feat: use environment API to build

web-infra-dev · Jul 2, 2024 · 7b00683 · 7b00683
1 parent a645e60
commit 7b00683
Show file tree

Hide file tree

Showing 7 changed files with 130 additions and 88 deletions.
diff --git a/e2e/package.json b/e2e/package.json
@@ -11,6 +11,7 @@
   },
   "devDependencies": {
     "@playwright/test": "1.43.1",
+    "@rsbuild/core": "1.0.0-alpha.0",
     "@rslib/core": "workspace:*",
     "@rslib/tsconfig": "workspace:*",
     "@types/fs-extra": "^11.0.4",

diff --git a/e2e/scripts/shared.ts b/e2e/scripts/shared.ts
@@ -1,27 +1,38 @@
 import { join } from 'node:path';
+import { mergeRsbuildConfig as mergeConfig } from '@rsbuild/core';
 import type { LibConfig, RslibConfig } from '@rslib/core';
 import { globContentJSON } from '#helper';
 
-export function generateBundleEsmConfig(cwd: string): LibConfig {
-  return {
+export function generateBundleEsmConfig(
+  cwd: string,
+  config: LibConfig = {},
+): LibConfig {
+  const esmBasicConfig: LibConfig = {
     format: 'esm',
     output: {
       distPath: {
         root: join(cwd, './dist/esm'),
       },
     },
   };
+
+  return mergeConfig(esmBasicConfig, config);
 }
 
-export function generateBundleCjsConfig(cwd: string): LibConfig {
-  return {
+export function generateBundleCjsConfig(
+  cwd: string,
+  config: LibConfig = {},
+): LibConfig {
+  const cjsBasicConfig: LibConfig = {
     format: 'cjs',
     output: {
       distPath: {
         root: join(cwd, './dist/cjs'),
       },
     },
   };
+
+  return mergeConfig(cjsBasicConfig, config);
 }
 
 export async function getEntryJsResults(rslibConfig: RslibConfig) {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -38,7 +38,7 @@
     "prebundle": "prebundle"
   },
   "dependencies": {
-    "@rsbuild/core": "0.7.10"
+    "@rsbuild/core": "1.0.0-alpha.0"
   },
   "devDependencies": {
     "@rslib/tsconfig": "workspace:*",

diff --git a/packages/core/src/build.ts b/packages/core/src/build.ts
@@ -1,21 +1,14 @@
-import type { RsbuildInstance } from '@rsbuild/core';
 import type { BuildOptions } from './cli/commands';
 import { initRsbuild } from './config';
 import type { RslibConfig } from './types/config';
 
 export async function build(config: RslibConfig, options?: BuildOptions) {
-  const rsbuildInstances = await initRsbuild(config);
+  const rsbuildInstance = await initRsbuild(config);
 
-  const buildPromises = rsbuildInstances.map(
-    async (rsbuildInstance: RsbuildInstance) => {
-      return await rsbuildInstance.build({
-        mode: 'production',
-        watch: options?.watch,
-      });
-    },
-  );
+  await rsbuildInstance.build({
+    mode: 'production',
+    watch: options?.watch,
+  });
 
-  await Promise.all(buildPromises);
-
-  return rsbuildInstances;
+  return rsbuildInstance;
 }
diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -8,6 +8,7 @@ import {
 } from '@rsbuild/core';
 import { DEFAULT_CONFIG_NAME, DEFAULT_EXTENSIONS } from './constant';
 import type {
+  Format,
   LibConfig,
   RslibConfig,
   RslibConfigAsyncFn,
@@ -73,6 +74,9 @@ export async function loadConfig(
 
 export async function createInternalRsbuildConfig(): Promise<RsbuildConfig> {
   return defineRsbuildConfig({
+    dev: {
+      progressBar: false,
+    },
     tools: {
       htmlPlugin: false,
     },
@@ -141,19 +145,20 @@ export function convertLibConfigToRsbuildConfig(
   }
 }
 
-export async function composeCreateRsbuildConfig(
-  rslibConfig: RslibConfig,
-): Promise<RsbuildConfig[]> {
+export async function composeCreateRsbuildConfig(rslibConfig: RslibConfig) {
   const internalRsbuildConfig = await createInternalRsbuildConfig();
 
   const { lib: libConfigsArray, ...sharedRsbuildConfig } = rslibConfig;
 
   if (!libConfigsArray) {
-    logger.error('You must specify lib field in config file.');
-    return [];
+    throw new Error(
+      `Expect lib field to be an array, but got ${libConfigsArray}.`,
+    );
   }
 
-  const composedRsbuildConfig = libConfigsArray.map((libConfig: LibConfig) => {
+  const composedRsbuildConfig: Partial<Record<Format, RsbuildConfig>> = {};
+
+  for (const libConfig of libConfigsArray) {
     const { format, ...overrideRsbuildConfig } = libConfig;
 
     // Merge order matters, keep `internalRsbuildConfig` at the last position
@@ -164,23 +169,21 @@ export async function composeCreateRsbuildConfig(
       internalRsbuildConfig,
     );
 
-    return convertLibConfigToRsbuildConfig(libConfig, mergedRsbuildConfig);
-  });
+    composedRsbuildConfig[format!] = convertLibConfigToRsbuildConfig(
+      libConfig,
+      mergedRsbuildConfig,
+    );
+  }
 
   return composedRsbuildConfig;
 }
 
 export async function initRsbuild(rslibConfig: RslibConfig) {
-  // TODO: use environment API instead
-  const rsbuildConfigArray = await composeCreateRsbuildConfig(rslibConfig);
+  const rsbuildConfigObject = await composeCreateRsbuildConfig(rslibConfig);
 
-  const rsbuildPromises = rsbuildConfigArray.map(
-    async (rsbuildConfig: RsbuildConfig) => {
-      return createRsbuild({ rsbuildConfig });
+  return createRsbuild({
+    rsbuildConfig: {
+      environments: rsbuildConfigObject,
     },
-  );
-
-  const rsbuildInstances = await Promise.all(rsbuildPromises);
-
-  return rsbuildInstances;
+  });
 }
diff --git a/packages/core/tests/__snapshots__/config.test.ts.snap b/packages/core/tests/__snapshots__/config.test.ts.snap
@@ -1,8 +1,11 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1`] = `
-[
-  {
+{
+  "cjs": {
+    "dev": {
+      "progressBar": false,
+    },
     "output": {
       "distPath": {
         "js": "./",
@@ -12,31 +15,30 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
     },
     "source": {
       "alias": {
-        "bar": "bar",
-        "foo": "foo/esm",
+        "bar": "bar/cjs",
+        "foo": "foo",
       },
-      "preEntry": "./b.js",
+      "preEntry": [
+        "./a.js",
+        "./c.js",
+        "./d.js",
+      ],
     },
     "tools": {
       "htmlPlugin": false,
       "rspack": {
-        "experiments": {
-          "outputModule": true,
-        },
-        "optimization": {
-          "concatenateModules": true,
-        },
         "output": {
-          "iife": false,
           "library": {
-            "type": "modern-module",
+            "type": "commonjs",
           },
-          "module": true,
         },
       },
     },
   },
-  {
+  "esm": {
+    "dev": {
+      "progressBar": false,
+    },
     "output": {
       "distPath": {
         "js": "./",
@@ -46,27 +48,34 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
     },
     "source": {
       "alias": {
-        "bar": "bar/cjs",
-        "foo": "foo",
+        "bar": "bar",
+        "foo": "foo/esm",
       },
-      "preEntry": [
-        "./a.js",
-        "./c.js",
-        "./d.js",
-      ],
+      "preEntry": "./b.js",
     },
     "tools": {
       "htmlPlugin": false,
       "rspack": {
+        "experiments": {
+          "outputModule": true,
+        },
+        "optimization": {
+          "concatenateModules": true,
+        },
         "output": {
+          "iife": false,
           "library": {
-            "type": "commonjs",
+            "type": "modern-module",
           },
+          "module": true,
         },
       },
     },
   },
-  {
+  "umd": {
+    "dev": {
+      "progressBar": false,
+    },
     "output": {
       "distPath": {
         "js": "./",
@@ -92,5 +101,5 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
       },
     },
   },
-]
+}
 `;