Merge branch 'master' into doc-bot

webpack · May 2, 2020 · 7dccc05 · 7dccc05
2 parents 14497db + 375ab23
commit 7dccc05
Show file tree

Hide file tree

Showing 10 changed files with 292 additions and 184 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -43,8 +43,8 @@ jobs:
     strategy:
       maxParallel: 6
       matrix:
-        node-13:
-          node_version: ^13.0.0
+        node-14:
+          node_version: ^14.0.0
           webpack_version: latest
         node-12:
           node_version: ^12.0.0
@@ -102,8 +102,8 @@ jobs:
     strategy:
       maxParallel: 6
       matrix:
-        node-13:
-          node_version: ^13.0.0
+        node-14:
+          node_version: ^14.0.0
           webpack_version: latest
         node-12:
           node_version: ^12.0.0
@@ -161,8 +161,8 @@ jobs:
     strategy:
       maxParallel: 6
       matrix:
-        node-13:
-          node_version: ^13.0.0
+        node-14:
+          node_version: ^14.0.0
           webpack_version: latest
         node-12:
           node_version: ^12.0.0

diff --git a/lib/Server.js b/lib/Server.js
@@ -118,7 +118,7 @@ class Server {
     this.setupDevMiddleware();
 
     // set express routes
-    routes(this.app, this.middleware, this.options);
+    routes(this);
 
     // Keep track of websocket proxies for external websocket upgrade.
     this.websocketProxies = [];
@@ -687,6 +687,10 @@ class Server {
     } else {
       this.listeningApp = http.createServer(this.app);
     }
+
+    this.listeningApp.on('error', (err) => {
+      this.log.error(err);
+    });
   }
 
   createSocketServer() {

diff --git a/lib/utils/routes.js b/lib/utils/routes.js
@@ -5,7 +5,11 @@ const { join } = require('path');
 
 const clientBasePath = join(__dirname, '..', '..', 'client');
 
-function routes(app, middleware, options) {
+function routes(server) {
+  const app = server.app;
+  const middleware = server.middleware;
+  const options = server.options;
+
   app.get('/__webpack_dev_server__/live.bundle.js', (req, res) => {
     res.setHeader('Content-Type', 'application/javascript');
 
@@ -30,6 +34,11 @@ function routes(app, middleware, options) {
     createReadStream(join(clientBasePath, 'live.html')).pipe(res);
   });
 
+  app.get('/invalidate', (_req, res) => {
+    server.invalidate();
+    res.end();
+  });
+
   app.get('/webpack-dev-server', (req, res) => {
     res.setHeader('Content-Type', 'text/html');
 

diff --git a/lib/utils/setupExitSignals.js b/lib/utils/setupExitSignals.js
@@ -5,7 +5,7 @@ const signals = ['SIGINT', 'SIGTERM'];
 function setupExitSignals(serverData) {
   signals.forEach((signal) => {
     process.on(signal, () => {
-      if (serverData.server) {
+      if (serverData && serverData.server) {
         serverData.server.close(() => {
           // eslint-disable-next-line no-process-exit
           process.exit();

diff --git a/lint-staged.config.js b/lint-staged.config.js
@@ -1,6 +1,6 @@
 'use strict';
 
 module.exports = {
-  '*.js': ['prettier --write', 'eslint --fix', 'git add'],
-  '*.{json,md,yml,css}': ['prettier --write', 'git add'],
+  '*.js': ['prettier --write', 'eslint --fix'],
+  '*.{json,md,yml,css}': ['prettier --write'],
 };