From a7750f2c84a197eed93e953a239bc45719c3c20a Mon Sep 17 00:00:00 2001
From: huqi <hq_1980@hotmail.com>
Date: Tue, 1 Dec 2020 11:58:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=89=93=E5=8C=85=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0sourceMap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gulpfile.js       | 31 +++++++++++++++++++++++++------
 o2web/gulpfile.js | 23 ++++++++++++++++++-----
 package.json      |  3 ++-
 3 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index c1039f0add..27a08d7887 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -21,6 +21,7 @@ var assetRev = require('gulp-tm-asset-rev');
 const os = require('os');
 var through2 = require('through2');
 var path = require('path');
+var sourceMap = require('gulp-sourcemaps');
 
 //var downloadHost = "download.o2oa.net";
 // var downloadHost = "release.o2oa.net";
@@ -414,10 +415,13 @@ function build_concat_o2(){
     ];
     var dest = 'target/o2server/servers/webServer/o2_core/';
     return gulp.src(src)
+        .pipe(sourceMap.init())
         .pipe(concat('o2.js'))
         .pipe(gulp.dest(dest))
+        .pipe(concat('o2.min.js'))
         .pipe(uglify())
-        .pipe(rename({ extname: '.min.js' }))
+        //.pipe(rename({ extname: '.min.js' }))
+        .pipe(sourceMap.write(""))
         .pipe(gulp.dest(dest))
 }
 function build_concat_desktop(){
@@ -441,10 +445,13 @@ function build_concat_desktop(){
     ];
     var dest = 'target/o2server/servers/webServer/o2_core/o2/xDesktop/';
     return gulp.src(src)
+        .pipe(sourceMap.init())
         .pipe(concat('$all.js'))
         .pipe(gulp.dest(dest))
+        .pipe(concat('$all.min.js'))
         .pipe(uglify())
-        .pipe(rename({ extname: '.min.js' }))
+        //.pipe(rename({ extname: '.min.js' }))
+        .pipe(sourceMap.write(""))
         .pipe(gulp.dest(dest))
 }
 function build_concat_xform(){
@@ -471,10 +478,13 @@ function build_concat_xform(){
     ];
     var dest = 'target/o2server/servers/webServer/'+path+'/';
     return gulp.src(src)
+        .pipe(sourceMap.init())
         .pipe(concat('$all.js'))
         .pipe(gulp.dest(dest))
+        .pipe(concat('$all.min.js'))
         .pipe(uglify())
-        .pipe(rename({ extname: '.min.js' }))
+        //.pipe(rename({ extname: '.min.js' }))
+        .pipe(sourceMap.write(""))
         .pipe(gulp.dest(dest))
 }
 
@@ -489,10 +499,13 @@ function build_bundle(){
     ];
     var dest = 'target/o2server/servers/webServer/'+path+'/';
     return gulp.src(src)
+        .pipe(sourceMap.init())
         .pipe(concat('bundle.js'))
         .pipe(gulp.dest(dest))
+        .pipe(concat('bundle.min.js'))
         .pipe(uglify())
-        .pipe(rename({ extname: '.min.js' }))
+        //.pipe(rename({ extname: '.min.js' }))
+        .pipe(sourceMap.write(""))
         .pipe(gulp.dest(dest))
 }
 
@@ -642,10 +655,13 @@ function build_concat_basework_body() {
     ];
     var dest = 'target/o2server/servers/webServer/x_desktop/js/';
     return gulp.src(src)
+        .pipe(sourceMap.init())
         .pipe(concat('base_work.js'))
         .pipe(gulp.dest(dest))
+        .pipe(concat('base_work.min.js'))
         .pipe(uglify())
-        .pipe(rename({ extname: '.min.js' }))
+        //.pipe(rename({ extname: '.min.js' }))
+        .pipe(sourceMap.write(""))
         .pipe(gulp.dest(dest));
 }
 
@@ -743,10 +759,13 @@ function build_concat_baseportal_body() {
     ];
     var dest = 'target/o2server/servers/webServer/x_desktop/js/';
     return gulp.src(src)
+        .pipe(sourceMap.init())
         .pipe(concat('base_portal.js'))
         .pipe(gulp.dest(dest))
+        .pipe(concat('base_portal.min.js'))
         .pipe(uglify())
-        .pipe(rename({ extname: '.min.js' }))
+        //.pipe(rename({ extname: '.min.js' }))
+        .pipe(sourceMap.write(""))
         .pipe(gulp.dest(dest));
 }
 
