Просмотр исходного кода

organize webpack configuration files

Yuki Takei 7 лет назад
Родитель
Сommit
024b807686
3 измененных файлов с 9 добавлено и 12 удалено
  1. 3 7
      config/webpack.common.js
  2. 4 3
      config/webpack.dev.js
  3. 2 2
      config/webpack.prod.js

+ 3 - 7
config/webpack.common.js

@@ -101,14 +101,10 @@ module.exports = (options) => {
           loader: 'imports-loader?module=>false,exports=>false,define=>false,this=>window'
         },
         {
-          test: /\.css$/,
-          use: ['style-loader', 'css-loader'],
-          exclude: [helpers.root('src/client/styles')]
-        },
-        {
-          test: /\.scss$/,
+          test: /\.(sc|sa|c)ss$/,
           use: ['style-loader', 'css-loader', 'sass-loader'],
-          exclude: [helpers.root('src/client/styles')]
+          exclude: [helpers.root('src/client')]
+
         },
         /*
          * File loader for supporting images, for example, in CSS files.

+ 4 - 3
config/webpack.dev.js

@@ -29,16 +29,17 @@ module.exports = require('./webpack.common')({
   module: {
     rules: [
       {
-        test: /\.scss$/,
+        test: /\.(sc|sa|c)ss$/,
         use: [
           'style-loader',
           { loader: 'css-loader', options: { sourceMap: true } },
           { loader: 'sass-loader', options: { sourceMap: true } },
         ],
-        include: [helpers.root('src/client/styles/scss')]
+        include: [helpers.root('src/client')],
+        exclude: [helpers.root('src/client/styles/hackmd')],
       },
       { // Dump CSS for HackMD
-        test: /\.scss$/,
+        test: /\.(sc|sa|c)ss$/,
         use: ExtractTextPlugin.extract({
           use: [
             'css-loader',

+ 2 - 2
config/webpack.prod.js

@@ -26,7 +26,7 @@ module.exports = require('./webpack.common')({
   module: {
     rules: [
       {
-        test: /\.scss$/,
+        test: /\.(sc|sa|c)ss$/,
         use: ExtractTextPlugin.extract({
           use: [
             'css-loader',
@@ -39,7 +39,7 @@ module.exports = require('./webpack.common')({
             'sass-loader'
           ]
         }),
-        include: [helpers.root('src/client/styles/scss'), helpers.root('src/client/styles/hackmd')]
+        include: [helpers.root('src/client')]
       }
     ]
   },