fix(server): don't crash on setupExitSignals(undefined) (#2507)

webpack · Apr 8, 2020 · 0d5c681 · 0d5c681
1 parent c436058
commit 0d5c681
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
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/test/server/utils/setupExitSignals.test.js b/test/server/utils/setupExitSignals.test.js
@@ -25,6 +25,16 @@ describe('setupExitSignals', () => {
   });
 
   signals.forEach((signal) => {
+    it(`should exit process (${signal}, serverData never defined`, (done) => {
+      // eslint-disable-next-line no-undefined
+      setupExitSignals(undefined);
+      process.emit(signal);
+      setTimeout(() => {
+        expect(exitSpy.mock.calls.length).toEqual(1);
+        done();
+      }, 1000);
+    });
+
     it(`should exit process (${signal}, server never defined)`, (done) => {
       setupExitSignals({
         server: null,