@rspack/core 0.7.5-canary-910259c-20240624004455 → 0.7.5-canary-0d03907-20240624125011

package/dist/config/zod.js

@@ -345,6 +345,7 @@ const reexportExportsPresence = zod_1.z
     .enum(["error", "warn", "auto"])
     .or(zod_1.z.literal(false));
 const strictExportPresence = zod_1.z.boolean();
+const worker = zod_1.z.array(zod_1.z.string()).or(zod_1.z.boolean());
 const javascriptParserOptions = zod_1.z.strictObject({
     dynamicImportMode: dynamicImportMode.optional(),
     dynamicImportPreload: dynamicImportPreload.optional(),
@@ -355,7 +356,8 @@ const javascriptParserOptions = zod_1.z.strictObject({
     exportsPresence: exportsPresence.optional(),
     importExportsPresence: importExportsPresence.optional(),
     reexportExportsPresence: reexportExportsPresence.optional(),
-    strictExportPresence: strictExportPresence.optional()
+    strictExportPresence: strictExportPresence.optional(),
+    worker: worker.optional()
 });
 const parserOptionsByModuleTypeKnown = zod_1.z.strictObject({
     asset: assetParserOptions.optional(),

package/dist/loader-runner/index.js

@@ -32,6 +32,7 @@ const binding_1 = require("@rspack/binding");
 const webpack_sources_1 = require("webpack-sources");
 const Module_1 = require("../Module");
 const NormalModule_1 = require("../NormalModule");
+const RspackError_1 = require("../RspackError");
 const adapterRuleUse_1 = require("../config/adapterRuleUse");
 const util_2 = require("../util");
 const createHash_1 = require("../util/createHash");
@@ -517,14 +518,34 @@ async function runLoaders(compiler, context) {
     };
     loaderContext.rootContext = compiler.context;
     loaderContext.emitError = function emitError(error) {
-        const title = "Module Error";
-        const message = error instanceof Error ? (0, util_2.concatErrorMsgAndStack)(error) : error;
-        compiler._lastCompilation.__internal__pushDiagnostic("error", title, `${message}\n(from: ${(0, util_2.stringifyLoaderObject)(loaderContext.loaders[loaderContext.loaderIndex])})`);
+        if (!(error instanceof Error)) {
+            error = new RspackError_1.NonErrorEmittedError(error);
+        }
+        let hasStack = !!error.stack;
+        error.name = "ModuleError";
+        error.message = `${error.message} (from: ${(0, util_2.stringifyLoaderObject)(loaderContext.loaders[loaderContext.loaderIndex])})`;
+        hasStack && Error.captureStackTrace(error);
+        error = (0, util_2.concatErrorMsgAndStack)(error);
+        error.moduleIdentifier = this._module.identifier();
+        compiler._lastCompilation.__internal__pushDiagnostic({
+            error,
+            severity: binding_1.JsRspackSeverity.Error
+        });
     };
     loaderContext.emitWarning = function emitWarning(warning) {
-        const title = "Module Warning";
-        const message = warning instanceof Error ? (0, util_2.concatErrorMsgAndStack)(warning) : warning;
-        compiler._lastCompilation.__internal__pushDiagnostic("warning", title, `${message}\n(from: ${(0, util_2.stringifyLoaderObject)(loaderContext.loaders[loaderContext.loaderIndex])})`);
+        if (!(warning instanceof Error)) {
+            warning = new RspackError_1.NonErrorEmittedError(warning);
+        }
+        let hasStack = !!warning.stack;
+        warning.name = "ModuleWarning";
+        warning.message = `${warning.message} (from: ${(0, util_2.stringifyLoaderObject)(loaderContext.loaders[loaderContext.loaderIndex])})`;
+        hasStack && Error.captureStackTrace(warning);
+        warning = (0, util_2.concatErrorMsgAndStack)(warning);
+        warning.moduleIdentifier = this._module.identifier();
+        compiler._lastCompilation.__internal__pushDiagnostic({
+            error: warning,
+            severity: binding_1.JsRspackSeverity.Warn
+        });
     };
     loaderContext.emitFile = function emitFile(name, content, sourceMap, assetInfo) {
         let source;

package/dist/stats/DefaultStatsFactoryPlugin.js

@@ -277,13 +277,23 @@ const SORTERS = {
         _: 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,
     // not support module.reasons (missing Module.identifier())
-    // not support chunk.origins (missing compilation.chunkGraph)
+    "chunk.origins": {
+        _: comparators => {
+            comparators.push(
+            // compareSelect(
+            // 	origin =>
+            // 		origin.module ? chunkGraph.getModuleId(origin.module) : undefined,
+            // 	compareIds
+            // ),
+            (0, comparators_1.compareSelect)((origin) => origin.loc, compareIds), (0, comparators_1.compareSelect)((origin) => origin.request, compareIds));
+        }
+    }
 };
 const SIMPLE_EXTRACTORS = {
     compilation: {
@@ -708,6 +718,10 @@ const SIMPLE_EXTRACTORS = {
             object.files = chunk.files;
             object.auxiliaryFiles = chunk.auxiliaryFiles;
             object.childrenByOrder = chunk.childrenByOrder;
+            object.runtime = chunk.runtime;
+            object.sizes = Object.fromEntries(chunk.sizes.map(({ sourceType, size }) => [sourceType, size]));
+            object.reason = chunk.reason;
+            object.rendered = chunk.rendered;
         },
         ids: (object, chunk) => {
             object.id = chunk.id;
@@ -720,6 +734,9 @@ const SIMPLE_EXTRACTORS = {
         chunkModules: (object, chunk, context, options, factory) => {
             const { type } = context;
             object.modules = factory.create(`${type}.modules`, chunk.modules, context);
+        },
+        chunkOrigins: (object, chunk, context, options, factory) => {
+            object.origins = chunk.origins;
         }
     }
 };

package/dist/stats/DefaultStatsPrinterPlugin.js

@@ -357,13 +357,13 @@ const SIMPLE_PRINTERS = {
     // 	chunkEntry ? formatFlag("entry") : undefined,
     // "error.chunkInitial": (chunkInitial, { formatFlag }) =>
     // 	chunkInitial ? formatFlag("initial") : undefined,
-    // "error.file": (file, { bold }) => bold(file),
+    "error.file": (file, { bold }) => bold(file),
     "error.moduleName": (moduleName, { bold }) => {
         return moduleName.includes("!")
             ? `${bold(moduleName.replace(/^(\s|\S)*!/, ""))} (${moduleName})`
             : `${bold(moduleName)}`;
     },
-    // "error.loc": (loc, { green }) => green(loc),
+    "error.loc": (loc, { green }) => green(loc),
     "error.message": (message, { bold, formatError }) => message.includes("\u001b[") ? message : bold(formatError(message)),
     // "error.details": (details, { formatError }) => formatError(details),
     // "error.stack": stack => stack,

package/dist/stats/statsFactoryUtils.d.ts

@@ -3,7 +3,9 @@ import type { Compilation, NormalizedStatsOptions } from "../Compilation";
 import { type Comparator } from "../util/comparators";
 import type { StatsFactory, StatsFactoryContext } from "./StatsFactory";
 export type KnownStatsChunkGroup = binding.JsStatsChunkGroup;
-export type KnownStatsChunk = binding.JsStatsChunk;
+export type KnownStatsChunk = Omit<binding.JsStatsChunk, "sizes"> & {
+    sizes: Record<string, number>;
+};
 export type StatsChunkGroup = binding.JsStatsChunkGroup & Record<string, any>;
 export type KnownStatsAsset = binding.JsStatsAsset;
 export type StatsAsset = KnownStatsAsset & Record<string, any>;
@@ -95,7 +97,7 @@ export type SimpleExtractors = {
     moduleIssuer: ExtractorsByOption<binding.JsStatsModuleIssuer, StatsModuleIssuer>;
     profile: ExtractorsByOption<binding.JsStatsModuleProfile, StatsProfile>;
     moduleReason: ExtractorsByOption<binding.JsStatsModuleReason, StatsModuleReason>;
-    chunk: ExtractorsByOption<StatsChunk, KnownStatsChunk>;
+    chunk: ExtractorsByOption<binding.JsStatsChunk, KnownStatsChunk>;
 };
 export declare const uniqueArray: <T, I>(items: Iterable<T>, selector: (arg: T) => Iterable<I>) => I[];
 export declare const uniqueOrderedArray: <T, I>(items: Iterable<T>, selector: (arg: T) => Iterable<I>, comparator: Comparator) => I[];

package/dist/util/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { JsStatsError } from "@rspack/binding";
+import type { JsRspackError, JsStatsError } from "@rspack/binding";
 import { LoaderObject } from "../loader-runner";
 export declare function mapValues(record: Record<string, string>, fn: (key: string) => string): {
     [k: string]: string;
@@ -10,7 +10,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): string;
+export declare function concatErrorMsgAndStack(err: Error | JsRspackError | string): JsRspackError;
 export declare function indent(str: string, prefix: string): string;
 export declare function stringifyLoaderObject(o: LoaderObject): string;
 export declare function asArray<T>(item: T[]): T[];

package/dist/util/index.js

@@ -61,12 +61,13 @@ function isJsStatsError(err) {
 exports.isJsStatsError = isJsStatsError;
 function concatErrorMsgAndStack(err) {
     if (typeof err === "string") {
-        return err;
+        return new Error(err);
     }
     if ("stack" in err) {
-        return err.stack || err.message;
+        err.message = err.stack || err.message;
+        return err;
     }
-    return err.message;
+    return err;
 }
 exports.concatErrorMsgAndStack = concatErrorMsgAndStack;
 function indent(str, prefix) {

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "@rspack/core",
-  "version": "0.7.5-canary-910259c-20240624004455",
+  "version": "0.7.5-canary-0d03907-20240624125011",
   "webpackVersion": "5.75.0",
   "license": "MIT",
   "description": "The fast Rust-based web bundler with webpack-compatible API",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "publishConfig": {
+    "access": "public",
+    "provenance": true
+  },
   "exports": {
     ".": {
       "default": "./dist/index.js"
@@ -74,15 +78,15 @@
     "watchpack": "^2.4.0",
     "zod": "^3.21.4",
     "zod-validation-error": "1.3.1",
-    "@rspack/core": "0.7.5-canary-910259c-20240624004455",
-    "@rspack/plugin-minify": "^0.7.5-canary-910259c-20240624004455"
+    "@rspack/plugin-minify": "^0.7.5-canary-0d03907-20240624125011",
+    "@rspack/core": "0.7.5-canary-0d03907-20240624125011"
   },
   "dependencies": {
     "@module-federation/runtime-tools": "0.1.6",
     "caniuse-lite": "^1.0.30001616",
     "tapable": "2.2.1",
     "webpack-sources": "3.2.3",
-    "@rspack/binding": "0.7.5-canary-910259c-20240624004455"
+    "@rspack/binding": "0.7.5-canary-0d03907-20240624125011"
   },
   "peerDependencies": {
     "@swc/helpers": ">=0.5.1"

package/dist/builtin-loader/swc/emotion.d.ts

@@ -1,17 +0,0 @@
-type EmotionConfigImportMap = {
-    [packageName: string]: {
-        [exportName: string]: {
-            canonicalImport?: [string, string];
-        };
-    };
-};
-type EmotionConfig = {
-    sourceMap?: boolean;
-    autoLabel?: "never" | "dev-only" | "always";
-    labelFormat?: string;
-    importMap?: EmotionConfigImportMap;
-};
-type EmotionOptions = boolean | EmotionConfig | undefined;
-declare function resolveEmotion(emotion: EmotionOptions, isProduction: boolean): EmotionConfig | undefined;
-export { resolveEmotion };
-export type { EmotionOptions };

package/dist/builtin-loader/swc/emotion.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveEmotion = void 0;
-function resolveEmotion(emotion, isProduction) {
-    if (!emotion) {
-        return undefined;
-    }
-    if (emotion === true) {
-        emotion = {};
-    }
-    const autoLabel = emotion?.autoLabel ?? "dev-only";
-    const emotionConfig = {
-        enabled: true,
-        // @ts-expect-error autoLabel is string for JavaScript interface, however is boolean for Rust interface
-        autoLabel: autoLabel === "dev-only" ? !isProduction : autoLabel === "always",
-        importMap: emotion?.importMap,
-        labelFormat: emotion?.labelFormat ?? "[local]",
-        sourcemap: isProduction ? false : emotion?.sourceMap ?? true
-    };
-    return emotionConfig;
-}
-exports.resolveEmotion = resolveEmotion;

package/dist/builtin-loader/swc/relay.d.ts

@@ -1,5 +0,0 @@
-import type { RawRelayConfig } from "@rspack/binding";
-type RelayOptions = boolean | RawRelayConfig | undefined;
-declare function resolveRelay(relay: RelayOptions, rootDir: string): RawRelayConfig | undefined;
-export { resolveRelay };
-export type { RelayOptions };

package/dist/builtin-loader/swc/relay.js

@@ -1,48 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveRelay = void 0;
-const path_1 = __importDefault(require("path"));
-function getRelayConfigFromProject(rootDir) {
-    for (const configName of [
-        "relay.config.json",
-        "relay.config.js",
-        "package.json"
-    ]) {
-        const configPath = path_1.default.join(rootDir, configName);
-        try {
-            let config = require(configPath);
-            let finalConfig;
-            if (configName === "package.json") {
-                finalConfig = config?.relay;
-            }
-            else {
-                finalConfig = config;
-            }
-            if (finalConfig) {
-                return {
-                    language: finalConfig.language,
-                    artifactDirectory: finalConfig.artifactDirectory
-                };
-            }
-        }
-        catch (_) { }
-    }
-}
-function resolveRelay(relay, rootDir) {
-    if (!relay) {
-        return undefined;
-    }
-    // Search relay config based on
-    if (relay === true) {
-        return (getRelayConfigFromProject(rootDir) || {
-            language: "javascript"
-        });
-    }
-    else {
-        return relay;
-    }
-}
-exports.resolveRelay = resolveRelay;