Upgraded webpack to version 4

Author: squidfunk

Makefile

@@ -35,7 +35,7 @@ node_modules:
 # Build theme for distribution with Webpack
 dist/adapter/index.js: $(shell find src/adapter) \
 .babelrc webpack.config.ts dist/index.js
-	$(shell npm bin)/webpack --env.prod
+	$(shell npm bin)/webpack --mode production
 
 # Create directories
 dist/config dist/static:
@@ -78,16 +78,19 @@ lint: node_modules
 
 # Execute integration tests
 test-integration: node_modules build
-	$(shell npm bin)/karma start tests/karma.integration.conf.ts \
-		--single-run
+	TS_NODE_PROJECT=tests/tsconfig.json TS_NODE_FILES=1 \
+		$(shell npm bin)/karma start tests/karma.integration.conf.ts \
+			--single-run
 
 # Execute unit tests
 test: node_modules
-	$(shell npm bin)/karma start tests/karma.conf.ts --single-run
+	TS_NODE_PROJECT=tests/tsconfig.json TS_NODE_FILES=1 \
+		$(shell npm bin)/karma start tests/karma.conf.ts --single-run
 
 # Execute unit tests in watch mode
 watch: node_modules
-	$(shell npm bin)/karma start tests/karma.conf.ts
+	TS_NODE_PROJECT=tests/tsconfig.json TS_NODE_FILES=1 \
+		$(shell npm bin)/karma start tests/karma.conf.ts
 
 # -----------------------------------------------------------------------------
 

package-lock.json

@@ -30,52 +30,52 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "build": "make -j clean build",
+    "build": "make build",
     "clean": "make clean",
     "lint": "make lint",
     "test": "make test",
     "test:integration": "make test-integration",
     "watch": "make watch"
   },
   "dependencies": {
-    "@types/karma": "^1.7.3",
-    "jsonschema": "^1.1.1"
+    "@types/karma": "^1.7.7",
+    "jsonschema": "^1.2.4"
   },
   "devDependencies": {
-    "@types/chance": "^1.0.0",
-    "@types/jasmine": "^2.8.6",
+    "@types/chance": "^1.0.1",
+    "@types/jasmine": "^2.8.14",
     "@types/jsonschema": "^1.1.1",
-    "@types/karma-fixture": "^0.2.3",
-    "@types/node": "^9.4.7",
+    "@types/karma-fixture": "^0.2.5",
+    "@types/node": "^9.6.41",
     "@types/webpack": "^4.4.22",
     "array-findindex-polyfill": "^0.1.0",
-    "babel-core": "^6.25.0",
-    "babel-loader": "^7.1.1",
-    "babel-preset-env": "^1.6.1",
-    "chance": "^1.0.13",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^7.1.5",
+    "babel-preset-env": "^1.7.0",
+    "chance": "^1.0.18",
     "codecov": "^3.1.0",
-    "es6-promise": "^4.2.4",
-    "event-hooks-webpack-plugin": "^1.0.0",
+    "es6-promise": "^4.2.5",
     "git-hooks": "^1.1.8",
-    "istanbul-instrumenter-loader": "^3.0.0",
+    "istanbul-instrumenter-loader": "^3.0.1",
     "jasmine-core": "^2.7.0",
     "karma": "^3.1.4",
     "karma-chrome-launcher": "^2.2.0",
     "karma-clear-screen-reporter": "^1.0.0",
-    "karma-coverage-istanbul-reporter": "^1.4.1",
+    "karma-coverage-istanbul-reporter": "^1.4.3",
     "karma-fixture": "^0.2.6",
     "karma-html2js-preprocessor": "^1.1.0",
-    "karma-jasmine": "^1.1.1",
+    "karma-jasmine": "^1.1.2",
     "karma-sauce-launcher": "^2.0.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "^0.0.32",
-    "karma-summary-reporter": "^1.3.3",
+    "karma-summary-reporter": "^1.5.2",
     "karma-webpack": "^2.0.13",
     "moniker": "^0.1.2",
-    "ts-loader": "^3.5.0",
-    "ts-node": "^6.2.0",
-    "tslint": "^5.9.1",
-    "typescript": "^2.8.1",
-    "webpack": "^3.4.1"
+    "ts-loader": "^4.4.2",
+    "ts-node": "^7.0.1",
+    "tslint": "^5.12.0",
+    "typescript": "^3.2.2",
+    "webpack": "^4.28.2",
+    "webpack-cli": "^3.1.2"
   }
 }

package.json

@@ -33,12 +33,6 @@ import {
   RuleSetRule as WebpackRuleSetRule
 } from "webpack"
 
-/* ----------------------------------------------------------------------------
- * Plugins
- * ------------------------------------------------------------------------- */
-
-import EventHooksPlugin = require("event-hooks-webpack-plugin")
-
 /* ----------------------------------------------------------------------------
  * Functions
  * ------------------------------------------------------------------------- */
@@ -88,19 +82,6 @@ export function webpack(
       /* Polyfills */
       new ProvidePlugin({
         Promise: "es6-promise"
-      }),
-
-      /* Hack: The webpack development middleware sometimes goes into a loop
-         on macOS when starting for the first time. This is a quick fix until
-         this issue is resolved. See: http://bit.ly/2AsizEn */
-      new EventHooksPlugin({
-        "watch-run": (compiler: any, done: () => {}) => {
-          compiler.startTime += 10000
-          done()
-        },
-        "done": (stats: any) => {
-          stats.startTime -= 10000
-        }
       })
     ],
     devtool: "source-map"
