@rsbuild/core 0.7.0-beta.0 → 0.7.0-beta.2

package/compiled/rspack-manifest-plugin/index.js

@@ -1,7 +1,7 @@
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
-/***/ 1797:
+/***/ 1266:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
@@ -105,7 +105,7 @@ exports.transformFiles = transformFiles;
 
 /***/ }),
 
-/***/ 7226:
+/***/ 8391:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
@@ -116,7 +116,7 @@ const fs_1 = __nccwpck_require__(7147);
 const path_1 = __nccwpck_require__(1017);
 const tapable_1 = __nccwpck_require__(4260);
 const webpack_sources_1 = __nccwpck_require__(5433);
-const helpers_1 = __nccwpck_require__(1797);
+const helpers_1 = __nccwpck_require__(1266);
 const compilerHookMap = new WeakMap();
 const getCompilerHooks = (compiler) => {
     let hooks = compilerHookMap.get(compiler);
@@ -7751,7 +7751,7 @@ var exports = __webpack_exports__;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RspackManifestPlugin = exports.WebpackManifestPlugin = exports.getCompilerHooks = void 0;
 const path_1 = __nccwpck_require__(1017);
-const hooks_1 = __nccwpck_require__(7226);
+const hooks_1 = __nccwpck_require__(8391);
 Object.defineProperty(exports, "getCompilerHooks", ({ enumerable: true, get: function () { return hooks_1.getCompilerHooks; } }));
 const emitCountMap = new Map();
 const defaults = {

package/dist/cli/commands.js

@@ -24,7 +24,7 @@ module.exports = __toCommonJS(commands_exports);
 var import_node_fs = require("node:fs");
 var import_node_path = require("node:path");
 var import_shared = require("@rsbuild/shared");
-var import_commander = require("../../compiled/commander");
+var import_commander = require("../../compiled/commander/index.js");
 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.7.0-beta.0");
+  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.7.0-beta.2");
   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

@@ -21,7 +21,7 @@ __export(prepare_exports, {
   prepareCli: () => prepareCli
 });
 module.exports = __toCommonJS(prepare_exports);
-var import_rslog = require("@rsbuild/shared/rslog");
+var import_shared = require("@rsbuild/shared");
 function initNodeEnv() {
   if (!process.env.NODE_ENV) {
     const command = process.argv[2];
@@ -34,7 +34,7 @@ function prepareCli() {
   if (!npm_execpath || npm_execpath.includes("npx-cli.js") || npm_execpath.includes(".bun")) {
     console.log();
   }
-  import_rslog.logger.greet(`  ${`Rsbuild v${"0.7.0-beta.0"}`}
+  import_shared.logger.greet(`  ${`Rsbuild v${"0.7.0-beta.2"}`}
 `);
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/client/format.js

@@ -41,7 +41,7 @@ function formatMessage(stats) {
   let message;
   if (typeof stats === "object") {
     const fileName = resolveFileName(stats);
-    const mainMessage = typeof stats.formatted === "string" ? stats.formatted : stats.message;
+    const mainMessage = stats.message;
     const details = stats.details ? `
 Details: ${stats.details}
 ` : "";

package/dist/client/hmr.mjs

@@ -19,7 +19,7 @@ function formatMessage(stats) {
   let message;
   if (typeof stats === "object") {
     const fileName = resolveFileName(stats);
-    const mainMessage = typeof stats.formatted === "string" ? stats.formatted : stats.message;
+    const mainMessage = stats.message;
     const details = stats.details ? `
 Details: ${stats.details}
 ` : "";

package/dist/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.7.0-beta.0",
+    version: "0.7.0-beta.2",
     rootPath,
     distPath,
     cachePath,

package/dist/index.js

@@ -40,7 +40,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.7.0-beta.0";
+const version = "0.7.0-beta.2";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PLUGIN_CSS_NAME,

package/dist/loadEnv.js

@@ -34,8 +34,8 @@ module.exports = __toCommonJS(loadEnv_exports);
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_path = require("node:path");
 var import_shared = require("@rsbuild/shared");
-var import_dotenv = require("../compiled/dotenv");
-var import_dotenv_expand = require("../compiled/dotenv-expand");
+var import_dotenv_expand = require("../compiled/dotenv-expand/index.js");
+var import_dotenv = require("../compiled/dotenv/index.js");
 function loadEnv({
   cwd = process.cwd(),
   mode = (0, import_shared.getNodeEnv)(),

package/dist/plugins/css.js

@@ -70,7 +70,7 @@ async function loadUserPostcssrc(root) {
   if (cached) {
     return cached;
   }
-  const { default: postcssrc } = await Promise.resolve().then(() => __toESM(require("../../compiled/postcss-load-config")));
+  const { default: postcssrc } = await Promise.resolve().then(() => __toESM(require("../../compiled/postcss-load-config/index.js")));
   const promise = postcssrc({}, root).catch((err) => {
     if (err.message?.includes("No PostCSS Config found")) {
       return {};

package/dist/plugins/manifest.js

@@ -126,7 +126,7 @@ const pluginManifest = () => ({
         return;
       }
       const fileName = typeof manifest === "string" ? manifest : "manifest.json";
-      const { RspackManifestPlugin } = await Promise.resolve().then(() => __toESM(require("../../compiled/rspack-manifest-plugin")));
+      const { RspackManifestPlugin } = await Promise.resolve().then(() => __toESM(require("../../compiled/rspack-manifest-plugin/index.js")));
       chain.plugin(CHAIN_ID.PLUGIN.MANIFEST).use(RspackManifestPlugin, [
         {
           fileName,

package/dist/plugins/sass.js

@@ -96,7 +96,7 @@ const getResolveUrlJoinFn = async () => {
     asGenerator,
     createJoinImplementation,
     defaultJoinGenerator
-  } = await Promise.resolve().then(() => __toESM(require("../../compiled/resolve-url-loader")));
+  } = await Promise.resolve().then(() => __toESM(require("../../compiled/resolve-url-loader/index.js")));
   const rsbuildGenerator = asGenerator((item, ...rest) => {
     if (!item.uri.startsWith(".")) {
       return [null];

package/dist/plugins/splitChunks.js

@@ -108,7 +108,7 @@ function splitByModule(ctx) {
       ...userDefinedCacheGroups,
       // Core group
       vendors: {
-        priority: -10,
+        priority: -9,
         test: import_shared.NODE_MODULES_REGEX,
         name(module2) {
           return module2 ? getPackageNameFromModulePath(module2.context) : void 0;

package/dist/plugins/startUrl.js

@@ -79,7 +79,7 @@ async function openBrowser(url) {
     }
   }
   try {
-    const { default: open } = await Promise.resolve().then(() => __toESM(require("../../compiled/open")));
+    const { default: open } = await Promise.resolve().then(() => __toESM(require("../../compiled/open/index.js")));
     await open(url);
     return true;
   } catch (err) {

package/dist/server/devMiddleware.js

@@ -32,7 +32,7 @@ __export(devMiddleware_exports, {
 });
 module.exports = __toCommonJS(devMiddleware_exports);
 var import_shared = require("@rsbuild/shared");
-var import_webpack_dev_middleware = __toESM(require("../../compiled/webpack-dev-middleware"));
+var import_webpack_dev_middleware = __toESM(require("../../compiled/webpack-dev-middleware/index.js"));
 function applyHMREntry({
   compiler,
   clientPaths,

package/dist/server/devServer.js

@@ -79,7 +79,7 @@ async function createDevServer(options, createDevMiddleware, {
       devMiddleware
     });
     compilerDevMiddleware.init();
-    outputFileSystem = (0, import_shared.isMultiCompiler)(compiler) ? compiler.compilers[0].outputFileSystem : compiler.outputFileSystem;
+    outputFileSystem = ((0, import_shared.isMultiCompiler)(compiler) ? compiler.compilers[0].outputFileSystem : compiler.outputFileSystem) || import_node_fs.default;
     return {
       middleware: compilerDevMiddleware.middleware,
       sockWrite: (...args) => compilerDevMiddleware.sockWrite(...args),

package/dist/server/getDevMiddlewares.d.ts

@@ -1,12 +1,10 @@
-/// <reference types="node" />
-import type fs from 'node:fs';
-import type { CompileMiddlewareAPI, DevConfig, Middlewares, ServerConfig, UpgradeEvent } from '@rsbuild/shared';
+import type { CompileMiddlewareAPI, DevConfig, Middlewares, OutputFileSystem, ServerConfig, UpgradeEvent } from '@rsbuild/shared';
 export type RsbuildDevMiddlewareOptions = {
     pwd: string;
     dev: DevConfig;
     server: ServerConfig;
     compileMiddlewareAPI?: CompileMiddlewareAPI;
-    outputFileSystem: typeof fs;
+    outputFileSystem: OutputFileSystem;
     output: {
         distPath: string;
     };

package/dist/server/getDevMiddlewares.js

@@ -63,7 +63,7 @@ const applyDefaultMiddlewares = async ({
 }) => {
   const upgradeEvents = [];
   if (server.compress) {
-    const { default: compression } = await Promise.resolve().then(() => __toESM(require("../../compiled/http-compression")));
+    const { default: compression } = await Promise.resolve().then(() => __toESM(require("../../compiled/http-compression/index.js")));
     middlewares.push((req, res, next) => {
       compression({
         gzip: true,
@@ -95,7 +95,7 @@ const applyDefaultMiddlewares = async ({
       middlewares.push(middleware);
     }
   }
-  const { default: launchEditorMiddleware } = await Promise.resolve().then(() => __toESM(require("../../compiled/launch-editor-middleware")));
+  const { default: launchEditorMiddleware } = await Promise.resolve().then(() => __toESM(require("../../compiled/launch-editor-middleware/index.js")));
   middlewares.push(["/__open-in-editor", launchEditorMiddleware()]);
   if (compileMiddlewareAPI) {
     middlewares.push(compileMiddlewareAPI.middleware);
@@ -112,7 +112,7 @@ const applyDefaultMiddlewares = async ({
     });
   }
   if (server.publicDir !== false && server.publicDir?.name) {
-    const { default: sirv } = await Promise.resolve().then(() => __toESM(require("../../compiled/sirv")));
+    const { default: sirv } = await Promise.resolve().then(() => __toESM(require("../../compiled/sirv/index.js")));
     const { name } = server.publicDir;
     const publicDir = (0, import_node_path.isAbsolute)(name) ? name : (0, import_node_path.join)(pwd, name);
     const assetMiddleware = sirv(publicDir, {
@@ -131,7 +131,7 @@ const applyDefaultMiddlewares = async ({
     })
   );
   if (server.historyApiFallback) {
-    const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("../../compiled/connect-history-api-fallback")));
+    const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("../../compiled/connect-history-api-fallback/index.js")));
     const historyApiFallbackMiddleware = connectHistoryApiFallback(
       server.historyApiFallback === true ? {} : server.historyApiFallback
     );

package/dist/server/middlewares.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="node" />
-import type fs from 'node:fs';
-import { type HtmlFallback, type RequestHandler as Middleware } from '@rsbuild/shared';
+import { type HtmlFallback, type RequestHandler as Middleware, type OutputFileSystem } from '@rsbuild/shared';
 import type Connect from '@rsbuild/shared/connect';
 export declare const faviconFallbackMiddleware: Middleware;
 export declare const getRequestLoggerMiddleware: () => Promise<Connect.NextHandleFunction>;
@@ -9,5 +7,5 @@ export declare const getHtmlFallbackMiddleware: (params: {
     distPath: string;
     callback?: Middleware;
     htmlFallback?: HtmlFallback;
-    outputFileSystem: typeof fs;
+    outputFileSystem: OutputFileSystem;
 }) => Middleware;

package/dist/server/middlewares.js

@@ -61,7 +61,7 @@ const getStatusCodeColor = (status) => {
   return (res) => res;
 };
 const getRequestLoggerMiddleware = async () => {
-  const { default: onFinished } = await Promise.resolve().then(() => __toESM(require("../../compiled/on-finished")));
+  const { default: onFinished } = await Promise.resolve().then(() => __toESM(require("../../compiled/on-finished/index.js")));
   return (req, res, next) => {
     const _startAt = process.hrtime();
     const logRequest = () => {
@@ -86,7 +86,7 @@ const notFoundMiddleware = (_req, res, _next) => {
   res.end();
 };
 const getHtmlFallbackMiddleware = ({ htmlFallback, distPath, callback, outputFileSystem }) => {
-  return (req, res, next) => {
+  return async (req, res, next) => {
     if (
       // Only accept GET or HEAD
       req.method !== "GET" && req.method !== "HEAD" || // Require Accept header
@@ -106,6 +106,13 @@ const getHtmlFallbackMiddleware = ({ htmlFallback, distPath, callback, outputFil
       );
       return next();
     }
+    const isFileExists = async (filePath) => {
+      return new Promise((resolve) => {
+        outputFileSystem.stat(filePath, (_error, stats) => {
+          resolve(stats?.isFile());
+        });
+      });
+    };
     const rewrite = (newUrl, isFallback = false) => {
       if (isFallback && (0, import_shared.isDebug)()) {
         (0, import_shared.debug)(
@@ -125,7 +132,7 @@ const getHtmlFallbackMiddleware = ({ htmlFallback, distPath, callback, outputFil
     if (pathname.endsWith("/")) {
       const newUrl = `${pathname}index.html`;
       const filePath = import_node_path.default.join(distPath, pathname, "index.html");
-      if (outputFileSystem.existsSync(filePath)) {
+      if (await isFileExists(filePath)) {
         return rewrite(newUrl);
       }
     } else if (
@@ -134,12 +141,12 @@ const getHtmlFallbackMiddleware = ({ htmlFallback, distPath, callback, outputFil
     ) {
       const newUrl = `${pathname}.html`;
       const filePath = import_node_path.default.join(distPath, `${pathname}.html`);
-      if (outputFileSystem.existsSync(filePath)) {
+      if (await isFileExists(filePath)) {
         return rewrite(newUrl);
       }
     }
     if (htmlFallback === "index") {
-      if (outputFileSystem.existsSync(import_node_path.default.join(distPath, "index.html"))) {
+      if (await isFileExists(import_node_path.default.join(distPath, "index.html"))) {
         return rewrite("/index.html", true);
       }
     }

package/dist/server/prodServer.js

@@ -40,7 +40,7 @@ module.exports = __toCommonJS(prodServer_exports);
 var import_node_path = require("node:path");
 var import_shared = require("@rsbuild/shared");
 var import_connect = __toESM(require("@rsbuild/shared/connect"));
-var import_sirv = __toESM(require("../../compiled/sirv"));
+var import_sirv = __toESM(require("../../compiled/sirv/index.js"));
 var import_helper = require("./helper");
 var import_httpServer = require("./httpServer");
 var import_middlewares = require("./middlewares");
@@ -62,7 +62,7 @@ class RsbuildProdServer {
       this.middlewares.use(await (0, import_middlewares.getRequestLoggerMiddleware)());
     }
     if (compress) {
-      const { default: compression } = await Promise.resolve().then(() => __toESM(require("../../compiled/http-compression")));
+      const { default: compression } = await Promise.resolve().then(() => __toESM(require("../../compiled/http-compression/index.js")));
       this.middlewares.use((req, res, next) => {
         compression({
           gzip: true,
@@ -88,7 +88,7 @@ class RsbuildProdServer {
     }
     this.applyStaticAssetMiddleware();
     if (historyApiFallback) {
-      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("../../compiled/connect-history-api-fallback")));
+      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("../../compiled/connect-history-api-fallback/index.js")));
       const historyApiFallbackMiddleware = connectHistoryApiFallback(
         historyApiFallback === true ? {} : historyApiFallback
       );

package/dist/server/socketServer.d.ts

@@ -3,7 +3,7 @@
 import type { IncomingMessage } from 'node:http';
 import type { Socket } from 'node:net';
 import { type DevConfig, type Stats } from '@rsbuild/shared';
-import ws from '../../compiled/ws';
+import ws from '../../compiled/ws/index.js';
 export declare class SocketServer {
     private wsServer;
     private readonly sockets;

package/dist/server/socketServer.js

@@ -37,7 +37,7 @@ __export(socketServer_exports, {
 });
 module.exports = __toCommonJS(socketServer_exports);
 var import_shared = require("@rsbuild/shared");
-var import_ws = __toESM(require("../../compiled/ws"));
+var import_ws = __toESM(require("../../compiled/ws/index.js"));
 var import_shared2 = require("../provider/shared");
 class SocketServer {
   constructor(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.7.0-beta.0",
+  "version": "0.7.0-beta.2",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -48,12 +48,12 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@rspack/core": "0.6.5",
+    "@rspack/core": "0.6.5-canary-2456d69-20240515093621",
     "@swc/helpers": "0.5.3",
     "core-js": "~3.36.0",
     "html-webpack-plugin": "npm:html-rspack-plugin@5.7.2",
     "postcss": "^8.4.38",
-    "@rsbuild/shared": "0.7.0-beta.0"
+    "@rsbuild/shared": "0.7.0-beta.2"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",