storybook-builder-rsbuild 0.0.9 → 0.0.11

package/dist/index.d.ts

@@ -29,6 +29,10 @@ type BuilderOptions = {
      * Enable Rspack's lazy compilation (experimental).
      */
     lazyCompilation?: boolean;
+    /**
+     * Which environment to use from the Rsbuild config.
+     */
+    environment?: string;
 };
 interface BuilderResult extends BuilderResult$1 {
     stats?: Stats;

package/dist/index.js

@@ -372,14 +372,46 @@ var iframe_rsbuild_config_default = async (options) => {
   if (!options.cache) {
     throw new Error("Cache is required");
   }
+  let contentFromConfig = {};
   const { content } = await (0, import_core.loadConfig)({
     cwd: workingDir,
     path: rsbuildConfigPath
   });
-  content.source ??= {};
-  content.source.entry = {};
+  const { environments, ...withoutEnv } = content;
+  if (content.environments) {
+    const envCount = Object.keys(content.environments).length;
+    if (envCount === 0) {
+      contentFromConfig = withoutEnv;
+    } else if (envCount === 1) {
+      contentFromConfig = (0, import_core.mergeRsbuildConfig)(
+        withoutEnv,
+        content.environments[0]
+      );
+    } else {
+      const userEnv = builderOptions.environment;
+      if (typeof userEnv !== "string") {
+        throw new Error(
+          "You must specify an environment when there are multiple environments in the Rsbuild config."
+        );
+      }
+      if (Object.keys(content.environments).includes(userEnv)) {
+        contentFromConfig = (0, import_core.mergeRsbuildConfig)(
+          withoutEnv,
+          content.environments[userEnv]
+        );
+      } else {
+        throw new Error(
+          `The specified environment "${userEnv}" is not found in the Rsbuild config.`
+        );
+      }
+    }
+  } else {
+    contentFromConfig = content;
+  }
+  contentFromConfig.source ??= {};
+  contentFromConfig.source.entry = {};
   const resourceFilename = isProd ? "static/media/[name].[contenthash:8][ext]" : "static/media/[path][name][ext]";
-  const merged = (0, import_core.mergeRsbuildConfig)(content, {
+  const merged = (0, import_core.mergeRsbuildConfig)(contentFromConfig, {
     output: {
       cleanDistPath: false,
       dataUriLimit: {
@@ -431,14 +463,14 @@ var iframe_rsbuild_config_default = async (options) => {
     },
     plugins: [
       shouldCheckTs ? (0, import_plugin_type_check.pluginTypeCheck)(tsCheckOptions) : null,
-      (0, import_rsbuild_plugin_html_minifier_terser.pluginHtmlMinifierTerser)({
+      (0, import_rsbuild_plugin_html_minifier_terser.pluginHtmlMinifierTerser)(() => ({
         collapseWhitespace: true,
         removeComments: true,
         removeRedundantAttributes: true,
         removeScriptTypeAttributes: false,
         removeStyleLinkTypeAttributes: true,
         useShortDoctype: true
-      })
+      }))
     ].filter(Boolean),
     tools: {
       rspack: (config, { addRules, appendPlugins, rspack, mergeConfig }) => {

package/dist/index.mjs

@@ -315,14 +315,46 @@ var iframe_rsbuild_config_default = async (options) => {
   if (!options.cache) {
     throw new Error("Cache is required");
   }
+  let contentFromConfig = {};
   const { content } = await loadConfig({
     cwd: workingDir,
     path: rsbuildConfigPath
   });
-  content.source ??= {};
-  content.source.entry = {};
+  const { environments, ...withoutEnv } = content;
+  if (content.environments) {
+    const envCount = Object.keys(content.environments).length;
+    if (envCount === 0) {
+      contentFromConfig = withoutEnv;
+    } else if (envCount === 1) {
+      contentFromConfig = mergeRsbuildConfig(
+        withoutEnv,
+        content.environments[0]
+      );
+    } else {
+      const userEnv = builderOptions.environment;
+      if (typeof userEnv !== "string") {
+        throw new Error(
+          "You must specify an environment when there are multiple environments in the Rsbuild config."
+        );
+      }
+      if (Object.keys(content.environments).includes(userEnv)) {
+        contentFromConfig = mergeRsbuildConfig(
+          withoutEnv,
+          content.environments[userEnv]
+        );
+      } else {
+        throw new Error(
+          `The specified environment "${userEnv}" is not found in the Rsbuild config.`
+        );
+      }
+    }
+  } else {
+    contentFromConfig = content;
+  }
+  contentFromConfig.source ??= {};
+  contentFromConfig.source.entry = {};
   const resourceFilename = isProd ? "static/media/[name].[contenthash:8][ext]" : "static/media/[path][name][ext]";
-  const merged = mergeRsbuildConfig(content, {
+  const merged = mergeRsbuildConfig(contentFromConfig, {
     output: {
       cleanDistPath: false,
       dataUriLimit: {
@@ -374,14 +406,14 @@ var iframe_rsbuild_config_default = async (options) => {
     },
     plugins: [
       shouldCheckTs ? pluginTypeCheck(tsCheckOptions) : null,
-      pluginHtmlMinifierTerser({
+      pluginHtmlMinifierTerser(() => ({
         collapseWhitespace: true,
         removeComments: true,
         removeRedundantAttributes: true,
         removeScriptTypeAttributes: false,
         removeStyleLinkTypeAttributes: true,
         useShortDoctype: true
-      })
+      }))
     ].filter(Boolean),
     tools: {
       rspack: (config, { addRules, appendPlugins, rspack, mergeConfig }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-builder-rsbuild",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Rsbuild builder for Storybook",
   "keywords": [
     "storybook",
@@ -56,7 +56,7 @@
     "!src/**/*"
   ],
   "dependencies": {
-    "@rsbuild/plugin-type-check": "1.0.1-beta.0",
+    "@rsbuild/plugin-type-check": "1.0.1-beta.10",
     "@storybook/addon-docs": "^8.2.1",
     "@storybook/core-webpack": "^8.2.1",
     "browser-assert": "^1.2.1",
@@ -78,7 +78,7 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@rsbuild/core": "1.0.1-beta.0",
+    "@rsbuild/core": "1.0.1-beta.10",
     "@types/express": "^4.17.21",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^18.0.0",
@@ -90,7 +90,7 @@
     "typescript": "^5.3.2"
   },
   "peerDependencies": {
-    "@rsbuild/core": ">= 1.0.0-alpha.9",
+    "@rsbuild/core": ">= 1.0.0-alpha.9 || >= 1.0.1-beta || 1.x",
     "storybook": "^8.2.1"
   },
   "peerDependenciesMeta": {