@@ -122,7 +103,7 @@ export function saucelabs(
 
     /* Define browsers to run tests on, see http://bit.ly/2pl96u1 */
     browsers: Object.keys(browsers),
-    customLaunchers: browsers,
+    customLaunchers: browsers as any,
 
     /* Configure SauceLabs integration */
     concurrency: 5,

tests/karma/common.ts

@@ -1,37 +1,11 @@
 {
+  "extends": "../tsconfig.json",
   "compilerOptions": {
-    "allowJs": true,
-    "alwaysStrict": true,
-    "baseUrl": ".",
-    "lib": [
-      "dom",
-      "es2015",
-      "esnext"
-    ],
-    "moduleResolution": "node",
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitAny": true,
-    "noImplicitReturns": true,
-    "noImplicitThis": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "outDir": "dist",
-    "paths": {
-      "~/*": ["../src/*"],
-      "_/*": ["./*"]
-    },
-    "preserveConstEnums": true,
-    "removeComments": true,
-    "sourceMap": true,
-    "strict": true,
-    "stripInternal": true,
-    "target": "es5"
+    "removeComments": false
   },
   "include": [
-    ".",
+    "../src",
+    "../tests",
     "../typings"
-  ],
-  "exclude": [
-    "node_modules"
   ]
 }

tests/tsconfig.json

@@ -7,6 +7,7 @@
       "es2015",
       "esnext"
     ],
+    "module": "commonjs",
     "moduleResolution": "node",
     "noFallthroughCasesInSwitch": true,
     "noImplicitAny": true,
@@ -17,6 +18,7 @@
     "outDir": "dist",
     "preserveConstEnums": true,
     "removeComments": true,
+    "resolveJsonModule": true,
     "sourceMap": true,
     "strict": true,
     "stripInternal": true,

tsconfig.json

@@ -36,7 +36,6 @@ declare module "karma" {
     coverageIstanbulReporter?: {       /* karma-coverage */
       reports: string[]
     }
-    customLaunchers?: any              /* karma-sauce-launcher */
     sauceLabs?: {
       build?: string,
       testName: string,

typings/event-hooks-webpack-plugin.d.ts

@@ -24,32 +24,27 @@ import * as path from "path"
 import {
   Configuration,
   NoEmitOnErrorsPlugin,
-  optimize,
   ProvidePlugin
 } from "webpack"
 
-/* Webpack plugins */
-const {
-  UglifyJsPlugin
-} = optimize
-
-/* ----------------------------------------------------------------------------
- * Plugins
- * ------------------------------------------------------------------------- */
-
-import EventHooksPlugin = require("event-hooks-webpack-plugin")
-
 /* ----------------------------------------------------------------------------
  * Configuration
  * ------------------------------------------------------------------------- */
 
-export default (env?: { prod?: boolean }) => {
+/**
+ * Webpack configuration
+ *
+ * @param env - Webpack environment arguments
+ * @param args - Command-line arguments
+ *
+ * @return Webpack configuration
+ */
+export default (_env: never, args: Configuration) => {
   const config: Configuration = {
+    mode: args.mode,
 
     /* Entrypoint */
-    entry: [
-      path.resolve(__dirname, "src/adapter/index.ts")
-    ],
+    entry: ["src/adapter"],
 
     /* Loaders */
     module: {
@@ -66,6 +61,8 @@ export default (env?: { prod?: boolean }) => {
                 compilerOptions: {
                   declaration: true,
                   declarationDir: "..",
+                  noUnusedLocals: args.mode === "production",
+                  noUnusedParameters: args.mode === "production",
                   removeComments: false,
                   target: "es2015"     /* Use ES modules for tree-shaking */
                 }
@@ -80,7 +77,7 @@ export default (env?: { prod?: boolean }) => {
     /* Export class constructor as entrypoint */
     output: {
       path: path.resolve(__dirname, "dist/adapter"),
-      pathinfo: true,
+      pathinfo: false,
       filename: "index.js",
       libraryTarget: "window"
     },
@@ -94,19 +91,6 @@ export default (env?: { prod?: boolean }) => {
       /* Polyfills */
       new ProvidePlugin({
         Promise: "es6-promise"
-      }),
-
-      /* Hack: The webpack development middleware sometimes goes into a loop
-         on macOS when starting for the first time. This is a quick fix until
-         this issue is resolved. See: http://bit.ly/2AsizEn */
-      new EventHooksPlugin({
-        "watch-run": (compiler: any, done: () => {}) => {
-          compiler.startTime += 10000
-          done()
-        },
-        "done": (stats: any) => {
-          stats.startTime -= 10000
-        }
       })
     ],
 
@@ -123,29 +107,6 @@ export default (env?: { prod?: boolean }) => {
     devtool: "source-map"
   }
 
-  /* Build for production environment */
-  if (env && env.prod) {
-
-    /* Uglify sources */
-    config.plugins!.push(
-      new UglifyJsPlugin({
-        comments: false,
-        compress: {
-          warnings: false,
-          screw_ie8: true,
-          conditionals: true,
-          unused: true,
-          comparisons: true,
-          sequences: true,
-          dead_code: true,
-          evaluate: true,
-          if_return: true,
-          join_vars: true
-        },
-        sourceMap: true
-      }))
-  }
-
   /* We're good to go */
   return config
 }