chore: merge conf

e2e/cases/alias/alias-by-target/rsbuild.config.ts

@@ -6,7 +6,7 @@ export default defineConfig({
   },
   environments: {
     web: {
-      source: {
+      resolve: {
         alias: {
           '@common': './src/common',
         },
@@ -16,7 +16,7 @@ export default defineConfig({
       },
     },
     node: {
-      source: {
+      resolve: {
         alias: {
           '@common': './src/common2',
         },

e2e/cases/alias/jsconfig-paths/index.test.ts

@@ -8,10 +8,12 @@ rspackOnlyTest(
       cwd: __dirname,
       page,
       rsbuildConfig: {
-        source: {
+        resolve: {
           alias: {
             '@common': './src/common2',
           },
+        },
+        source: {
           tsconfigPath: './jsconfig.json',
         },
       },
@@ -31,18 +33,20 @@ rspackOnlyTest(
       cwd: __dirname,
       page,
       rsbuildConfig: {
-        source: {
+        resolve: {
           alias: {
             '@/common': './src/common2',
           },
           aliasStrategy: 'prefer-alias',
+        },
+        source: {
           tsconfigPath: './jsconfig.json',
         },
       },
     });
 
     const foo = page.locator('#foo');
-    await expect(foo).toHaveText('source.alias worked');
+    await expect(foo).toHaveText('resolve.alias worked');
 
     await rsbuild.close();
   },

e2e/cases/alias/jsconfig-paths/src/common2/test.js

@@ -1 +1 @@
-export const content = 'source.alias worked';
+export const content = 'resolve.alias worked';

e2e/cases/alias/legacy-alias/index.test.ts

@@ -0,0 +1,20 @@
+import { build } from '@e2e/helper';
+import { expect, test } from '@playwright/test';
+
+test('should allow to use the legacy `source.alias` config', async () => {
+  const rsbuild = await build({
+    cwd: __dirname,
+  });
+
+  const files = await rsbuild.unwrapOutputJSON();
+  const fileNames = Object.keys(files);
+  const webIndex = fileNames.find(
+    (file) => file.includes('static/js') && file.endsWith('index.js'),
+  );
+  const nodeIndex = fileNames.find(
+    (file) => file.includes('server/index') && file.endsWith('index.js'),
+  );
+
+  expect(files[webIndex!]).toContain('for web target');
+  expect(files[nodeIndex!]).toContain('for node target');
+});

e2e/cases/alias/legacy-alias/rsbuild.config.ts

@@ -0,0 +1,32 @@
+import { defineConfig } from '@rsbuild/core';
+
+export default defineConfig({
+  output: {
+    filenameHash: false,
+  },
+  environments: {
+    web: {
+      source: {
+        alias: {
+          '@common': './src/common',
+        },
+      },
+      output: {
+        target: 'web',
+      },
+    },
+    node: {
+      source: {
+        alias: {
+          '@common': './src/common2',
+        },
+      },
+      output: {
+        target: 'node',
+        distPath: {
+          root: 'dist/server',
+        },
+      },
+    },
+  },
+});

e2e/cases/alias/legacy-alias/src/common/test.js

@@ -0,0 +1 @@
+export const content = 'for web target';

e2e/cases/alias/legacy-alias/src/common2/test.js

@@ -0,0 +1 @@
+export const content = 'for node target';

e2e/cases/alias/legacy-alias/src/index.js

@@ -0,0 +1,3 @@
+import { content } from '@common/test';
+
+console.log(content);

e2e/cases/alias/tsconfig-paths-references/index.test.ts

@@ -8,7 +8,7 @@ rspackOnlyTest(
       cwd: __dirname,
       page,
       rsbuildConfig: {
-        source: {
+        resolve: {
           alias: {
             '@common': './src/common2',
           },

e2e/cases/alias/tsconfig-paths-references/src/common2/test.ts

@@ -1 +1 @@
-export const content = 'source.alias worked';
+export const content = 'resolve.alias worked';

e2e/cases/alias/tsconfig-paths-specify-config/rsbuild.config.ts

@@ -1,10 +1,12 @@
 import { defineConfig } from '@rsbuild/core';
 
 export default defineConfig({
-  source: {
+  resolve: {
     alias: {
       '@common': './src/common2',
     },
+  },
+  source: {
     tsconfigPath: 'tsconfig.custom.json',
   },
 });

e2e/cases/alias/tsconfig-paths-specify-config/src/common2/test.ts

@@ -1 +1 @@
-export const content = 'source.alias worked';
+export const content = 'resolve.alias worked';

e2e/cases/alias/tsconfig-paths/index.test.ts

@@ -8,7 +8,7 @@ test('tsconfig paths should work and override the alias config', async ({
     cwd: __dirname,
     page,
     rsbuildConfig: {
-      source: {
+      resolve: {
         alias: {
           '@common': './src/common2',
         },
@@ -29,7 +29,7 @@ test('tsconfig paths should not work when aliasStrategy is "prefer-alias"', asyn
     cwd: __dirname,
     page,
     rsbuildConfig: {
-      source: {
+      resolve: {
         alias: {
           '@/common': './src/common2',
         },
@@ -39,7 +39,7 @@ test('tsconfig paths should not work when aliasStrategy is "prefer-alias"', asyn
   });
 
   const foo = page.locator('#foo');
-  await expect(foo).toHaveText('source.alias worked');
+  await expect(foo).toHaveText('resolve.alias worked');
 
   await rsbuild.close();
 });

e2e/cases/alias/tsconfig-paths/src/common2/test.ts

@@ -1 +1 @@
-export const content = 'source.alias worked';
+export const content = 'resolve.alias worked';

e2e/cases/config/rspack-config-validate/index.test.ts

@@ -86,7 +86,7 @@ rspackOnlyTest(
     } catch (e) {
       expect(e).toBeTruthy();
       expect(stripAnsi((e as Error).message)).toContain(
-        'rsbuild:react appears to be an Rsbuild plugin. It cannot be used as an Rspack plugin.',
+        '[rsbuild:plugin] "rsbuild:react" appears to be an Rsbuild plugin. It cannot be used as an Rspack plugin.',
       );
     }
   },

e2e/cases/css/import-common-css/index.test.ts

@@ -7,7 +7,7 @@ rspackOnlyTest('should compile common CSS import correctly', async () => {
   const rsbuild = await build({
     cwd: __dirname,
     rsbuildConfig: {
-      source: {
+      resolve: {
         alias: {
           '@': './src',
         },

e2e/cases/css/resolve-alias/rsbuild.config.ts

@@ -4,7 +4,7 @@ import { pluginSass } from '@rsbuild/plugin-sass';
 
 export default {
   plugins: [pluginLess(), pluginSass()],
-  source: {
+  resolve: {
     alias: {
       '@common': path.resolve(__dirname, 'src/common'),
     },

e2e/cases/javascript-api/build/index.test.ts

@@ -0,0 +1,17 @@
+import { expect, test } from '@playwright/test';
+import { createRsbuild } from '@rsbuild/core';
+
+test('should allow to call `build` and get stats object', async () => {
+  const rsbuild = await createRsbuild({
+    cwd: __dirname,
+  });
+
+  const { stats, close } = await rsbuild.build();
+
+  await close();
+
+  const result = stats?.toJson({ all: true })!;
+
+  expect(result.name).toBe('web');
+  expect(result.assets?.length).toBeGreaterThan(0);
+});

e2e/cases/javascript-api/build/src/index.js

@@ -0,0 +1 @@
+console.log('hello');

e2e/cases/output/manifest/index.test.ts

@@ -1,6 +1,6 @@
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { build } from '@e2e/helper';
+import { build, dev } from '@e2e/helper';
 import { expect, test } from '@playwright/test';
 
 const fixtures = __dirname;
@@ -108,3 +108,36 @@ test('output.manifest when target is node', async () => {
     },
   });
 });
+
+test('output.manifest should always write to disk when dev', async ({
+  page,
+}) => {
+  const rsbuild = await dev({
+    cwd: fixtures,
+    page,
+    rsbuildConfig: {
+      output: {
+        distPath: {
+          root: 'dist-dev',
+        },
+        manifest: true,
+        legalComments: 'none',
+        filenameHash: false,
+      },
+      performance: {
+        chunkSplit: {
+          strategy: 'all-in-one',
+        },
+      },
+    },
+  });
+
+  const files = await rsbuild.unwrapOutputJSON();
+
+  const manifestContent =
+    files[Object.keys(files).find((file) => file.endsWith('manifest.json'))!];
+
+  expect(manifestContent).toBeDefined();
+
+  await rsbuild.close();
+});

e2e/cases/resolve/dedupe/index.test.ts

@@ -0,0 +1,36 @@
+import { join } from 'node:path';
+import { build } from '@e2e/helper';
+import { expect, test } from '@playwright/test';
+import { outputFileSync } from 'fs-extra';
+
+function writeDuplicatedPackage(flag: string) {
+  const fooPath = join(__dirname, 'node_modules', 'foo');
+  outputFileSync(
+    join(fooPath, 'package.json'),
+    JSON.stringify({ name: 'foo', version: '1.0.0' }),
+  );
+  outputFileSync(
+    join(fooPath, 'index.js'),
+    'import React from "react";export default React;',
+  );
+  outputFileSync(
+    join(fooPath, 'node_modules', 'react', 'package.json'),
+    JSON.stringify({ name: 'react', version: '1.0.0' }),
+  );
+  outputFileSync(
+    join(fooPath, 'node_modules', 'react', 'index.js'),
+    `console.log("${flag}");`,
+  );
+}
+
+test('should dedupe specified packages as expected', async () => {
+  const flag = 'This is fake React';
+  writeDuplicatedPackage(flag);
+
+  const rsbuild = await build({
+    cwd: __dirname,
+  });
+
+  const { content } = await rsbuild.getIndexFile();
+  expect(content).not.toContain(flag);
+});

e2e/cases/resolve/dedupe/rsbuild.config.ts

@@ -0,0 +1,12 @@
+import { defineConfig } from '@rsbuild/core';
+
+export default defineConfig({
+  resolve: {
+    dedupe: ['react', 'react-dom'],
+  },
+  performance: {
+    chunkSplit: {
+      strategy: 'all-in-one',
+    },
+  },
+});

e2e/cases/resolve/dedupe/src/index.js

@@ -0,0 +1,5 @@
+import foo from 'foo';
+import React from 'react';
+import ReactDOM from 'react-dom';
+
+console.log(React, ReactDOM, foo);

e2e/cases/server/ssr/rsbuild.config.ts

@@ -9,7 +9,7 @@ import { pluginReact } from '@rsbuild/plugin-react';
 export const serverRender =
   (serverAPI: SetupMiddlewaresServer): RequestHandler =>
   async (_req, res, _next) => {
-    const indexModule = await serverAPI.environments.ssr.loadBundle<{
+    const indexModule = await serverAPI.environments.node.loadBundle<{
       render: () => string;
     }>('index');
 
@@ -59,7 +59,7 @@ export default defineConfig({
         },
       },
     },
-    ssr: {
+    node: {
       output: {
         target: 'node',
       },

e2e/cases/source/source.test.ts

@@ -16,10 +16,12 @@ test.describe('source configure multi', () => {
           entry: {
             index: join(fixtures, 'basic/src/index.js'),
           },
+          preEntry: ['./src/pre.js'],
+        },
+        resolve: {
           alias: {
             '@common': './src/common',
           },
-          preEntry: ['./src/pre.js'],
         },
       },
     });

e2e/cases/svelte/package.json

@@ -3,11 +3,11 @@
   "name": "@e2e/svelte",
   "version": "1.0.0",
   "dependencies": {
-    "svelte": "^5.2.7"
+    "svelte": "^5.4.0"
   },
   "devDependencies": {
-    "less": "^4.2.0",
-    "sass": "^1.81.0",
+    "less": "^4.2.1",
+    "sass": "^1.81.1",
     "stylus": "0.64.0"
   }
 }