Webpack 4 (#267)

* upgrade url-join to 4.0.0, account for changes

* webpack 4 support

.gitignore

@@ -1,2 +1,4 @@
+.nyc_output
 node_modules
 coverage
+*.lcov

.travis.yml

@@ -10,5 +10,4 @@ script:
   npm run ci
 
 after_success:
-  - cat ./coverage/coverage.json | node_modules/codecov.io/bin/codecov.io.js
-  - rm -rf ./coverage
+  npm run cover

lib/DevMiddlewareError.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = class DevMiddlewareError extends Error {
+
+};

lib/context.js

@@ -60,7 +60,7 @@ module.exports = function ctx(compiler, options) {
     }
   }
 
-  function invalid(...args) {
+  function invalid(callback) {
     if (context.state) {
       context.options.reporter(context.options, {
         log,
@@ -70,9 +70,7 @@ module.exports = function ctx(compiler, options) {
 
     // We are now in invalid state
     context.state = false;
-    // resolve async
-    if (args.length === 2 && typeof args[1] === 'function') {
-      const [, callback] = args;
+    if (callback && typeof callback === 'function') {
       callback();
     }
   }
@@ -94,26 +92,11 @@ module.exports = function ctx(compiler, options) {
   }
 
   context.rebuild = rebuild;
-  context.compiler.plugin('invalid', invalid);
-  context.compiler.plugin('run', invalid);
-
-  context.compiler.plugin('done', (stats) => {
-    // clean up the time offset
-    if (options.watchOffset > 0) {
-      stats.startTime -= options.watchOffset;
-    }
-
-    done(stats);
-  });
-
-  context.compiler.plugin('watch-run', (watcher, callback) => {
-    // apply a fix for compiler.watch, if watchOffset is greater than 0:
-    //   ff0000-ad-tech/wp-plugin-watch-offset
-    // offset start-time
-    if (options.watchOffset > 0) {
-      watcher.startTime += options.watchOffset;
-    }
-    invalid(watcher, callback);
+  context.compiler.hooks.invalid.tap('WebpackDevMiddleware', invalid);
+  context.compiler.hooks.run.tap('WebpackDevMiddleware', invalid);
+  context.compiler.hooks.done.tap('WebpackDevMiddleware', done);
+  context.compiler.hooks.watchRun.tap('WebpackDevMiddleware', (comp, callback) => {
+    invalid(callback);
   });
 
   return context;

lib/middleware.js

@@ -2,6 +2,7 @@
 
 const mime = require('mime');
 const urlJoin = require('url-join');
+const DevMiddlewareError = require('./DevMiddlewareError');
 const { getFilenameFromUrl, handleRangeHeaders, handleRequest, ready } = require('./util');
 
 module.exports = function wrapper(context) {
@@ -34,26 +35,24 @@ module.exports = function wrapper(context) {
       function processRequest() {
         try {
           let stat = context.fs.statSync(filename);
+
           if (!stat.isFile()) {
             if (stat.isDirectory()) {
               let { index } = context.options;
 
               if (index === undefined || index === true) {
                 index = 'index.html';
               } else if (!index) {
-              // TODO throw a proper error
-                throw new Error('next');
+                throw new DevMiddlewareError('next');
               }
 
               filename = urlJoin(filename, index);
               stat = context.fs.statSync(filename);
               if (!stat.isFile()) {
-              // TODO throw a proper error
-                throw new Error('next');
+                throw new DevMiddlewareError('next');
               }
             } else {
-            // TODO throw a proper error
-              throw new Error('next');
+              throw new DevMiddlewareError('next');
             }
           }
         } catch (e) {
@@ -63,7 +62,9 @@ module.exports = function wrapper(context) {
         // server content
         let content = context.fs.readFileSync(filename);
         content = handleRangeHeaders(content, req, res);
+
         let contentType = mime.getType(filename);
+
         // do not add charset to WebAssembly files, otherwise compileStreaming will fail in the client
         if (!/\.wasm$/.test(filename)) {
           contentType += '; charset=UTF-8';

lib/util.js

@@ -6,6 +6,7 @@ const MemoryFileSystem = require('memory-fs');
 const pathabs = require('path-is-absolute');
 const parseRange = require('range-parser');
 const urlJoin = require('url-join');
+const DevMiddlewareError = require('./DevMiddlewareError');
 
 const HASH_REGEXP = /[0-9a-f]{10,}/;
 
@@ -90,7 +91,11 @@ module.exports = {
     let uri = outputPath;
 
     if (filename) {
-      uri = urlJoin((outputPath || '').replace(/\/$/, ''), filename);
+      uri = urlJoin((outputPath || ''), filename);
+
+      if (!uri.startsWith('/')) {
+        uri = `/${uri}`;
+      }
     }
 
     // if no matches, use outputPath as filename
@@ -156,7 +161,7 @@ module.exports = {
 
   setFs(context, compiler) {
     if (typeof compiler.outputPath === 'string' && !pathabs.posix(compiler.outputPath) && !pathabs.win32(compiler.outputPath)) {
-      throw new Error('`output.path` needs to be an absolute path or `/`.');
+      throw new DevMiddlewareError('`output.path` needs to be an absolute path or `/`.');
     }
 
     let fs;