Merge branch 'cssmodules' into beta

alleyinteractive · Oct 16, 2017 · 1db82ec · 1db82ec
2 parents bfb08cc + 3bb2535
commit 1db82ec
Show file tree

Hide file tree

Showing 13 changed files with 420 additions and 4,159 deletions.
diff --git a/config/webpack.server.config.js b/config/webpack.server.config.js
@@ -8,6 +8,7 @@ const CleanPlugin = require('clean-webpack-plugin');
 
 module.exports = function getConfig(env) {
   const context = path.join(__dirname, '../');
+  const include = path.join(__dirname, '../src/cli');
 
   return {
     context,
@@ -36,17 +37,17 @@ module.exports = function getConfig(env) {
       __dirname: false,
     },
     module: {
-      noParse: /requireExternal/,
+      noParse: [/requireExternal/, /hotTemplate/],
       rules: [
         {
           enforce: 'pre',
           test: /\.js$/,
-          exclude: [/node_modules/, /\.min\.js$/],
+          include,
           use: 'eslint-loader',
         },
         {
           test: /\.js$/,
-          exclude: /node_modules/,
+          include,
           use: 'babel-loader',
         },
       ],