fix(react): preserve dedicated rspack config file

nrwl · Dec 7, 2024 · 92d88a8 · 92d88a8
1 parent 5d61191
commit 92d88a8
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/packages/react/src/generators/application/application.ts b/packages/react/src/generators/application/application.ts
@@ -321,43 +321,31 @@ export async function applicationGeneratorInternal(
   tasks.push(routingTask);
   setDefaults(host, options);
 
-  if (options.bundler === 'rspack' && options.style === 'styled-jsx') {
-    logger.warn(
-      `${pc.bold('styled-jsx')} is not supported by ${pc.bold(
-        'Rspack'
-      )}. We've added ${pc.bold(
-        'babel-loader'
-      )} to your project, but using babel will slow down your build.`
-    );
-
-    tasks.push(
-      addDependenciesToPackageJson(
-        host,
-        {},
-        { 'babel-loader': babelLoaderVersion }
-      )
-    );
+  if (options.bundler === 'rspack') {
+    if (options.style === 'styled-jsx') {
+      logger.warn(
+        `${pc.bold('styled-jsx')} is not supported by ${pc.bold(
+          'Rspack'
+        )}. We've added ${pc.bold(
+          'babel-loader'
+        )} to your project, but using babel will slow down your build.`
+      );
 
-    host.write(
-      joinPathFragments(options.appProjectRoot, 'rspack.config.js'),
-      stripIndents`
-        const { composePlugins, withNx, withReact } = require('@nx/rspack');
-        module.exports = composePlugins(withNx(), withReact(), (config) => {
-          config.module.rules.push({
-            test: /\\.[jt]sx$/i,
-            use: [
-              {
-                loader: 'babel-loader',
-                options: {
-                  presets: ['@babel/preset-typescript'],
-                  plugins: ['styled-jsx/babel'],
-                },
-              },
-            ],
-          });
-          return config;
-        });
-        `
+      tasks.push(
+        addDependenciesToPackageJson(
+          host,
+          {},
+          { 'babel-loader': babelLoaderVersion }
+        )
+      );
+    }
+    /**
+     * override the default config
+     */
+    host.delete(joinPathFragments(options.appProjectRoot, 'rspack.config.js'));
+    host.rename(
+      joinPathFragments(options.appProjectRoot, 'tmp-rspack.config.js'),
+      joinPathFragments(options.appProjectRoot, 'rspack.config.js')
     );
   }
 

diff --git a/...iles/base-rspack/rspack.config.js__tmpl__ → .../base-rspack/tmp-rspack.config.js__tmpl__ b/...iles/base-rspack/rspack.config.js__tmpl__ → .../base-rspack/tmp-rspack.config.js__tmpl__
@@ -47,6 +47,18 @@ module.exports = composePlugins(
   (config) => {
     // Update the rspack config as needed here.
     // e.g. `config.plugins.push(new MyPlugin())`
+    <%_ if (style === 'styled-jsx') { _%>config.module.rules.push({
+      test: /\.[jt]sx$/i,
+      use: [
+        {
+          loader: 'babel-loader',
+          options: {
+            presets: ['@babel/preset-typescript'],
+            plugins: ['styled-jsx/babel'],
+          },
+        },
+      ],
+    });<%_ } _%>
     return config;
   }
 );