@rsbuild/core 0.7.4 → 0.7.6

package/dist/index.cjs

@@ -1003,7 +1003,7 @@ async function createContextByConfig(options, bundlerType, config = {}) {
   return {
     entry: getEntryObject(config, "web"),
     targets: config.output?.targets || [],
-    version: "0.7.4",
+    version: "0.7.6",
     rootPath,
     distPath,
     cachePath,
@@ -5078,7 +5078,7 @@ async function getDefaultSwcConfig(config, rootPath, target) {
     }
   };
 }
-async function applyCoreJs(swcConfig, chain, polyfillMode) {
+async function applyCoreJs(swcConfig, polyfillMode) {
   const coreJsPath = require.resolve("core-js/package.json");
   const version2 = (0, import_shared42.getCoreJsVersion)(coreJsPath);
   const coreJsDir = import_node_path23.default.dirname(coreJsPath);
@@ -5086,9 +5086,7 @@ async function applyCoreJs(swcConfig, chain, polyfillMode) {
   if (polyfillMode === "usage") {
     swcConfig.env.shippedProposals = true;
   }
-  chain.resolve.alias.merge({
-    "core-js": coreJsDir
-  });
+  return coreJsDir;
 }
 function applyTransformImport(swcConfig, pluginImport) {
   if (pluginImport !== false && pluginImport) {
@@ -5134,6 +5132,9 @@ var init_swc = __esm({
           handler: async (chain, { CHAIN_ID: CHAIN_ID3, target }) => {
             const config = api.getNormalizedConfig();
             const rule = chain.module.rule(CHAIN_ID3.RULE.JS).test(import_shared42.SCRIPT_REGEX).type("javascript/auto");
+            const dataUriRule = chain.module.rule(CHAIN_ID3.RULE.JS_DATA_URI).mimetype({
+              or: ["text/javascript", "application/javascript"]
+            });
             (0, import_shared42.applyScriptCondition)({
               rule,
               chain,
@@ -5161,7 +5162,10 @@ var init_swc = __esm({
                 swcConfig.env.mode = void 0;
               } else {
                 swcConfig.env.mode = polyfillMode;
-                await applyCoreJs(swcConfig, chain, polyfillMode);
+                const coreJsDir = await applyCoreJs(swcConfig, polyfillMode);
+                for (const item of [rule, dataUriRule]) {
+                  item.resolve.alias.set("core-js", coreJsDir);
+                }
               }
             }
             const mergedSwcConfig = (0, import_shared42.reduceConfigs)({
@@ -5170,9 +5174,7 @@ var init_swc = __esm({
               mergeFn: import_shared42.deepmerge
             });
             rule.use(CHAIN_ID3.USE.SWC).loader(builtinSwcLoaderName).options(mergedSwcConfig);
-            chain.module.rule(CHAIN_ID3.RULE.JS_DATA_URI).mimetype({
-              or: ["text/javascript", "application/javascript"]
-            }).resolve.set("fullySpecified", false).end().use(CHAIN_ID3.USE.SWC).loader(builtinSwcLoaderName).options((0, import_shared42.cloneDeep)(mergedSwcConfig));
+            dataUriRule.resolve.set("fullySpecified", false).end().use(CHAIN_ID3.USE.SWC).loader(builtinSwcLoaderName).options((0, import_shared42.cloneDeep)(mergedSwcConfig));
           }
         });
       }
@@ -5478,25 +5480,24 @@ function pluginOpen() {
       const onStartServer = async (params) => {
         const { port, routes } = params;
         const config = api.getNormalizedConfig();
-        const { beforeStartUrl } = config.dev;
-        const open = config.server.open || config.dev.startUrl;
         const { https } = api.context.devServer || {};
+        const { targets, before } = normalizeOpenConfig(config);
         const isCodesandbox = process.env.CSB === "true";
-        const shouldOpen = Boolean(open) && !isCodesandbox;
+        const shouldOpen = targets !== void 0 && !isCodesandbox;
         if (!shouldOpen) {
           return;
         }
         const urls = [];
         const protocol = https ? "https" : "http";
         const baseUrl = `${protocol}://localhost:${port}`;
-        if (open === true || !open) {
+        if (!targets.length) {
           if (routes.length) {
             urls.push(`${baseUrl}${routes[0].pathname}`);
           }
         } else {
           urls.push(
-            ...(0, import_shared44.castArray)(open).map(
-              (item) => resolveUrl(replacePlaceholder(item, port), baseUrl)
+            ...targets.map(
+              (target) => resolveUrl(replacePlaceholder(target, port), baseUrl)
             )
           );
         }
@@ -5508,20 +5509,17 @@ function pluginOpen() {
             }
           }
         };
-        if (beforeStartUrl) {
-          Promise.all((0, import_shared44.castArray)(beforeStartUrl).map((fn) => fn())).then(
-            openUrls
-          );
-        } else {
-          openUrls();
+        if (before) {
+          await before();
         }
+        openUrls();
       };
       api.onAfterStartDevServer(onStartServer);
       api.onAfterStartProdServer(onStartServer);
     }
   };
 }
-var import_node_child_process, import_node_util, import_shared44, execAsync, supportedChromiumBrowsers, getTargetBrowser, replacePlaceholder, openedURLs;
+var import_node_child_process, import_node_util, import_shared44, execAsync, supportedChromiumBrowsers, getTargetBrowser, replacePlaceholder, openedURLs, normalizeOpenConfig;
 var init_open = __esm({
   "src/plugins/open.ts"() {
     "use strict";
@@ -5550,6 +5548,26 @@ var init_open = __esm({
     };
     replacePlaceholder = (url2, port) => url2.replace(/<port>/g, String(port));
     openedURLs = [];
+    normalizeOpenConfig = (config) => {
+      const open = config.server.open || config.dev.startUrl;
+      const { beforeStartUrl } = config.dev;
+      if (open === false) {
+        return {};
+      }
+      if (open === true) {
+        return { targets: [], before: beforeStartUrl };
+      }
+      if (typeof open === "string") {
+        return { targets: [open], before: beforeStartUrl };
+      }
+      if (Array.isArray(open)) {
+        return { targets: open, before: beforeStartUrl };
+      }
+      return {
+        targets: open.target ? (0, import_shared44.castArray)(open.target) : [],
+        before: open.before
+      };
+    };
   }
 });
 
@@ -7206,7 +7224,7 @@ var applyServerOptions = (command) => {
   command.option("-o --open [url]", "open the page in browser on startup").option("--port <port>", "specify a port number for server to listen").option("--host <host>", "specify the host that the server listens to");
 };
 function runCli() {
-  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.7.4");
+  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.7.6");
   const devCommand = import_commander.program.command("dev");
   const buildCommand = import_commander.program.command("build");
   const previewCommand = import_commander.program.command("preview");
@@ -7296,7 +7314,7 @@ function prepareCli() {
   if (!npm_execpath || npm_execpath.includes("npx-cli.js") || npm_execpath.includes(".bun")) {
     console.log();
   }
-  import_shared61.logger.greet(`  ${`Rsbuild v${"0.7.4"}`}
+  import_shared61.logger.greet(`  ${`Rsbuild v${"0.7.6"}`}
 `);
 }
 
@@ -7323,7 +7341,7 @@ init_config();
 var import_shared62 = require("@rsbuild/shared");
 init_mergeConfig();
 init_constants();
-var version = "0.7.4";
+var version = "0.7.6";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PLUGIN_CSS_NAME,

package/dist/index.js

@@ -1042,7 +1042,7 @@ async function createContextByConfig(options, bundlerType, config = {}) {
   return {
     entry: getEntryObject(config, "web"),
     targets: config.output?.targets || [],
-    version: "0.7.4",
+    version: "0.7.6",
     rootPath,
     distPath,
     cachePath,
@@ -5249,7 +5249,7 @@ async function getDefaultSwcConfig(config, rootPath, target) {
     }
   };
 }
-async function applyCoreJs(swcConfig, chain, polyfillMode) {
+async function applyCoreJs(swcConfig, polyfillMode) {
   const coreJsPath = __require.resolve("core-js/package.json");
   const version2 = getCoreJsVersion(coreJsPath);
   const coreJsDir = path11.dirname(coreJsPath);
@@ -5257,9 +5257,7 @@ async function applyCoreJs(swcConfig, chain, polyfillMode) {
   if (polyfillMode === "usage") {
     swcConfig.env.shippedProposals = true;
   }
-  chain.resolve.alias.merge({
-    "core-js": coreJsDir
-  });
+  return coreJsDir;
 }
 function applyTransformImport(swcConfig, pluginImport) {
   if (pluginImport !== false && pluginImport) {
@@ -5304,6 +5302,9 @@ var init_swc = __esm({
           handler: async (chain, { CHAIN_ID: CHAIN_ID3, target }) => {
             const config = api.getNormalizedConfig();
             const rule = chain.module.rule(CHAIN_ID3.RULE.JS).test(SCRIPT_REGEX).type("javascript/auto");
+            const dataUriRule = chain.module.rule(CHAIN_ID3.RULE.JS_DATA_URI).mimetype({
+              or: ["text/javascript", "application/javascript"]
+            });
             applyScriptCondition({
               rule,
               chain,
@@ -5331,7 +5332,10 @@ var init_swc = __esm({
                 swcConfig.env.mode = void 0;
               } else {
                 swcConfig.env.mode = polyfillMode;
-                await applyCoreJs(swcConfig, chain, polyfillMode);
+                const coreJsDir = await applyCoreJs(swcConfig, polyfillMode);
+                for (const item of [rule, dataUriRule]) {
+                  item.resolve.alias.set("core-js", coreJsDir);
+                }
               }
             }
             const mergedSwcConfig = reduceConfigs2({
@@ -5340,9 +5344,7 @@ var init_swc = __esm({
               mergeFn: deepmerge5
             });
             rule.use(CHAIN_ID3.USE.SWC).loader(builtinSwcLoaderName).options(mergedSwcConfig);
-            chain.module.rule(CHAIN_ID3.RULE.JS_DATA_URI).mimetype({
-              or: ["text/javascript", "application/javascript"]
-            }).resolve.set("fullySpecified", false).end().use(CHAIN_ID3.USE.SWC).loader(builtinSwcLoaderName).options(cloneDeep(mergedSwcConfig));
+            dataUriRule.resolve.set("fullySpecified", false).end().use(CHAIN_ID3.USE.SWC).loader(builtinSwcLoaderName).options(cloneDeep(mergedSwcConfig));
           }
         });
       }
@@ -5661,25 +5663,24 @@ function pluginOpen() {
       const onStartServer = async (params) => {
         const { port, routes } = params;
         const config = api.getNormalizedConfig();
-        const { beforeStartUrl } = config.dev;
-        const open = config.server.open || config.dev.startUrl;
         const { https } = api.context.devServer || {};
+        const { targets, before } = normalizeOpenConfig(config);
         const isCodesandbox = process.env.CSB === "true";
-        const shouldOpen = Boolean(open) && !isCodesandbox;
+        const shouldOpen = targets !== void 0 && !isCodesandbox;
         if (!shouldOpen) {
           return;
         }
         const urls = [];
         const protocol = https ? "https" : "http";
         const baseUrl = `${protocol}://localhost:${port}`;
-        if (open === true || !open) {
+        if (!targets.length) {
           if (routes.length) {
             urls.push(`${baseUrl}${routes[0].pathname}`);
           }
         } else {
           urls.push(
-            ...castArray6(open).map(
-              (item) => resolveUrl(replacePlaceholder(item, port), baseUrl)
+            ...targets.map(
+              (target) => resolveUrl(replacePlaceholder(target, port), baseUrl)
             )
           );
         }
@@ -5691,20 +5692,17 @@ function pluginOpen() {
             }
           }
         };
-        if (beforeStartUrl) {
-          Promise.all(castArray6(beforeStartUrl).map((fn) => fn())).then(
-            openUrls
-          );
-        } else {
-          openUrls();
+        if (before) {
+          await before();
         }
+        openUrls();
       };
       api.onAfterStartDevServer(onStartServer);
       api.onAfterStartProdServer(onStartServer);
     }
   };
 }
-var execAsync, supportedChromiumBrowsers, getTargetBrowser, replacePlaceholder, openedURLs;
+var execAsync, supportedChromiumBrowsers, getTargetBrowser, replacePlaceholder, openedURLs, normalizeOpenConfig;
 var init_open = __esm({
   "src/plugins/open.ts"() {
     "use strict";
@@ -5731,6 +5729,26 @@ var init_open = __esm({
     };
     replacePlaceholder = (url2, port) => url2.replace(/<port>/g, String(port));
     openedURLs = [];
+    normalizeOpenConfig = (config) => {
+      const open = config.server.open || config.dev.startUrl;
+      const { beforeStartUrl } = config.dev;
+      if (open === false) {
+        return {};
+      }
+      if (open === true) {
+        return { targets: [], before: beforeStartUrl };
+      }
+      if (typeof open === "string") {
+        return { targets: [open], before: beforeStartUrl };
+      }
+      if (Array.isArray(open)) {
+        return { targets: open, before: beforeStartUrl };
+      }
+      return {
+        targets: open.target ? castArray6(open.target) : [],
+        before: open.before
+      };
+    };
   }
 });
 
@@ -7416,7 +7434,7 @@ var applyServerOptions = (command) => {
   command.option("-o --open [url]", "open the page in browser on startup").option("--port <port>", "specify a port number for server to listen").option("--host <host>", "specify the host that the server listens to");
 };
 function runCli() {
-  program.name("rsbuild").usage("<command> [options]").version("0.7.4");
+  program.name("rsbuild").usage("<command> [options]").version("0.7.6");
   const devCommand = program.command("dev");
   const buildCommand = program.command("build");
   const previewCommand = program.command("preview");
@@ -7507,7 +7525,7 @@ function prepareCli() {
   if (!npm_execpath || npm_execpath.includes("npx-cli.js") || npm_execpath.includes(".bun")) {
     console.log();
   }
-  logger19.greet(`  ${`Rsbuild v${"0.7.4"}`}
+  logger19.greet(`  ${`Rsbuild v${"0.7.6"}`}
 `);
 }
 
@@ -7535,7 +7553,7 @@ init_config();
 init_mergeConfig();
 init_constants();
 import { logger as logger20 } from "@rsbuild/shared";
-var version = "0.7.4";
+var version = "0.7.6";
 export {
   PLUGIN_CSS_NAME,
   PLUGIN_SWC_NAME,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.7.4",
+  "version": "0.7.6",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -51,7 +51,7 @@
     "core-js": "~3.36.0",
     "html-webpack-plugin": "npm:html-rspack-plugin@5.7.2",
     "postcss": "^8.4.38",
-    "@rsbuild/shared": "0.7.4"
+    "@rsbuild/shared": "0.7.6"
   },
   "devDependencies": {
     "@types/connect": "3.4.38",