Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump webpack-dev-server #7988

Merged
merged 4 commits into from
Nov 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
296 changes: 146 additions & 150 deletions packages/create-react-app/yarn.lock.cached

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion packages/react-dev-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
"react-error-overlay": "^6.0.3",
"recursive-readdir": "2.2.2",
"shell-quote": "1.7.2",
"sockjs-client": "1.4.0",
"strip-ansi": "5.2.0",
"text-table": "0.2.0"
},
Expand Down
5 changes: 2 additions & 3 deletions packages/react-dev-utils/webpackHotDevClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// that looks similar to our console output. The error overlay is inspired by:
// https://github.com/glenjamin/webpack-hot-middleware

var SockJS = require('sockjs-client');
var stripAnsi = require('strip-ansi');
var url = require('url');
var launchEditorEndpoint = require('./launchEditorEndpoint');
Expand Down Expand Up @@ -58,9 +57,9 @@ if (module.hot && typeof module.hot.dispose === 'function') {
}

// Connect to WebpackDevServer via a socket.
var connection = new SockJS(
var connection = new WebSocket(
url.format({
protocol: window.location.protocol,
protocol: 'ws',
hostname: window.location.hostname,
port: window.location.port,
// Hardcoded in WebpackDevServer
Expand Down
6 changes: 6 additions & 0 deletions packages/react-scripts/config/webpackDevServer.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ module.exports = function(proxy, allowedHost) {
// in the Webpack development configuration. Note that only changes
// to CSS are currently hot reloaded. JS changes will refresh the browser.
hot: true,
// Use 'ws' instead of 'sockjs-node' on server since we're using native
// websockets in `webpackHotDevClient`.
transportMode: 'ws',
// Prevent a WS client from getting injected as we're already including
// `webpackHotDevClient`.
injectClient: false,
// It is important to tell WebpackDevServer to use the same "root" path
// as we specified in the config. In development, we always serve from /.
publicPath: '/',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,36 @@ export default feature =>
let window;

if (process.env.E2E_FILE) {
window = (await JSDOM.fromFile(file, {
pretendToBeVisual: true,
resources: fileResourceLoader,
runScripts: 'dangerously',
url,
})).window;
window = (
await JSDOM.fromFile(file, {
pretendToBeVisual: true,
resources: fileResourceLoader,
runScripts: 'dangerously',
url,
})
).window;
} else {
window = (await JSDOM.fromURL(url, {
pretendToBeVisual: true,
resources: 'usable',
runScripts: 'dangerously',
})).window;
window = (
await JSDOM.fromURL(url, {
pretendToBeVisual: true,
resources: 'usable',
runScripts: 'dangerously',
})
).window;
}

const cleanup = () => {
if (window) {
window.close();
window = null;
}
};

const { document } = window;

const cancelToken = setTimeout(() => {
// Cleanup jsdom instance since we don't need it anymore
window.close();
cleanup();

reject(`Timed out loading feature: ${feature}`);
}, 10000);
Expand All @@ -81,7 +92,7 @@ export default feature =>
clearTimeout(cancelToken);

// Cleanup jsdom instance since we don't need it anymore
window.close();
cleanup();

reject(`Error loading feature: ${feature}`);
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"ts-pnp": "1.1.5",
"url-loader": "2.2.0",
"webpack": "4.41.2",
"webpack-dev-server": "3.2.1",
"webpack-dev-server": "3.9.0",
"webpack-manifest-plugin": "2.2.0",
"workbox-webpack-plugin": "4.3.1"
},
Expand Down
2 changes: 1 addition & 1 deletion tasks/e2e-kitchensink-eject.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ set -x
cd ..
root_path=$PWD
# Set a Windows path for GitBash on Windows
if [ $AGENT_OS == 'Windows_NT' ]; then
if [ "$AGENT_OS" == 'Windows_NT' ]; then
root_path=$(cmd //c cd)
fi

Expand Down
2 changes: 1 addition & 1 deletion tasks/e2e-kitchensink.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ set -x
cd ..
root_path=$PWD
# Set a Windows path for GitBash on Windows
if [ $AGENT_OS == 'Windows_NT' ]; then
if [ "$AGENT_OS" == 'Windows_NT' ]; then
root_path=$(cmd //c cd)
fi

Expand Down