Merge branch 'master' into handle-array-paths

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.7.0](https://github.com/webpack/webpack-dev-server/compare/v3.5.1...v3.7.0) (2019-06-06)
+
+
+### Bug Fixes
+
+* change clientLogLevel order to be called first ([#1973](https://github.com/webpack/webpack-dev-server/issues/1973)) ([57c8c92](https://github.com/webpack/webpack-dev-server/commit/57c8c92))
+* es6 syntax in client ([#1982](https://github.com/webpack/webpack-dev-server/issues/1982)) ([802aa30](https://github.com/webpack/webpack-dev-server/commit/802aa30))
+
+
+### Features
+
+* **server:** add serverMode option ([#1937](https://github.com/webpack/webpack-dev-server/issues/1937)) ([44a8cde](https://github.com/webpack/webpack-dev-server/commit/44a8cde))
+
+
+
 ## [3.6.0](https://github.com/webpack/webpack-dev-server/compare/v3.5.1...v3.6.0) (2019-06-05)
 
 

lib/utils/updateCompiler.js

@@ -6,7 +6,6 @@
 */
 const webpack = require('webpack');
 const addEntries = require('./addEntries');
-const SockJSClient = require('./../clients/SockJSClient');
 
 function updateCompiler(compiler, options) {
   if (options.inline !== false) {
@@ -51,7 +50,10 @@ function updateCompiler(compiler, options) {
       compiler.hooks.entryOption.call(config.context, config.entry);
 
       const providePlugin = new webpack.ProvidePlugin({
-        __webpack_dev_server_client__: SockJSClient.getClientPath(options),
+        // SockJSClient.getClientPath(options)
+        __webpack_dev_server_client__: require.resolve(
+          '../../client/clients/SockJSClient.js'
+        ),
       });
       providePlugin.apply(compiler);
     });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-dev-server",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "bin": "bin/webpack-dev-server.js",
   "main": "lib/Server.js",
@@ -24,8 +24,9 @@
     "test:watch": "npm run test:coverage --watch",
     "test": "npm run test:coverage",
     "pretest": "npm run lint",
-    "prepare": "rimraf ./ssl/*.pem && npm run -s transpile:index && npm run -s build:live && npm run -s build:index && npm run -s build:sockjs",
+    "prepare": "rimraf ./ssl/*.pem && npm run -s transpile:index && npm run transpile:clients && npm run -s build:live && npm run -s build:index && npm run -s build:sockjs",
     "transpile:index": "babel client-src/default --out-dir client --ignore \"./client-src/default/*.config.js\"",
+    "transpile:clients": "babel client-src/clients --out-dir client/clients",
     "build:index": "webpack ./client-src/default/index.js -o client/index.bundle.js --color --config client-src/default/webpack.config.js",
     "build:live": "webpack ./client-src/live/index.js -o client/live.bundle.js --color --config client-src/live/webpack.config.js",
     "build:sockjs": "webpack ./client-src/sockjs/index.js -o client/sockjs.bundle.js --color --config client-src/sockjs/webpack.config.js",

test/SockJSClient.test.js

@@ -3,7 +3,7 @@
 const http = require('http');
 const express = require('express');
 const sockjs = require('sockjs');
-const SockJSClient = require('../lib/clients/SockJSClient');
+const SockJSClient = require('../client-src/clients/SockJSClient');
 
 describe('SockJSClient', () => {
   let socketServer;

test/e2e/ProvidePlugin.test.js

@@ -4,7 +4,7 @@ const testServer = require('../helpers/test-server');
 const config = require('../fixtures/provide-plugin-config/webpack.config');
 const runBrowser = require('../helpers/run-browser');
 
-describe('ProvidePlugin', () => {
+describe.skip('ProvidePlugin', () => {
   describe('inline', () => {
     beforeAll((done) => {
       const options = {

test/fixtures/provide-plugin-config/foo.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const SockJSClient = require('../../../lib/clients/SockJSClient');
+const SockJSClient = require('../../../client-src/clients/SockJSClient');
 
 window.expectedClient = SockJSClient;
 // eslint-disable-next-line camelcase, no-undef