Merge pull request #76 from ElemeFE/fix/clear

cooking: fix clear in development
ElemeFE · Sep 11, 2016 · 21ab95c · 21ab95c
2 parents 071ba07 + 9987c4e
commit 21ab95c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/packages/cooking/util/merge.js b/packages/cooking/util/merge.js
@@ -95,6 +95,13 @@ module.exports = function (userConfig, baseConfig) {
     // extractCSS
     if (userConfig.devServer) {
       extractCSS(userConfig.devServer.extractCSS, config, false)
+
+      // clean
+      if (is.Boolean(userConfig.devServer.clean)) {
+        config.__COOKING_CLEAN__ = userConfig.devServer.clean
+      } else {
+        config.__COOKING_CLEAN__ = true
+      }
     }
 
     // devtool
@@ -158,6 +165,13 @@ module.exports = function (userConfig, baseConfig) {
       }
     }
 
+    // clean
+    if (is.Boolean(userConfig.clean)) {
+      config.__COOKING_CLEAN__ = userConfig.clean
+    } else {
+      config.__COOKING_CLEAN__ = true
+    }
+
     extractCSS(userConfig.extractCSS, config, userConfig.hash)
   }
 
@@ -176,13 +190,6 @@ module.exports = function (userConfig, baseConfig) {
     config.postcss = require('./load-postcss')(userConfig.postcss)
   }
 
-  // clean
-  if (is.Boolean(userConfig.clean)) {
-    config.__COOKING_CLEAN__ = userConfig.clean
-  } else {
-    config.__COOKING_CLEAN__ = true
-  }
-
   // chunk
   const CommonsChunkPlugin = webpack.optimize.CommonsChunkPlugin
   const chunks = userConfig.chunk

diff --git a/packages/cooking/util/parse.js b/packages/cooking/util/parse.js
@@ -35,7 +35,7 @@ module.exports = function (config) {
     process.env.NODE_ENV === 'development' ? config.devServer : false
   )
 
-  if (config.__COOKING_CLEAN__ && process.env.NODE_ENV === 'production') {
+  if (config.__COOKING_CLEAN__) {
     shelljs.rm('-rf', config.output.path)
   }
 

diff --git a/test/cooking.test.js b/test/cooking.test.js
@@ -260,6 +260,7 @@ test('cooking set extractCSS in development', t => {
 })
 
 test('cooking clean', t => {
+  process.env.NODE_ENV = 'production'
   cooking.set({
     clean: true
   })