Update tests, build to webpack v2

bencripps · Feb 25, 2017 · 261f218 · 261f218
1 parent b6ad760
commit 261f218
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 45 deletions.
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "demo:run": "http-server -p 3000 ./demo",
     "build": "webpack --pretty --config webpack/webpack.config.dev.js",
     "dist": "babel ./src --out-dir dist",
-    "hot": "webpack-dev-server --hot --inline --pretty --config webpack/webpack.config.hot.js",
+    "hot": "webpack-dev-server --hot --config webpack/webpack.config.hot.js",
     "lint": "eslint ./",
     "prepublish": "npm run dist",
     "prod": "webpack -p --config webpack/webpack.config.prod.js",
@@ -79,7 +79,7 @@
     "jasmine-core": "^2.5.2",
     "jsdom": "^9.8.3",
     "json-loader": "^0.5.4",
-    "karma": "^1.3.0",
+    "karma": "^1.4.1",
     "karma-babel-preprocessor": "^6.0.1",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^2.0.0",
@@ -95,7 +95,7 @@
     "karma-sinon-chai": "^1.2.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.26",
-    "karma-webpack": "^2.0.1",
+    "karma-webpack": "^2.0.2",
     "lolex": "^1.5.1",
     "mocha": "^3.1.2",
     "node-storage-shim": "^1.0.1",
@@ -112,7 +112,7 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^2.3.1",
     "url-loader": "^0.5.7",
-    "webpack": "^1.13.2",
-    "webpack-dev-server": "^1.16.1"
+    "webpack": "^2.2.1",
+    "webpack-dev-server": "^2.3.0"
   }
 }
diff --git a/test/karma.config.js b/test/karma.config.js
@@ -42,14 +42,9 @@ module.exports = function exports(config) {
         ],
 
         preprocessors: {
-            './../webpack/webpack.test.js': ['babel', 'webpack', 'sourcemap']
+            './../webpack/webpack.test.js': ['babel', 'webpack']
         },
 
-        babelPreprocessor: {
-            options: {
-                presets: ['es2015']
-            }
-        },
         reporters: REPORTERS,
         specReporter: {
             maxLogLines: 20,
@@ -60,19 +55,11 @@ module.exports = function exports(config) {
         },
         singleRun: SINGLE_RUN,
         webpack: {
-            isparta: {
-                embedSource: true,
-                noAutoWrap: true,
-                babel: {
-                    presets: ['es2015', 'stage-0', 'react']
-                }
-            },
             resolve: {
-                extensions: ['', '.js', '.jsx', '.styl']
+                extensions: ['.js', '.jsx', '.styl']
             },
             module: {
-                preLoaders: PRELOADERS,
-                loaders: loaders
+                rules: PRELOADERS.concat(loaders)
             },
             externals: {
                 cheerio: 'window',
@@ -85,7 +72,7 @@ module.exports = function exports(config) {
                 fs: 'empty'
             },
             devServer: {
-                quiet: false
+                quiet: true
             }
         },
         webpackMiddleware: {

diff --git a/webpack/loaders.js b/webpack/loaders.js
@@ -3,28 +3,28 @@ const path = require('path');
 module.exports = [
     {
         test: /\.js$|\.jsx$/,
-        loaders: ['babel-loader'],
+        loader: 'babel-loader',
         exclude: /node_modules|\.json$/
     },
     {
-        loaders: ['babel-loader'],
+        loader: 'babel-loader',
         include: path.resolve(__dirname, '../test')
     },
     {
         test: /\.styl$/,
         exclude: /node_modules|\.json$/,
-        loaders: ['style-loader', 'css-loader', 'stylus-loader']
+        use: ['style-loader', 'css-loader', 'stylus-loader']
     },
     {
         test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loaders: ['url-loader?limit=10000&mimetype=application/font-woff']
+        loader: 'url-loader?limit=10000&mimetype=application/font-woff'
     },
     {
         test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loaders: ['file-loader']
+        loader: 'file-loader'
     },
     {
         test: /\.json$/,
-        loaders: ['json-loader']
+        loader: 'json-loader'
     }
 ];
diff --git a/webpack/preloaders.js b/webpack/preloaders.js
@@ -1,12 +1,11 @@
 module.exports = [
     {
         test: /\.js$|\.jsx$/,
-        loaders: ['babel-loader'],
-        exclude: /node_modules|\.json$|\.test\.js/
-    },
-    {
-        test: /\.js$|\.jsx$/,
-        exclude: /node_modules|test|\.test\.js/,
-        loader: 'isparta'
+        enforce: 'post',
+        exclude: /node_modules|test|\.test\.|.styl/,
+        loader: 'istanbul-instrumenter-loader',
+        query: {
+            esModules: true
+        }
     }
 ];
diff --git a/webpack/webpack.config.hot.js b/webpack/webpack.config.hot.js
@@ -2,8 +2,6 @@ const loaders = require('./loaders');
 
 module.exports = {
     entry: [
-        'webpack/hot/dev-server',
-        'webpack-dev-server/client?http://localhost:8080',
         './demo/entry.js'
     ],
     devServer: {
@@ -23,16 +21,10 @@ module.exports = {
         fs: 'empty'
     },
     resolve: {
-        extensions: ['', '.js', '.jsx', '.styl']
+        extensions: ['.js', '.jsx', '.styl']
     },
     module: {
-        eslint: {
-            configFile: '.eslintrc',
-            emitError: true,
-            failOnError: true,
-            failOnWarning: false
-        },
-        loaders: loaders
+        rules: loaders
     },
     devtool: 'inline-source-map'
 };