@rspack/core 1.0.0-alpha.5 → 1.0.0-beta.1

package/dist/lib/cache/getLazyHashedEtag.js

@@ -1,21 +1,20 @@
-/*
-    MIT License http://www.opensource.org/licenses/mit-license.php
-    Author Tobias Koppers @sokra
-*/
 "use strict";
-const createHash = require("../../util/createHash");
-// /** @typedef {import("../util/Hash")} Hash */
-// /** @typedef {typeof import("../util/Hash")} HashConstructor */
-/** @typedef {any} Hash */
-/** @typedef {any} HashConstructor */
 /**
- * @typedef {Object} HashableObject
- * @property {function(Hash): void} updateHash
+ * The following code is modified based on
+ * https://github.com/webpack/webpack/blob/4b4ca3b/lib/cache/getLazyHashedEtag.js
+ *
+ * MIT Licensed
+ * Author Tobias Koppers @sokra
+ * Copyright (c) JS Foundation and other contributors
+ * https://github.com/webpack/webpack/blob/main/LICENSE
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getter = void 0;
+const createHash_1 = require("../../util/createHash");
 class LazyHashedEtag {
     /**
-     * @param {HashableObject} obj object with updateHash method
-     * @param {string | HashConstructor} hashFunction the hash function to use
+     * @param obj object with updateHash method
+     * @param hashFunction the hash function to use
      */
     constructor(obj, hashFunction = "md4") {
         this._obj = obj;
@@ -23,26 +22,23 @@ class LazyHashedEtag {
         this._hashFunction = hashFunction;
     }
     /**
-     * @returns {string} hash of object
+     * @returns hash of object
      */
     toString() {
         if (this._hash === undefined) {
-            // @ts-expect-error
-            const hash = createHash(this._hashFunction);
+            const hash = (0, createHash_1.createHash)(this._hashFunction);
             this._obj.updateHash(hash);
-            this._hash = /** @type {string} */ (hash.digest("base64"));
+            this._hash = hash.digest("base64");
         }
         return this._hash;
     }
 }
-/** @type {Map<string | HashConstructor, WeakMap<HashableObject, LazyHashedEtag>>} */
 const mapStrings = new Map();
