Merge pull request #73 from pirelenito/enable-extract-text-only-on-bu…

…ild-and-dist Enable ExtractTextPlugin only while building and distributing
saguijs · Apr 3, 2016 · c283f81 · c283f81
2 parents 9179b95 + 008a182
commit c283f81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/configure/webpack/plugins/css-modules.js b/src/configure/webpack/plugins/css-modules.js
@@ -3,9 +3,9 @@ import ExtractTextPlugin from 'extract-text-webpack-plugin'
 
 export default {
   name: 'webpack-css-modules',
-  configure ({ pages = [] }) {
+  configure ({ pages = [], buildTarget }) {
     const extractCSS = new ExtractTextPlugin('[name]-[hash]-[ext].css')
-    const hasPages = pages.length > 0
+    const enabled = pages.length > 0 && (buildTarget === 'dist' || buildTarget === 'build')
 
     // importLoaders: use the following postcss-loader in @import statements
     // modules: enable css-mobules
@@ -22,12 +22,12 @@ export default {
         loaders: [
           {
             test: /\.css$/,
-            loader: hasPages ? extractCSS.extract(baseLoader) : `style!${baseLoader}`
+            loader: enabled ? extractCSS.extract(baseLoader) : `style!${baseLoader}`
           }
         ]
       },
 
-      plugins: hasPages ? [extractCSS] : []
+      plugins: enabled ? [extractCSS] : []
     }
   }
 }
diff --git a/src/configure/webpack/plugins/scss.js b/src/configure/webpack/plugins/scss.js
@@ -3,9 +3,9 @@ import ExtractTextPlugin from 'extract-text-webpack-plugin'
 
 export default {
   name: 'webpack-scss',
-  configure ({ pages = [], projectPath }) {
+  configure ({ pages = [], projectPath, buildTarget }) {
     const extractCSS = new ExtractTextPlugin('[name]-[hash]-scss.css')
-    const hasPages = pages.length > 0
+    const enabled = pages.length > 0 && (buildTarget === 'dist' || buildTarget === 'build')
 
     const baseLoader = 'css!resolve-url!sass?sourceMap&outputStyle=expanded&' +
       'includePaths[]=' + (path.resolve(projectPath, './node_modules'))
@@ -15,11 +15,11 @@ export default {
         loaders: [
           {
             test: /\.scss$/,
-            loader: hasPages ? extractCSS.extract(baseLoader) : `style!${baseLoader}`
+            loader: enabled ? extractCSS.extract(baseLoader) : `style!${baseLoader}`
           }
         ]
       },
-      plugins: hasPages ? [extractCSS] : []
+      plugins: enabled ? [extractCSS] : []
     }
   }
 }