fix: derive rspack.target from libConfig.syntax (#213)

web-infra-dev · Sep 18, 2024 · 057cd87 · 057cd87
1 parent ed9fe5b
commit 057cd87
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/e2e/cases/syntax/index.test.ts b/e2e/cases/syntax/index.test.ts
@@ -23,5 +23,7 @@ test('should downgrade class private method with output.syntax config', async ()
   expect(entries.esm1).toContain('#bar');
 
   expect(entries.cjs0).toContain('#bar');
+  expect(entries.cjs0).toContain('()=>{'); // test webpack runtime arrow function
   expect(entries.cjs1).not.toContain('#bar');
+  expect(entries.cjs1).not.toContain('()=>{'); // test webpack runtime arrow function
 });
diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -560,18 +560,17 @@ const composeSyntaxConfig = (
   // Defaults to ESNext, Rslib will assume all of the latest JavaScript and CSS features are supported.
 
   if (syntax) {
+    const resolvedBrowserslist = transformSyntaxToBrowserslist(syntax, target);
     return {
       tools: {
         rspack: (config) => {
-          // TODO: Rspack should could resolve `browserslist:{query}` like webpack.
-          // https://webpack.js.org/configuration/target/#browserslist
-          // Using 'es5' as a temporary solution for compatibility.
-          config.target = ['es5'];
-          return config;
+          config.target = resolvedBrowserslist.map(
+            (item) => `browserslist:${item}` as const,
+          );
         },
       },
       output: {
-        overrideBrowserslist: transformSyntaxToBrowserslist(syntax, target),
+        overrideBrowserslist: resolvedBrowserslist,
       },
     };
   }
@@ -725,6 +724,11 @@ const composeTargetConfig = (
         tools: {
           rspack: {
             target: ['web'],
+            output: {
+              chunkLoading: 'import',
+              workerChunkLoading: 'import',
+              wasmLoading: 'fetch',
+            },
           },
         },
       };
@@ -736,6 +740,11 @@ const composeTargetConfig = (
             // "__dirname" and "__filename" shims will automatically be enabled when `output.module` is `true`,
             // and leave them as-is in the rest of the cases.
             // { node: { __dirname: ..., __filename: ... } }
+            output: {
+              chunkLoading: 'require',
+              workerChunkLoading: 'async-node',
+              wasmLoading: 'async-node',
+            },
           },
         },
         output: {

diff --git a/packages/core/tests/__snapshots__/config.test.ts.snap b/packages/core/tests/__snapshots__/config.test.ts.snap
@@ -119,6 +119,11 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
           },
           [Function],
           {
+            "output": {
+              "chunkLoading": "import",
+              "wasmLoading": "fetch",
+              "workerChunkLoading": "import",
+            },
             "target": [
               "web",
             ],
@@ -248,6 +253,11 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
           },
           [Function],
           {
+            "output": {
+              "chunkLoading": "import",
+              "wasmLoading": "fetch",
+              "workerChunkLoading": "import",
+            },
             "target": [
               "web",
             ],
@@ -371,6 +381,11 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
           },
           [Function],
           {
+            "output": {
+              "chunkLoading": "import",
+              "wasmLoading": "fetch",
+              "workerChunkLoading": "import",
+            },
             "target": [
               "web",
             ],