diff --git a/o2web/gulpfile.js b/o2web/gulpfile.js
index dede3d4c38..424a434c8a 100644
--- a/o2web/gulpfile.js
+++ b/o2web/gulpfile.js
@@ -166,6 +166,7 @@ function createXFormConcatTask(path, isMin, thisOptions) {
         ];
         var dest = option.dest+'/' + path + '/';
         return gulp.src(src)
+            .pipe(sourceMap.init())
             .pipe(concat('$all.js'))
             .pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
             .pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
@@ -183,8 +184,9 @@ function createXFormConcatTask(path, isMin, thisOptions) {
                 remotePath: (option.remotePath || '/') + path
             })))
             .pipe(gulp.dest(dest))
+            .pipe(concat('$all.min.js'))
             .pipe(uglify())
-            .pipe(rename({ extname: '.min.js' }))
+            .pipe(sourceMap.write(""))
             .pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
             .pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
                 host: option.host,
@@ -214,6 +216,7 @@ function createO2ConcatTask(path, isMin, thisOptions) {
         ];
         var dest = option.dest+'/' + path + '/';
         return gulp.src(src)
+            .pipe(sourceMap.init())
             .pipe(concat('o2.js'))
             .pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
             .pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
@@ -231,8 +234,10 @@ function createO2ConcatTask(path, isMin, thisOptions) {
                 remotePath: (option.remotePath || '/') + path
             })))
             .pipe(gulp.dest(dest))
+            .pipe(concat('o2.min.js'))
             .pipe(uglify())
-            .pipe(rename({ extname: '.min.js' }))
+            //.pipe(rename({ extname: '.min.js' }))
+            .pipe(sourceMap.write(""))
             .pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
             .pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
                 host: option.host,
@@ -272,6 +277,7 @@ function createO2ConcatTask(path, isMin, thisOptions) {
         ];
         var dest = option.dest+'/' + path + '/o2/xDesktop/';
         return gulp.src(src)
+            .pipe(sourceMap.init())
             .pipe(concat('$all.js'))
             .pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/o2/xDesktop/')))
             .pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
@@ -289,8 +295,10 @@ function createO2ConcatTask(path, isMin, thisOptions) {
                 remotePath: (option.remotePath || '/') + path+"/o2/xDesktop/"
             })))
             .pipe(gulp.dest(dest))
+            .pipe(concat('$all.min.js'))
             .pipe(uglify())
-            .pipe(rename({ extname: '.min.js' }))
+            //.pipe(rename({ extname: '.min.js' }))
+            .pipe(sourceMap.write(""))
             .pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/o2/xDesktop/')))
             .pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
                 host: option.host,
@@ -320,6 +328,7 @@ function createO2ConcatTask(path, isMin, thisOptions) {
         ];
         var dest = option.dest+'/' + path + '/';
         return gulp.src(src)
+            .pipe(sourceMap.init())
             .pipe(concat('bundle.js'))
             .pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
             .pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
@@ -337,8 +346,10 @@ function createO2ConcatTask(path, isMin, thisOptions) {
                 remotePath: (option.remotePath || '/') + path
             })))
             .pipe(gulp.dest(dest))
+            .pipe(concat('bundle.min.js'))
             .pipe(uglify())
-            .pipe(rename({ extname: '.min.js' }))
+            //.pipe(rename({ extname: '.min.js' }))
+            .pipe(sourceMap.write(""))
             .pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
             .pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
                 host: option.host,
@@ -527,7 +538,7 @@ function createBaseWorkConcatBodyTask(path, isMin, thisOptions) {
             .pipe(gulp.dest(dest))
 
             .pipe(uglify())
-            .pipe(rename({ extname: '.min.js' }))
+            .pipe(concat('js/base_work.min.js'))
             .pipe( sourceMap.write("") )
             .pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
             .pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
@@ -656,6 +667,7 @@ function createBasePortalConcatBodyTask(path, isMin, thisOptions) {
         ];
         var dest = option.dest+'/' + path + '/';
         return gulp.src(src)
+            .pipe(sourceMap.init())
             .pipe(concat('js/base_portal.js'))
             .pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
             .pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
@@ -676,6 +688,7 @@ function createBasePortalConcatBodyTask(path, isMin, thisOptions) {
             // .pipe(gulp.src(src))
             .pipe(concat('js/base_portal.min.js'))
             .pipe(uglify())
+            .pipe( sourceMap.write("") )
             // .pipe(rename({ extname: '.min.js' }))
             .pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
             .pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
diff --git a/package.json b/package.json
index b6531a76a2..e7231bcc55 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
                 "progress-stream": "^2.0.0",
                 "request": "^2.88.2",
                 "single-line-log": "^1.1.2",
-                "targz": "^1.0.1"
+                "targz": "^1.0.1",
+                "gulp-sourcemaps": "^3.0.0"
         }
 }
-- 
GitLab