@rsbuild/core 0.0.17 → 0.0.19

package/bin/rsbuild.js

@@ -1,7 +1,18 @@
 #!/usr/bin/env node
 const { logger } = require('rslog');
 
+function initNodeEnv() {
+  if (!process.env.NODE_ENV) {
+    const command = process.argv[2];
+    process.env.NODE_ENV = ['build', 'preview'].includes(command)
+      ? 'production'
+      : 'development';
+  }
+}
+
 async function main() {
+  initNodeEnv();
+
   const { version } = require('../package.json');
 
   // If not called through a package manager,

package/dist/cli/commands.d.ts

@@ -4,4 +4,7 @@ export type InspectOptions = {
   output: string;
   verbose?: boolean;
 };
+export type DevOptions = {
+  open?: boolean;
+};
 export declare function setupProgram(rsbuild: RsbuildInstance): void;

package/dist/cli/commands.js

@@ -28,8 +28,10 @@ function setupProgram(rsbuild) {
   const pkgJson = (0, import_path.join)(__dirname, "../../package.json");
   const { version } = import_fs_extra.fs.readJSONSync(pkgJson);
   import_commander.program.name("rsbuild").usage("<command> [options]").version(version);
-  import_commander.program.command("dev").description("starting the dev server").action(async () => {
-    await rsbuild.startDevServer();
+  import_commander.program.command("dev").option(`--open`, "open the page in browser on startup").description("starting the dev server").action(async (options) => {
+    await rsbuild.startDevServer({
+      open: options.open
+    });
   });
   import_commander.program.command("build").description("build the app for production").action(async () => {
     await rsbuild.build();

package/dist/cli/config.d.ts

@@ -4,6 +4,10 @@ export type RsbuildConfig = BaseRsbuildConfig & {
     entries?: RsbuildEntry;
   };
   plugins?: RsbuildPlugin[];
+  /**
+   * @private only for testing
+   */
+  provider?: any;
 };
 export declare const defineConfig: (config: RsbuildConfig) => RsbuildConfig;
 export declare function loadConfig(): Promise<ReturnType<typeof defineConfig>>;

package/dist/cli/index.js

@@ -31,7 +31,8 @@ async function runCli(options = {}) {
   const config = await (0, import_config.loadConfig)();
   const rsbuild = await (0, import__.createRsbuild)({
     rsbuildConfig: config,
-    entry: ((_a = config.source) == null ? void 0 : _a.entries) || (0, import_config.getDefaultEntries)()
+    entry: ((_a = config.source) == null ? void 0 : _a.entries) || (0, import_config.getDefaultEntries)(),
+    provider: config.provider
   });
   if (options.defaultPlugins) {
     rsbuild.addPlugins(options.defaultPlugins);

package/dist/plugins/define.js

@@ -21,33 +21,23 @@ __export(define_exports, {
   pluginDefine: () => pluginDefine
 });
 module.exports = __toCommonJS(define_exports);
-var import_lodash = require("lodash");
 var import_shared = require("@rsbuild/shared");
 const pluginDefine = () => ({
   name: "plugin-define",
   setup(api) {
-    api.modifyBundlerChain((chain, { env, target, CHAIN_ID, bundler }) => {
+    api.modifyBundlerChain((chain, { CHAIN_ID, bundler }) => {
       const config = api.getNormalizedConfig();
       const publicPath = chain.output.get("publicPath");
       const assetPrefix = publicPath && typeof publicPath === "string" ? publicPath : config.output.assetPrefix;
       const builtinVars = {
-        "process.env.NODE_ENV": process.env.NODE_ENV,
-        "process.env.ASSET_PREFIX": (0, import_shared.removeTailSlash)(assetPrefix)
+        "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV),
+        "process.env.ASSET_PREFIX": JSON.stringify(
+          (0, import_shared.removeTailSlash)(assetPrefix)
+        )
       };
-      const globalVars = (0, import_shared.mergeChainedOptions)({
-        defaults: builtinVars,
-        options: config.source.globalVars,
-        utils: { env, target }
-      });
-      const serializedVars = (0, import_lodash.mapValues)(
-        globalVars,
-        (value) => {
-          var _a;
-          return (_a = JSON.stringify(value)) != null ? _a : "undefined";
-        }
-      );
-      const defineExprs = config.source.define;
-      chain.plugin(CHAIN_ID.PLUGIN.DEFINE).use(bundler.DefinePlugin, [{ ...serializedVars, ...defineExprs }]);
+      chain.plugin(CHAIN_ID.PLUGIN.DEFINE).use(bundler.DefinePlugin, [
+        { ...builtinVars, ...config.source.define }
+      ]);
     });
   }
 });

package/dist/plugins/index.js

@@ -50,7 +50,6 @@ const plugins = {
   font: () => Promise.resolve().then(() => __toESM(require("./asset"))).then((m) => m.pluginAsset("font", import_shared.FONT_EXTENSIONS)),
   image: () => Promise.resolve().then(() => __toESM(require("./asset"))).then((m) => m.pluginAsset("image", import_shared.IMAGE_EXTENSIONS)),
   media: () => Promise.resolve().then(() => __toESM(require("./asset"))).then((m) => m.pluginAsset("media", import_shared.MEDIA_EXTENSIONS)),
-  assetsRetry: () => Promise.resolve().then(() => __toESM(require("./assetsRetry"))).then((m) => m.pluginAssetsRetry()),
   rem: () => Promise.resolve().then(() => __toESM(require("./rem"))).then((m) => m.pluginRem()),
   wasm: () => Promise.resolve().then(() => __toESM(require("./wasm"))).then((m) => m.pluginWasm()),
   moment: () => Promise.resolve().then(() => __toESM(require("./moment"))).then((m) => m.pluginMoment()),

package/dist/plugins/nodeAddons.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,20 +15,13 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var nodeAddons_exports = {};
 __export(nodeAddons_exports, {
   pluginNodeAddons: () => pluginNodeAddons
 });
 module.exports = __toCommonJS(nodeAddons_exports);
+var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
 const pluginNodeAddons = () => ({
   name: "plugin-node-addons",
@@ -40,19 +31,21 @@ const pluginNodeAddons = () => ({
         if (!isServer && !isServiceWorker) {
           return;
         }
-        const pkgUp = await Promise.resolve().then(() => __toESM(require("pkg-up")));
-        const getDistName = (resource) => {
-          const pkgJSON = pkgUp.sync({ cwd: resource });
+        const getDistName = (resourcePath) => {
+          const pkgJSON = (0, import_shared.findUpSync)({
+            filename: "package.json",
+            cwd: (0, import_path.dirname)(resourcePath)
+          });
           if (!pkgJSON) {
             throw new Error(
               `Failed to compile Node.js addons, couldn't find the package.json of ${import_shared.color.yellow(
-                resource
+                resourcePath
               )}.`
             );
           }
-          const getFilename = (resource2, pkgName2) => {
+          const getFilename = (resource, pkgName2) => {
             const reg = new RegExp(`node_modules/${pkgName2}/(.+)`);
-            const match = resource2.match(reg);
+            const match = resource.match(reg);
             const filename = match == null ? void 0 : match[1];
             if (!filename) {
               return "[name].[ext]";
@@ -62,7 +55,7 @@ const pluginNodeAddons = () => ({
           const { name: pkgName } = require(pkgJSON);
           const config = api.getNormalizedConfig();
           const serverPath = (0, import_shared.getDistPath)(config.output, "server");
-          return `${serverPath}/${getFilename(resource, pkgName)}`;
+          return `${serverPath}/${getFilename(resourcePath, pkgName)}`;
         };
         chain.module.rule(CHAIN_ID.RULE.NODE).test(/\.node$/).use(CHAIN_ID.USE.NODE).loader((0, import_shared.getSharedPkgCompiledPath)("node-loader")).options({
           name: getDistName

package/dist/plugins/startUrl.js

@@ -36,6 +36,8 @@ module.exports = __toCommonJS(startUrl_exports);
 var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
 var import_child_process = require("child_process");
+var import_util = require("util");
+const execAsync = (0, import_util.promisify)(import_child_process.exec);
 const supportedChromiumBrowsers = [
   "Google Chrome Canary",
   "Google Chrome Dev",
@@ -46,10 +48,10 @@ const supportedChromiumBrowsers = [
   "Vivaldi",
   "Chromium"
 ];
-const getTargetBrowser = () => {
+const getTargetBrowser = async () => {
   let targetBrowser = process.env.BROWSER;
   if (!targetBrowser || !supportedChromiumBrowsers.includes(targetBrowser)) {
-    const ps = (0, import_child_process.execSync)("ps cax").toString();
+    const { stdout: ps } = await execAsync("ps cax");
     targetBrowser = supportedChromiumBrowsers.find((b) => ps.includes(b));
   }
   return targetBrowser;
@@ -58,14 +60,13 @@ async function openBrowser(url) {
   const shouldTryOpenChromeWithAppleScript = process.platform === "darwin";
   if (shouldTryOpenChromeWithAppleScript) {
     try {
-      const targetBrowser = getTargetBrowser();
+      const targetBrowser = await getTargetBrowser();
       if (targetBrowser) {
-        (0, import_child_process.execSync)(
+        await execAsync(
           `osascript openChrome.applescript "${encodeURI(
             url
           )}" "${targetBrowser}"`,
           {
-            stdio: "ignore",
             cwd: (0, import_path.join)(__dirname, "../../static")
           }
         );
@@ -94,22 +95,17 @@ function pluginStartUrl() {
   return {
     name: "plugin-start-url",
     setup(api) {
-      let port;
       api.onAfterStartDevServer(async (params) => {
-        ({ port } = params);
-      });
-      api.onDevCompileDone(async ({ isFirstCompile }) => {
-        if (!isFirstCompile || !port) {
-          return;
-        }
+        const { port } = params;
         const config = api.getNormalizedConfig();
         const { startUrl, beforeStartUrl } = config.dev;
-        const { https } = api.context.devServer || {};
-        if (!startUrl) {
+        const { open, https } = api.context.devServer || {};
+        const shouldOpen = Boolean(startUrl) || open;
+        if (!shouldOpen) {
           return;
         }
         const urls = [];
-        if (startUrl === true) {
+        if (startUrl === true || !startUrl) {
           const protocol = https ? "https" : "http";
           urls.push(`${protocol}://localhost:${port}`);
         } else {

package/dist/rspack-provider/core/createCompiler.d.ts

@@ -1,4 +1,6 @@
 import { type RspackConfig } from '@rsbuild/shared';
+import { type RspackCompiler, type RspackMultiCompiler } from '@rsbuild/shared';
+import { type InitConfigsOptions } from './initConfigs';
 import type { Context } from '../types';
 export declare function createCompiler({
   context,
@@ -6,4 +8,5 @@ export declare function createCompiler({
 }: {
   context: Context;
   rspackConfigs: RspackConfig[];
-}): Promise<import("@rspack/core").MultiCompiler>;
+}): Promise<import("@rspack/core").MultiCompiler>;
+export declare function startDevCompile(options: InitConfigsOptions, customCompiler?: RspackCompiler | RspackMultiCompiler): Promise<import("@rsbuild/shared").DevMiddleware>;

package/dist/rspack-provider/core/createCompiler.js

@@ -28,10 +28,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var createCompiler_exports = {};
 __export(createCompiler_exports, {
-  createCompiler: () => createCompiler
+  createCompiler: () => createCompiler,
+  startDevCompile: () => startDevCompile
 });
 module.exports = __toCommonJS(createCompiler_exports);
 var import_shared = require("@rsbuild/shared");
+var import_devMiddleware = require("./devMiddleware");
+var import_initConfigs = require("./initConfigs");
 async function createCompiler({
   context,
   rspackConfigs
@@ -43,16 +46,18 @@ async function createCompiler({
   const { rspack } = await Promise.resolve().then(() => __toESM(require("@rspack/core")));
   const compiler = rspack(rspackConfigs);
   let isFirstCompile = true;
-  compiler.hooks.done.tap("done", async (stats) => {
-    var _a;
+  compiler.hooks.watchRun.tap("rsbuild:compiling", () => {
+    import_shared.logger.start("Compiling...");
+  });
+  compiler.hooks.done.tap("rsbuild:done", async (stats) => {
     const obj = stats.toJson({
       all: false,
       timings: true
     });
-    if (!stats.hasErrors()) {
-      (_a = obj.children) == null ? void 0 : _a.forEach((c, index) => {
+    if (!stats.hasErrors() && obj.children) {
+      obj.children.forEach((c, index) => {
         if (c.time) {
-          const time = (0, import_shared.prettyTime)([0, c.time * 10 ** 6]);
+          const time = (0, import_shared.prettyTime)(c.time / 1e3);
           const target = Array.isArray(context.target) ? context.target[index] : context.target;
           const name = import_shared.TARGET_ID_MAP[target || "web"];
           import_shared.logger.ready(`${name} compiled in ${time}`);
@@ -77,7 +82,21 @@ async function createCompiler({
   (0, import_shared.debug)("create compiler done");
   return compiler;
 }
+async function startDevCompile(options, customCompiler) {
+  let compiler;
+  if (customCompiler) {
+    compiler = customCompiler;
+  } else {
+    const { rspackConfigs } = await (0, import_initConfigs.initConfigs)(options);
+    compiler = await createCompiler({
+      context: options.context,
+      rspackConfigs
+    });
+  }
+  return (0, import_devMiddleware.getDevMiddleware)(compiler);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createCompiler
+  createCompiler,
+  startDevCompile
 });

package/dist/rspack-provider/core/devMiddleware.d.ts

@@ -1,5 +1,3 @@
-import type { ModernDevServerOptions } from '@modern-js/server';
+import { DevMiddleware } from '@rsbuild/shared';
 import type { Compiler, MultiCompiler } from '@rspack/core';
-type DevMiddlewareOptions = ModernDevServerOptions['devMiddleware'];
-export declare const getDevMiddleware: (multiCompiler: Compiler | MultiCompiler) => NonNullable<DevMiddlewareOptions>;
-export {};
+export declare const getDevMiddleware: (multiCompiler: Compiler | MultiCompiler) => NonNullable<DevMiddleware>;

package/dist/rspack-provider/plugins/progress.js

@@ -36,8 +36,12 @@ const pluginProgress = () => ({
   name: "plugin-progress",
   setup(api) {
     api.modifyBundlerChain(async (chain, { target, CHAIN_ID }) => {
+      var _a;
       const config = api.getNormalizedConfig();
-      const options = config.dev.progressBar;
+      const options = (_a = config.dev.progressBar) != null ? _a : (
+        // enable progress bar in production by default
+        (0, import_shared.isProd)()
+      );
       if (!options) {
         return;
       }

package/dist/rspack-provider/plugins/swc.js

@@ -44,11 +44,10 @@ async function getDefaultSwcConfig(config, rootPath, target) {
         tsx: true,
         syntax: "typescript",
         decorators: true
-      }
-      // TODO: Enabling it will cause performance degradation
+      },
       // Avoid the webpack magic comment to be removed
       // https://github.com/swc-project/swc/issues/6403
-      // preserveAllComments: true,
+      preserveAllComments: true
     },
     isModule: "unknown",
     minify: false,

package/dist/rspack-provider/provider.js

@@ -37,6 +37,7 @@ var import_initConfigs = require("./core/initConfigs");
 var import_initPlugins = require("./core/initPlugins");
 var import_plugin = require("./shared/plugin");
 var import_rspackVersion = require("./shared/rspackVersion");
+var import_server = require("../server");
 function rspackProvider({
   rsbuildConfig: originalRsbuildConfig
 }) {
@@ -72,14 +73,15 @@ function rspackProvider({
         });
       },
       async startDevServer(options) {
-        const { startDevServer } = await Promise.resolve().then(() => __toESM(require("./core/startDevServer")));
-        return startDevServer(
+        const { startDevCompile } = await Promise.resolve().then(() => __toESM(require("./core/createCompiler")));
+        return (0, import_server.startDevServer)(
           { context, pluginStore, rsbuildOptions },
+          startDevCompile,
           options
         );
       },
       async preview() {
-        return (0, import_shared.startProdServer)(context, context.config);
+        return (0, import_server.startProdServer)(context, context.config);
       },
       async build(options) {
         const { build: buildImpl, rspackBuild } = await Promise.resolve().then(() => __toESM(require("./core/build")));

package/dist/rspack-provider/shared/plugin.js

@@ -68,7 +68,6 @@ const applyDefaultPlugins = (plugins) => (0, import_shared.awaitableGetter)([
   plugins.startUrl(),
   plugins.inlineChunk(),
   plugins.bundleAnalyzer(),
-  plugins.assetsRetry(),
   plugins.networkPerformance(),
   plugins.preloadOrPrefetch(),
   plugins.performance(),

package/dist/server/constants.d.ts

@@ -0,0 +1,6 @@
+import type { DevServerOptions } from '@rsbuild/shared';
+/**
+ * hmr socket connect path
+ */
+export declare const HMR_SOCK_PATH = "/webpack-hmr";
+export declare const getDefaultDevOptions: () => DevServerOptions;

package/dist/server/constants.js

@@ -0,0 +1,49 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var constants_exports = {};
+__export(constants_exports, {
+  HMR_SOCK_PATH: () => HMR_SOCK_PATH,
+  getDefaultDevOptions: () => getDefaultDevOptions
+});
+module.exports = __toCommonJS(constants_exports);
+const HMR_SOCK_PATH = "/webpack-hmr";
+const getDefaultDevOptions = () => {
+  return {
+    client: {
+      path: HMR_SOCK_PATH,
+      // By default it is set to the port number of the dev server
+      port: "",
+      // By default it is set to "location.hostname"
+      host: "",
+      // By default it is set to "location.protocol === 'https:' ? 'wss' : 'ws'""
+      protocol: ""
+    },
+    https: false,
+    devMiddleware: { writeToDisk: true },
+    watch: true,
+    hot: true,
+    compress: true,
+    liveReload: true
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  HMR_SOCK_PATH,
+  getDefaultDevOptions
+});

package/dist/server/dev-middleware/hmr-client/createSocketUrl.d.ts

@@ -0,0 +1,16 @@
+/**
+ * hmr socket connect path
+ */
+export declare const HMR_SOCK_PATH = "/webpack-hmr";
+export declare function createSocketUrl(resourceQuery: string): string;
+export declare function formatURL({
+  port,
+  protocol,
+  hostname,
+  pathname
+}: {
+  port: string;
+  protocol: string;
+  hostname: string;
+  pathname: string;
+}): string;

package/dist/server/dev-middleware/hmr-client/createSocketUrl.js

@@ -0,0 +1,68 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var createSocketUrl_exports = {};
+__export(createSocketUrl_exports, {
+  HMR_SOCK_PATH: () => HMR_SOCK_PATH,
+  createSocketUrl: () => createSocketUrl,
+  formatURL: () => formatURL
+});
+module.exports = __toCommonJS(createSocketUrl_exports);
+const HMR_SOCK_PATH = "/webpack-hmr";
+function createSocketUrl(resourceQuery) {
+  const searchParams = resourceQuery.substr(1).split("&");
+  const options = {};
+  for (const pair of searchParams) {
+    const ary = pair.split("=");
+    options[ary[0]] = decodeURIComponent(ary[1]);
+  }
+  const currentLocation = self.location;
+  return getSocketUrl(options, currentLocation);
+}
+function formatURL({
+  port,
+  protocol,
+  hostname,
+  pathname
+}) {
+  if (window.URL) {
+    const url = new URL("http://localhost");
+    url.port = port;
+    url.hostname = hostname;
+    url.protocol = protocol;
+    url.pathname = pathname;
+    return url.toString();
+  }
+  const colon = protocol.indexOf(":") === -1 ? ":" : "";
+  return `${protocol}${colon}//${hostname}:${port}${pathname}`;
+}
+function getSocketUrl(urlParts, location) {
+  const { host, port, path, protocol } = urlParts;
+  return formatURL({
+    protocol: protocol || (location.protocol === "https:" ? "wss" : "ws"),
+    hostname: host || location.hostname,
+    port: port || location.port,
+    pathname: path || HMR_SOCK_PATH
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  HMR_SOCK_PATH,
+  createSocketUrl,
+  formatURL
+});

package/dist/server/dev-middleware/hmr-client/index.d.ts

@@ -0,0 +1 @@
+export {};