-/** @type {WeakMap<HashConstructor, WeakMap<HashableObject, LazyHashedEtag>>} */
 const mapObjects = new WeakMap();
 /**
- * @param {HashableObject} obj object with updateHash method
- * @param {string | HashConstructor} hashFunction the hash function to use
- * @returns {LazyHashedEtag} etag
+ * @param obj object with updateHash method
+ * @param ashFunction the hash function to use
+ * @returns etag
  */
 const getter = (obj, hashFunction = "md4") => {
     let innerMap;
@@ -73,4 +69,5 @@ const getter = (obj, hashFunction = "md4") => {
     innerMap.set(obj, newHash);
     return newHash;
 };
-module.exports = getter;
+exports.getter = getter;
+exports.default = exports.getter;

package/dist/lib/cache/mergeEtags.d.ts

@@ -1,11 +1,17 @@
-export = mergeEtags;
 /**
- * @param {Etag} a first
- * @param {Etag} b second
- * @returns {Etag} result
+ * The following code is modified based on
+ * https://github.com/webpack/webpack/blob/4b4ca3b/lib/cache/mergeEtags.js
+ *
+ * MIT Licensed
+ * Author Tobias Koppers @sokra
+ * Copyright (c) JS Foundation and other contributors
+ * https://github.com/webpack/webpack/blob/main/LICENSE
  */
-declare function mergeEtags(a: Etag, b: Etag): Etag;
-declare namespace mergeEtags {
-    export { Etag };
-}
-type Etag = import("../Cache").Etag;
+import type { Etag } from "../Cache";
+/**
+ * @param a first
+ * @param b second
+ * @returns result
+ */
+export declare const mergeEtags: (a: Etag, b: Etag) => Etag;
+export default mergeEtags;

package/dist/lib/cache/mergeEtags.js

@@ -1,13 +1,19 @@
-/*
-    MIT License http://www.opensource.org/licenses/mit-license.php
-    Author Tobias Koppers @sokra
-*/
 "use strict";
-/** @typedef {import("../Cache").Etag} Etag */
+/**
+ * The following code is modified based on
+ * https://github.com/webpack/webpack/blob/4b4ca3b/lib/cache/mergeEtags.js
+ *
+ * MIT Licensed
+ * Author Tobias Koppers @sokra
+ * Copyright (c) JS Foundation and other contributors
+ * https://github.com/webpack/webpack/blob/main/LICENSE
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeEtags = void 0;
 class MergedEtag {
     /**
-     * @param {Etag} a first
-     * @param {Etag} b second
+     * @param a first
+     * @param b second
      */
     constructor(a, b) {
         this.a = a;
@@ -20,20 +26,18 @@ class MergedEtag {
 const dualObjectMap = new WeakMap();
 const objectStringMap = new WeakMap();
 /**
- * @param {Etag} a first
- * @param {Etag} b second
- * @returns {Etag} result
+ * @param a first
+ * @param b second
+ * @returns result
  */
 const mergeEtags = (a, b) => {
     if (typeof a === "string") {
         if (typeof b === "string") {
             return `${a}|${b}`;
         }
-        else {
-            const temp = b;
-            b = a;
-            a = temp;
-        }
+        const temp = b;
+        b = a;
+        a = temp;
     }
     else {
         if (typeof b !== "string") {
@@ -48,9 +52,7 @@ const mergeEtags = (a, b) => {
                 map.set(b, newMergedEtag);
                 return newMergedEtag;
             }
-            else {
-                return mergedEtag;
-            }
+            return mergedEtag;
         }
     }
     // a is object, b is string
@@ -64,8 +66,7 @@ const mergeEtags = (a, b) => {
         map.set(b, newMergedEtag);
         return newMergedEtag;
     }
-    else {
-        return mergedEtag;
-    }
+    return mergedEtag;
 };
-module.exports = mergeEtags;
+exports.mergeEtags = mergeEtags;
+exports.default = exports.mergeEtags;

package/dist/lib/formatLocation.d.ts

@@ -1,11 +1,16 @@
-export = formatLocation;
 /**
- * @param {DependencyLocation} loc location
- * @returns {string} formatted location
+ * The following code is modified based on
+ * https://github.com/webpack/webpack/blob/4b4ca3b/lib/formatLocation.js
+ *
+ * MIT Licensed
+ * Author Tobias Koppers @sokra
+ * Copyright (c) JS Foundation and other contributors
+ * https://github.com/webpack/webpack/blob/main/LICENSE
  */
-declare function formatLocation(loc: DependencyLocation): string;
-declare namespace formatLocation {
-    export { DependencyLocation, SourcePosition };
-}
 type DependencyLocation = any;
-type SourcePosition = any;
+/**
+ * @param loc location
+ * @returns formatted location
+ */
+declare const formatLocation: (loc: DependencyLocation) => string;
+export default formatLocation;

package/dist/lib/formatLocation.js

@@ -1,32 +1,34 @@
-/*
-    MIT License http://www.opensource.org/licenses/mit-license.php
-    Author Tobias Koppers @sokra
-*/
 "use strict";
-// /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
-// /** @typedef {import("./Dependency").SourcePosition} SourcePosition */
-/** @typedef {any} DependencyLocation */
-/** @typedef {any} SourcePosition */
 /**
- * @param {SourcePosition} pos position
- * @returns {string} formatted position
+ * The following code is modified based on
+ * https://github.com/webpack/webpack/blob/4b4ca3b/lib/formatLocation.js
+ *
+ * MIT Licensed
+ * Author Tobias Koppers @sokra
+ * Copyright (c) JS Foundation and other contributors
+ * https://github.com/webpack/webpack/blob/main/LICENSE
  */
-const formatPosition = pos => {
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * @param pos position
+ * @returns formatted position
+ */
+const formatPosition = (pos) => {
     if (pos && typeof pos === "object") {
         if ("line" in pos && "column" in pos) {
             return `${pos.line}:${pos.column}`;
         }
-        else if ("line" in pos) {
+        if ("line" in pos) {
             return `${pos.line}:?`;
         }
     }
     return "";
 };
 /**
- * @param {DependencyLocation} loc location
- * @returns {string} formatted location
+ * @param loc location
+ * @returns formatted location
  */
-const formatLocation = loc => {
+const formatLocation = (loc) => {
     if (loc && typeof loc === "object") {
         if ("start" in loc && loc.start && "end" in loc && loc.end) {
             if (typeof loc.start === "object" &&
@@ -37,7 +39,7 @@ const formatLocation = loc => {
                 loc.start.line === loc.end.line) {
                 return `${formatPosition(loc.start)}-${loc.end.column}`;
             }
-            else if (typeof loc.start === "object" &&
+            if (typeof loc.start === "object" &&
                 typeof loc.start.line === "number" &&
                 typeof loc.start.column !== "number" &&
                 typeof loc.end === "object" &&
@@ -45,9 +47,7 @@ const formatLocation = loc => {
                 typeof loc.end.column !== "number") {
                 return `${loc.start.line}-${loc.end.line}`;
             }
-            else {
-                return `${formatPosition(loc.start)}-${formatPosition(loc.end)}`;
-            }
+            return `${formatPosition(loc.start)}-${formatPosition(loc.end)}`;
         }
         if ("start" in loc && loc.start) {
             return formatPosition(loc.start);
@@ -61,4 +61,4 @@ const formatLocation = loc => {
     }
     return "";
 };
-module.exports = formatLocation;
+exports.default = formatLocation;

package/dist/loader-runner/LoaderLoadingError.d.ts

@@ -1,3 +1,13 @@
-export = LoadingLoaderError;
+/**
+ * The following code is from
+ * https://github.com/webpack/loader-runner
+ *
+ * MIT Licensed
+ * Author Tobias Koppers @sokra
+ * Copyright (c) JS Foundation and other contributors
+ * https://github.com/webpack/loader-runner/blob/main/LICENSE
+ */
 declare class LoadingLoaderError extends Error {
+    constructor(message: string);
 }
+export default LoadingLoaderError;

package/dist/loader-runner/LoaderLoadingError.js

@@ -1,3 +1,4 @@
+"use strict";
 /**
  * The following code is from
  * https://github.com/webpack/loader-runner
@@ -7,15 +8,12 @@
  * Copyright (c) JS Foundation and other contributors
  * https://github.com/webpack/loader-runner/blob/main/LICENSE
  */
-"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class LoadingLoaderError extends Error {
-    /**
-     * @param {string=} message
-     */
     constructor(message) {
         super(message);
         this.name = "LoaderRunnerError";
         Error.captureStackTrace(this, this.constructor);
     }
 }
-module.exports = LoadingLoaderError;
+exports.default = LoadingLoaderError;

package/dist/loader-runner/index.js

@@ -293,7 +293,6 @@ async function runLoaders(compiler, context) {
     const contextDependencies = context.contextDependencies;
     const missingDependencies = context.missingDependencies;
     const buildDependencies = context.buildDependencies;
-    const assetFilenames = context.assetFilenames;
     /// Construct `loaderContext`
     const loaderContext = {};
     loaderContext.loaders = context.loaderItems.map(item => {
@@ -356,7 +355,6 @@ async function runLoaders(compiler, context) {
                         if (res.cacheable === false) {
                             this.cacheable(false);
                         }
-                        assetFilenames.push(...res.assets);
                         resolve(compiler.__internal__getModuleExecutionResult(res.id));
                     }
                 });
@@ -384,7 +382,6 @@ async function runLoaders(compiler, context) {
                 if (res.cacheable === false) {
                     this.cacheable(false);
                 }
-                assetFilenames.push(...res.assets);
                 callback(undefined, compiler.__internal__getModuleExecutionResult(res.id));
             }
         });
@@ -560,9 +557,12 @@ async function runLoaders(compiler, context) {
             // @ts-expect-error webpack-sources type declaration is wrong
             content);
         }
-        assetFilenames.push(name),
-            // @ts-expect-error
-            compiler._lastCompilation.emitAsset(name, source, assetInfo);
+        // @ts-expect-error
+        compiler._lastCompilation.__internal__emit_asset_from_loader(name, 
+        // @ts-expect-error
+        source, 
+        // @ts-expect-error
+        assetInfo, context._moduleIdentifier);
     };
     loaderContext.fs = compiler.inputFileSystem;
     const getAbsolutify = (0, memoize_1.memoize)(() => identifier_1.absolutify.bindCache(compiler.root));
@@ -709,9 +709,7 @@ function utf8BufferToString(buf) {
     if (str.charCodeAt(0) === 0xfeff) {
         return str.slice(1);
     }
-    else {
-        return str;
-    }
+    return str;
 }
 function convertArgs(args, raw) {
     if (!raw && Buffer.isBuffer(args[0]))

package/dist/loader-runner/loadLoader.d.ts

@@ -1,2 +1,11 @@
-declare function _exports(loader: any, callback: any): any;
-export = _exports;
+/**
+ * The following code is from
+ * https://github.com/webpack/loader-runner
+ *
+ * MIT Licensed
+ * Author Tobias Koppers @sokra
+ * Copyright (c) JS Foundation and other contributors
+ * https://github.com/webpack/loader-runner/blob/main/LICENSE
+ */
+import type { LoaderObject } from ".";
+export default function loadLoader(loader: LoaderObject, callback: (err: unknown) => void): void;

package/dist/loader-runner/loadLoader.js

@@ -8,19 +8,20 @@
  * Copyright (c) JS Foundation and other contributors
  * https://github.com/webpack/loader-runner/blob/main/LICENSE
  */
-var LoaderLoadingError = require("./LoaderLoadingError");
-/** @type {undefined | import('node:url')} */
-var url;
-// @ts-expect-error
-module.exports = function loadLoader(loader, callback) {
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const LoaderLoadingError_1 = __importDefault(require("./LoaderLoadingError"));
+var url = undefined;
+function loadLoader(loader, callback) {
     if (loader.type === "module") {
         try {
             if (url === undefined)
                 url = require("node:url");
             var loaderUrl = url.pathToFileURL(loader.path);
-            /** @type {Promise<any>} */
             var modulePromise = eval("import(" + JSON.stringify(loaderUrl.toString()) + ")");
-            modulePromise.then(module => {
+            modulePromise.then((module) => {
                 handleResult(loader, module, callback);
             }, callback);
             return;
@@ -36,28 +37,25 @@ module.exports = function loadLoader(loader, callback) {
         catch (e) {
             // it is possible for node to choke on a require if the FD descriptor
             // limit has been reached. give it a chance to recover.
-            // @ts-expect-error
-            if (e instanceof Error && e.code === "EMFILE") {
-                // @ts-expect-error
+            if (e instanceof Error &&
+                e.code === "EMFILE") {
                 var retry = loadLoader.bind(null, loader, callback);
                 if (typeof setImmediate === "function") {
                     // node >= 0.9.0
-                    return setImmediate(retry);
-                }
-                else {
-                    // node < 0.9.0
-                    return process.nextTick(retry);
+                    return void setImmediate(retry);
                 }
+                // node < 0.9.0
+                return process.nextTick(retry);
             }
             return callback(e);
         }
         return handleResult(loader, module, callback);
     }
-};
-// @ts-expect-error
+}
+exports.default = loadLoader;
 function handleResult(loader, module, callback) {
     if (typeof module !== "function" && typeof module !== "object") {
-        return callback(new LoaderLoadingError("Module '" +
+        return callback(new LoaderLoadingError_1.default("Module '" +
             loader.path +
             "' is not a loader (export function or es6 module)"));
     }
@@ -66,7 +64,7 @@ function handleResult(loader, module, callback) {
     loader.raw = module.raw;
     if (typeof loader.normal !== "function" &&
         typeof loader.pitch !== "function") {
-        return callback(new LoaderLoadingError("Module '" +
+        return callback(new LoaderLoadingError_1.default("Module '" +
             loader.path +
             "' is not a loader (must have normal or pitch function)"));
     }

package/dist/logging/createConsoleLogger.js

@@ -87,13 +87,9 @@ module.exports = ({ level = "info", debug = false, console }) => {
                 if (args.length > 0 && typeof args[0] === "string") {
                     return [`[${name}] ${args[0]}`, ...args.slice(1)];
                 }
-                else {
-                    return [`[${name}]`, ...args];
-                }
-            }
-            else {
-                return [];
+                return [`[${name}]`, ...args];
             }
+            return [];
         };
         const debug = debugFilters.some(f => f(name));
         switch (type) {

package/dist/logging/truncateArgs.js

@@ -30,12 +30,10 @@ const truncateArgs = (args, maxLength) => {
         if (availableLength >= args[0].length) {
             return args;
         }
-        else if (availableLength > 3) {
+        if (availableLength > 3) {
             return ["..." + args[0].slice(-availableLength + 3)];
         }
-        else {
-            return [args[0].slice(-availableLength)];
-        }
+        return [args[0].slice(-availableLength)];
     }
     // Check if there is space for at least 4 chars per arg
     // @ts-expect-error
@@ -76,15 +74,13 @@ const truncateArgs = (args, maxLength) => {
         if (str.length === length) {
             return str;
         }
-        else if (length > 5) {
+        if (length > 5) {
             return "..." + str.slice(-length + 3);
         }
-        else if (length > 0) {
+        if (length > 0) {
             return str.slice(-length);
         }
-        else {
-            return "";
-        }
+        return "";
     });
 };
 exports.truncateArgs = truncateArgs;

package/dist/node/nodeConsole.js

@@ -50,9 +50,7 @@ module.exports = ({ colors, appendOnly, stream }) => {
                 str.replace(/\n/g, colorSuffix + "\n" + prefix + colorPrefix) +
                 colorSuffix);
         }
-        else {
-            return prefix + str.replace(/\n/g, "\n" + prefix);
-        }
+        return prefix + str.replace(/\n/g, "\n" + prefix);
     };
     const clearStatusMessage = () => {
         if (hasStatusMessage) {

package/dist/rspackOptionsApply.js

@@ -18,7 +18,7 @@ const graceful_fs_1 = __importDefault(require("../compiled/graceful-fs"));
 const Module_1 = require("./Module");
 const builtin_plugin_1 = require("./builtin-plugin");
 const EntryOptionPlugin_1 = __importDefault(require("./lib/EntryOptionPlugin"));
-const ignoreWarningsPlugin_1 = __importDefault(require("./lib/ignoreWarningsPlugin"));
+const IgnoreWarningsPlugin_1 = __importDefault(require("./lib/IgnoreWarningsPlugin"));
 const DefaultStatsFactoryPlugin_1 = require("./stats/DefaultStatsFactoryPlugin");
 const DefaultStatsPresetPlugin_1 = require("./stats/DefaultStatsPresetPlugin");
 const DefaultStatsPrinterPlugin_1 = require("./stats/DefaultStatsPrinterPlugin");
@@ -258,7 +258,7 @@ class RspackOptionsApply {
         new DefaultStatsPresetPlugin_1.DefaultStatsPresetPlugin().apply(compiler);
         new DefaultStatsPrinterPlugin_1.DefaultStatsPrinterPlugin().apply(compiler);
         if (options.ignoreWarnings && options.ignoreWarnings.length > 0) {
-            new ignoreWarningsPlugin_1.default(options.ignoreWarnings).apply(compiler);
+            new IgnoreWarningsPlugin_1.default(options.ignoreWarnings).apply(compiler);
         }
         compiler.hooks.afterPlugins.call(compiler);
         if (!compiler.inputFileSystem) {

package/dist/stats/DefaultStatsFactoryPlugin.js

@@ -261,7 +261,7 @@ const MODULES_GROUPERS = (type) => ({
                     if (groupModulesByType) {
                         return [module.moduleType.split("/", 1)[0]];
                     }
-                    else if (module.moduleType === "runtime") {
+                    if (module.moduleType === "runtime") {
                         return ["runtime"];
                     }
                 },
@@ -395,16 +395,21 @@ const RESULT_SORTERS = {
     "compilation.assets": ASSET_SORTERS,
     "asset.related": ASSET_SORTERS
 };
+const MODULES_SORTER = {
+    _: comparators => {
+        comparators.push((0, comparators_1.compareSelect)((m) => m.depth, comparators_1.compareNumbers), (0, comparators_1.compareSelect)((m) => m.preOrderIndex, comparators_1.compareNumbers), (0, comparators_1.compareSelect)((m) => m.identifier, compareIds));
+    }
+};
 const SORTERS = {
     "compilation.chunks": {
         _: comparators => {
             comparators.push((0, comparators_1.compareSelect)((c) => c.id, compareIds));
         }
     },
-    // "compilation.modules": MODULES_SORTER,
-    // "chunk.rootModules": MODULES_SORTER,
-    // "chunk.modules": MODULES_SORTER,
-    // "module.modules": MODULES_SORTER,
+    "compilation.modules": MODULES_SORTER,
+    "chunk.rootModules": MODULES_SORTER,
+    "chunk.modules": MODULES_SORTER,
+    "module.modules": MODULES_SORTER,
     // not support module.reasons (missing Module.identifier())
     "chunk.origins": {
         _: comparators => {
@@ -665,7 +670,7 @@ const SIMPLE_EXTRACTORS = {
                 // compilationFileToChunks
                 // compilationAuxiliaryFileToChunks
             });
-            const limited = (0, statsFactoryUtils_1.spaceLimited)(groupedAssets, options.assetsSpace || Number.POSITIVE_INFINITY);
+            const limited = (0, statsFactoryUtils_1.spaceLimited)(groupedAssets, options.assetsSpace ?? Number.POSITIVE_INFINITY);
             object.assets = limited.children;
             object.filteredAssets = limited.filteredChildren;
         },
@@ -805,9 +810,14 @@ const SIMPLE_EXTRACTORS = {
             const { type } = context;
             object.type = module.type;
             object.moduleType = module.moduleType;
-            // TODO: object.layer = module.layer;
+            object.layer = module.layer;
             object.size = module.size;
-            object.sizes = Object.fromEntries(module.sizes.map(({ sourceType, size }) => [sourceType, size]));
+            const sizes = module.sizes.map(({ sourceType, size }) => [
+                sourceType,
+                size
+            ]);
+            sizes.sort((a, b) => -compareIds(a, b));
+            object.sizes = Object.fromEntries(sizes);
             object.built = module.built;
             object.codeGenerated = module.codeGenerated;
             object.buildTimeExecuted = module.buildTimeExecuted;

package/dist/stats/DefaultStatsPresetPlugin.js

@@ -43,7 +43,7 @@ const NAMED_PRESETS = {
         // warningsSpace: Infinity,
         modulesSpace: Number.POSITIVE_INFINITY,
         // chunkModulesSpace: Infinity,
-        // assetsSpace: Infinity,
+        assetsSpace: Number.POSITIVE_INFINITY,
         // reasonsSpace: Infinity,
         children: true
     },
@@ -69,8 +69,8 @@ const NAMED_PRESETS = {
         // exclude: false,
         // errorsSpace: 1000,
         // warningsSpace: 1000,
-        modulesSpace: 1000
-        // assetsSpace: 1000,
+        modulesSpace: 1000,
+        assetsSpace: 1000
         // reasonsSpace: 1000
     },
     minimal: {
@@ -82,7 +82,7 @@ const NAMED_PRESETS = {
         // warningsSpace: 0,
         modulesSpace: 0,
         assets: true,
-        // assetsSpace: 0,
+        assetsSpace: 0,
         errors: true,
         errorsCount: true,
         warnings: true,