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.

Sign up for GitHub

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

Jump to bottom

fix: multi compiler mode with multiple web targets #3840

Merged
merged 7 commits into from Sep 13, 2021
Merged

fix: multi compiler mode with multiple web targets #3840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3218f31
fix: multi compiler mode with multiple web targets
alexander-akait Sep 13, 2021
d0bd50f
test: update
alexander-akait Sep 13, 2021
abfa58d
test: more
alexander-akait Sep 13, 2021
1aace04
test: more
alexander-akait Sep 13, 2021
de99006
test: update
alexander-akait Sep 13, 2021
09562a2
test: fix
alexander-akait Sep 13, 2021
2479fe1
test: fix
alexander-akait Sep 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion client-src/utils/reloadApp.js
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ function reloadApp({ hot, liveReload }, status) {
? // eslint-disable-next-line camelcase
__webpack_hash__
: status.previousHash || "";
const isInitial = status.currentHash.indexOf(webpackHash) === 0;
const isInitial = status.currentHash.indexOf(webpackHash) >= 0;

if (isInitial) {
const isLegacyInitial =
Expand Down
30 changes: 11 additions & 19 deletions lib/Server.js
View file
Open in desktop
Expand Up @@ -1150,26 +1150,18 @@ class Server {
}

setupHooks() {
const addHooks = (compiler) => {
compiler.hooks.invalid.tap("webpack-dev-server", () => {
if (this.webSocketServer) {
this.sendMessage(this.webSocketServer.clients, "invalid");
}
});
compiler.hooks.done.tap("webpack-dev-server", (stats) => {
if (this.webSocketServer) {
this.sendStats(this.webSocketServer.clients, this.getStats(stats));
}

this.stats = stats;
});
};
this.compiler.hooks.invalid.tap("webpack-dev-server", () => {
if (this.webSocketServer) {
this.sendMessage(this.webSocketServer.clients, "invalid");
}
});
this.compiler.hooks.done.tap("webpack-dev-server", (stats) => {
if (this.webSocketServer) {
this.sendStats(this.webSocketServer.clients, this.getStats(stats));
}

if (this.compiler.compilers) {
this.compiler.compilers.forEach(addHooks);
} else {
addHooks(this.compiler);
}
this.stats = stats;
});
}

setupHostHeaderCheck() {
Expand Down
4 changes: 2 additions & 2 deletions test/client/utils/reloadApp.test.js
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@ describe("'reloadApp' function", () => {

reloadApp(
{ hot: false, hotReload: true, liveReload: true },
{ isUnloading: false, currentHash: "other-mock-hash" }
{ isUnloading: false, currentHash: "changed-mock" }
);

setTimeout(() => {
Expand All @@ -101,7 +101,7 @@ describe("'reloadApp' function", () => {
test("should run liveReload when protocol is http:", (done) => {
reloadApp(
{ hot: false, hotReload: true, liveReload: true },
{ isUnloading: false, currentHash: "other-mock-hash" }
{ isUnloading: false, currentHash: "changed-mock" }
);

setTimeout(() => {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/module-federation.test.js
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ const objectEntryConfig = require("../fixtures/module-federation-config/webpack.
const multiConfig = require("../fixtures/module-federation-config/webpack.multi.config");
const runBrowser = require("../helpers/run-browser");
const isWebpack5 = require("../helpers/isWebpack5");
const port = require("../ports-map")["universal-compiler"];
const port = require("../ports-map")["module-federation"];

const describeOnlyWebpack5 = isWebpack5 ? describe : describe.skip;

Expand Down