refactor(config): simplify test inheritance imports and cases

Author: chenjiahan

packages/rstack/src/rstestConfig.ts

@@ -14,29 +14,23 @@ const resolveAutomaticExtends = async (
   // Prefer the app when both app and lib are defined. Merging both adapters can
   // introduce conflicting runtime, resolve, and source transform settings.
   if (layers.some((layer) => layer.app !== undefined)) {
-    const [{ withRsbuildConfig }, { resolveRsbuildConfig }] = await Promise.all(
-      [
-        import(
-          /* rspackChunkName: 'adapterRsbuild' */
-          '@rstest/adapter-rsbuild'
-        ),
-        import('./rsbuildConfig.ts'),
-      ],
+    const { withRsbuildConfig } = await import(
+      /* rspackChunkName: 'adapterRsbuild' */
+      '@rstest/adapter-rsbuild'
     );
+    const { resolveRsbuildConfig } = await import('./rsbuildConfig.ts');
 
     return withRsbuildConfig({
       config: await resolveRsbuildConfig(layers, params),
     });
   }
 
   if (layers.some((layer) => layer.lib !== undefined)) {
-    const [{ withRslibConfig }, { resolveRslibConfig }] = await Promise.all([
-      import(
-        /* rspackChunkName: 'adapterRslib' */
-        '@rstest/adapter-rslib'
-      ),
-      import('./rslibConfig.ts'),
-    ]);
+    const { withRslibConfig } = await import(
+      /* rspackChunkName: 'adapterRslib' */
+      '@rstest/adapter-rslib'
+    );
+    const { resolveRslibConfig } = await import('./rslibConfig.ts');
 
     return withRslibConfig({
       config: await resolveRslibConfig(layers, params),

packages/rstack/tests/config/test-merge.test.ts

@@ -99,18 +99,32 @@ test('inherits merged lib config when no layer defines app', async () => {
   });
 });
 
-test.each([
-  { extends: undefined },
-  { projects: ['./external.config.ts', { name: 'explicit', extends: {} }] },
-])(
-  'skips build config factories when inheritance is disabled: %j',
-  async (testConfig) => {
-    const build = rs.fn(() => ({}));
-    await resolveRstestConfig(
-      [{ app: build, lib: build, test: { retry: 1 } }, { test: testConfig }],
-      params,
-    );
+test('skips build config factories when the root explicitly defines extends', async () => {
+  const build = rs.fn(() => ({}));
+  await resolveRstestConfig(
+    [
+      { app: build, lib: build, test: { retry: 1 } },
+      { test: { extends: undefined } },
+    ],
+    params,
+  );
+
+  expect(build).not.toHaveBeenCalled();
+});
+
+test('skips build config factories when no project needs automatic inheritance', async () => {
+  const build = rs.fn(() => ({}));
+  await resolveRstestConfig(
+    [
+      { app: build, lib: build, test: { retry: 1 } },
+      {
+        test: {
+          projects: ['./external.config.ts', { name: 'explicit', extends: {} }],
+        },
+      },
+    ],
+    params,
+  );
 
-    expect(build).not.toHaveBeenCalled();
-  },
-);
+  expect(build).not.toHaveBeenCalled();
+});