feat: support read environments source.entry config (#2643)

Co-authored-by: neverland <[email protected]>
web-infra-dev · Jun 20, 2024 · e7163d7 · e7163d7
1 parent 552facf
commit e7163d7
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 4 deletions.
diff --git a/packages/core/src/createContext.ts b/packages/core/src/createContext.ts
@@ -108,6 +108,7 @@ export function createPublicContext(
     'configPath',
     'tsconfigPath',
     'bundlerType',
+    'environments',
   ];
 
   // Using Proxy to get the current value of context.

diff --git a/packages/core/src/plugins/entry.ts b/packages/core/src/plugins/entry.ts
@@ -30,11 +30,10 @@ export const pluginEntry = (): RsbuildPlugin => ({
 
   setup(api) {
     api.modifyBundlerChain(
-      async (chain, { target, isServer, isServiceWorker }) => {
-        const config = api.getNormalizedConfig();
+      async (chain, { environment, isServer, isServiceWorker }) => {
+        const config = api.getNormalizedConfig({ environment });
         const { preEntry } = config.source;
-        const entry =
-          target === 'web' ? api.context.entry : getEntryObject(config, target);
+        const { entry } = api.context.environments[environment];
 
         const injectCoreJsEntry =
           config.output.polyfill === 'entry' && !isServer && !isServiceWorker;

diff --git a/packages/core/tests/__snapshots__/entry.test.ts.snap b/packages/core/tests/__snapshots__/entry.test.ts.snap
@@ -0,0 +1,20 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`plugin-entry > should apply environments entry config correctly 1`] = `
+[
+  {
+    "entry": {
+      "index": [
+        "src/index.client",
+      ],
+    },
+  },
+  {
+    "entry": {
+      "index": [
+        "src/index.ssr",
+      ],
+    },
+  },
+]
+`;
diff --git a/packages/core/tests/entry.test.ts b/packages/core/tests/entry.test.ts
@@ -60,4 +60,31 @@ describe('plugin-entry', () => {
 
     expect(config).toEqual(item.expected);
   });
+
+  it('should apply environments entry config correctly', async () => {
+    const rsbuild = await createStubRsbuild({
+      plugins: [pluginEntry()],
+      rsbuildConfig: {
+        environments: {
+          web: {
+            source: {
+              entry: {
+                index: './src/index.client',
+              },
+            },
+          },
+          ssr: {
+            source: {
+              entry: {
+                index: './src/index.ssr',
+              },
+            },
+          },
+        },
+      },
+    });
+
+    const configs = await rsbuild.initConfigs();
+    expect(configs).toMatchSnapshot();
+  });
 });