enable disableTransformByDefault

nrwl · Dec 6, 2023 · 60606ec · 60606ec
1 parent 6676ee5
commit 60606ec
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 35 deletions.
diff --git a/packages/rspack/src/utils/with-nx.ts b/packages/rspack/src/utils/with-nx.ts
@@ -3,6 +3,7 @@ import {
   ExternalItem,
   ResolveAlias,
   RspackPluginInstance,
+  rspack,
 } from '@rspack/core';
 import { LicenseWebpackPlugin } from 'license-webpack-plugin';
 import * as path from 'path';
@@ -58,6 +59,13 @@ export function withNx(_opts = {}) {
       );
     }
 
+    plugins.push(new rspack.CopyRspackPlugin({
+      patterns: getCopyPatterns(
+        normalizeAssets(options.assets, context.root, sourceRoot)
+      ),
+    }));
+    plugins.push(new rspack.ProgressPlugin())
+
     options.fileReplacements.forEach((item) => {
       alias[item.replace] = item.with;
     });
@@ -133,25 +141,12 @@ export function withNx(_opts = {}) {
       infrastructureLogging: {
         debug: false,
       },
-      builtins: {
-        copy: {
-          patterns: getCopyPatterns(
-            normalizeAssets(options.assets, context.root, sourceRoot)
-          ),
-        },
-        progress: {},
-      },
       externals,
       externalsType,
       stats: {
         colors: true,
         preset: 'normal',
       },
-      experiments: {
-        rspackFuture: {
-          disableTransformByDefault: false
-        }
-      }
     };
 
     if (options.optimization) {

diff --git a/packages/rspack/src/utils/with-react.ts b/packages/rspack/src/utils/with-react.ts
@@ -15,15 +15,51 @@ export function withReact(opts = {}) {
       context,
     });
 
+    const react = {
+      runtime: 'automatic',
+      development: isDev,
+      refresh: isDev,
+    };
+
     return {
       ...config,
-      builtins: {
-        ...config.builtins,
-        react: {
-          runtime: 'automatic',
-          development: isDev,
-          refresh: isDev,
-        },
+      module: {
+        ...config.module,
+        rules: [
+          ...(config.module.rules || []),
+          {
+            test: /\.jsx$/,
+            loader: 'builtin:swc-loader',
+            options: {
+              jsc: {
+                parser: {
+                  syntax: 'ecmascript',
+                  jsx: true,
+                },
+              },
+              transform: {
+                react,
+              },
+            },
+            type: 'javascript/auto',
+          },
+          {
+            test: /\.tsx$/,
+            loader: 'builtin:swc-loader',
+            options: {
+              jsc: {
+                parser: {
+                  syntax: 'typescript',
+                  jsx: true,
+                },
+              },
+              transform: {
+                react,
+              },
+            },
+            type: 'javascript/auto',
+          },
+        ],
       },
     };
   };

diff --git a/packages/rspack/src/utils/with-web.ts b/packages/rspack/src/utils/with-web.ts
@@ -1,4 +1,4 @@
-import { Configuration, RuleSetRule } from '@rspack/core';
+import { Configuration, RuleSetRule, rspack } from '@rspack/core';
 import * as path from 'path';
 import { SharedConfigContext } from './model';
 
@@ -44,6 +44,19 @@ export function withWeb(opts: WithWebOptions = {}) {
         ...config.module,
         rules: [
           ...(config.module.rules || []),
+          {
+            test: /\.ts$/,
+            loader: 'builtin:swc-loader',
+            options: {
+              jsc: {
+                parser: {
+                  syntax: 'typescript',
+                  jsx: true,
+                },
+              },
+            },
+            type: 'javascript/auto',
+          },
           {
             test: /\.css$/,
             type: opts?.cssModules ? 'css/module' : undefined,
@@ -98,21 +111,17 @@ export function withWeb(opts: WithWebOptions = {}) {
           },
         ].filter((a): a is RuleSetRule => !!a),
       },
-      builtins: {
-        ...config.builtins,
-        html: [
-          ...(config.builtins.html || []),
-          {
-            template: options.indexHtml
-              ? path.join(context.root, options.indexHtml)
-              : path.join(projectRoot, 'src/index.html'),
-          },
-        ],
-        define: {
-          ...config.builtins.define,
+      plugins: [
+        ...config.plugins,
+        new rspack.HtmlRspackPlugin({
+          template: options.indexHtml
+            ? path.join(context.root, options.indexHtml)
+            : path.join(projectRoot, 'src/index.html'),
+        }),
+        new rspack.DefinePlugin({
           'process.env.NODE_ENV': isProd ? "'production'" : "'development'",
-        },
-      },
+        })
+      ],
     };
   };
 }