fix(rspack): fix withNx

nrwl · Nov 11, 2024 · f74f840 · f74f840
1 parent b5591f5
commit f74f840
Show file tree

Hide file tree

Showing 10 changed files with 368 additions and 18 deletions.
diff --git a/packages/js/src/utils/buildable-libs-utils.ts b/packages/js/src/utils/buildable-libs-utils.ts
@@ -431,7 +431,8 @@ export function createTmpTsConfig(
   workspaceRoot: string,
   projectRoot: string,
   dependencies: DependentBuildableProjectNode[],
-  useWorkspaceAsBaseUrl: boolean = false
+  useWorkspaceAsBaseUrl: boolean = false,
+  doNotCleanOnExit: boolean = false
 ) {
   const tmpTsConfigPath = join(
     workspaceRoot,
@@ -445,8 +446,9 @@ export function createTmpTsConfig(
     tmpTsConfigPath,
     dependencies
   );
-  process.on('exit', () => cleanupTmpTsConfigFile(tmpTsConfigPath));
-
+  if (!doNotCleanOnExit) {
+    process.on('exit', () => cleanupTmpTsConfigFile(tmpTsConfigPath));
+  }
   if (useWorkspaceAsBaseUrl) {
     parsedTSConfig.compilerOptions ??= {};
     parsedTSConfig.compilerOptions.baseUrl = workspaceRoot;

diff --git a/packages/rspack/src/executors/dev-server/dev-server.impl.ts b/packages/rspack/src/executors/dev-server/dev-server.impl.ts
@@ -11,6 +11,7 @@ import { createCompiler, isMultiCompiler } from '../../utils/create-compiler';
 import { isMode } from '../../utils/mode-utils';
 import { getDevServerOptions } from './lib/get-dev-server-config';
 import { DevServerExecutorSchema } from './schema';
+import { normalizeOptions } from '../rspack/lib/normalize-options';
 
 type DevServer = Configuration['devServer'];
 export default async function* runExecutor(
@@ -30,14 +31,28 @@ export default async function* runExecutor(
 
   const buildOptions = readTargetOptions(buildTarget, context);
 
+  process.env.NX_BUILD_LIBS_FROM_SOURCE = `${buildOptions.buildLibsFromSource}`;
+  process.env.NX_BUILD_TARGET = options.buildTarget;
+
+  const metadata = context.projectsConfigurations.projects[context.projectName];
+  const sourceRoot = metadata.sourceRoot;
+  const normalizedBuildOptions = normalizeOptions(
+    buildOptions,
+    context.root,
+    metadata.root,
+    sourceRoot
+  );
   let devServerConfig: DevServer = getDevServerOptions(
     context.root,
     options,
-    buildOptions
+    normalizedBuildOptions
   );
-
   const compiler = await createCompiler(
-    { ...buildOptions, devServer: devServerConfig, mode: options.mode },
+    {
+      ...normalizedBuildOptions,
+      devServer: devServerConfig,
+      mode: options.mode,
+    },
     context
   );
 

diff --git a/packages/rspack/src/executors/dev-server/lib/get-dev-server-config.ts b/packages/rspack/src/executors/dev-server/lib/get-dev-server-config.ts
@@ -26,7 +26,7 @@ export function getDevServerOptions(
 
   const config: RspackDevServerConfiguration = {
     host: serveOptions.host,
-    port: serveOptions.port,
+    port: serveOptions.port ?? 4200,
     headers: { 'Access-Control-Allow-Origin': '*' },
     historyApiFallback: {
       index:

diff --git a/packages/rspack/src/executors/rspack/lib/normalize-options.ts b/packages/rspack/src/executors/rspack/lib/normalize-options.ts
@@ -0,0 +1,56 @@
+import { resolve } from 'path';
+
+import {
+  normalizeAssets,
+  normalizeFileReplacements,
+} from '../../../plugins/utils/plugins/normalize-options';
+import type {
+  RspackExecutorSchema,
+  NormalizedRspackExecutorSchema,
+} from '../schema';
+
+export function normalizeOptions(
+  options: RspackExecutorSchema,
+  root: string,
+  projectRoot: string,
+  sourceRoot: string
+): NormalizedRspackExecutorSchema {
+  const normalizedOptions = {
+    ...options,
+    root,
+    projectRoot,
+    sourceRoot,
+    target: options.target ?? 'web',
+    outputFileName: options.outputFileName ?? 'main.js',
+    rspackConfig: normalizePluginPath(options.rspackConfig, root),
+    fileReplacements: normalizeFileReplacements(root, options.fileReplacements),
+    optimization:
+      typeof options.optimization !== 'object'
+        ? {
+            scripts: options.optimization,
+            styles: options.optimization,
+          }
+        : options.optimization,
+  };
+  if (options.assets) {
+    normalizedOptions.assets = normalizeAssets(
+      options.assets,
+      root,
+      sourceRoot,
+      projectRoot,
+      false // executor assets are relative to workspace root for consistency
+    );
+  }
+  return normalizedOptions as NormalizedRspackExecutorSchema;
+}
+
+export function normalizePluginPath(pluginPath: void | string, root: string) {
+  if (!pluginPath) {
+    return '';
+  }
+  try {
+    return require.resolve(pluginPath);
+  } catch {
+    return resolve(root, pluginPath);
+  }
+}
diff --git a/packages/rspack/src/executors/rspack/rspack.impl.ts b/packages/rspack/src/executors/rspack/rspack.impl.ts
@@ -7,6 +7,7 @@ import * as path from 'path';
 import { createCompiler, isMultiCompiler } from '../../utils/create-compiler';
 import { isMode } from '../../utils/mode-utils';
 import { RspackExecutorSchema } from './schema';
+import { normalizeOptions } from './lib/normalize-options';
 
 export default async function* runExecutor(
   options: RspackExecutorSchema,
@@ -28,8 +29,16 @@ export default async function* runExecutor(
     force: true,
     recursive: true,
   });
+  const metadata = context.projectsConfigurations.projects[context.projectName];
+  const sourceRoot = metadata.sourceRoot;
+  const normalizedOptions = normalizeOptions(
+    options,
+    context.root,
+    metadata.root,
+    sourceRoot
+  );
 
-  const compiler = await createCompiler(options, context);
+  const compiler = await createCompiler(normalizedOptions, context);
 
   const iterable = createAsyncIterable<{
     success: boolean;
@@ -58,7 +67,11 @@ export default async function* runExecutor(
           }
           next({
             success: !stats.hasErrors(),
-            outfile: path.resolve(context.root, options.outputPath, 'main.js'),
+            outfile: path.resolve(
+              context.root,
+              normalizedOptions.outputPath,
+              'main.js'
+            ),
           });
         }
       );
@@ -90,7 +103,11 @@ export default async function* runExecutor(
           }
           next({
             success: !stats.hasErrors(),
-            outfile: path.resolve(context.root, options.outputPath, 'main.js'),
+            outfile: path.resolve(
+              context.root,
+              normalizedOptions.outputPath,
+              'main.js'
+            ),
           });
           done();
         });

diff --git a/packages/rspack/src/plugins/utils/apply-base-config.ts b/packages/rspack/src/plugins/utils/apply-base-config.ts
@@ -390,6 +390,8 @@ function applyNxDependentConfig(
         test: /\.([jt])sx?$/,
         loader: 'builtin:swc-loader',
         exclude: /node_modules/,
+
+        type: 'javascript/auto',
         options: {
           jsc: {
             parser: {
@@ -407,8 +409,6 @@ function applyNxDependentConfig(
                 useBuiltins: false,
               },
             },
-            type: 'javascript/auto',
-            loose: true,
           },
         },
       },

diff --git a/packages/rspack/src/plugins/utils/apply-web-config.ts b/packages/rspack/src/plugins/utils/apply-web-config.ts
@@ -71,6 +71,9 @@ export function applyWebConfig(
         template: options.index,
         sri: options.subresourceIntegrity ? 'sha256' : undefined,
         ...(options.baseHref ? { base: { href: options.baseHref } } : {}),
+        ...(config.output?.scriptType === 'module'
+          ? { scriptLoading: 'module' }
+          : {}),
       })
     );
   }