@rspack/core 2.0.0 → 2.0.2

package/compiled/watchpack/types/watchEventSource.d.ts

@@ -0,0 +1,53 @@
+export function batch(fn: () => void): void;
+export function getNumberOfWatchers(): number;
+export function watch(filePath: string): Watcher;
+export type FSWatcher = import("fs").FSWatcher;
+export type EventType = import("./index").EventType;
+export type WatcherSet = Set<Watcher>;
+export type WatcherEvents = {
+	/**
+	 * change event
+	 */
+	change: (eventType: EventType, filename?: string) => void;
+	/**
+	 * error event
+	 */
+	error: (err: unknown) => void;
+};
+/**
+ * @typedef {object} WatcherEvents
+ * @property {(eventType: EventType, filename?: string) => void} change change event
+ * @property {(err: unknown) => void} error error event
+ */
+/**
+ * @extends {EventEmitter<{ [K in keyof WatcherEvents]: Parameters<WatcherEvents[K]> }>}
+ */
+export class Watcher extends EventEmitter<{
+	/**
+	 * change event
+	 */
+	change: [
+		eventType: import("./index").EventType,
+		filename?: string | undefined,
+	];
+	/**
+	 * error event
+	 */
+	error: [err: unknown];
+}> {
+	constructor();
+	close(): void;
+}
+/**
+ * @param {FSWatcher} watcher watcher
+ * @param {string} filePath a file path
+ * @param {(type: "rename" | "change", filename: string) => void} handleChangeEvent function to handle change
+ * @returns {(type: "rename" | "change", filename: string) => void} handler of change event
+ */
+export function createHandleChangeEvent(
+	watcher: FSWatcher,
+	filePath: string,
+	handleChangeEvent: (type: "rename" | "change", filename: string) => void,
+): (type: "rename" | "change", filename: string) => void;
+export const watcherLimit: number;
+import { EventEmitter } from "events";

package/compiled/watchpack/types/watchpack.d.ts

@@ -0,0 +1,2 @@
+declare const _exports: typeof import("./index");
+export = _exports;

package/dist/Compilation.d.ts

