@rspack/core 1.0.0-beta.1 → 1.0.0-beta.3

package/dist/sharing/ProvideSharedPlugin.d.ts

@@ -1,33 +1,34 @@
-import { type BuiltinPlugin, BuiltinPluginName } from "@rspack/binding";
+import { type BuiltinPlugin, BuiltinPluginName, type RawProvideOptions } from "@rspack/binding";
 import type { Compiler } from "../Compiler";
 import { RspackBuiltinPlugin } from "../builtin-plugin/base";
-export type ProvideSharedPluginOptions = {
-    provides: Provides;
+export type ProvideSharedPluginOptions<Enhanced extends boolean = false> = {
+    provides: Provides<Enhanced>;
     shareScope?: string;
-    enhanced?: boolean;
+    enhanced?: Enhanced;
 };
-export type Provides = (ProvidesItem | ProvidesObject)[] | ProvidesObject;
+export type Provides<Enhanced extends boolean> = (ProvidesItem | ProvidesObject<Enhanced>)[] | ProvidesObject<Enhanced>;
 export type ProvidesItem = string;
-export type ProvidesObject = {
-    [k: string]: ProvidesConfig | ProvidesItem;
+export type ProvidesObject<Enhanced extends boolean> = {
+    [k: string]: ProvidesConfig<Enhanced> | ProvidesItem;
 };
-export type ProvidesConfig = {
+export type ProvidesConfig<Enhanced extends boolean> = Enhanced extends true ? ProvidesEnhancedConfig : ProvidesV1Config;
+type ProvidesV1Config = {
     eager?: boolean;
     shareKey: string;
     shareScope?: string;
     version?: false | string;
 };
-export declare class ProvideSharedPlugin extends RspackBuiltinPlugin {
+type ProvidesEnhancedConfig = ProvidesV1Config & ProvidesEnhancedExtraConfig;
+type ProvidesEnhancedExtraConfig = {
+    singleton?: boolean;
+    strictVersion?: boolean;
+    requiredVersion?: false | string;
+};
+export declare class ProvideSharedPlugin<Enhanced extends boolean = false> extends RspackBuiltinPlugin {
     name: BuiltinPluginName;
-    _options: {
-        provides: [string, {
-            shareKey: string;
-            version: string | false | undefined;
-            shareScope: string;
-            eager: boolean;
-        }][];
-        enhanced: boolean;
-    };
-    constructor(options: ProvideSharedPluginOptions);
+    _provides: [string, Omit<RawProvideOptions, "key">][];
+    _enhanced?: Enhanced;
+    constructor(options: ProvideSharedPluginOptions<Enhanced>);
     raw(compiler: Compiler): BuiltinPlugin;
 }
+export {};

package/dist/sharing/ProvideSharedPlugin.js

@@ -9,29 +9,38 @@ class ProvideSharedPlugin extends base_1.RspackBuiltinPlugin {
     constructor(options) {
         super();
         this.name = binding_1.BuiltinPluginName.ProvideSharedPlugin;
-        this._options = {
-            provides: (0, options_1.parseOptions)(options.provides, item => {
-                if (Array.isArray(item))
-                    throw new Error("Unexpected array of provides");
-                const result = {
-                    shareKey: item,
-                    version: undefined,
-                    shareScope: options.shareScope || "default",
-                    eager: false
-                };
-                return result;
-            }, item => ({
+        this._provides = (0, options_1.parseOptions)(options.provides, item => {
+            if (Array.isArray(item))
+                throw new Error("Unexpected array of provides");
+            return {
+                shareKey: item,
+                version: undefined,
+                shareScope: options.shareScope || "default",
+                eager: false
+            };
+        }, item => {
+            const raw = {
                 shareKey: item.shareKey,
                 version: item.version,
                 shareScope: item.shareScope || options.shareScope || "default",
                 eager: !!item.eager
-            })),
-            enhanced: options.enhanced ?? false
-        };
+            };
+            if (options.enhanced) {
+                const enhancedItem = item;
+                return {
+                    ...raw,
+                    singleton: enhancedItem.singleton,
+                    requiredVersion: enhancedItem.requiredVersion,
+                    strictVersion: enhancedItem.strictVersion
+                };
+            }
+            return raw;
+        });
+        this._enhanced = options.enhanced;
     }
     raw(compiler) {
-        new ShareRuntimePlugin_1.ShareRuntimePlugin(this._options.enhanced).apply(compiler);
-        const rawOptions = this._options.provides.map(([key, v]) => ({
+        new ShareRuntimePlugin_1.ShareRuntimePlugin(this._enhanced ?? false).apply(compiler);
+        const rawOptions = this._provides.map(([key, v]) => ({
             key,
             ...v
         }));

package/dist/sharing/SharePlugin.d.ts

@@ -40,6 +40,9 @@ export declare class SharePlugin {
             shareScope: string | undefined;
             version: string | false | undefined;
             eager: boolean | undefined;
+            singleton: boolean | undefined;
+            requiredVersion: string | false | undefined;
+            strictVersion: boolean | undefined;
         };
     }[];
     _enhanced: boolean;

package/dist/sharing/SharePlugin.js

@@ -39,7 +39,10 @@ class SharePlugin {
                 shareKey: options.shareKey || key,
                 shareScope: options.shareScope,
                 version: options.version,
-                eager: options.eager
+                eager: options.eager,
+                singleton: options.singleton,
+                requiredVersion: options.requiredVersion,
+                strictVersion: options.strictVersion
             }
         }));
         this._shareScope = options.shareScope;

package/dist/stats/DefaultStatsFactoryPlugin.js

@@ -120,7 +120,7 @@ const ASSETS_GROUPERS = {
                                 ? `${path.join("/")}/*${extension}`
                                 : `*${extension}`);
                         while (path.length > 0) {
-                            keys.push(path.join("/") + "/");
+                            keys.push(`${path.join("/")}/`);
                             path.pop();
                         }
                     }
@@ -146,7 +146,7 @@ const ASSETS_GROUPERS = {
         const groupByAssetInfoFlag = (name) => {
             groupConfigs.push({
                 getKeys: asset => {
-                    return asset.info && asset.info[name] ? ["1"] : undefined;
+                    return asset.info?.[name] ? ["1"] : undefined;
                 },
                 // @ts-expect-error
                 createGroup: (key, children) => {
@@ -256,12 +256,13 @@ const MODULES_GROUPERS = (type) => ({
         if (groupModulesByType || !options.runtimeModules) {
             groupConfigs.push({
                 getKeys: (module) => {
-                    if (!module.moduleType)
+                    const moduleType = module.moduleType;
+                    if (!moduleType)
                         return;
                     if (groupModulesByType) {
-                        return [module.moduleType.split("/", 1)[0]];
+                        return [moduleType.split("/", 1)[0]];
                     }
-                    if (module.moduleType === "runtime") {
+                    if (moduleType === "runtime") {
                         return ["runtime"];
                     }
                 },
@@ -305,7 +306,7 @@ const MODULES_GROUPERS = (type) => ({
                                 ? `${path.join("/")}/*${extension}`
                                 : `*${extension}`);
                         while (path.length > 0) {
-                            keys.push(path.join("/") + "/");
+                            keys.push(`${path.join("/")}/`);
                             path.pop();
                         }
                     }
@@ -397,7 +398,7 @@ const RESULT_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));
+        comparators.push((0, comparators_1.compareSelect)((m) => m.commonAttributes.depth, comparators_1.compareNumbers), (0, comparators_1.compareSelect)((m) => m.commonAttributes.preOrderIndex, comparators_1.compareNumbers), (0, comparators_1.compareSelect)((m) => m.commonAttributes.moduleDescriptor?.identifier, compareIds));
     }
 };
 const SORTERS = {
@@ -426,16 +427,33 @@ const SORTERS = {
 const EXTRACT_ERROR = {
     _: (object, error) => {
         object.message = error.message;
-        object.chunkName = error.chunkName;
-        object.chunkEntry = error.chunkEntry;
-        object.chunkInitial = error.chunkInitial;
-        object.file = error.file;
-        object.moduleIdentifier = error.moduleIdentifier;
-        object.moduleName = error.moduleName;
+        if (error.chunkName) {
+            object.chunkName = error.chunkName;
+        }
+        if (error.chunkEntry) {
+            object.chunkEntry = error.chunkEntry;
+        }
+        if (error.chunkInitial) {
+            object.chunkInitial = error.chunkInitial;
+        }
+        if (error.file) {
+            object.file = error.file;
+        }
+        if (error.moduleDescriptor) {
+            object.moduleIdentifier = error.moduleDescriptor.identifier;
+            object.moduleName = error.moduleDescriptor.name;
+        }
+        if ("loc" in error) {
+            object.loc = error.loc;
+        }
     },
     ids: (object, error) => {
-        object.chunkId = error.chunkId;
-        object.moduleId = error.moduleId;
+        if (error.chunkId) {
+            object.chunkId = error.chunkId;
+        }
+        if (error.moduleDescriptor) {
+            object.moduleId = error.moduleDescriptor.id;
+        }
     },
     moduleTrace: (object, error, context, _, factory) => {
         const { type } = context;
@@ -451,17 +469,18 @@ const EXTRACT_ERROR = {
 const SIMPLE_EXTRACTORS = {
     compilation: {
         _: (object, compilation, context, options) => {
+            const statsCompilation = context.getStatsCompilation(compilation);
             if (!context.makePathsRelative) {
                 context.makePathsRelative = identifier_1.makePathsRelative.bindContextCache(compilation.compiler.context, compilation.compiler.root);
             }
             if (!context.cachedGetErrors) {
                 context.cachedGetErrors = _compilation => {
-                    return context.getInner(compilation).getErrors();
+                    return statsCompilation.errors;
                 };
             }
             if (!context.cachedGetWarnings) {
                 context.cachedGetWarnings = _compilation => {
-                    const warnings = context.getInner(compilation).getWarnings();
+                    const warnings = statsCompilation.warnings;
                     return compilation.hooks.processWarnings.call(warnings);
                 };
             }
@@ -605,7 +624,8 @@ const SIMPLE_EXTRACTORS = {
             }
         },
         hash: (object, compilation, context) => {
-            object.hash = context.getInner(compilation).getHash() || undefined;
+            const statsCompilation = context.getStatsCompilation(compilation);
+            object.hash = statsCompilation.hash;
         },
         version: object => {
             const { version, webpackVersion } = require("../../package.json");
@@ -628,9 +648,10 @@ const SIMPLE_EXTRACTORS = {
             object.outputPath = compilation.outputOptions.path;
         },
         assets: (object, compilation, context, options, factory) => {
-            const { assets: compilationAssets, assetsByChunkName } = context
-                .getInner(compilation)
-                .getAssets();
+            const { type, getStatsCompilation } = context;
+            const statsCompilation = getStatsCompilation(compilation);
+            const compilationAssets = statsCompilation.assets;
+            const assetsByChunkName = statsCompilation.assetsByChunkName;
             const assetMap = new Map();
             const assets = new Set();
             for (const asset of compilationAssets) {
@@ -665,7 +686,7 @@ const SIMPLE_EXTRACTORS = {
                 acc[cur.name] = cur.files;
                 return acc;
             }, {});
-            const groupedAssets = factory.create(`${context.type}.assets`, Array.from(assets), {
+            const groupedAssets = factory.create(`${type}.assets`, Array.from(assets), {
                 ...context
                 // compilationFileToChunks
                 // compilationAuxiliaryFileToChunks
@@ -675,28 +696,24 @@ const SIMPLE_EXTRACTORS = {
             object.filteredAssets = limited.filteredChildren;
         },
         chunks: (object, compilation, context, options, factory) => {
-            const { type } = context;
-            const chunks = context
-                .getInner(compilation)
-                .getChunks(options.chunkModules, options.chunkRelations, options.reasons, options.moduleAssets, options.nestedModules, options.source, options.usedExports, options.providedExports);
+            const { type, getStatsCompilation } = context;
+            const statsCompilation = getStatsCompilation(compilation);
+            const chunks = statsCompilation.chunks;
             object.chunks = factory.create(`${type}.chunks`, chunks, context);
         },
         modules: (object, compilation, context, options, factory) => {
-            const { type } = context;
-            const array = context
-                .getInner(compilation)
-                .getModules(options.reasons, options.moduleAssets, options.nestedModules, options.source, options.usedExports, options.providedExports);
+            const { type, getStatsCompilation } = context;
+            const statsCompilation = getStatsCompilation(compilation);
+            const array = statsCompilation.modules;
             const groupedModules = factory.create(`${type}.modules`, array, context);
             const limited = (0, statsFactoryUtils_1.spaceLimited)(groupedModules, options.modulesSpace);
             object.modules = limited.children;
             object.filteredModules = limited.filteredChildren;
         },
         entrypoints: (object, compilation, context, { entrypoints, chunkGroups, chunkGroupAuxiliary, chunkGroupChildren }, factory) => {
-            const { type } = context;
-            const array = context
-                .getInner(compilation)
-                .getEntrypoints(chunkGroupAuxiliary, chunkGroupChildren)
-                .map(entrypoint => ({
+            const { type, getStatsCompilation } = context;
+            const statsCompilation = getStatsCompilation(compilation);
+            const array = statsCompilation.entrypoints.map(entrypoint => ({
                 name: entrypoint.name,
                 chunkGroup: entrypoint
             }));
@@ -722,26 +739,65 @@ const SIMPLE_EXTRACTORS = {
             object.entrypoints = factory.create(`${type}.entrypoints`, array, context);
         },
         chunkGroups: (object, compilation, context, { chunkGroupAuxiliary, chunkGroupChildren }, factory) => {
-            const { type } = context;
-            const namedChunkGroups = context
-                .getInner(compilation)
-                .getNamedChunkGroups(chunkGroupAuxiliary, chunkGroupChildren)
-                .map(cg => ({
+            const { type, getStatsCompilation } = context;
+            const statsCompilation = getStatsCompilation(compilation);
+            const namedChunkGroups = statsCompilation.namedChunkGroups.map(cg => ({
                 name: cg.name,
                 chunkGroup: cg
             }));
             object.namedChunkGroups = factory.create(`${type}.namedChunkGroups`, namedChunkGroups, context);
         },
-        errors: (object, compilation, context, _options, _factory) => {
-            const { cachedGetErrors } = context;
-            object.errors = cachedGetErrors(compilation);
+        errors: (object, compilation, context, options, factory) => {
+            const { type, cachedGetErrors } = context;
+            // const rawErrors = cachedGetErrors!(compilation);
+            const factorizedErrors = factory.create(`${type}.errors`, cachedGetErrors(compilation), context);
+            // let filtered = 0;
+            // if (options.errorDetails === "auto" && rawErrors.length >= 3) {
+            // 	filtered = rawErrors
+            // 		.map(e => typeof e !== "string" && e.details)
+            // 		.filter(Boolean).length;
+            // }
+            // if (
+            // 	options.errorDetails === true ||
+            // 	!Number.isFinite(options.errorsSpace)
+            // ) {
+            // 	object.errors = factorizedErrors;
+            // 	if (filtered) object.filteredErrorDetailsCount = filtered;
+            // 	return;
+            // }
+            // const [errors, filteredBySpace] = errorsSpaceLimit(
+            // 	factorizedErrors,
+            // 	options.errorsSpace
+            // );
+            // object.filteredErrorDetailsCount = filtered + filteredBySpace;
+            object.errors = factorizedErrors;
         },
         errorsCount: (object, compilation, { cachedGetErrors }) => {
             object.errorsCount = (0, statsFactoryUtils_1.countWithChildren)(compilation, c => cachedGetErrors(c));
         },
-        warnings: (object, compilation, context, _options, _factory) => {
-            const { cachedGetWarnings } = context;
-            object.warnings = cachedGetWarnings(compilation);
+        warnings: (object, compilation, context, options, factory) => {
+            const { type, cachedGetWarnings } = context;
+            const rawWarnings = factory.create(`${type}.warnings`, cachedGetWarnings(compilation), context);
+            // let filtered = 0;
+            // if (options.errorDetails === "auto") {
+            // 	filtered = cachedGetWarnings!(compilation)
+            // 		.map(e => typeof e !== "string" && e.details)
+            // 		.filter(Boolean).length;
+            // }
+            // if (
+            // 	options.errorDetails === true ||
+            // 	!Number.isFinite(options.warningsSpace)
+            // ) {
+            // 	object.warnings = rawWarnings;
+            // 	if (filtered) object.filteredWarningDetailsCount = filtered;
+            // 	return;
+            // }
+            // const [warnings, filteredBySpace] = errorsSpaceLimit(
+            // 	rawWarnings,
+            // 	options.warningsSpace
+            // );
+            // object.filteredWarningDetailsCount = filtered + filteredBySpace;
+            object.warnings = rawWarnings;
         },
         warningsCount: (object, compilation, context) => {
             const { cachedGetWarnings } = context;
@@ -808,21 +864,24 @@ const SIMPLE_EXTRACTORS = {
     module: {
         _: (object, module, context, options, factory) => {
             const { type } = context;
-            object.type = module.type;
-            object.moduleType = module.moduleType;
-            object.layer = module.layer;
-            object.size = module.size;
-            const sizes = module.sizes.map(({ sourceType, size }) => [
+            const { commonAttributes } = module;
+            object.type = commonAttributes.type;
+            object.moduleType = commonAttributes.moduleType;
+            object.layer = commonAttributes.layer;
+            object.size = commonAttributes.size;
+            const sizes = commonAttributes.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;
-            object.cached = module.cached;
-            if (module.built || module.codeGenerated || options.cachedModules) {
+            object.built = commonAttributes.built;
+            object.codeGenerated = commonAttributes.codeGenerated;
+            object.buildTimeExecuted = commonAttributes.buildTimeExecuted;
+            object.cached = commonAttributes.cached;
+            if (commonAttributes.built ||
+                commonAttributes.codeGenerated ||
+                options.cachedModules) {
                 Object.assign(object, factory.create(`${type}$visible`, module, context));
             }
         }
@@ -830,43 +889,52 @@ const SIMPLE_EXTRACTORS = {
     module$visible: {
         _: (object, module, context, options, factory) => {
             const { type } = context;
-            object.identifier = module.identifier;
-            object.name = module.name;
-            object.nameForCondition = module.nameForCondition;
-            object.index = module.preOrderIndex;
-            object.preOrderIndex = module.preOrderIndex;
-            object.index2 = module.postOrderIndex;
-            object.postOrderIndex = module.postOrderIndex;
-            object.cacheable = module.cacheable;
-            object.optional = module.optional;
-            object.orphan = module.orphan;
+            const { commonAttributes } = module;
+            if (commonAttributes.moduleDescriptor) {
+                object.identifier = commonAttributes.moduleDescriptor.identifier;
+                object.name = commonAttributes.moduleDescriptor.name;
+            }
+            object.nameForCondition = commonAttributes.nameForCondition;
+            object.index = commonAttributes.preOrderIndex;
+            object.preOrderIndex = commonAttributes.preOrderIndex;
+            object.index2 = commonAttributes.postOrderIndex;
+            object.postOrderIndex = commonAttributes.postOrderIndex;
+            object.cacheable = commonAttributes.cacheable;
+            object.optional = commonAttributes.optional;
+            object.orphan = commonAttributes.orphan;
             object.dependent = module.dependent;
-            object.issuer = module.issuer;
-            object.issuerName = module.issuerName;
-            object.issuerPath = factory.create(`${type.slice(0, -8)}.issuerPath`, module.issuerPath, context);
-            object.failed = module.failed;
-            object.errors = module.errors;
-            object.warnings = module.warnings;
-            const profile = module.profile;
+            object.issuer = module.issuerDescriptor?.identifier;
+            object.issuerName = module.issuerDescriptor?.name;
+            object.issuerPath =
+                module.issuerDescriptor &&
+                    factory.create(`${type.slice(0, -8)}.issuerPath`, module.issuerPath, context);
+            object.failed = commonAttributes.failed;
+            object.errors = commonAttributes.errors;
+            object.warnings = commonAttributes.warnings;
+            const profile = commonAttributes.profile;
             if (profile) {
                 object.profile = factory.create(`${type}.profile`, profile, context);
             }
         },
         ids: (object, module) => {
-            object.id = module.id;
-            object.issuerId = module.issuerId;
-            object.chunks = module.chunks;
+            const { commonAttributes } = module;
+            if (commonAttributes.moduleDescriptor) {
+                object.id = commonAttributes.moduleDescriptor.id;
+            }
+            object.issuerId = module.issuerDescriptor?.id;
+            object.chunks = commonAttributes.chunks;
         },
         moduleAssets: (object, module) => {
-            object.assets = module.assets;
+            object.assets = module.commonAttributes.assets;
         },
         reasons: (object, module, context, options, factory) => {
             const { type } = context;
-            object.reasons = factory.create(`${type.slice(0, -8)}.reasons`, module.reasons, context);
+            object.reasons = factory.create(`${type.slice(0, -8)}.reasons`, module.commonAttributes.reasons, context);
             // object.filteredReasons
         },
         source: (object, module) => {
-            object.source = module.source;
+            const { commonAttributes } = module;
+            object.source = commonAttributes.source;
         },
         usedExports: (object, module) => {
             if (typeof module.usedExports === "string") {
@@ -885,18 +953,20 @@ const SIMPLE_EXTRACTORS = {
             }
         },
         providedExports: (object, module) => {
-            if (Array.isArray(module.providedExports)) {
-                object.providedExports = module.providedExports;
+            const { commonAttributes } = module;
+            if (Array.isArray(commonAttributes.providedExports)) {
+                object.providedExports = commonAttributes.providedExports;
             }
             else {
                 object.providedExports = null;
             }
         },
         optimizationBailout: (object, module) => {
-            object.optimizationBailout = module.optimizationBailout || null;
+            object.optimizationBailout =
+                module.commonAttributes.optimizationBailout || null;
         },
         depth: (object, module) => {
-            object.depth = module.depth;
+            object.depth = module.commonAttributes.depth;
         },
         nestedModules: (object, module, context, options, factory) => {
             const { type } = context;
@@ -924,22 +994,28 @@ const SIMPLE_EXTRACTORS = {
     },
     moduleIssuer: {
         _: (object, module, context, options, factory) => {
-            object.identifier = module.identifier;
-            object.name = module.name;
+            if (module.moduleDescriptor) {
+                object.identifier = module.moduleDescriptor.identifier;
+                object.name = module.moduleDescriptor.name;
+            }
         },
         ids: (object, module) => {
-            object.id = module.id;
+            object.id = module.moduleDescriptor.id;
         }
     },
     moduleReason: {
         _: (object, reason) => {
-            object.moduleIdentifier = reason.moduleIdentifier;
-            object.moduleName = reason.moduleName;
+            if (reason.moduleDescriptor) {
+                object.moduleIdentifier = reason.moduleDescriptor.identifier;
+                object.moduleName = reason.moduleDescriptor.name;
+            }
             object.type = reason.type;
             object.userRequest = reason.userRequest;
         },
         ids: (object, reason) => {
-            object.moduleId = reason.moduleId;
+            object.moduleId = reason.moduleDescriptor
+                ? reason.moduleDescriptor.id
+                : null;
         }
     },
     chunk: {
@@ -972,7 +1048,18 @@ const SIMPLE_EXTRACTORS = {
             object.modules = factory.create(`${type}.modules`, chunk.modules, context);
         },
         chunkOrigins: (object, chunk, context, options, factory) => {
-            object.origins = chunk.origins;
+            object.origins = chunk.origins.map(origin => {
+                const { moduleDescriptor, loc, request } = origin;
+                const statsChunkOrigin = {
+                    module: moduleDescriptor ? moduleDescriptor.identifier : "",
+                    moduleIdentifier: moduleDescriptor ? moduleDescriptor.identifier : "",
+                    moduleName: moduleDescriptor ? moduleDescriptor.name : "",
+                    moduleId: moduleDescriptor ? moduleDescriptor.id : undefined,
+                    loc,
+                    request
+                };
+                return statsChunkOrigin;
+            });
         }
     },
     // chunkOrigin
@@ -980,14 +1067,18 @@ const SIMPLE_EXTRACTORS = {
     warning: EXTRACT_ERROR,
     moduleTraceItem: {
         _: (object, { origin, module }, context, { requestShortener }, factory) => {
-            object.originIdentifier = origin.identifier;
-            object.originName = origin.name;
-            object.moduleIdentifier = module.identifier;
-            object.moduleName = module.name;
+            if (origin.moduleDescriptor) {
+                object.originIdentifier = origin.moduleDescriptor.identifier;
+                object.originName = origin.moduleDescriptor.name;
+            }
+            if (module.moduleDescriptor) {
+                object.moduleIdentifier = module.moduleDescriptor.identifier;
+                object.moduleName = module.moduleDescriptor.name;
+            }
         },
         ids: (object, { origin, module }) => {
-            object.originId = origin.id;
-            object.moduleId = module.id;
+            object.originId = origin.moduleDescriptor.id;
+            object.moduleId = module.moduleDescriptor.id;
         }
     }
     // moduleTraceDependency

package/dist/stats/DefaultStatsPresetPlugin.js

@@ -194,8 +194,7 @@ const DEFAULTS = {
         : forToString
             ? all === true
             : all !== false,
-    // cachedModules: ({ all, cached }, { forToString }) =>
-    // 	cached !== undefined ? cached : forToString ? all === true : all !== false,
+    cachedModules: ({ all, cached }, { forToString }) => cached !== undefined ? cached : forToString ? all === true : all !== false,
     moduleAssets: OFF_FOR_TO_STRING,
     depth: OFF_FOR_TO_STRING,
     // cachedAssets: OFF_FOR_TO_STRING,
@@ -272,9 +271,7 @@ const NORMALIZER = {
         });
     },
     logging: (value) => {
-        if (value === true)
-            value = "log";
-        return value;
+        return value === true ? "log" : value;
     },
     loggingDebug: (value) => {
         const array = !Array.isArray(value) ? (value ? [value] : []) : value;