chore(ws): switch default transportMode to ws

Author: knagaitsev

lib/utils/getSocketServerImplementation.js

@@ -30,7 +30,7 @@ function getSocketServerImplementation(options) {
 
   if (!serverImplFound) {
     throw new Error(
-      "transportMode.server must be a string denoting a default implementation (e.g. 'sockjs', 'ws'), a full path to " +
+      "transportMode.server must be a string denoting a default implementation (e.g. 'ws', 'sockjs'), a full path to " +
         'a JS file which exports a class extending BaseServer (webpack-dev-server/lib/servers/BaseServer) ' +
         'via require.resolve(...), or the class itself which extends BaseServer'
     );

lib/utils/normalizeOptions.js

@@ -15,8 +15,8 @@ function normalizeOptions(compiler, options) {
   // normalize transportMode option
   if (options.transportMode === undefined) {
     options.transportMode = {
-      server: 'sockjs',
-      client: 'sockjs',
+      server: 'ws',
+      client: 'ws',
     };
   } else {
     switch (typeof options.transportMode) {
@@ -28,8 +28,8 @@ function normalizeOptions(compiler, options) {
         break;
       // if not a string, it is an object
       default:
-        options.transportMode.server = options.transportMode.server || 'sockjs';
-        options.transportMode.client = options.transportMode.client || 'sockjs';
+        options.transportMode.server = options.transportMode.server || 'ws';
+        options.transportMode.client = options.transportMode.client || 'ws';
     }
   }
 

test/server/transportMode-option.test.js

@@ -439,11 +439,11 @@ describe('transportMode', () => {
     });
 
     describe('server', () => {
-      let MockSockJSServer;
+      let MockWebsocketServer;
       beforeEach((done) => {
-        jest.mock('../../lib/servers/SockJSServer');
+        jest.mock('../../lib/servers/WebsocketServer');
         mockedTestServer = require('../helpers/test-server');
-        MockSockJSServer = require('../../lib/servers/SockJSServer');
+        MockWebsocketServer = require('../../lib/servers/WebsocketServer');
 
         server = mockedTestServer.start(
           config,
@@ -463,7 +463,7 @@ describe('transportMode', () => {
       });
 
       it('should use server implementation correctly', () => {
-        const mockServerInstance = MockSockJSServer.mock.instances[0];
+        const mockServerInstance = MockWebsocketServer.mock.instances[0];
 
         const connectionObj = {
           foo: 'bar',
@@ -483,8 +483,8 @@ describe('transportMode', () => {
         expect(server.sockets.length).toEqual(0);
 
         // check that the dev server was passed to the socket server implementation constructor
-        expect(MockSockJSServer.mock.calls[0].length).toEqual(1);
-        expect(MockSockJSServer.mock.calls[0][0].options.port).toEqual(port);
+        expect(MockWebsocketServer.mock.calls[0].length).toEqual(1);
+        expect(MockWebsocketServer.mock.calls[0][0].options.port).toEqual(port);
 
         expect(mockServerInstance.onConnection.mock.calls).toMatchSnapshot();
         expect(mockServerInstance.send.mock.calls.length).toEqual(4);
@@ -504,7 +504,7 @@ describe('transportMode', () => {
       });
 
       it('should close client with bad headers', () => {
-        const mockServerInstance = MockSockJSServer.mock.instances[0];
+        const mockServerInstance = MockWebsocketServer.mock.instances[0];
 
         // this simulates a client connecting to the server
         mockServerInstance.onConnection.mock.calls[0][0](
@@ -516,8 +516,8 @@ describe('transportMode', () => {
           }
         );
         expect(server.sockets.length).toEqual(0);
-        expect(MockSockJSServer.mock.calls[0].length).toEqual(1);
-        expect(MockSockJSServer.mock.calls[0][0].options.port).toEqual(port);
+        expect(MockWebsocketServer.mock.calls[0].length).toEqual(1);
+        expect(MockWebsocketServer.mock.calls[0][0].options.port).toEqual(port);
         expect(mockServerInstance.onConnection.mock.calls).toMatchSnapshot();
         // the only call to send() here should be an invalid header message
         expect(mockServerInstance.send.mock.calls).toMatchSnapshot();

test/server/utils/__snapshots__/normalizeOptions.test.js.snap

@@ -8,8 +8,8 @@ Object {
   ],
   "contentBasePublicPath": "/",
   "transportMode": Object {
-    "client": "sockjs",
-    "server": "sockjs",
+    "client": "ws",
+    "server": "ws",
   },
   "watchOptions": Object {},
 }
@@ -20,8 +20,8 @@ Object {
   "contentBase": "/path/to/dist",
   "contentBasePublicPath": "/",
   "transportMode": Object {
-    "client": "sockjs",
-    "server": "sockjs",
+    "client": "ws",
+    "server": "ws",
   },
   "watchOptions": Object {},
 }
@@ -31,8 +31,8 @@ exports[`normalizeOptions contentBasePublicPath string should set correct option
 Object {
   "contentBasePublicPath": "/content-base-public-path",
   "transportMode": Object {
-    "client": "sockjs",
-    "server": "sockjs",
+    "client": "ws",
+    "server": "ws",
   },
   "watchOptions": Object {},
 }
@@ -42,8 +42,8 @@ exports[`normalizeOptions no options should set correct options 1`] = `
 Object {
   "contentBasePublicPath": "/",
   "transportMode": Object {
-    "client": "sockjs",
-    "server": "sockjs",
+    "client": "ws",
+    "server": "ws",
   },
   "watchOptions": Object {},
 }
@@ -54,7 +54,7 @@ Object {
   "contentBasePublicPath": "/",
   "transportMode": Object {
     "client": "/path/to/custom/client/",
-    "server": "sockjs",
+    "server": "ws",
   },
   "watchOptions": Object {},
 }
@@ -64,7 +64,7 @@ exports[`normalizeOptions transportMode custom server class should set correct o
 Object {
   "contentBasePublicPath": "/",
   "transportMode": Object {
-    "client": "sockjs",
+    "client": "ws",
     "server": [Function],
   },
   "watchOptions": Object {},
@@ -75,7 +75,7 @@ exports[`normalizeOptions transportMode custom server path should set correct op
 Object {
   "contentBasePublicPath": "/",
   "transportMode": Object {
-    "client": "sockjs",
+    "client": "ws",
     "server": "/path/to/custom/server/",
   },
   "watchOptions": Object {},
@@ -119,8 +119,8 @@ exports[`normalizeOptions watchOptions should set correct options 1`] = `
 Object {
   "contentBasePublicPath": "/",
   "transportMode": Object {
-    "client": "sockjs",
-    "server": "sockjs",
+    "client": "ws",
+    "server": "ws",
   },
   "watchOptions": Object {
     "poll": true,