Merge branch 'bump_rslib_010' into dirname_shims_1115

web-infra-dev · Nov 21, 2024 · b151312 · b151312
2 parents a71523d + efce0e8
commit b151312
Show file tree

Hide file tree

Showing 48 changed files with 544 additions and 625 deletions.
diff --git a/.changeset/cyan-flies-destroy.md b/.changeset/cyan-flies-destroy.md
@@ -0,0 +1,5 @@
+---
+'@rsbuild/plugin-assets-retry': patch
+---
+
+fix(plugin-assets-retry): avoid **webpack_require**.e pollution
diff --git a/e2e/cases/module-federation-v2/host/rsbuild.config.ts b/e2e/cases/module-federation-v2/host/rsbuild.config.ts
@@ -1,26 +1,19 @@
-import { ModuleFederationPlugin } from '@module-federation/rspack';
+import { pluginModuleFederation } from '@module-federation/rsbuild-plugin';
 import { defineConfig } from '@rsbuild/core';
 import { pluginReact } from '@rsbuild/plugin-react';
 
 export default defineConfig({
-  plugins: [pluginReact()],
+  plugins: [
+    pluginReact(),
+    pluginModuleFederation({
+      name: 'host',
+      remotes: {
+        remote: `remote@http://localhost:${process.env.REMOTE_PORT || 3002}/mf-manifest.json`,
+      },
+      shared: ['react', 'react-dom'],
+    }),
+  ],
   dev: {
     writeToDisk: true,
   },
-  tools: {
-    rspack: {
-      output: {
-        uniqueName: 'host',
-      },
-      plugins: [
-        new ModuleFederationPlugin({
-          name: 'host',
-          remotes: {
-            remote: `remote@http://localhost:${process.env.REMOTE_PORT || 3002}/mf-manifest.json`,
-          },
-          shared: ['react', 'react-dom'],
-        }),
-      ],
-    },
-  },
 });
diff --git a/e2e/cases/module-federation-v2/index.test.ts b/e2e/cases/module-federation-v2/index.test.ts
@@ -60,40 +60,44 @@ rspackOnlyTest(
   },
 );
 
