@rsbuild/core 0.4.12 → 0.4.14

package/dist/cli/commands.js

@@ -24,7 +24,7 @@ module.exports = __toCommonJS(commands_exports);
 var import_node_path = require("node:path");
 var import_node_fs = require("node:fs");
 var import_shared = require("@rsbuild/shared");
-var import_commander = require("@rsbuild/shared/commander");
+var import_commander = require("../../compiled/commander");
 var import_init = require("./init");
 const applyCommonOptions = (command) => {
   command.option(
@@ -39,7 +39,7 @@ const 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.4.12");
+  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.4.14");
   const devCommand = import_commander.program.command("dev");
   const buildCommand = import_commander.program.command("build");
   const previewCommand = import_commander.program.command("preview");

package/dist/cli/prepare.js

@@ -34,7 +34,7 @@ function prepareCli() {
   if (!npm_execpath || npm_execpath.includes("npx-cli.js")) {
     console.log();
   }
-  import_rslog.logger.greet(`  ${`Rsbuild v${"0.4.12"}`}
+  import_rslog.logger.greet(`  ${`Rsbuild v${"0.4.14"}`}
 `);
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.js

@@ -38,7 +38,7 @@ var import_config = require("./config");
 var import_shared = require("@rsbuild/shared");
 var import_mergeConfig = require("./mergeConfig");
 var import_constants = require("./constants");
-const version = "0.4.12";
+const version = "0.4.14";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PLUGIN_CSS_NAME,

package/dist/plugins/asset.js

@@ -34,6 +34,24 @@ __export(asset_exports, {
 module.exports = __toCommonJS(asset_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_shared = require("@rsbuild/shared");
+const chainStaticAssetRule = ({
+  rule,
+  maxSize,
+  filename,
+  assetType
+}) => {
+  rule.oneOf(`${assetType}-asset-url`).type("asset/resource").resourceQuery(/(__inline=false|url)/).set("generator", {
+    filename
+  });
+  rule.oneOf(`${assetType}-asset-inline`).type("asset/inline").resourceQuery(/inline/);
+  rule.oneOf(`${assetType}-asset`).type("asset").parser({
+    dataUrlCondition: {
+      maxSize
+    }
+  }).set("generator", {
+    filename
+  });
+};
 function getRegExpForExts(exts) {
   const matcher = exts.map((ext) => ext.trim()).map((ext) => ext.startsWith(".") ? ext.slice(1) : ext).join("|");
   return new RegExp(
@@ -50,9 +68,10 @@ const pluginAsset = () => ({
         const regExp = getRegExpForExts(exts);
         const distDir = (0, import_shared.getDistPath)(config, assetType);
         const filename = (0, import_shared.getFilename)(config, assetType, isProd);
-        const maxSize = config.output.dataUriLimit[assetType];
+        const { dataUriLimit } = config.output;
+        const maxSize = typeof dataUriLimit === "number" ? dataUriLimit : dataUriLimit[assetType];
         const rule = chain.module.rule(assetType).test(regExp);
-        (0, import_shared.chainStaticAssetRule)({
+        chainStaticAssetRule({
           rule,
           maxSize,
           filename: import_node_path.default.posix.join(distDir, filename),

package/dist/plugins/fileSize.js

@@ -73,19 +73,19 @@ const coloringAssetName = (assetName) => {
   }
   return import_shared2.color.magenta(assetName);
 };
-async function printFileSizes(config, stats, distPath) {
+async function printFileSizes(config, stats, rootPath) {
   if (config.detail === false && config.total === false) {
     return;
   }
   const { default: gzipSize } = await Promise.resolve().then(() => __toESM(require("@rsbuild/shared/gzip-size")));
-  const formatAsset = (asset) => {
+  const formatAsset = (asset, distPath, distFolder) => {
     const fileName = asset.name.split("?")[0];
     const contents = import_shared.fse.readFileSync(import_node_path.default.join(distPath, fileName));
     const size = contents.length;
     const gzippedSize = gzipSize.sync(contents);
     return {
       size,
-      folder: import_node_path.default.join(import_node_path.default.basename(distPath), import_node_path.default.dirname(fileName)),
+      folder: import_node_path.default.join(distFolder, import_node_path.default.dirname(fileName)),
       name: import_node_path.default.basename(fileName),
       gzippedSize,
       sizeLabel: calcFileSize(size),
@@ -94,6 +94,10 @@ async function printFileSizes(config, stats, distPath) {
   };
   const multiStats = "stats" in stats ? stats.stats : [stats];
   const assets = multiStats.map((stats2) => {
+    const distPath = stats2.compilation.outputOptions.path;
+    if (!distPath) {
+      return [];
+    }
     const origin = stats2.toJson({
       all: false,
       assets: true,
@@ -107,7 +111,10 @@ async function printFileSizes(config, stats, distPath) {
     const filteredAssets = origin.assets.filter(
       (asset) => filterAsset(asset.name)
     );
-    return filteredAssets.map(formatAsset);
+    const distFolder = distPath.replace(rootPath + import_node_path.default.sep, "");
+    return filteredAssets.map(
+      (asset) => formatAsset(asset, distPath, distFolder)
+    );
   }).reduce((single, all) => all.concat(single), []);
   if (assets.length === 0) {
     return;
@@ -173,7 +180,7 @@ const pluginFileSize = () => ({
           await printFileSizes(
             printFileSizeConfig,
             stats,
-            api.context.distPath
+            api.context.rootPath
           );
         } catch (err) {
           import_shared2.logger.warn("Failed to print file size.");

package/dist/plugins/nodeAddons.js

@@ -22,7 +22,6 @@ __export(nodeAddons_exports, {
 });
 module.exports = __toCommonJS(nodeAddons_exports);
 var import_node_path = require("node:path");
-var import_shared = require("@rsbuild/shared");
 const pluginNodeAddons = () => ({
   name: "rsbuild:node-addons",
   setup(api) {
@@ -30,35 +29,7 @@ const pluginNodeAddons = () => ({
       if (!isServer) {
         return;
       }
-      const getDistName = (resourcePath) => {
-        const pkgJSON = (0, import_shared.findUpSync)({
-          filename: "package.json",
-          cwd: (0, import_node_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(
-              resourcePath
-            )}.`
-          );
-        }
-        const getFilename = (resource, pkgName2) => {
-          const reg = new RegExp(`node_modules/${pkgName2}/(.+)`);
-          const match = resource.match(reg);
-          const filename = match?.[1];
-          if (!filename) {
-            return "[name].[ext]";
-          }
-          return `${filename}`;
-        };
-        const { name: pkgName } = import_shared.fse.readJSONSync(pkgJSON);
-        const config = api.getNormalizedConfig();
-        const serverPath = (0, import_shared.getDistPath)(config, "server");
-        return `${serverPath}/${getFilename(resourcePath, pkgName)}`;
-      };
-      chain.module.rule(CHAIN_ID.RULE.NODE).test(/\.node$/).use(CHAIN_ID.USE.NODE).loader((0, import_node_path.join)(__dirname, "../../compiled/node-loader")).options({
-        name: getDistName
-      });
+      chain.module.rule(CHAIN_ID.RULE.NODE).test(/\.node$/).use(CHAIN_ID.USE.NODE).loader((0, import_node_path.join)(__dirname, "../rspack/nodeAddonsLoader"));
     });
   }
 });

