Skip to content

refactor: remove alias hijacking #23

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

Merged
merged 1 commit into from
Mar 12, 2025
Merged

refactor: remove alias hijacking #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 0 additions & 51 deletions src/alias.ts
View file
Open in desktop

This file was deleted.

25 changes: 10 additions & 15 deletions src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import WebpackDevServer from "webpack-dev-server";
// @ts-ignore 'package.json' is not under 'rootDir'
import { version } from "../package.json";

import { addResolveAlias, removeResolveAlias } from "./alias";
import type { DevServer, ResolvedDevServer } from "./config";
import { applyDevServerPatch } from "./patch";

Expand Down Expand Up @@ -102,20 +101,16 @@ export class RspackDevServer extends WebpackDevServer {
await super.initialize();
}

// @ts-ignore
private override addAdditionalEntries(compiler: Compiler) {
addResolveAlias("webpack-dev-server", {
"../client/index.js": require.resolve("@rspack/dev-server/client/index"),
"webpack/hot/only-dev-server": require.resolve(
"@rspack/core/hot/only-dev-server",
),
"webpack/hot/dev-server": require.resolve("@rspack/core/hot/dev-server"),
});
try {
// @ts-expect-error
super.addAdditionalEntries(compiler);
} finally {
removeResolveAlias("webpack-dev-server");
getClientEntry(): string {
return require.resolve("@rspack/dev-server/client/index");
}

getClientHotEntry(): string | undefined {
if (this.options.hot === "only") {
return require.resolve("@rspack/core/hot/only-dev-server");
}
if (this.options.hot) {
return require.resolve("@rspack/core/hot/dev-server");
}
}
}