@rspack/core 0.7.1-canary-1b93a35-20240605065754 → 0.7.1-canary-a7d673e-20240606094751

package/dist/ChunkGraph.js

@@ -9,19 +9,19 @@ class ChunkGraph {
         this.compilation = compilation;
     }
     getChunkModules(chunk) {
-        return (0, binding_1.__chunk_graph_inner_get_chunk_modules)(chunk.__internal_inner_ukey(), this.compilation.__internal_getInner()).map(m => Module_1.Module.__from_binding(m, this.compilation));
+        return (0, binding_1.__chunk_graph_inner_get_chunk_modules)(chunk.__internal_inner_ukey(), this.compilation.__internal_getInner()).map(m => Module_1.Module.__from_binding(m));
     }
     getChunkModulesIterable(chunk) {
-        return new Set((0, binding_1.__chunk_graph_inner_get_chunk_modules)(chunk.__internal_inner_ukey(), this.compilation.__internal_getInner()).map(m => Module_1.Module.__from_binding(m, this.compilation)));
+        return new Set((0, binding_1.__chunk_graph_inner_get_chunk_modules)(chunk.__internal_inner_ukey(), this.compilation.__internal_getInner()).map(m => Module_1.Module.__from_binding(m)));
     }
     getChunkEntryModulesIterable(chunk) {
-        return new Set((0, binding_1.__chunk_graph_inner_get_chunk_entry_modules)(chunk.__internal_inner_ukey(), this.compilation.__internal_getInner()).map(m => Module_1.Module.__from_binding(m, this.compilation)));
+        return new Set((0, binding_1.__chunk_graph_inner_get_chunk_entry_modules)(chunk.__internal_inner_ukey(), this.compilation.__internal_getInner()).map(m => Module_1.Module.__from_binding(m)));
     }
     getChunkEntryDependentChunksIterable(chunk) {
         return new Set((0, binding_1.__chunk_graph_inner_get_chunk_entry_dependent_chunks_iterable)(chunk.__internal_inner_ukey(), this.compilation.__internal_getInner()).map(c => Chunk_1.Chunk.__from_binding(c, this.compilation.__internal_getInner())));
     }
     getChunkModulesIterableBySourceType(chunk, sourceType) {
-        return new Set((0, binding_1.__chunk_graph_inner_get_chunk_modules_iterable_by_source_type)(chunk.__internal_inner_ukey(), sourceType, this.compilation.__internal_getInner()).map(m => Module_1.Module.__from_binding(m, this.compilation)));
+        return new Set((0, binding_1.__chunk_graph_inner_get_chunk_modules_iterable_by_source_type)(chunk.__internal_inner_ukey(), sourceType, this.compilation.__internal_getInner()).map(m => Module_1.Module.__from_binding(m)));
     }
 }
 exports.ChunkGraph = ChunkGraph;

package/dist/Compilation.d.ts

@@ -136,15 +136,6 @@ export declare class Compilation {
      * Note: This is a proxy for webpack internal API, only method `get` is supported now.
      */
     get namedChunks(): Map<string, Readonly<Chunk>>;
-    /**
-     * Note: This is not a webpack public API, maybe removed in future.
-     *
-     * @internal
-     */
-    __internal__getCustomModule(moduleIdentifier: string): {
-        buildInfo: Record<string, unknown>;
-        buildMeta: Record<string, unknown>;
-    };
     getCache(name: string): import("./lib/CacheFacade");
     createStatsOptions(optionsOrPreset: StatsValue | undefined, context?: CreateStatsOptionsContext): StatsOptions;
     createStatsFactory(options: StatsOptions): StatsFactory;

package/dist/Compilation.js

@@ -36,7 +36,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _Compilation_instances, _Compilation_inner, _Compilation_cachedAssets, _Compilation_customModules, _Compilation_createCachedAssets;
+var _Compilation_instances, _Compilation_inner, _Compilation_cachedAssets, _Compilation_createCachedAssets;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Compilation = void 0;
 const tapable = __importStar(require("tapable"));
@@ -67,33 +67,25 @@ class Compilation {
                 return null;
             }
         };