package/dist/plugins/splitChunks.js

@@ -101,7 +101,7 @@ function splitByModule(ctx) {
   return {
     ...defaultConfig,
     minSize: 0,
-    maxInitialRequests: Infinity,
+    maxInitialRequests: Number.POSITIVE_INFINITY,
     ...override,
     cacheGroups: {
       ...defaultConfig.cacheGroups,
@@ -124,7 +124,7 @@ function splitBySize(ctx) {
   return {
     ...defaultConfig,
     minSize: userConfig.minSize ?? 0,
-    maxSize: userConfig.maxSize ?? Infinity,
+    maxSize: userConfig.maxSize ?? Number.POSITIVE_INFINITY,
     ...override,
     cacheGroups: {
       ...defaultConfig.cacheGroups,

package/dist/provider/build.js

@@ -41,9 +41,20 @@ const build = async (initOptions, { mode = "production", watch, compiler: custom
     });
     bundlerConfigs = rspackConfigs;
   }
+  let isFirstCompile = true;
   await context.hooks.onBeforeBuild.call({
     bundlerConfigs
   });
+  const onDone = async (stats) => {
+    const p = context.hooks.onAfterBuild.call({ isFirstCompile, stats });
+    isFirstCompile = false;
+    await p;
+  };
+  if ((0, import_shared.isMultiCompiler)(compiler)) {
+    compiler.hooks.done.tap("rsbuild:done", onDone);
+  } else {
+    compiler.hooks.done.tapPromise("rsbuild:done", onDone);
+  }
   if (watch) {
     compiler.watch({}, (err) => {
       if (err) {
@@ -52,21 +63,18 @@ const build = async (initOptions, { mode = "production", watch, compiler: custom
     });
     return;
   }
-  const { stats } = await new Promise(
-    (resolve, reject) => {
-      compiler.run((err, stats2) => {
-        if (err || stats2?.hasErrors()) {
-          const buildError = err || new Error("Rspack build failed!");
-          reject(buildError);
-        } else {
-          compiler.close(() => {
-            resolve({ stats: stats2 });
-          });
-        }
-      });
-    }
-  );
-  await context.hooks.onAfterBuild.call({ stats });
+  await new Promise((resolve, reject) => {
+    compiler.run((err, stats) => {
+      if (err || stats?.hasErrors()) {
+        const buildError = err || new Error("Rspack build failed!");
+        reject(buildError);
+      } else {
+        compiler.close(() => {
+          resolve({ stats });
+        });
+      }
+    });
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/provider/createCompiler.js

@@ -71,7 +71,7 @@ async function createCompiler({
   if ((0, import_shared.isProd)()) {
     compiler.hooks.run.tap("rsbuild:run", logRspackVersion);
   }
-  compiler.hooks.done.tap("rsbuild:done", async (stats) => {
+  const done = async (stats) => {
     const obj = stats.toJson({
       all: false,
       timings: true
@@ -108,7 +108,12 @@ async function createCompiler({
     }
     isCompiling = false;
     isFirstCompile = false;
-  });
+  };
+  if ((0, import_shared.isMultiCompiler)(compiler)) {
+    compiler.hooks.done.tap("rsbuild:done", done);
+  } else {
+    compiler.hooks.done.tapPromise("rsbuild:done", done);
+  }
   await context.hooks.onAfterCreateCompiler.call({ compiler });
   (0, import_shared.debug)("create compiler done");
   return compiler;

package/dist/provider/createContext.js

@@ -44,7 +44,7 @@ async function createContextByConfig(options, bundlerType, config = {}) {
   const context = {
     entry: (0, import_entry.getEntryObject)(config, "web"),
     targets: config.output?.targets || [],
-    version: "0.4.12",
+    version: "0.4.14",
     rootPath,
     distPath,
     cachePath,

package/dist/provider/devMiddleware.js

@@ -49,7 +49,7 @@ const getDevMiddleware = (multiCompiler) => (options) => {
     }
     (0, import_shared.setupServerHooks)(compiler, callbacks);
   };
-  if (multiCompiler.compilers) {
+  if ((0, import_shared.isMultiCompiler)(multiCompiler)) {
     multiCompiler.compilers.forEach(setupCompiler);
   } else {
     setupCompiler(multiCompiler);

package/dist/rspack/nodeAddonsLoader.d.ts

@@ -0,0 +1,3 @@
+import type { Rspack } from '@rsbuild/shared';
+export default function (this: Rspack.LoaderContext, source: string): string;
+export declare const raw = true;

package/dist/rspack/nodeAddonsLoader.js

@@ -0,0 +1,68 @@
+"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)
+    __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 __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 nodeAddonsLoader_exports = {};
+__export(nodeAddonsLoader_exports, {
+  default: () => nodeAddonsLoader_default,
+  raw: () => raw
+});
+module.exports = __toCommonJS(nodeAddonsLoader_exports);
+var import_node_path = __toESM(require("node:path"));
+const getFilename = (resourcePath) => {
+  let basename = "";
+  if (resourcePath) {
+    const parsed = import_node_path.default.parse(resourcePath);
+    if (parsed.dir) {
+      basename = parsed.name;
+    }
+  }
+  if (basename) {
+    return `${basename}.node`;
+  }
+  return null;
+};
+function nodeAddonsLoader_default(source) {
+  const name = getFilename(this.resourcePath);
+  if (name === null) {
+    throw new Error(`Failed to load Node.js addon: "${this.resourcePath}"`);
+  }
+  this.emitFile(name, source);
+  return `
+try {
+  const path = require("path");
+  process.dlopen(module, path.join(__dirname, "${name}"));
+} catch (error) {
+  throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
+}
+`;
+}
+const raw = true;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  raw
+});

package/dist/server/devServer.js

@@ -78,9 +78,7 @@ async function getServerAPIs(options, createDevMiddleware, {
         customCompiler
       );
       const { CompilerDevMiddleware } = await Promise.resolve().then(() => __toESM(require("./compilerDevMiddleware")));
-      const publicPaths = compiler.compilers ? compiler.compilers.map(
-        import_shared.getPublicPathFromCompiler
-      ) : [(0, import_shared.getPublicPathFromCompiler)(compiler)];
+      const publicPaths = (0, import_shared.isMultiCompiler)(compiler) ? compiler.compilers.map(import_shared.getPublicPathFromCompiler) : [(0, import_shared.getPublicPathFromCompiler)(compiler)];
       const compilerDevMiddleware = new CompilerDevMiddleware({
         dev: devServerConfig,
         publicPaths,

package/dist/server/helper.js

@@ -149,7 +149,7 @@ const getPort = async ({
   silent = false
 }) => {
   if (typeof port === "string") {
-    port = parseInt(port, 10);
+    port = Number.parseInt(port, 10);
   }
   if (strictPort) {
     tryLimits = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.4.12",
+  "version": "0.4.14",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -55,13 +55,13 @@
     "@rspack/core": "0.5.6",
     "@swc/helpers": "0.5.3",
     "core-js": "~3.32.2",
-    "html-webpack-plugin": "npm:html-rspack-plugin@5.6.1",
+    "html-webpack-plugin": "npm:html-rspack-plugin@5.6.2",
     "postcss": "^8.4.33",
-    "@rsbuild/shared": "0.4.12"
+    "@rsbuild/shared": "0.4.14"
   },
   "devDependencies": {
     "@types/node": "16.x",
-    "typescript": "^5.3.0",
+    "typescript": "^5.4.2",
     "webpack": "^5.89.0"
   },
   "engines": {

package/compiled/node-loader/index.d.ts

@@ -1 +0,0 @@
-export = any;

package/compiled/node-loader/index.js

@@ -1 +0,0 @@
-(()=>{"use strict";var e={950:(e,r,t)=>{const n=t(867);e.exports=n.default;e.exports.raw=n.raw},867:(e,r,t)=>{Object.defineProperty(r,"__esModule",{value:true});r["default"]=loader;r.raw=void 0;var n=t(72);var o=_interopRequireDefault(t(349));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function loader(e){const r=this.getOptions(o.default);const t=(0,n.interpolateName)(this,typeof r.name!=="undefined"?r.name:"[contenthash].[ext]",{context:this.rootContext,content:e});this.emitFile(t,e);return`\ntry {\n  process.dlopen(module, __dirname + require("path").sep + __webpack_public_path__ + ${JSON.stringify(t)}${typeof r.flags!=="undefined"?`, ${JSON.stringify(r.flags)}`:""});\n} catch (error) {\n  throw new Error('node-loader:\\n' + error);\n}\n`}const a=true;r.raw=a},72:e=>{e.exports=require("@rsbuild/shared/loader-utils2")},349:e=>{e.exports=JSON.parse('{"title":"Node Loader options","type":"object","properties":{"name":{"anyOf":[{"type":"string"},{"instanceof":"Function"}]},"flags":{"type":"integer"}},"additionalProperties":false}')}};var r={};function __nccwpck_require__(t){var n=r[t];if(n!==undefined){return n.exports}var o=r[t]={exports:{}};var a=true;try{e[t](o,o.exports,__nccwpck_require__);a=false}finally{if(a)delete r[t]}return o.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(950);module.exports=t})();

package/compiled/node-loader/package.json

@@ -1 +0,0 @@
-{"name":"node-loader","author":"Tobias Koppers @sokra","version":"2.0.0","funding":{"type":"opencollective","url":"https://opencollective.com/webpack"},"license":"MIT","types":"index.d.ts","type":"commonjs"}