@rspack/core 0.6.5-canary-6d6fcd3-20240514084813 → 0.6.5-canary-2456d69-20240515093621

package/dist/util/fs.js

@@ -1,2 +1,124 @@
 "use strict";
+/**
+ * The following code is modified based on
+ * https://github.com/webpack/webpack/blob/4b4ca3b/lib/util/fs.js
+ *
+ * MIT Licensed
+ * Author Tobias Koppers @sokra
+ * Copyright (c) JS Foundation and other contributors
+ * https://github.com/webpack/webpack/blob/main/LICENSE
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.mkdirp = exports.rmrf = void 0;
+const assert_1 = __importDefault(require("assert"));
+const path_1 = __importDefault(require("path"));
+function rmrf(fs, p, callback) {
+    fs.stat(p, (err, stats) => {
+        if (err) {
+            if (err.code === "ENOENT") {
+                return callback();
+            }
+            return callback(err);
+        }
+        if (stats.isDirectory()) {
+            fs.readdir(p, (err, files) => {
+                if (err) {
+                    return callback(err);
+                }
+                let count = files.length;
+                if (count === 0) {
+                    fs.rmdir(p, callback);
+                }
+                else {
+                    files.forEach(file => {
+                        (0, assert_1.default)(typeof file === "string");
+                        const fullPath = join(fs, p, file);
+                        rmrf(fs, fullPath, err => {
+                            if (err) {
+                                return callback(err);
+                            }
+                            count--;
+                            if (count === 0) {
+                                fs.rmdir(p, callback);
+                            }
+                        });
+                    });
+                }
+            });
+        }
+        else {
+            fs.unlink(p, callback);
+        }
+    });
+}
+exports.rmrf = rmrf;
+const join = (fs, rootPath, filename) => {
+    if (fs && fs.join) {
+        return fs.join(rootPath, filename);
+    }
+    else if (path_1.default.posix.isAbsolute(rootPath)) {
+        return path_1.default.posix.join(rootPath, filename);
+    }
+    else if (path_1.default.win32.isAbsolute(rootPath)) {
+        return path_1.default.win32.join(rootPath, filename);
+    }
+    else {
+        throw new Error(`${rootPath} is neither a posix nor a windows path, and there is no 'join' method defined in the file system`);
+    }
+};
+const dirname = (fs, absPath) => {
+    if (fs && fs.dirname) {
+        return fs.dirname(absPath);
+    }
+    else if (path_1.default.posix.isAbsolute(absPath)) {
+        return path_1.default.posix.dirname(absPath);
+    }
+    else if (path_1.default.win32.isAbsolute(absPath)) {
+        return path_1.default.win32.dirname(absPath);
+    }
+    else {
+        throw new Error(`${absPath} is neither a posix nor a windows path, and there is no 'dirname' method defined in the file system`);
+    }
+};
+const mkdirp = (fs, p, callback) => {
+    fs.mkdir(p, err => {
+        if (err) {
+            if (err.code === "ENOENT") {
+                const dir = dirname(fs, p);
+                if (dir === p) {
+                    callback(err);
+                    return;
+                }
+                (0, exports.mkdirp)(fs, dir, err => {
+                    if (err) {
+                        callback(err);
+                        return;
+                    }
+                    fs.mkdir(p, err => {
+                        if (err) {
+                            if (err.code === "EEXIST") {
+                                callback();
+                                return;
+                            }
+                            callback(err);
+                            return;
+                        }
+                        callback();
+                    });
+                });
+                return;
+            }
+            else if (err.code === "EEXIST") {
+                callback();
+                return;
+            }
+            callback(err);
+            return;
+        }
+        callback();
+    });
+};
+exports.mkdirp = mkdirp;

package/dist/util/index.d.ts

@@ -11,7 +11,7 @@ export declare const toObject: (input: string | Buffer | object) => object;
 export declare function serializeObject(map: string | object | undefined | null): Buffer | undefined;
 export declare function isPromiseLike(value: unknown): value is Promise<any>;
 export declare function isJsStatsError(err: any): err is JsStatsError;
-export declare function concatErrorMsgAndStack(err: Error | JsStatsError): string;
+export declare function concatErrorMsgAndStack(err: Error | JsStatsError | string): string;
 export declare function indent(str: string, prefix: string): string;
 export declare function stringifyLoaderObject(o: LoaderObject): string;
 export declare function asArray<T>(item: T[]): T[];
@@ -19,3 +19,4 @@ export declare function asArray<T>(item: readonly T[]): readonly T[];
 export declare function asArray<T>(item: T): T[];
 export declare function toJsAssetInfo(info?: AssetInfo): JsAssetInfo;
 export declare const deprecatedWarn: (content: string, enable?: boolean) => void;
+export declare const unsupported: (name: string, issue?: string) => never;

package/dist/util/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deprecatedWarn = exports.toJsAssetInfo = exports.asArray = exports.stringifyLoaderObject = exports.indent = exports.concatErrorMsgAndStack = exports.isJsStatsError = exports.isPromiseLike = exports.serializeObject = exports.toObject = exports.toBuffer = exports.isNil = exports.mapValues = void 0;
+exports.unsupported = exports.deprecatedWarn = exports.toJsAssetInfo = exports.asArray = exports.stringifyLoaderObject = exports.indent = exports.concatErrorMsgAndStack = exports.isJsStatsError = exports.isPromiseLike = exports.serializeObject = exports.toObject = exports.toBuffer = exports.isNil = exports.mapValues = void 0;
 function mapValues(record, fn) {
     return Object.fromEntries(Object.entries(record).map(([key, value]) => [key, fn(value)]));
 }
@@ -60,16 +60,13 @@ function isJsStatsError(err) {
 }
 exports.isJsStatsError = isJsStatsError;
 function concatErrorMsgAndStack(err) {
-    // deduplicate the error if message is already shown in the stack
-    //@ts-ignore
-    const stackStartPrefix = err.name ? `${err.name}: ` : "Error: ";
-    return isJsStatsError(err)
-        ? err.formatted
-        : err.stack
-            ? err.stack.startsWith(`${stackStartPrefix}${err.message}`)
-                ? `${err.stack}`
-                : `${err.message}\n${err.stack}`
-            : `${err.message}`;
+    if (typeof err === "string") {
+        return err;
+    }
+    if ("stack" in err) {
+        return err.stack || err.message;
+    }
+    return err.message;
 }
 exports.concatErrorMsgAndStack = concatErrorMsgAndStack;
 function indent(str, prefix) {
@@ -116,3 +113,11 @@ const deprecatedWarn = (content, enable = getDeprecationStatus()) => {
     }
 };
 exports.deprecatedWarn = deprecatedWarn;
+const unsupported = (name, issue) => {
+    let s = `${name} is not supported by rspack.`;
+    if (issue) {
+        s += ` Please refer to issue ${issue} for more information.`;
+    }
+    throw new Error(s);
+};
+exports.unsupported = unsupported;

package/dist/util/source.d.ts

@@ -0,0 +1,18 @@
+/// <reference types="node" />
+import type { JsCompatSource } from "@rspack/binding";
+import { Source } from "webpack-sources";
+declare class JsSource extends Source {
+    static __from_binding(source: JsCompatSource): Source;
+    static __to_binding(source: Source): {
+        source: Buffer;
+        isRaw: boolean;
+        isBuffer: boolean;
+        map?: undefined;
+    } | {
+        source: Buffer;
+        map: Buffer;
+        isRaw: boolean;
+        isBuffer: boolean;
+    };
+}
+export { JsSource };

package/dist/util/source.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsSource = void 0;
+const webpack_sources_1 = require("webpack-sources");
+const index_1 = require("./index");
+class JsSource extends webpack_sources_1.Source {
+    static __from_binding(source) {
+        if (source.isRaw) {
+            return new webpack_sources_1.RawSource(
+            // @ts-expect-error: webpack-sources can accept buffer as source, see: https://github.com/webpack/webpack-sources/blob/9f98066311d53a153fdc7c633422a1d086528027/lib/RawSource.js#L12
+            source.isBuffer ? source.source : source.source.toString("utf-8"));
+        }
+        if (!source.map) {
+            return new webpack_sources_1.RawSource(source.source.toString("utf-8"));
+        }
+        return new webpack_sources_1.CompatSource({
+            source() {
+                return source.source.toString("utf-8");
+            },
+            buffer() {
+                return source.source;
+            },
+            map(_) {
+                if (source.map) {
+                    return JSON.parse(source.map.toString("utf-8"));
+                }
+                return null;
+            }
+        });
+    }
+    static __to_binding(source) {
+        var _a, _b, _c;
+        const sourceSource = source.source();
+        const isBuffer = Buffer.isBuffer(sourceSource);
+        if (source instanceof webpack_sources_1.RawSource) {
+            return {
+                source: source.buffer(),
+                isRaw: true,
+                isBuffer
+            };
+        }
+        const buffer = (_b = (_a = source.buffer) === null || _a === void 0 ? void 0 : _a.call(source)) !== null && _b !== void 0 ? _b : (isBuffer
+            ? sourceSource
+            : sourceSource instanceof ArrayBuffer
+                ? arrayBufferToBuffer(sourceSource)
+                : Buffer.from(sourceSource));
+        const map = JSON.stringify((_c = source.map) === null || _c === void 0 ? void 0 : _c.call(source, {
+            columns: true
+        }));
+        return {
+            source: buffer,
+            map: (0, index_1.isNil)(map) ? map : Buffer.from(map),
+            isRaw: false,
+            isBuffer
+        };
+    }
+}
+exports.JsSource = JsSource;
+function arrayBufferToBuffer(ab) {
+    const buf = Buffer.alloc(ab.byteLength);
+    const view = new Uint8Array(ab);
+    for (let i = 0; i < buf.length; ++i) {
+        buf[i] = view[i];
+    }
+    return buf;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/core",
-  "version": "0.6.5-canary-6d6fcd3-20240514084813",
+  "version": "0.6.5-canary-2456d69-20240515093621",
   "webpackVersion": "5.75.0",
   "license": "MIT",
   "description": "A Fast Rust-based Web Bundler",
@@ -71,8 +71,8 @@
     "watchpack": "^2.4.0",
     "zod": "^3.21.4",
     "zod-validation-error": "1.3.1",
-    "@rspack/core": "0.6.5-canary-6d6fcd3-20240514084813",
-    "@rspack/plugin-minify": "^0.6.5-canary-6d6fcd3-20240514084813"
+    "@rspack/core": "0.6.5-canary-2456d69-20240515093621",
+    "@rspack/plugin-minify": "^0.6.5-canary-2456d69-20240515093621"
   },
   "dependencies": {
     "@module-federation/runtime-tools": "0.1.6",
@@ -80,7 +80,7 @@
     "enhanced-resolve": "5.12.0",
     "tapable": "2.2.1",
     "webpack-sources": "3.2.3",
-    "@rspack/binding": "0.6.5-canary-6d6fcd3-20240514084813"
+    "@rspack/binding": "0.6.5-canary-2456d69-20240515093621"
   },
   "peerDependencies": {
     "@swc/helpers": ">=0.5.1"

package/dist/util/createSource.d.ts

@@ -1,5 +0,0 @@
-import type { JsCompatSource } from "@rspack/binding";
-import { Source } from "webpack-sources";
-declare function createSourceFromRaw(source: JsCompatSource): Source;
-declare function createRawFromSource(source: Source): JsCompatSource;
-export { createSourceFromRaw, createRawFromSource };

package/dist/util/createSource.js

@@ -1,65 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRawFromSource = exports.createSourceFromRaw = void 0;
-const webpack_sources_1 = require("webpack-sources");
-const index_1 = require("./index");
-function createSourceFromRaw(source) {
-    if (source.isRaw) {
-        return new webpack_sources_1.RawSource(
-        // @ts-expect-error: webpack-sources can accept buffer as source, see: https://github.com/webpack/webpack-sources/blob/9f98066311d53a153fdc7c633422a1d086528027/lib/RawSource.js#L12
-        source.isBuffer ? source.source : source.source.toString("utf-8"));
-    }
-    if (!source.map) {
-        return new webpack_sources_1.RawSource(source.source.toString("utf-8"));
-    }
-    return new webpack_sources_1.CompatSource({
-        source() {
-            return source.source.toString("utf-8");
-        },
-        buffer() {
-            return source.source;
-        },
-        map(_) {
-            if (source.map) {
-                return JSON.parse(source.map.toString("utf-8"));
-            }
-            return null;
-        }
-    });
-}
-exports.createSourceFromRaw = createSourceFromRaw;
-function createRawFromSource(source) {
-    var _a, _b, _c;
-    const sourceSource = source.source();
-    const isBuffer = Buffer.isBuffer(sourceSource);
-    if (source instanceof webpack_sources_1.RawSource) {
-        return {
-            source: source.buffer(),
-            isRaw: true,
-            isBuffer
-        };
-    }
-    const buffer = (_b = (_a = source.buffer) === null || _a === void 0 ? void 0 : _a.call(source)) !== null && _b !== void 0 ? _b : (isBuffer
-        ? sourceSource
-        : sourceSource instanceof ArrayBuffer
-            ? arrayBufferToBuffer(sourceSource)
-            : Buffer.from(sourceSource));
-    const map = JSON.stringify((_c = source.map) === null || _c === void 0 ? void 0 : _c.call(source, {
-        columns: true
-    }));
-    return {
-        source: buffer,
-        map: (0, index_1.isNil)(map) ? map : Buffer.from(map),
-        isRaw: false,
-        isBuffer
-    };
-}
-exports.createRawFromSource = createRawFromSource;
-function arrayBufferToBuffer(ab) {
-    const buf = Buffer.alloc(ab.byteLength);
-    const view = new Uint8Array(ab);
-    for (let i = 0; i < buf.length; ++i) {
-        buf[i] = view[i];
-    }
-    return buf;
-}