修复合并JS的bug

littledu · littledu · commit 5640494d32ba · 2017-05-10T19:46:57.000+08:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "WeFlow",
-  "version": "1.3.2",
-  "release": "1.3.2",
+  "version": "1.3.3",
+  "release": "1.3.3",
   "description": "A minimal Electron application",
   "main": "main.js",
   "scripts": {
@@ -66,7 +66,7 @@
     "gulp-sftp": "^0.1.5",
     "gulp-tmtsprite": "^0.0.22",
     "gulp-uglify": "^1.5.3",
-    "gulp-usemin": "^0.3.23",
+    "gulp-useref": "^3.1.2",
     "gulp-util": "^3.0.7",
     "gulp-webp": "^2.3.0",
     "gulp-zip": "^3.2.0",
diff --git a/src/_tasks/dist.js b/src/_tasks/dist.js
@@ -11,7 +11,7 @@ const gulpif = require('gulp-if');
 const less = require('gulp-less');
 const util = require(path.join(__dirname, './lib/util'));
 const uglify = require('gulp-uglify');
-const usemin = require('gulp-usemin');
+const useref = require('gulp-useref');
 const lazyImageCSS = require('gulp-lazyimagecss');  // 自动为图片样式添加 宽/高/background-size 属性
 const minifyCSS = require('gulp-cssnano');
 const imagemin = require('weflow-imagemin');
@@ -26,6 +26,16 @@ const posthtmlPx2rem = require('posthtml-px2rem');
 const RevAll = require('weflow-rev-all');   // reversion
 const revDel = require('gulp-rev-delete-original');
 const sass = require('gulp-sass');
+
+//svg转换用到的组件
+var rename = require('gulp-rename');
+var svgmin = require('gulp-svgmin');
+var svgInline = require('gulp-svg-inline');
+var replace = require('gulp-replace');
+var parseSVG = require('./common/parseSVG');
+var svgToPng = require('./common/svgToPng');
+var svgSymbol = require('gulp-svg-sprite');
+
 const Common = require(path.join(__dirname, '../common'));
 
 let webp = require(path.join(__dirname, './common/webp'));
@@ -82,7 +92,10 @@ function dist(projectPath, log, callback) {
             html: path.join(projectPath, './tmp/html'),
             js: path.join(projectPath, './tmp/js'),
             sprite: path.join(projectPath, './tmp/sprite'),
-            spriteAll: path.join(projectPath, './tmp/sprite/**/*')
+            spriteAll: path.join(projectPath, './tmp/sprite/**/*'),
+            svg: path.join(projectPath, './tmp/img'),
+            symboltemp: path.join(projectPath, './tmp/symboltemp/'),
+            symbol: path.join(projectPath, './tmp/symbolsvg')
         },
         dist: {
             dir: path.join(projectPath, './dist'),
@@ -100,6 +113,11 @@ function dist(projectPath, log, callback) {
         })
     }
 
+    // 清除 svg 过渡目录
+    function delSVG() {
+        return del([paths.tmp.symboltemp]);
+    }
+
     function condition(file) {
         return path.extname(file.path) === '.png';
     }
@@ -112,7 +130,7 @@ function dist(projectPath, log, callback) {
                 console.log(error.message);
                 log(error.message);
             })
-            .pipe(lazyImageCSS({imagePath: lazyDir}))
+            .pipe(lazyImageCSS({imagePath: lazyDir, SVGGracefulDegradation:config.SVGGracefulDegradation}))
             .pipe(tmtsprite({margin: 4}))
             .pipe(gulpif(condition, gulp.dest(paths.tmp.sprite), gulp.dest(paths.tmp.css)))
             .on('data', function () {
@@ -239,7 +257,7 @@ function dist(projectPath, log, callback) {
                 ))
             )
             .pipe(gulp.dest(paths.tmp.html))
-            .pipe(usemin())
+            .pipe(useref())
             .pipe(gulp.dest(paths.tmp.html))
             .on('end', function () {
                 console.log('compileHtml success.');