-        /**
-         * Records the dynamically added fields for Module on the JavaScript side, using the Module identifier for association.
-         * These fields are generally used within a plugin, so they do not need to be passed back to the Rust side.
-         */
-        _Compilation_customModules.set(this, void 0);
         this.fileDependencies = (0, fake_1.createFakeCompilationDependencies)(() => __classPrivateFieldGet(this, _Compilation_inner, "f").getFileDependencies(), d => __classPrivateFieldGet(this, _Compilation_inner, "f").addFileDependencies(d));
         this.contextDependencies = (0, fake_1.createFakeCompilationDependencies)(() => __classPrivateFieldGet(this, _Compilation_inner, "f").getContextDependencies(), d => __classPrivateFieldGet(this, _Compilation_inner, "f").addContextDependencies(d));
         this.missingDependencies = (0, fake_1.createFakeCompilationDependencies)(() => __classPrivateFieldGet(this, _Compilation_inner, "f").getMissingDependencies(), d => __classPrivateFieldGet(this, _Compilation_inner, "f").addMissingDependencies(d));
         this.buildDependencies = (0, fake_1.createFakeCompilationDependencies)(() => __classPrivateFieldGet(this, _Compilation_inner, "f").getBuildDependencies(), d => __classPrivateFieldGet(this, _Compilation_inner, "f").addBuildDependencies(d));
-        this._rebuildModuleCaller = (function (compilation) {
-            return new MergeCaller_1.default((args) => {
-                __classPrivateFieldGet(compilation, _Compilation_inner, "f").rebuildModule(args.map(item => item[0]), function (err, modules) {
-                    for (const [id, callback] of args) {
-                        const m = modules.find(item => item.moduleIdentifier === id);
-                        if (m) {
-                            callback(err, Module_1.Module.__from_binding(m, compilation));
-                        }
-                        else {
-                            callback(err || new Error("module no found"), null);
-                        }
+        this._rebuildModuleCaller = new MergeCaller_1.default((args) => {
+            __classPrivateFieldGet(this, _Compilation_inner, "f").rebuildModule(args.map(item => item[0]), function (err, modules) {
+                for (const [id, callback] of args) {
+                    const m = modules.find(item => item.moduleIdentifier === id);
+                    if (m) {
+                        callback(err, Module_1.Module.__from_binding(m));
                     }
-                });
-            }, 10);
-        })(this);
+                    else {
+                        callback(err || new Error("module no found"), null);
+                    }
+                }
+            });
+        }, 10);
         __classPrivateFieldSet(this, _Compilation_inner, inner, "f");
         __classPrivateFieldSet(this, _Compilation_cachedAssets, __classPrivateFieldGet(this, _Compilation_instances, "m", _Compilation_createCachedAssets).call(this), "f");
-        __classPrivateFieldSet(this, _Compilation_customModules, {}, "f");
         const processAssetsHook = new liteTapable.AsyncSeriesHook([
             "assets"
         ]);
@@ -195,7 +187,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
     }
     get modules() {
         return (0, memoize_1.memoizeValue)(() => {
-            return this.__internal__getModules().map(item => Module_1.Module.__from_binding(item, this));
+            return this.__internal__getModules().map(item => Module_1.Module.__from_binding(item));
         });
     }
     // FIXME: Webpack returns a `Set`
@@ -219,21 +211,6 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
             }
         };
     }
-    /**
-     * Note: This is not a webpack public API, maybe removed in future.
-     *
-     * @internal
-     */
-    __internal__getCustomModule(moduleIdentifier) {
-        let module = __classPrivateFieldGet(this, _Compilation_customModules, "f")[moduleIdentifier];
-        if (!module) {
-            module = __classPrivateFieldGet(this, _Compilation_customModules, "f")[moduleIdentifier] = {
-                buildInfo: {},
-                buildMeta: {}
-            };
-        }
-        return module;
-    }
     getCache(name) {
         return this.compiler.getCache(name);
     }
