Merge 463f6fb into 1d4ea53

collab-project · Sep 24, 2018 · f8162f9 · f8162f9
2 parents 1d4ea53 + 463f6fb
commit f8162f9
Show file tree

Hide file tree

Showing 6 changed files with 167 additions and 284 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -34,13 +34,5 @@
     "keyword-spacing": ["error", { "before": true }],
     "space-infix-ops": 2,
     "prefer-arrow-callback": 2
-  },
-  "overrides": [
-    {
-      "files": ["test-*.js", "*.spec.js"],
-      "rules": {
-        "prefer-arrow-callback": "off"
-      }
-    }
-  ]
+  }
 }
diff --git a/build-config/fragments/common.js b/build-config/fragments/common.js
@@ -34,7 +34,7 @@ var cssBannerPlugin = new webpack.BannerPlugin({
 
 // inject JS version number
 var jsVersionPlugin = new webpack.DefinePlugin({
-  '__VERSION__': JSON.stringify(pckg.version)
+    '__VERSION__': JSON.stringify(pckg.version)
 });
 
 var rootDir = path.resolve(__dirname, '..', '..');
@@ -58,6 +58,7 @@ module.exports = {
     module: {
         rules: [
             {
+                // javascript
                 test: /\.js$/,
                 include: path.resolve(rootDir, 'src', 'js'),
                 exclude: /(node_modules|bower_components|test)/,
@@ -66,8 +67,10 @@ module.exports = {
                 }
             },
             {
+                // scss
                 test: /\.scss$/,
                 include: path.resolve(rootDir, 'src', 'css'),
+                exclude: /(node_modules|bower_components|test)/,
                 use: [
                     MiniCssExtractPlugin.loader,
                     'css-loader',

diff --git a/build-config/fragments/dev.js b/build-config/fragments/dev.js
@@ -6,13 +6,19 @@
 const path = require('path');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
+const contentBase = path.resolve(__dirname, '..', '..');
+
 module.exports = {
     mode: 'development',
     devtool: 'source-map',
     devServer: {
-        contentBase: [path.resolve(__dirname, '..', '..')],
+        contentBase: [contentBase],
         publicPath: 'localhost:8080/dist/',
-        watchContentBase: true
+        watchContentBase: true,
+        watchOptions: {
+            ignored: ['.chrome', 'node_modules', 'bower_components',
+                'coverage']
+        }
     },
     plugins: [
         new MiniCssExtractPlugin({