-// TODO support for remote HMR
-test.skip('should allow remote module to perform HMR', async ({ page }) => {
-  // HMR cases will fail in Windows
-  if (process.platform === 'win32') {
-    test.skip();
-  }
+rspackOnlyTest(
+  'should allow remote module to perform HMR',
+  async ({ page }) => {
+    // HMR cases will fail in Windows
+    if (process.platform === 'win32') {
+      test.skip();
+    }
 
-  writeButtonCode();
+    writeButtonCode();
 
-  const remotePort = await getRandomPort();
+    const remotePort = await getRandomPort();
 
-  process.env.REMOTE_PORT = remotePort.toString();
+    process.env.REMOTE_PORT = remotePort.toString();
 
-  const remoteApp = await dev({
-    cwd: remote,
-  });
-  const hostApp = await dev({
-    cwd: host,
-  });
+    const remoteApp = await dev({
+      cwd: remote,
+    });
+    const hostApp = await dev({
+      cwd: host,
+    });
 
-  await gotoPage(page, remoteApp);
-  await expect(page.locator('#title')).toHaveText('Remote');
-  await expect(page.locator('#button')).toHaveText('Button from remote');
+    await gotoPage(page, remoteApp);
+    await expect(page.locator('#title')).toHaveText('Remote');
+    await expect(page.locator('#button')).toHaveText('Button from remote');
 
-  await gotoPage(page, hostApp);
-  await expect(page.locator('#title')).toHaveText('Host');
-  await expect(page.locator('#button')).toHaveText('Button from remote');
+    await gotoPage(page, hostApp);
+    await expect(page.locator('#title')).toHaveText('Host');
+    await expect(page.locator('#button')).toHaveText('Button from remote');
 
-  writeButtonCode('Button from remote (HMR)');
-  await expect(page.locator('#button')).toHaveText('Button from remote (HMR)');
+    writeButtonCode('Button from remote (HMR)');
+    await expect(page.locator('#button')).toHaveText(
+      'Button from remote (HMR)',
+    );
 
-  await hostApp.close();
-  await remoteApp.close();
-});
+    await hostApp.close();
+    await remoteApp.close();
+  },
+);
 
 // TODO downgrade syntax
 test.skip('should transform module federation runtime with SWC', async () => {

diff --git a/e2e/cases/module-federation-v2/remote/rsbuild.config.ts b/e2e/cases/module-federation-v2/remote/rsbuild.config.ts
@@ -1,30 +1,22 @@
-import { ModuleFederationPlugin } from '@module-federation/rspack';
+import { pluginModuleFederation } from '@module-federation/rsbuild-plugin';
 import { defineConfig } from '@rsbuild/core';
 import { pluginReact } from '@rsbuild/plugin-react';
 
 export default defineConfig({
-  plugins: [pluginReact()],
+  plugins: [
+    pluginReact(),
+    pluginModuleFederation({
+      name: 'remote',
+      exposes: {
+        './Button': './src/test-temp-Button',
+      },
+      shared: ['react', 'react-dom'],
+    }),
+  ],
   server: {
     port: Number(process.env.REMOTE_PORT) || 3002,
   },
   dev: {
     writeToDisk: true,
-    assetPrefix: true,
-  },
-  tools: {
-    rspack: {
-      output: {
-        uniqueName: 'remote',
-      },
-      plugins: [
-        new ModuleFederationPlugin({
-          name: 'remote',
-          exposes: {
-            './Button': './src/test-temp-Button',
-          },
-          shared: ['react', 'react-dom'],
-        }),
-      ],
-    },
   },
 });
diff --git a/e2e/package.json b/e2e/package.json
@@ -38,7 +38,7 @@
     "@rsbuild/plugin-vue": "workspace:*",
     "@rsbuild/plugin-vue-jsx": "^1.0.1",
     "@rsbuild/webpack": "workspace:*",
-    "@module-federation/rspack": "0.7.6",
+    "@module-federation/rsbuild-plugin": "0.7.6",
     "@scripts/test-helper": "workspace:*",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.13",

diff --git a/examples/module-federation-v2/host/package.json b/examples/module-federation-v2/host/package.json
@@ -10,7 +10,7 @@
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@module-federation/rspack": "0.7.6",
+    "@module-federation/rsbuild-plugin": "0.7.6",
     "@rsbuild/core": "workspace:*",
     "@rsbuild/plugin-react": "workspace:*"
   }

diff --git a/examples/module-federation-v2/host/rsbuild.config.ts b/examples/module-federation-v2/host/rsbuild.config.ts
@@ -1,26 +1,19 @@
-import { ModuleFederationPlugin } from '@module-federation/rspack';
+import { pluginModuleFederation } from '@module-federation/rsbuild-plugin';
 import { defineConfig } from '@rsbuild/core';
 import { pluginReact } from '@rsbuild/plugin-react';
 
 export default defineConfig({
-  plugins: [pluginReact()],
+  plugins: [
+    pluginReact(),
+    pluginModuleFederation({
+      name: 'host',
+      remotes: {
+        remote: 'remote@http://localhost:3002/mf-manifest.json',
+      },
+      shared: ['react', 'react-dom'],
+    }),
+  ],
   server: {
     port: 3000,
   },
-  tools: {
-    rspack: {
-      output: {
-        uniqueName: 'host',
-      },
-      plugins: [
-        new ModuleFederationPlugin({
-          name: 'host',
-          remotes: {
-            remote: 'remote@http://localhost:3002/mf-manifest.json',
-          },
-          shared: ['react', 'react-dom'],
-        }),
-      ],
-    },
-  },
 });
diff --git a/examples/module-federation-v2/remote/package.json b/examples/module-federation-v2/remote/package.json
@@ -10,7 +10,7 @@
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@module-federation/rspack": "0.7.6",
+    "@module-federation/rsbuild-plugin": "0.7.6",
     "@rsbuild/core": "workspace:*",
     "@rsbuild/plugin-react": "workspace:*"
   }