@@ -45,7 +45,7 @@ export interface Asset {
     info: AssetInfo;
 }
 export type ChunkPathData = {
-    id?: string;
+    id?: string | number;
     name?: string;
     hash?: string;
     contentHash?: Record<string, string>;
@@ -56,7 +56,7 @@ export type PathData = {
     contentHash?: string;
     runtime?: string;
     url?: string;
-    id?: string;
+    id?: string | number;
     chunk?: Chunk | ChunkPathData;
     contentHashType?: string;
 };

package/dist/builtin-plugin/rsc/RscServerPlugin.d.ts

@@ -29,7 +29,7 @@ export interface RscManifestPerEntry {
 export type RscManifest = Record<string, RscManifestPerEntry>;
 export type RscServerPluginOptions = {
     coordinator: Coordinator;
-    onServerComponentChanges?: () => Promise<void>;
+    onServerComponentChanges?: () => void | Promise<void>;
     onManifest?: (manifest: RscManifest) => void | Promise<void>;
 };
 export declare class RscServerPlugin extends RspackBuiltinPlugin {

package/dist/builtin-plugin/rsc/index.d.ts

@@ -1,13 +1,13 @@
-import { RscClientPlugin, type RscClientPluginOptions } from './RscClientPlugin.js';
-import { RscServerPlugin } from './RscServerPlugin.js';
+import { RscClientPlugin } from './RscClientPlugin.js';
+import { RscServerPlugin, type RscServerPluginOptions } from './RscServerPlugin.js';
 declare class ServerPlugin extends RscServerPlugin {
-    constructor(options?: Omit<RscClientPluginOptions, 'coordinator'>);
+    constructor(options?: Omit<RscServerPluginOptions, 'coordinator'>);
 }
 declare class ClientPlugin extends RscClientPlugin {
 }
 export declare const rsc: {
     createPlugins: () => {
-        ServerPlugin: new (options?: Omit<RscClientPluginOptions, "coordinator">) => ServerPlugin;
+        ServerPlugin: new (options?: Omit<RscServerPluginOptions, "coordinator">) => ServerPlugin;
         ClientPlugin: new () => ClientPlugin;
     };
     Layers: {

package/dist/index.js

@@ -34,7 +34,7 @@ __webpack_require__.m = __webpack_modules__, __webpack_require__.n = (module)=>{
         value: !0
     });
 }, __webpack_require__.add({
-    "../../node_modules/.pnpm/enhanced-resolve@5.20.1/node_modules/enhanced-resolve/lib/CachedInputFileSystem.js" (module, __unused_rspack_exports, __webpack_require__) {
+    "../../node_modules/.pnpm/enhanced-resolve@5.21.0/node_modules/enhanced-resolve/lib/CachedInputFileSystem.js" (module, __unused_rspack_exports, __webpack_require__) {
         let { nextTick } = __webpack_require__("process"), dirname = (path)=>{
             let idx = path.length - 1;
             for(; idx >= 0;){
@@ -76,7 +76,7 @@ __webpack_require__.m = __webpack_modules__, __webpack_require__.n = (module)=>{
             constructor(duration, provider, syncProvider, providerContext){
                 this._duration = duration, this._provider = provider, this._syncProvider = syncProvider, this._providerContext = providerContext, this._activeAsyncOperations = new Map(), this._data = new Map(), this._levels = [];
                 for(let i = 0; i < 10; i++)this._levels.push(new Set());
-                for(let i = 5000; i < duration; i += 500)this._levels.push(new Set());
+                if (duration !== 1 / 0) for(let i = 5000; i < duration; i += 500)this._levels.push(new Set());
                 this._currentLevel = 0, this._tickInterval = Math.floor(duration / this._levels.length), this._mode = 0, this._timeout = void 0, this._nextDecay = void 0, this.provide = provider ? this.provide.bind(this) : null, this.provideSync = syncProvider ? this.provideSync.bind(this) : null;
             }
             provide(path, options, callback) {
@@ -176,7 +176,7 @@ __webpack_require__.m = __webpack_modules__, __webpack_require__.n = (module)=>{
                         if (this._runDecays(), 0 === this._mode) return;
                         timeout = Math.max(0, this._nextDecay - Date.now());
                 }
-                this._mode = 2;
+                if (this._mode = 2, this._duration === 1 / 0) return;
                 let ref = setTimeout(()=>{
                     this._mode = 1, this._runDecays();
                 }, timeout);
@@ -1671,7 +1671,7 @@ Object.defineProperty(binding_namespaceObject.Chunk.prototype, 'files', {
         let chunkHashMap = {}, chunkContentHashMap = {}, chunkNameMap = {};
         for (let chunk of this.getAllAsyncChunks()){
             let id = chunk.id;
-            if (!id) continue;
+            if (void 0 === id) continue;
             let chunkHash = realHash ? chunk.hash : chunk.renderedHash;
             for (let key of (chunkHash && (chunkHashMap[id] = chunkHash), Object.keys(chunk.contentHash)))chunkContentHashMap[key] || (chunkContentHashMap[key] = {}), chunkContentHashMap[key][id] = chunk.contentHash[key];
             chunk.name && (chunkNameMap[id] = chunk.name);
@@ -1809,7 +1809,7 @@ function createDiagnosticArray(adm) {
             return copy.sort(compareFn), adm.spliceWithArray(0, adm.length, copy), this;
         },
         at: (index)=>adm.get(index),
-        concat: (...items)=>([].includes, adm.values().concat(...items)),
+        concat: (...items)=>adm.values().concat(...items),
         flat: ()=>adm.values(),
         every: (predicate, thisArg)=>adm.values().every(predicate, thisArg),
         filter: (predicate, thisArg)=>adm.values().filter(predicate, thisArg),
@@ -1848,6 +1848,20 @@ function _to_property_key(arg) {
 function _type_of(obj) {
     return obj && "u" > typeof Symbol && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
+function normalizePathData(data = {}) {
+    let pathData = {
+        filename: data.filename,
+        hash: data.hash,
+        contentHash: data.contentHash,
+        runtime: data.runtime,
+        url: data.url
+    };
+    return void 0 !== data.id && (pathData.id = String(data.id)), data.chunk && (pathData.chunk = {
+        id: void 0 !== data.chunk.id ? String(data.chunk.id) : void 0,
+        name: data.chunk.name,
+        hash: data.chunk.hash
+    }), pathData;
+}
 let checkCompilation = (compilation)=>{
     if (!(compilation instanceof Compilation)) throw TypeError('The \'compilation\' argument must be an instance of Compilation. This usually occurs when multiple versions of "@rspack/core" are used, or when the code in "@rspack/core" is executed multiple times.');
 };
@@ -2159,27 +2173,19 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
         this.#warnings || (this.#warnings = createDiagnosticArray(this.#inner.warnings)), this.#warnings.splice(0, this.#warnings.length, ...warnings);
     }
     getPath(filename, data = {}) {
-        let pathData = {
-            ...data
-        };
+        let pathData = normalizePathData(data);
         return data.contentHashType && data.chunk?.contentHash && (pathData.contentHash = data.chunk.contentHash[data.contentHashType]), this.#inner.getPath(filename, pathData);
     }
     getPathWithInfo(filename, data = {}) {
-        let pathData = {
-            ...data
-        };
+        let pathData = normalizePathData(data);
         return data.contentHashType && data.chunk?.contentHash && (pathData.contentHash = data.chunk.contentHash[data.contentHashType]), this.#inner.getPathWithInfo(filename, pathData);
     }
     getAssetPath(filename, data = {}) {
-        let pathData = {
-            ...data
-        };
+        let pathData = normalizePathData(data);
         return data.contentHashType && data.chunk?.contentHash && (pathData.contentHash = data.chunk.contentHash[data.contentHashType]), this.#inner.getAssetPath(filename, pathData);
     }
     getAssetPathWithInfo(filename, data = {}) {
-        let pathData = {
-            ...data
-        };
+        let pathData = normalizePathData(data);
         return data.contentHashType && data.chunk?.contentHash && (pathData.contentHash = data.chunk.contentHash[data.contentHashType]), this.#inner.getAssetPathWithInfo(filename, pathData);
     }
     getLogger(name) {
@@ -6865,7 +6871,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
         return output.wasmLoading && enabledWasmLoadingTypes.add(output.wasmLoading), output.workerWasmLoading && enabledWasmLoadingTypes.add(output.workerWasmLoading), forEachEntry((desc)=>{
             desc.wasmLoading && enabledWasmLoadingTypes.add(desc.wasmLoading);
         }), Array.from(enabledWasmLoadingTypes);
-    }), D(output, 'bundlerInfo', {}), 'object' == typeof output.bundlerInfo && (D(output.bundlerInfo, 'version', "2.0.0"), D(output.bundlerInfo, 'bundler', 'rspack'), D(output.bundlerInfo, 'force', !1));
+    }), D(output, 'bundlerInfo', {}), 'object' == typeof output.bundlerInfo && (D(output.bundlerInfo, 'version', "2.0.2"), D(output.bundlerInfo, 'bundler', 'rspack'), D(output.bundlerInfo, 'force', !1));
 }, applyExternalsPresetsDefaults = (externalsPresets, { targetProperties, buildHttp, outputModule })=>{
     let isUniversal = (key)=>!!(outputModule && targetProperties && null === targetProperties[key]);
     D(externalsPresets, 'web', !buildHttp && targetProperties && (targetProperties.web || isUniversal('node'))), D(externalsPresets, 'node', targetProperties && (targetProperties.node || isUniversal('node'))), D(externalsPresets, 'electron', targetProperties && targetProperties.electron || isUniversal('electron')), D(externalsPresets, 'electronMain', targetProperties && !!targetProperties.electron && (targetProperties.electronMain || isUniversal('electronMain'))), D(externalsPresets, 'electronPreload', targetProperties && !!targetProperties.electron && (targetProperties.electronPreload || isUniversal('electronPreload'))), D(externalsPresets, 'electronRenderer', targetProperties && !!targetProperties.electron && (targetProperties.electronRenderer || isUniversal('electronRenderer'))), D(externalsPresets, 'nwjs', targetProperties && (targetProperties.nwjs || isUniversal('nwjs')));
@@ -8119,7 +8125,7 @@ class MultiStats {
         obj.children = this.stats.map((stat, idx)=>{
             let obj = stat.toJson(childOptions.children[idx]), compilationName = stat.compilation.name;
             return obj.name = compilationName && makePathsRelative(childOptions.context, compilationName, stat.compilation.compiler.root), obj;
-        }), childOptions.version && (obj.rspackVersion = "2.0.0", obj.version = "5.75.0"), childOptions.hash && (obj.hash = obj.children.map((j)=>j.hash).join(''));
+        }), childOptions.version && (obj.rspackVersion = "2.0.2", obj.version = "5.75.0"), childOptions.hash && (obj.hash = obj.children.map((j)=>j.hash).join(''));
         let mapError = (j, obj)=>({
                 ...obj,
                 compilerPath: obj.compilerPath ? `${j.name}.${obj.compilerPath}` : j.name
@@ -8628,7 +8634,7 @@ let arraySum = (array)=>{
         let str = `${a}`, length = lengths[i];
         return str.length === length ? str : length > 5 ? `...${str.slice(-length + 3)}` : length > 0 ? str.slice(-length) : '';
     });
-}, CachedInputFileSystem = __webpack_require__("../../node_modules/.pnpm/enhanced-resolve@5.20.1/node_modules/enhanced-resolve/lib/CachedInputFileSystem.js");
+}, CachedInputFileSystem = __webpack_require__("../../node_modules/.pnpm/enhanced-resolve@5.21.0/node_modules/enhanced-resolve/lib/CachedInputFileSystem.js");
 var CachedInputFileSystem_default = __webpack_require__.n(CachedInputFileSystem);
 class NodeEnvironmentPlugin {
     options;
@@ -9246,7 +9252,7 @@ let iterateConfig = (config, options, fn)=>{
 }, SORTERS = {
     'compilation.chunks': {
         _: (comparators)=>{
-            comparators.push(compareSelect((c)=>c.id, compareIds));
+            comparators.push(compareSelect((c)=>void 0 === c.id ? void 0 : String(c.id), compareIds));
         }
     },
     'compilation.modules': MODULES_SORTER,
@@ -9342,7 +9348,10 @@ let iterateConfig = (config, options, fn)=>{
                 ]) : 'error' === logging ? getLogTypesBitFlag([
                     LogType.error
                 ]) : getLogTypesBitFlag([]), object.logging = {};
-                let compilationLogging = compilation.logging;
+                let compilationLogging = new Map();
+                for (let [origin, logEntries] of compilation.logging)compilationLogging.set(origin, [
+                    ...logEntries
+                ]);
                 for (let { name, ...rest } of context.getInner(compilation).getLogging(acceptedTypes)){
                     let value = compilationLogging.get(name), entry = {
                         type: rest.type,
@@ -9390,7 +9399,7 @@ let iterateConfig = (config, options, fn)=>{
             object.hash = context.getStatsCompilation(compilation).hash;
         },
         version: (object)=>{
-            object.version = "5.75.0", object.rspackVersion = "2.0.0";
+            object.version = "5.75.0", object.rspackVersion = "2.0.2";
         },
         env: (object, _compilation, _context, { _env })=>{
             object.env = _env;
@@ -11048,7 +11057,7 @@ class TraceHookPlugin {
         });
     }
 }
-let CORE_VERSION = "2.0.0", VFILES_BY_COMPILER = new WeakMap();
+let CORE_VERSION = "2.0.2", VFILES_BY_COMPILER = new WeakMap();
 class VirtualModulesPlugin {
     #staticModules;
     #compiler;
@@ -13351,7 +13360,7 @@ async function transform(source, options) {
     let _options = JSON.stringify(options || {});
     return binding_default().transform(source, _options);
 }
-let exports_rspackVersion = "2.0.0", exports_version = "5.75.0", exports_WebpackError = Error, exports_config = {
+let exports_rspackVersion = "2.0.2", exports_version = "5.75.0", exports_WebpackError = Error, exports_config = {
     getNormalizedRspackOptions: getNormalizedRspackOptions,
     applyRspackOptionsDefaults: applyRspackOptionsDefaults,
     getNormalizedWebpackOptions: getNormalizedRspackOptions,

package/dist/stats/statsFactoryUtils.d.ts

@@ -77,9 +77,9 @@ export type KnownStatsAsset = {
     related?: StatsAsset[];
     chunkNames?: (string | number)[];
     chunkIdHints?: (string | number)[];
-    chunks?: (string | null | undefined)[];
+    chunks?: (string | number | null | undefined)[];
     auxiliaryChunkNames?: (string | number)[];
-    auxiliaryChunks?: (string | null | undefined)[];
+    auxiliaryChunks?: (string | number | null | undefined)[];
     auxiliaryChunkIdHints?: (string | number)[];
     filteredRelated?: number;
     isOverSizeLimit?: boolean;
@@ -108,7 +108,7 @@ export type KnownStatsModule = {
     orphan?: boolean;
     id?: string | number | null;
     issuerId?: string | number | null;
-    chunks?: string[];
+    chunks?: (string | number)[];
     assets?: string[];
     dependent?: boolean;
     issuer?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/core",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "webpackVersion": "5.75.0",
   "license": "MIT",
   "description": "Fast Rust-based bundler for the web with a modernized webpack API",
@@ -40,26 +40,25 @@
     "@ast-grep/napi": "^0.42.1",
     "@napi-rs/wasm-runtime": "1.1.4",
     "@rsbuild/plugin-node-polyfill": "^1.4.4",
-    "@rslib/core": "0.21.2",
+    "@rslib/core": "0.21.3",
     "@rspack/lite-tapable": "1.1.0",
     "@swc/types": "0.1.26",
     "@types/node": "^20.19.39",
-    "@types/watchpack": "^2.4.5",
     "browserslist-load-config": "^1.0.1",
     "browserslist-to-es-version": "^1.4.1",
     "connect-next": "^4.0.1",
-    "enhanced-resolve": "5.20.1",
-    "http-proxy-middleware": "^3.0.5",
-    "memfs": "4.53.0",
+    "enhanced-resolve": "5.21.0",
+    "http-proxy-middleware": "^4.0.0-beta.6",
+    "memfs": "4.57.2",
     "open": "^11.0.0",
     "prebundle": "^1.6.4",
     "tinypool": "^2.1.0",
     "typescript": "^6.0.3",
-    "watchpack": "2.4.4",
+    "watchpack": "2.5.1",
     "webpack-sources": "3.3.4"
   },
   "dependencies": {
-    "@rspack/binding": "2.0.0"
+    "@rspack/binding": "2.0.2"
   },
   "peerDependencies": {
     "@module-federation/runtime-tools": "^0.24.1 || ^2.0.0",