@rsbuild/core 0.1.0 → 0.1.2

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

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(createCompiler_exports);
 var import_shared = require("@rsbuild/shared");
 var import_devMiddleware = require("./devMiddleware");
 var import_initConfigs = require("./initConfigs");
+var import_shared2 = require("../shared");
 async function createCompiler({
   context,
   rspackConfigs
@@ -44,11 +45,26 @@ async function createCompiler({
     bundlerConfigs: rspackConfigs
   });
   const { rspack } = await Promise.resolve().then(() => __toESM(require("@rspack/core")));
+  if (!await (0, import_shared2.isSatisfyRspackVersion)(rspack.rspackVersion)) {
+    throw new Error(
+      `The current Rspack version does not meet the requirements, the minimum supported version of Rspack is ${import_shared.color.green(
+        import_shared2.rspackMinVersion
+      )}`
+    );
+  }
   const compiler = rspackConfigs.length === 1 ? rspack(rspackConfigs[0]) : rspack(rspackConfigs);
   let isFirstCompile = true;
   compiler.hooks.watchRun.tap("rsbuild:compiling", () => {
+    if (isFirstCompile) {
+      import_shared.logger.start(`Use Rspack v${rspack.rspackVersion}`);
+    }
     import_shared.logger.start("Compiling...");
   });
+  if ((0, import_shared.isProd)()) {
+    compiler.hooks.run.tap("rsbuild:run", () => {
+      import_shared.logger.start(`Use Rspack v${rspack.rspackVersion}`);
+    });
+  }
   compiler.hooks.done.tap("rsbuild:done", async (stats) => {
     const obj = stats.toJson({
       all: false,

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

@@ -64,7 +64,7 @@ function createContextByConfig(options, bundlerType, sourceConfig = {}, outputCo
     entry: sourceConfig.entry || // TODO: remove sourceConfig.entries in v0.2.0
     // compat with previous config
     sourceConfig.entries || getDefaultEntry(rootPath),
-    version: "0.1.0",
+    version: "0.1.2",
     target,
     rootPath,
     distPath,

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

@@ -92,7 +92,7 @@ const pluginSwc = () => ({
             swcConfig.env.mode = void 0;
           } else {
             swcConfig.env.mode = polyfillMode;
-            await applyCoreJs(swcConfig, chain, rule, polyfillMode);
+            await applyCoreJs(swcConfig, chain, polyfillMode);
           }
         }
         rule.use(CHAIN_ID.USE.SWC).loader(builtinSwcLoaderName).options(swcConfig);
@@ -110,7 +110,7 @@ const pluginSwc = () => ({
     });
   }
 });
-async function applyCoreJs(swcConfig, chain, rule, polyfillMode) {
+async function applyCoreJs(swcConfig, chain, polyfillMode) {
   const coreJsPath = require.resolve("core-js/package.json");
   const version = (0, import_shared.getCoreJsVersion)(coreJsPath);
   const coreJsDir = path.dirname(coreJsPath);
@@ -121,7 +121,6 @@ async function applyCoreJs(swcConfig, chain, rule, polyfillMode) {
   chain.resolve.alias.merge({
     "core-js": coreJsDir
   });
-  rule.exclude.add(coreJsDir);
 }
 function applyTransformImport(swcConfig, pluginImport) {
   var _a, _b, _c;

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

@@ -21,7 +21,6 @@ __export(transition_exports, {
   pluginTransition: () => pluginTransition
 });
 module.exports = __toCommonJS(transition_exports);
-var import_shared = require("@rsbuild/shared");
 const pluginTransition = () => ({
   name: "rsbuild:transition",
   setup(api) {
@@ -31,9 +30,6 @@ const pluginTransition = () => ({
         chain.optimization.chunkIds("deterministic");
       }
     });
-    api.modifyRspackConfig((config) => {
-      (0, import_shared.setConfig)(config, "experiments.rspackFuture.newResolver", true);
-    });
   }
 });
 // Annotate the CommonJS export names for ESM import in node:

package/dist/rspack-provider/provider.js

@@ -41,13 +41,6 @@ function rspackProvider({
 }) {
   const rsbuildConfig = (0, import_shared.pickRsbuildConfig)(originalRsbuildConfig);
   return async ({ pluginStore, rsbuildOptions, plugins }) => {
-    if (!await (0, import_shared2.isSatisfyRspackMinimumVersion)()) {
-      throw new Error(
-        `The current Rspack version does not meet the requirements, the minimum supported version of Rspack is ${import_shared.color.green(
-          import_shared2.supportedRspackMinimumVersion
-        )}`
-      );
-    }
     const context = await (0, import_createContext.createContext)(rsbuildOptions, rsbuildConfig);
     const pluginAPI = (0, import_initPlugins.getPluginAPI)({ context, pluginStore });
     context.pluginAPI = pluginAPI;

package/dist/rspack-provider/shared.d.ts

@@ -2,7 +2,7 @@ import { RsbuildPlugin } from '../types';
 import { Plugins } from '@rsbuild/shared';
 export declare const applyDefaultPlugins: (plugins: Plugins) => import("@rsbuild/shared").AwaitableGetter<RsbuildPlugin>;
 export declare const getRspackVersion: () => Promise<string>;
-export declare const supportedRspackMinimumVersion = "0.3.6";
-export declare const isSatisfyRspackMinimumVersion: (customVersion?: string) => Promise<boolean>;
+export declare const rspackMinVersion = "0.3.6";
+export declare const isSatisfyRspackVersion: (version: string) => Promise<boolean>;
 export declare const getCompiledPath: (packageName: string) => string;
 export declare const BUILTIN_LOADER = "builtin:";

package/dist/rspack-provider/shared.js

@@ -32,8 +32,8 @@ __export(shared_exports, {
   applyDefaultPlugins: () => applyDefaultPlugins,
   getCompiledPath: () => getCompiledPath,
   getRspackVersion: () => getRspackVersion,
-  isSatisfyRspackMinimumVersion: () => isSatisfyRspackMinimumVersion,
-  supportedRspackMinimumVersion: () => supportedRspackMinimumVersion
+  isSatisfyRspackVersion: () => isSatisfyRspackVersion,
+  rspackMinVersion: () => rspackMinVersion
 });
 module.exports = __toCommonJS(shared_exports);
 var import_path = require("path");
@@ -87,14 +87,13 @@ const getRspackVersion = async () => {
     return "";
   }
 };
-const supportedRspackMinimumVersion = "0.3.6";
-const isSatisfyRspackMinimumVersion = async (customVersion) => {
-  let version = customVersion || await getRspackVersion();
+const rspackMinVersion = "0.3.6";
+const isSatisfyRspackVersion = async (version) => {
   const semver = await Promise.resolve().then(() => __toESM(require("semver")));
   if (version.includes("-canary")) {
     version = version.split("-canary")[0];
   }
-  return version ? semver.lte(supportedRspackMinimumVersion, version) : true;
+  return version ? semver.lte(rspackMinVersion, version) : true;
 };
 const getCompiledPath = (packageName) => {
   const providerCompilerPath = (0, import_path.join)(__dirname, "../../compiled", packageName);
@@ -111,6 +110,6 @@ const BUILTIN_LOADER = "builtin:";
   applyDefaultPlugins,
   getCompiledPath,
   getRspackVersion,
-  isSatisfyRspackMinimumVersion,
-  supportedRspackMinimumVersion
+  isSatisfyRspackVersion,
+  rspackMinVersion
 });

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

@@ -1,9 +1,10 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { Server } from 'http';
+import type { Server } from 'http';
 import { EventEmitter } from 'events';
 import type { DevConfig, DevMiddlewareAPI, DevMiddleware as CustomDevMiddleware } from '@rsbuild/shared';
 type Options = {
+  publicPaths: string[];
   dev: DevConfig;
   devMiddleware?: CustomDevMiddleware;
 };
@@ -11,10 +12,12 @@ export default class DevMiddleware extends EventEmitter {
   middleware?: DevMiddlewareAPI;
   private devOptions;
   private devMiddleware?;
+  private publicPaths;
   private socketServer;
   constructor({
     dev,
-    devMiddleware
+    devMiddleware,
+    publicPaths
   }: Options);
   init(app: Server): void;
   close(): void;

package/dist/server/dev-middleware/index.js

@@ -44,15 +44,19 @@ function getHMRClientPath(client) {
   return clientEntry;
 }
 class DevMiddleware extends import_events.EventEmitter {
-  constructor({ dev, devMiddleware }) {
+  constructor({ dev, devMiddleware, publicPaths }) {
     super();
     this.devOptions = dev;
+    this.publicPaths = publicPaths;
     this.socketServer = new import_socketServer.default(dev);
     this.devMiddleware = devMiddleware;
   }
   init(app) {
     if (this.devMiddleware) {
-      this.middleware = this.setupDevMiddleware(this.devMiddleware);
+      this.middleware = this.setupDevMiddleware(
+        this.devMiddleware,
+        this.publicPaths
+      );
     }
     app.on("listening", () => {
       this.socketServer.prepare(app);
@@ -66,7 +70,7 @@ class DevMiddleware extends import_events.EventEmitter {
   sockWrite(type, data) {
     this.socketServer.sockWrite(type, data);
   }
-  setupDevMiddleware(devMiddleware) {
+  setupDevMiddleware(devMiddleware, publicPaths) {
     const { devOptions } = this;
     const callbacks = {
       onInvalid: () => {
@@ -80,12 +84,27 @@ class DevMiddleware extends import_events.EventEmitter {
     const enableHMR = this.devOptions.hmr;
     const middleware = devMiddleware({
       headers: devOptions.headers,
+      publicPath: "/",
       stats: false,
       callbacks,
       hmrClientPath: enableHMR ? getHMRClientPath(devOptions.client) : void 0,
       serverSideRender: true,
       writeToDisk: devOptions.writeToDisk
     });
-    return middleware;
+    const warp = async (req, res, next) => {
+      const url = req.url;
+      const assetPrefix = url && publicPaths.find((prefix) => url.startsWith(prefix));
+      if (assetPrefix && assetPrefix !== "/") {
+        req.url = url.slice(assetPrefix.length - 1);
+        middleware(req, res, (...args) => {
+          req.url = url;
+          next(...args);
+        });
+      } else {
+        middleware(req, res, next);
+      }
+    };
+    warp.close = middleware.close;
+    return warp;
   }
 }

package/dist/server/dev-middleware/socketServer.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import { Server } from 'http';
-import ws from 'ws';
-import { Stats, DevConfig } from '@rsbuild/shared';
+import type { Server } from 'http';
+import ws from '../../../compiled/ws';
+import { type Stats, type DevConfig } from '@rsbuild/shared';
 export default class SocketServer {
   private wsServer;
   private readonly sockets;

package/dist/server/dev-middleware/socketServer.js

@@ -31,7 +31,7 @@ __export(socketServer_exports, {
   default: () => SocketServer
 });
 module.exports = __toCommonJS(socketServer_exports);
-var import_ws = __toESM(require("ws"));
+var import_ws = __toESM(require("../../../compiled/ws"));
 var import_shared = require("@rsbuild/shared");
 class SocketServer {
   constructor(options) {

package/dist/server/devServer.js

@@ -50,6 +50,7 @@ class RsbuildDevServer {
     this.output = options.output;
     this.devMiddleware = new import_dev_middleware.default({
       dev: this.dev,
+      publicPaths: options.output.publicPaths,
       devMiddleware: options.devMiddleware
     });
   }
@@ -116,7 +117,6 @@ class RsbuildDevServer {
     this.middlewares.use(
       (0, import_middlewares.getHtmlFallbackMiddleware)({
         distPath: (0, import_path.isAbsolute)(distPath) ? distPath : (0, import_path.join)(this.pwd, distPath),
-        publicPath: this.output.publicPath,
         callback: devMiddleware.middleware,
         htmlFallback: this.dev.htmlFallback
       })
@@ -192,14 +192,14 @@ async function startDevServer(options, createDevMiddleware, {
     options,
     customCompiler
   );
-  const publicPath = compiler.compilers ? (0, import_shared.getPublicPathFromCompiler)(compiler.compilers[0]) : (0, import_shared.getPublicPathFromCompiler)(compiler);
+  const publicPaths = compiler.compilers ? compiler.compilers.map(import_shared.getPublicPathFromCompiler) : [(0, import_shared.getPublicPathFromCompiler)(compiler)];
   const server = new RsbuildDevServer({
     pwd: options.context.rootPath,
     devMiddleware,
     dev: devServerConfig,
     output: {
       distPath: ((_d = (_c = rsbuildConfig.output) == null ? void 0 : _c.distPath) == null ? void 0 : _d.root) || import_shared.ROOT_DIST_DIR,
-      publicPath
+      publicPaths
     }
   });
   (0, import_shared.debug)("create dev server done");

package/dist/server/middlewares.d.ts

@@ -3,7 +3,6 @@ export declare const faviconFallbackMiddleware: Middleware;
 export declare const notFoundMiddleware: Middleware;
 export declare const getHtmlFallbackMiddleware: (params: {
   distPath: string;
-  publicPath: string;
   callback?: Middleware;
   htmlFallback?: HtmlFallback;
 }) => Middleware;

package/dist/server/middlewares.js

@@ -48,7 +48,7 @@ const notFoundMiddleware = (_req, res, _next) => {
   res.statusCode = 404;
   res.end();
 };
-const getHtmlFallbackMiddleware = ({ htmlFallback, publicPath, distPath, callback }) => {
+const getHtmlFallbackMiddleware = ({ htmlFallback, distPath, callback }) => {
   return (req, res, next) => {
     if (
       // Only accept GET or HEAD
@@ -68,7 +68,6 @@ const getHtmlFallbackMiddleware = ({ htmlFallback, publicPath, distPath, callbac
     }
     const rewrite = (newUrl) => {
       var _a;
-      newUrl = (0, import_shared.urlJoin)(publicPath, newUrl);
       (_a = import_shared.debug) == null ? void 0 : _a(`Rewriting ${req.method} ${req.url} to ${newUrl}`);
       req.url = newUrl;
       if (callback) {
@@ -94,10 +93,6 @@ const getHtmlFallbackMiddleware = ({ htmlFallback, publicPath, distPath, callbac
       if (outputFileSystem.existsSync(filePath)) {
         return rewrite(newUrl);
       }
-    } else {
-      if (outputFileSystem.existsSync(import_path.default.join(distPath, pathname))) {
-        return rewrite(url);
-      }
     }
     if (htmlFallback === "index") {
       if (outputFileSystem.existsSync(import_path.default.join(distPath, "index.html"))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Unleash the power of Rspack with the out-of-the-box build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -63,12 +63,10 @@
     "html-webpack-plugin": "npm:html-rspack-plugin@5.5.7",
     "postcss": "8.4.31",
     "semver": "^7.5.4",
-    "ws": "^8.2.0",
-    "@rsbuild/shared": "0.1.0"
+    "@rsbuild/shared": "0.1.2"
   },
   "devDependencies": {
     "@types/node": "^16",
-    "@types/ws": "^8.2.0",
     "@types/semver": "^7.5.4",
     "typescript": "^5.3.0"
   },