diff --git a/examples/module-federation-v2/remote/rsbuild.config.ts b/examples/module-federation-v2/remote/rsbuild.config.ts
@@ -1,29 +1,19 @@
-import { ModuleFederationPlugin } from '@module-federation/rspack';
+import { pluginModuleFederation } from '@module-federation/rsbuild-plugin';
 import { defineConfig } from '@rsbuild/core';
 import { pluginReact } from '@rsbuild/plugin-react';
 
 export default defineConfig({
-  plugins: [pluginReact()],
+  plugins: [
+    pluginReact(),
+    pluginModuleFederation({
+      name: 'remote',
+      exposes: {
+        './Button': './src/Button',
+      },
+      shared: ['react', 'react-dom'],
+    }),
+  ],
   server: {
     port: 3002,
   },
-  dev: {
-    assetPrefix: true,
-  },
-  tools: {
-    rspack: {
-      output: {
-        uniqueName: 'remote',
-      },
-      plugins: [
-        new ModuleFederationPlugin({
-          name: 'remote',
-          exposes: {
-            './Button': './src/Button',
-          },
-          shared: ['react', 'react-dom'],
-        }),
-      ],
-    },
-  },
 });
diff --git a/packages/compat/plugin-webpack-swc/package.json b/packages/compat/plugin-webpack-swc/package.json
@@ -37,7 +37,7 @@
   "devDependencies": {
     "@rsbuild/core": "workspace:*",
     "@rsbuild/webpack": "workspace:*",
-    "@rslib/core": "0.0.18",
+    "@rslib/core": "0.1.0",
     "@types/lodash": "^4.17.13",
     "@types/semver": "^7.5.8",
     "typescript": "^5.6.3",

diff --git a/packages/compat/plugin-webpack-swc/rslib.config.ts b/packages/compat/plugin-webpack-swc/rslib.config.ts
@@ -4,16 +4,19 @@ import { defineConfig } from '@rslib/core';
 export default defineConfig({
   ...dualPackage,
   lib: [
-    ...dualPackage.lib.map((config) => {
-      if (config.format === 'cjs') {
-        config.source = {
-          entry: {
-            index: './src/index.ts',
-            loader: './src/loader.ts',
-          },
-        };
-      }
-      return config;
-    }),
+    ...dualPackage.lib,
+    {
+      format: 'esm',
+      source: {
+        entry: {
+          loader: './src/loader.ts',
+        },
+      },
+      output: {
+        filename: {
+          js: '[name].mjs',
+        },
+      },
+    },
   ],
 });
diff --git a/packages/compat/plugin-webpack-swc/src/plugin.ts b/packages/compat/plugin-webpack-swc/src/plugin.ts
@@ -67,7 +67,7 @@ export const pluginSwc = (options: PluginSwcOptions = {}): RsbuildPlugin => ({
           rule
             .test(test || /\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts)$/)
             .use(CHAIN_ID.USE.SWC)
-            .loader(path.resolve(__dirname, './loader.cjs'))
+            .loader(path.resolve(__dirname, './loader.mjs'))
             .options(removeUselessOptions(swcConfig) satisfies TransformConfig);
 
           if (include) {
@@ -103,7 +103,7 @@ export const pluginSwc = (options: PluginSwcOptions = {}): RsbuildPlugin => ({
           .resolve.set('fullySpecified', false)
           .end()
           .use(CHAIN_ID.USE.SWC)
-          .loader(path.resolve(__dirname, './loader.cjs'))
+          .loader(path.resolve(__dirname, './loader.mjs'))
           .options(removeUselessOptions(mainConfig) satisfies TransformConfig);
       },
     });