修复路径错误

littledu · littledu · commit 3916c4a6b5f8 · 2016-06-05T11:28:46.000+08:00
diff --git a/main.js b/main.js
@@ -26,7 +26,7 @@ function createWindow() {
     mainWindow.loadURL('file://' + __dirname + '/app.html');
 
     // Open the DevTools.
-    // mainWindow.webContents.openDevTools();
+    mainWindow.webContents.openDevTools();
 
     mainWindow.on('close', function (event) {
         if(process.platform !== 'win32' && !willClose){
diff --git a/package.json b/package.json
@@ -41,9 +41,8 @@
     "browser-sync": "^2.11.1",
     "crypto-md5": "^1.0.0",
     "del": "^2.2.0",
-    "electron-prebuilt": "^0.37.8",
     "extract-zip": "^1.5.0",
-    "gulp": "^3.9.1",
+    "gulp": "git://github.com/gulpjs/gulp#4.0",
     "gulp-cssnano": "^2.1.1",
     "gulp-ejs": "^2.1.1",
     "gulp-ftp": "^1.1.0",
diff --git a/src/_tasks/dev.js b/src/_tasks/dev.js
@@ -165,10 +165,6 @@ function watch(cb) {
 
 function watchHandler(type, file) {
 
-    if(typeof file !== 'string'){
-        file = file.path;
-    }
-
     let target = file.split('src')[1].match(/[\/\\](\w+)[\/\\]/);
 
     if (target.length && target[1]) {
@@ -178,7 +174,7 @@ function watchHandler(type, file) {
     switch (target) {
         case 'img':
             if (type === 'removed') {
-                let tmp = file.replace('src/', 'dev/');
+                let tmp = file.replace(/src/, 'dev');
                 del([tmp], {force: true}).then(function () {
                     reloadHandler();
                 });
@@ -189,7 +185,7 @@ function watchHandler(type, file) {
 
         case 'slice':
             if (type === 'removed') {
-                var tmp = file.replace('src/', 'dev/');
+                var tmp = file.replace(/src/, 'dev');
                 del([tmp], {force: true});
             } else {
                 copyHandler('slice', file);
@@ -198,7 +194,7 @@ function watchHandler(type, file) {
 
         case 'js':
             if (type === 'removed') {
-                var tmp = file.replace('src/', 'dev/');
+                var tmp = file.replace(/src/, 'dev');
                 del([tmp], {force: true});
             } else {
                 copyHandler('js', file);
@@ -207,7 +203,7 @@ function watchHandler(type, file) {
 
         case 'media':
             if (type === 'removed') {
-                var tmp = file.replace('src/', 'dev/');
+                var tmp = file.replace(/src/, 'dev');
                 del([tmp], {force: true});
             } else {
                 copyHandler('media', file);
@@ -217,7 +213,7 @@ function watchHandler(type, file) {
         case 'css':
 
             if (type === 'removed') {
-                var tmp = file.replace('src/', 'dev/').replace('.less', '.css');
+                var tmp = file.replace(/src/, 'dev').replace('.less', '.css');
                 del([tmp], {force: true});
             } else {
                 compileLess();
@@ -227,7 +223,8 @@ function watchHandler(type, file) {
 
         case 'html':
             if (type === 'removed') {
-                var tmp = file.replace('src/', 'dev/');
+                var tmp = file.replace(/src/, 'dev');
+                console.log(tmp);
                 del([tmp], {force: true}).then(function () {
                 });
             } else {
diff --git a/src/_tasks/dist.js b/src/_tasks/dist.js
@@ -81,7 +81,7 @@ function dist(projectPath, log, callback) {
             dir: path.join(projectPath, './tmp'),
             dirAll: path.join(projectPath, './tmp/**/*'),
             css: path.join(projectPath, './tmp/css'),
-            cssAll: path.join(projectPath, './tmp/style-*.css'),
+            cssAll: path.join(projectPath, './tmp/css/style-*.css'),
             img: path.join(projectPath, './tmp/img'),
             html: path.join(projectPath, './tmp/html'),
             sprite: path.join(projectPath, './tmp/sprite'),
@@ -127,6 +127,7 @@ function dist(projectPath, log, callback) {
         gulp.src(paths.src.less)
             .pipe(less())
             .pipe(lazyImageCSS({imagePath: lazyDir}))
+            .pipe(gulp.dest(paths.tmp.css))
             .on('data', function(){})
             .on('end', function () {
                 console.log('compileLess success.');