@@ -706,7 +683,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
     seal() { }
     unseal() { }
 }
-_Compilation_inner = new WeakMap(), _Compilation_cachedAssets = new WeakMap(), _Compilation_customModules = new WeakMap(), _Compilation_instances = new WeakSet(), _Compilation_createCachedAssets = function _Compilation_createCachedAssets() {
+_Compilation_inner = new WeakMap(), _Compilation_cachedAssets = new WeakMap(), _Compilation_instances = new WeakSet(), _Compilation_createCachedAssets = function _Compilation_createCachedAssets() {
     return new Proxy({}, {
         get: (_, property) => {
             if (typeof property === "string") {

package/dist/Compiler.js

@@ -608,9 +608,9 @@ _Compiler_instance = new WeakMap(), _Compiler_initial = new WeakMap(), _Compiler
             }
             return;
         }),
-        registerCompilationBuildModuleTaps: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_createHookRegisterTaps).call(this, binding.RegisterJsTapKind.CompilationBuildModule, () => __classPrivateFieldGet(this, _Compiler_compilation, "f").hooks.buildModule, queired => (m) => queired.call(Module_1.Module.__from_binding(m, __classPrivateFieldGet(this, _Compiler_compilation, "f")))),
-        registerCompilationStillValidModuleTaps: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_createHookRegisterTaps).call(this, binding.RegisterJsTapKind.CompilationStillValidModule, () => __classPrivateFieldGet(this, _Compiler_compilation, "f").hooks.stillValidModule, queired => (m) => queired.call(Module_1.Module.__from_binding(m, __classPrivateFieldGet(this, _Compiler_compilation, "f")))),
-        registerCompilationSucceedModuleTaps: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_createHookRegisterTaps).call(this, binding.RegisterJsTapKind.CompilationSucceedModule, () => __classPrivateFieldGet(this, _Compiler_compilation, "f").hooks.succeedModule, queired => (m) => queired.call(Module_1.Module.__from_binding(m, __classPrivateFieldGet(this, _Compiler_compilation, "f")))),
+        registerCompilationBuildModuleTaps: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_createHookRegisterTaps).call(this, binding.RegisterJsTapKind.CompilationBuildModule, () => __classPrivateFieldGet(this, _Compiler_compilation, "f").hooks.buildModule, queired => (m) => queired.call(Module_1.Module.__from_binding(m))),
+        registerCompilationStillValidModuleTaps: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_createHookRegisterTaps).call(this, binding.RegisterJsTapKind.CompilationStillValidModule, () => __classPrivateFieldGet(this, _Compiler_compilation, "f").hooks.stillValidModule, queired => (m) => queired.call(Module_1.Module.__from_binding(m))),
+        registerCompilationSucceedModuleTaps: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_createHookRegisterTaps).call(this, binding.RegisterJsTapKind.CompilationSucceedModule, () => __classPrivateFieldGet(this, _Compiler_compilation, "f").hooks.succeedModule, queired => (m) => queired.call(Module_1.Module.__from_binding(m))),
         registerCompilationExecuteModuleTaps: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_createHookRegisterTaps).call(this, binding.RegisterJsTapKind.CompilationExecuteModule, () => __classPrivateFieldGet(this, _Compiler_compilation, "f").hooks.executeModule, queried => ({ entry, id, codegenResults, runtimeModules }) => {
             const __webpack_require__ = (id) => {
                 const cached = moduleCache[id];

package/dist/Module.d.ts

@@ -1,6 +1,5 @@
 import { JsCodegenerationResult, JsCodegenerationResults, JsCreateData, JsModule } from "@rspack/binding";
 import { Source } from "webpack-sources";
-import { Compilation } from "./Compilation";
 export type ResourceData = {
     resource: string;
     path: string;
@@ -33,26 +32,12 @@ export type ContextModuleFactoryAfterResolveResult = false | {
 export declare class Module {
     #private;
     _originalSource?: Source;
-    context?: string;
-    resource?: string;
-    request?: string;
-    userRequest?: string;
     rawRequest?: string;
-    /**
-     * Records the dynamically added fields for Module on the JavaScript side.
-     * These fields are generally used within a plugin, so they do not need to be passed back to the Rust side.
-     * @see {@link Compilation#customModules}
-     */
-    buildInfo: Record<string, any>;
-    /**
-     * Records the dynamically added fields for Module on the JavaScript side.
-     * These fields are generally used within a plugin, so they do not need to be passed back to the Rust side.
-     * @see {@link Compilation#customModules}
-     */
-    buildMeta: Record<string, any>;
-    static __from_binding(module: JsModule, compilation?: Compilation): Module;
-    constructor(module: JsModule, compilation?: Compilation);
-    originalSource(): Source | null;
+    static __from_binding(module: JsModule): Module;
+    constructor(module: JsModule);
+    get context(): string | undefined;
+    get resource(): string | undefined;
+    get originalSource(): Source | null;
     identifier(): string;
     nameForCondition(): string | null;
 }

package/dist/Module.js

@@ -15,22 +15,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CodeGenerationResults = exports.CodeGenerationResult = exports.Module = void 0;
 const source_1 = require("./util/source");
 class Module {
-    static __from_binding(module, compilation) {
-        return new Module(module, compilation);
+    static __from_binding(module) {
+        return new Module(module);
     }
-    constructor(module, compilation) {
+    constructor(module) {
         _Module_inner.set(this, void 0);
         __classPrivateFieldSet(this, _Module_inner, module, "f");
-        this.context = module.context;
-        this.resource = module.resource;
-        this.request = module.request;
-        this.userRequest = module.userRequest;
         this.rawRequest = module.rawRequest;
-        const customModule = compilation?.__internal__getCustomModule(module.moduleIdentifier);
-        this.buildInfo = customModule?.buildInfo || {};
-        this.buildMeta = customModule?.buildMeta || {};
     }
-    originalSource() {
+    get context() {
+        return __classPrivateFieldGet(this, _Module_inner, "f").context;
+    }
+    get resource() {
+        return __classPrivateFieldGet(this, _Module_inner, "f").resource;
+    }
+    get originalSource() {
         if (this._originalSource)
             return this._originalSource;
         if (__classPrivateFieldGet(this, _Module_inner, "f").originalSource) {

package/dist/builtin-plugin/SplitChunksPlugin.js

@@ -34,7 +34,7 @@ function toRawSplitChunksOptions(sc, compiler) {
                     return name(undefined);
                 }
                 else {
-                    return name(Module_1.Module.__from_binding(ctx.module, compiler._lastCompilation));
+                    return name(Module_1.Module.__from_binding(ctx.module));
                 }
             };
         }
@@ -49,7 +49,7 @@ function toRawSplitChunksOptions(sc, compiler) {
                     return test(undefined);
                 }
                 else {
-                    return test(Module_1.Module.__from_binding(ctx.module, compiler._lastCompilation));
+                    return test(Module_1.Module.__from_binding(ctx.module));
                 }
             };
         }

package/dist/config/adapterRuleUse.d.ts

@@ -5,7 +5,6 @@ import { Compiler } from "../Compiler";
 import { Logger } from "../logging/Logger";
 import Hash = require("../util/hash");
 import { Compilation } from "../Compilation";
-import { Module } from "../Module";
 import { Mode, Resolve, RuleSetUseItem, Target } from "./zod";
 export interface ComposeJsUseOptions {
     devtool: RawOptions["devtool"];
@@ -112,7 +111,6 @@ export interface LoaderContext<OptionsType = {}> {
     data: unknown;
     _compiler: Compiler;
     _compilation: Compilation;
-    _module: Module;
     /**
      * Internal field for interoperability.
      * Do not use this in anywhere else.

package/dist/loader-runner/index.js

@@ -18,7 +18,6 @@ const createHash_1 = require("../util/createHash");
 const identifier_1 = require("../util/identifier");
 const memoize_1 = require("../util/memoize");
 const loadLoader = require("./loadLoader");
-const Module_1 = require("../Module");
 const querystring = require("node:querystring");
 const PATH_QUERY_FRAGMENT_REGEXP = /^((?:\u200b.|[^?#\u200b])*)(\?(?:\u200b.|[^#\u200b])*)?(#.*)?$/;
 function parsePathQueryFragment(str) {
@@ -203,7 +202,7 @@ async function runLoaders(compiler, rawContext) {
             return new Promise((resolve, reject) => {
                 compiler
                     ._lastCompilation.__internal_getInner()
-                    .importModule(request, options.publicPath, options.baseUri, rawContext._module.moduleIdentifier, loaderContext.context, (err, res) => {
+                    .importModule(request, options.publicPath, options.baseUri, rawContext._moduleIdentifier, loaderContext.context, (err, res) => {
                     if (err)
                         reject(err);
                     else {
@@ -219,9 +218,6 @@ async function runLoaders(compiler, rawContext) {
                         for (const dep of res.fileDependencies) {
                             this.addDependency(dep);
                         }
-                        if (res.cacheable === false) {
-                            this.cacheable(false);
-                        }
                         assetFilenames.push(...res.assets);
                         resolve(compiler.__internal__getModuleExecutionResult(res.id));
                     }
@@ -230,7 +226,7 @@ async function runLoaders(compiler, rawContext) {
         }
         return compiler
             ._lastCompilation.__internal_getInner()
-            .importModule(request, options.publicPath, options.baseUri, rawContext._module.moduleIdentifier, loaderContext.context, (err, res) => {
+            .importModule(request, options.publicPath, options.baseUri, rawContext._moduleIdentifier, loaderContext.context, (err, res) => {
             if (err) {
                 callback(err, undefined);
             }
@@ -247,9 +243,6 @@ async function runLoaders(compiler, rawContext) {
                 for (const dep of res.fileDependencies) {
                     this.addDependency(dep);
                 }
-                if (res.cacheable === false) {
-                    this.cacheable(false);
-                }
                 assetFilenames.push(...res.assets);
                 callback(undefined, compiler.__internal__getModuleExecutionResult(res.id));
             }
@@ -486,7 +479,6 @@ async function runLoaders(compiler, rawContext) {
     };
     loaderContext._compiler = compiler;
     loaderContext._compilation = compiler._lastCompilation;
-    loaderContext._module = Module_1.Module.__from_binding(rawContext._module, compiler._lastCompilation);
     loaderContext.getOptions = function () {
         const loader = getCurrentLoader(loaderContext);
         let options = loader?.options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/core",
-  "version": "0.7.1-canary-1b93a35-20240605065754",
+  "version": "0.7.1-canary-a7d673e-20240606094751",
   "webpackVersion": "5.75.0",
   "license": "MIT",
   "description": "A Fast Rust-based Web Bundler",
@@ -72,15 +72,15 @@
     "watchpack": "^2.4.0",
     "zod": "^3.21.4",
     "zod-validation-error": "1.3.1",
-    "@rspack/core": "0.7.1-canary-1b93a35-20240605065754",
-    "@rspack/plugin-minify": "^0.7.1-canary-1b93a35-20240605065754"
+    "@rspack/plugin-minify": "^0.7.1-canary-a7d673e-20240606094751",
+    "@rspack/core": "0.7.1-canary-a7d673e-20240606094751"
   },
   "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.1-canary-1b93a35-20240605065754"
+    "@rspack/binding": "0.7.1-canary-a7d673e-20240606094751"
   },
   "peerDependencies": {
     "@swc/helpers": ">=0.5.1"