From 330772053b4508d547d497f530677a9732bcde3e Mon Sep 17 00:00:00 2001
From: Sam Tsai <samtsai@gmail.com>
Date: Wed, 16 Oct 2024 05:33:52 -0400
Subject: [PATCH] fix(rspack): make rspack dev server respect port (#28251)

<!-- Please make sure you have read the submission guidelines before
posting an PR -->
<!--
https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr
-->

<!-- Please make sure that your commit message follows our format -->
<!-- Example: `fix(nx): must begin with lowercase` -->

<!-- If this is a particularly complex change or feature addition, you
can request a dedicated Nx release for this pull request branch. Mention
someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they
will confirm if the PR warrants its own release for testing purposes,
and generate it for you if appropriate. -->

## Current Behavior
<!-- This is the behavior we have today -->
Port is not respected from `rspack.config.[jt]s` and needs to be
explicitly set in `project.json` options.

## Expected Behavior
<!-- This is the behavior we should expect with the changes in this PR
-->
Port should be configurable via config, options, etc.

## Related Issue(s)
<!-- Please link the issue being fixed so it gets closed when this is
merged. -->
Fixes #28040 (port portion)
---
 packages/rspack/src/executors/dev-server/dev-server.impl.ts    | 3 +--
 .../rspack/src/utils/resolve-user-defined-rspack-config.ts     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/rspack/src/executors/dev-server/dev-server.impl.ts b/packages/rspack/src/executors/dev-server/dev-server.impl.ts
index 2f1f1925b0bca..560dd54ff7dfe 100644
--- a/packages/rspack/src/executors/dev-server/dev-server.impl.ts
+++ b/packages/rspack/src/executors/dev-server/dev-server.impl.ts
@@ -49,10 +49,9 @@ export default async function* runExecutor(
   devServerConfig = {
     ...devServerConfig,
     ...firstCompiler.options.devServer,
-    port: devServerConfig.port,
   };
 
-  const baseUrl = `http://localhost:${options.port ?? 4200}`;
+  const baseUrl = `http://localhost:${devServerConfig.port ?? 4200}`;
 
   return yield* createAsyncIterable(({ next }) => {
     const server = new RspackDevServer(
diff --git a/packages/rspack/src/utils/resolve-user-defined-rspack-config.ts b/packages/rspack/src/utils/resolve-user-defined-rspack-config.ts
index e4145d9280d89..24c612296a9ec 100644
--- a/packages/rspack/src/utils/resolve-user-defined-rspack-config.ts
+++ b/packages/rspack/src/utils/resolve-user-defined-rspack-config.ts
@@ -27,7 +27,7 @@ export function resolveUserDefinedRspackConfig(
   cleanupTranspiler();
 
   // If the user provides a configuration in TS file
-  // then there are 3 cases for exporing an object. The first one is:
+  // then there are 3 cases for exploring an object. The first one is:
   // `module.exports = { ... }`. And the second one is:
   // `export default { ... }`. The ESM format is compiled into:
   // `{ default: { ... } }`