Update webpack & friends

joshfrench · Mar 13, 2018 · cc1949c · cc1949c
1 parent 4a3e924
commit cc1949c
Show file tree

Hide file tree

Showing 5 changed files with 2,470 additions and 732 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -6,6 +6,6 @@
 </head>
 <body>
   <div id="root"></div>
-  <script src="index.js"></script>
+  <script src="main.js"></script>
 </body>
 </html>
diff --git a/karma.conf.js b/karma.conf.js
@@ -22,6 +22,7 @@ module.exports = function(config) {
     },
 
     webpack: {
+      mode: 'development',
       devtool: 'inline-source-map',
       module: {
         rules: [

diff --git a/package.json b/package.json
@@ -2,9 +2,9 @@
   "name": "mobiledoc-react-renderer",
   "version": "0.0.1",
   "description": "Renders Mobiledoc input to React tree",
-  "main": "index.js",
+  "main": "dist/main.js",
   "scripts": {
-    "start": "webpack-dev-server --progress",
+    "start": "webpack-dev-server --mode development --progress",
     "lint": "eslint src",
     "test": "karma start --single-run",
     "test:watch": "karma start",
@@ -18,7 +18,7 @@
   "devDependencies": {
     "babel-core": "^6.7.7",
     "babel-eslint": "^6.0.4",
-    "babel-loader": "^7.1.2",
+    "babel-loader": "^7.1.4",
     "babel-plugin-react-transform": "^3.0.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-polyfill": "^6.13.0",
@@ -27,11 +27,10 @@
     "chai": "^4.1.2",
     "chai-enzyme": "^1.0.0-beta.0",
     "cheerio": "^1.0.0-rc.2",
-    "enzyme": "^3.2.0",
+    "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.0",
     "eslint": "^4.12.1",
     "eslint-plugin-babel": "4.1.2",
-    "json-loader": "0.5.7",
     "karma": "^1.7.1",
     "karma-benchmark": "^0.7.1",
     "karma-benchmarkjs-reporter": "^1.0.0",
@@ -40,17 +39,16 @@
     "karma-mocha": "^1.3.0",
     "karma-mocha-reporter": "^2.2.5",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "^2.0.6",
+    "karma-webpack": "^2.0.13",
     "mocha": "^4.0.1",
     "react": "^16.0",
     "react-dom": "^16.0",
     "react-transform-hmr": "^1.0.4",
     "sinon": "^4.1.2",
     "sinon-chai": "^2.14.0",
-    "webpack": "^3.9.1",
-    "webpack-dev-middleware": "^1.6.1",
-    "webpack-dev-server": "^2.9.5",
-    "webpack-hot-middleware": "^2.12.2",
+    "webpack": "^4.1.1",
+    "webpack-cli": "^2.0.11",
+    "webpack-dev-server": "^3.1.1",
     "webpack-merge": "^0.14.0"
   },
   "license": "ISC",

diff --git a/webpack.config.js b/webpack.config.js
@@ -5,59 +5,30 @@ var merge = require('webpack-merge');
 var TARGET = process.env.npm_lifecycle_event;
 process.env.BABEL_ENV = TARGET;
 
-var config = {
-  entry: ['./src/index.js']
-};
-
-config.output = {
-  path: path.join(__dirname, 'dist'),
-  filename: 'index.js'
-};
-
-config.module = {
-  rules: [
-    {
-      test: /\.js$/,
-      loaders: ['babel-loader'],
-      exclude: /node_modules/
-    }
-  ]
+const config = {
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        loaders: ['babel-loader'],
+        exclude: /node_modules/
+      }
+    ]
+  }
 };
 
 // dev server
 if (TARGET === 'start' || !TARGET) {
   module.exports = merge(config, {
     devtool: 'inline-source-map',
-    entry: ['./demo/index.js'],
-    output: {
-      devtoolModuleFilenameTemplate: '[resourcePath]',
-      devtoolFallbackModuleFilenameTemplate: '[resourcePath]?[hash]'
-    },
+    entry: './demo/index.js',
     devServer: {
       contentBase: './demo',
-      hot: true,
-      inline: true,
-      progress: true,
       stats: 'errors-only'
-    },
-    plugins: [
-      new webpack.HotModuleReplacementPlugin()
-    ]
-  });
-}
-
-// karma and friends
-if (/^test/.test(TARGET)) {
-  module.exports = merge(config, {
-    devtool: 'inline-source-map',
-    output: {
-      devtoolModuleFilenameTemplate: '[resourcePath]',
-      devtoolFallbackModuleFilenameTemplate: '[resourcePath]?[hash]'
     }
   });
 }
 
-
 // production build
 if (TARGET === 'build') {
   module.exports = merge(config, {