@rspack/core 0.5.8-canary-cff2c4f-20240325162043 → 0.5.8-canary-8598a50-20240326124040

package/dist/Compiler.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 _Compiler_instances, _Compiler_instance, _Compiler_disabledHooks, _Compiler_moduleExecutionResultsMap, _Compiler_getInstance, _Compiler_updateDisabledHooks, _Compiler_afterProcessAssets, _Compiler_afterResolve, _Compiler_contextModuleFactoryBeforeResolve, _Compiler_contextModuleFactoryAfterResolve, _Compiler_normalModuleFactoryCreateModule, _Compiler_normalModuleFactoryResolveForScheme, _Compiler_optimizeChunkModules, _Compiler_optimizeTree, _Compiler_decorateUpdateDisabledHooks, _Compiler_createRegisterTaps, _Compiler_createCompilation, _Compiler_resetThisCompilation, _Compiler_newCompilationParams;
+var _Compiler_instances, _Compiler_instance, _Compiler_disabledHooks, _Compiler_moduleExecutionResultsMap, _Compiler_getInstance, _Compiler_updateDisabledHooks, _Compiler_afterProcessAssets, _Compiler_contextModuleFactoryBeforeResolve, _Compiler_contextModuleFactoryAfterResolve, _Compiler_normalModuleFactoryCreateModule, _Compiler_normalModuleFactoryResolveForScheme, _Compiler_optimizeChunkModules, _Compiler_optimizeTree, _Compiler_decorateUpdateDisabledHooks, _Compiler_createRegisterTaps, _Compiler_createCompilation, _Compiler_resetThisCompilation, _Compiler_newCompilationParams;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Compiler = void 0;
 const index_1 = require("./index");
@@ -58,7 +58,6 @@ const Logger_1 = require("./logging/Logger");
 const NormalModuleFactory_1 = require("./NormalModuleFactory");
 const bindingVersionCheck_1 = require("./util/bindingVersionCheck");
 const Watching_1 = require("./Watching");
-const NormalModule_1 = require("./NormalModule");
 const builtin_plugin_1 = require("./builtin-plugin");
 const rspackOptionsApply_1 = require("./rspackOptionsApply");
 const defaults_1 = require("./config/defaults");
@@ -504,7 +503,6 @@ _Compiler_instance = new WeakMap(), _Compiler_disabledHooks = new WeakMap(), _Co
     __classPrivateFieldSet(this, _Compiler_instance, new instanceBinding.Rspack(rawOptions, this.builtinPlugins, {
         normalModuleFactoryCreateModule: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_normalModuleFactoryCreateModule).bind(this),
         normalModuleFactoryResolveForScheme: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_normalModuleFactoryResolveForScheme).bind(this),
-        afterResolve: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_afterResolve).bind(this),
         contextModuleFactoryBeforeResolve: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_contextModuleFactoryBeforeResolve).bind(this),
         contextModuleFactoryAfterResolve: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_contextModuleFactoryAfterResolve).bind(this)
     }, {
@@ -604,18 +602,30 @@ _Compiler_instance = new WeakMap(), _Compiler_disabledHooks = new WeakMap(), _Co
             resolveData.request = normalizedResolveData.request;
             resolveData.context = normalizedResolveData.context;
             return [ret, resolveData];
+        }),
+        registerNormalModuleFactoryAfterResolveTaps: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_createRegisterTaps).call(this, () => this.compilationParams.normalModuleFactory.hooks.afterResolve, queried => async (arg) => {
+            const data = {
+                request: arg.request,
+                context: arg.context,
+                fileDependencies: arg.fileDependencies,
+                missingDependencies: arg.missingDependencies,
+                contextDependencies: arg.contextDependencies,
+                factoryMeta: arg.factoryMeta,
+                createData: arg.createData
+            };
+            const ret = await queried.promise(data);
+            return [ret, data.createData];
         })
     }, (0, fileSystem_1.createThreadsafeNodeFSFromRaw)(this.outputFileSystem)), "f");
     callback(null, __classPrivateFieldGet(this, _Compiler_instance, "f"));
 }, _Compiler_updateDisabledHooks = function _Compiler_updateDisabledHooks(callback) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const disabledHooks = [];
     const hookMap = {
-        afterResolve: (_a = this.compilationParams) === null || _a === void 0 ? void 0 : _a.normalModuleFactory.hooks.afterResolve,
-        contextModuleFactoryBeforeResolve: (_b = this.compilationParams) === null || _b === void 0 ? void 0 : _b.contextModuleFactory.hooks.beforeResolve,
-        contextModuleFactoryAfterResolve: (_c = this.compilationParams) === null || _c === void 0 ? void 0 : _c.contextModuleFactory.hooks.afterResolve,
-        normalModuleFactoryCreateModule: (_d = this.compilationParams) === null || _d === void 0 ? void 0 : _d.normalModuleFactory.hooks.createModule,
-        normalModuleFactoryResolveForScheme: (_e = this.compilationParams) === null || _e === void 0 ? void 0 : _e.normalModuleFactory.hooks.resolveForScheme
+        contextModuleFactoryBeforeResolve: (_a = this.compilationParams) === null || _a === void 0 ? void 0 : _a.contextModuleFactory.hooks.beforeResolve,
+        contextModuleFactoryAfterResolve: (_b = this.compilationParams) === null || _b === void 0 ? void 0 : _b.contextModuleFactory.hooks.afterResolve,
+        normalModuleFactoryCreateModule: (_c = this.compilationParams) === null || _c === void 0 ? void 0 : _c.normalModuleFactory.hooks.createModule,
+        normalModuleFactoryResolveForScheme: (_d = this.compilationParams) === null || _d === void 0 ? void 0 : _d.normalModuleFactory.hooks.resolveForScheme
     };
     for (const [name, hook] of Object.entries(hookMap)) {
         if (typeof hook !== "undefined" &&
@@ -640,17 +650,6 @@ _Compiler_instance = new WeakMap(), _Compiler_disabledHooks = new WeakMap(), _Co
 }, _Compiler_afterProcessAssets = async function _Compiler_afterProcessAssets() {
     await this.compilation.hooks.afterProcessAssets.promise(this.compilation.assets);
     __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_updateDisabledHooks).call(this);
-}, _Compiler_afterResolve = async function _Compiler_afterResolve(resolveData) {
-    let res = await this.compilationParams.normalModuleFactory.hooks.afterResolve.promise(resolveData);
-    NormalModule_1.NormalModule.getCompilationHooks(this.compilation).loader.tap("sideEffectFreePropPlugin", (loaderContext) => {
-        loaderContext._module = {
-            factoryMeta: {
-                sideEffectFree: !!resolveData.factoryMeta.sideEffectFree
-            }
-        };
-    });
-    __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_updateDisabledHooks).call(this);
-    return [res, resolveData.createData];
 }, _Compiler_contextModuleFactoryBeforeResolve = async function _Compiler_contextModuleFactoryBeforeResolve(resourceData) {
     let res = await this.compilationParams.contextModuleFactory.hooks.beforeResolve.promise(resourceData);
     __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_updateDisabledHooks).call(this);

package/dist/Module.d.ts

@@ -1,5 +1,24 @@
-import { JsCodegenerationResult, JsCodegenerationResults, JsModule } from "@rspack/binding";
+import { JsCodegenerationResult, JsCodegenerationResults, JsCreateData, JsFactoryMeta, JsModule } from "@rspack/binding";
 import { Source } from "webpack-sources";
+export type ResourceData = {
+    resource: string;
+    path: string;
+    query?: string;
+    fragment?: string;
+};
+export type ResourceDataWithData = ResourceData & {
+    data?: Record<string, any>;
+};
+export type CreateData = Partial<JsCreateData>;
+export type ResolveData = {
+    context: string;
+    request: string;
+    fileDependencies: string[];
+    missingDependencies: string[];
+    contextDependencies: string[];
+    factoryMeta?: JsFactoryMeta;
+    createData?: CreateData;
+};
 export declare class Module {
     #private;
     _originalSource?: Source;

package/dist/NormalModuleFactory.d.ts

@@ -1,22 +1,7 @@
 import { AsyncSeriesBailHook, HookMap } from "tapable";
 import * as liteTapable from "./lite-tapable";
 import type * as binding from "@rspack/binding";
-type ResourceData = {
-    resource: string;
-    path: string;
-    query?: string;
-    fragment?: string;
-};
-type ResourceDataWithData = ResourceData & {
-    data?: Record<string, any>;
-};
-type ResolveData = {
-    context?: string;
-    request: string;
-    fileDependencies: string[];
-    missingDependencies: string[];
-    contextDependencies: string[];
-};
+import { ResolveData, ResourceDataWithData } from "./Module";
 type CreateModuleData = binding.CreateModuleData & {
     settings: {};
     matchResource: string;
@@ -25,7 +10,7 @@ export declare class NormalModuleFactory {
     hooks: {
         resolveForScheme: HookMap<AsyncSeriesBailHook<[ResourceDataWithData], true | void>>;
         beforeResolve: liteTapable.AsyncSeriesBailHook<[ResolveData], false | void>;
-        afterResolve: AsyncSeriesBailHook<[ResolveData], boolean | void>;
+        afterResolve: liteTapable.AsyncSeriesBailHook<[ResolveData], false | void>;
         createModule: AsyncSeriesBailHook<[CreateModuleData, {}], void>;
     };
     constructor();

package/dist/NormalModuleFactory.js

@@ -42,7 +42,7 @@ class NormalModuleFactory {
             // /** @type {AsyncSeriesBailHook<[ResolveData], false | void>} */
             beforeResolve: new liteTapable.AsyncSeriesBailHook(["resolveData"]),
             // /** @type {AsyncSeriesBailHook<[ResolveData], false | void>} */
-            afterResolve: new tapable_1.AsyncSeriesBailHook(["resolveData"]),
+            afterResolve: new liteTapable.AsyncSeriesBailHook(["resolveData"]),
             // /** @type {AsyncSeriesBailHook<[ResolveData["createData"], ResolveData], Module | void>} */
             createModule: new tapable_1.AsyncSeriesBailHook(["createData", "resolveData"])
             // /** @type {SyncWaterfallHook<[Module, ResolveData["createData"], ResolveData], Module>} */

package/dist/config/adapter.js

@@ -336,8 +336,7 @@ const getRawModuleRule = (rule, path, options) => {
             if (rule.resourceQuery && !tryMatch(query, rule.resourceQuery)) {
                 return false;
             }
-            if (rule.resourceFragment &&
-                !tryMatch(fragment, rule.resourceFragment)) {
+            if (rule.resourceFragment && !tryMatch(fragment, rule.resourceFragment)) {
                 return false;
             }
             return true;

package/dist/container/default.runtime.js

@@ -66,10 +66,15 @@ module.exports = function () {
                     if (typeof stage === "object" && stage !== null) {
                         const { name, version, factory, eager } = stage;
                         if (shared[name]) {
+                            shared[name].version.push(version);
                             shared[name].scope.push(scope);
                         }
                         else {
-                            shared[name] = { version, get: factory, scope: [scope] };
+                            shared[name] = {
+                                version: [version],
+                                get: factory,
+                                scope: [scope]
+                            };
                         }
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/core",
-  "version": "0.5.8-canary-cff2c4f-20240325162043",
+  "version": "0.5.8-canary-8598a50-20240326124040",
   "webpackVersion": "5.75.0",
   "license": "MIT",
   "description": "A Fast Rust-based Web Bundler",
@@ -56,8 +56,8 @@
     "styled-components": "^6.0.8",
     "terser": "5.27.2",
     "wast-loader": "^1.11.4",
-    "@rspack/core": "0.5.8-canary-cff2c4f-20240325162043",
-    "@rspack/plugin-minify": "^0.5.8-canary-cff2c4f-20240325162043"
+    "@rspack/core": "0.5.8-canary-8598a50-20240326124040",
+    "@rspack/plugin-minify": "^0.5.8-canary-8598a50-20240326124040"
   },
   "dependencies": {
     "@module-federation/runtime-tools": "0.0.8",
@@ -72,7 +72,7 @@
     "webpack-sources": "3.2.3",
     "zod": "^3.21.4",
     "zod-validation-error": "1.3.1",
-    "@rspack/binding": "0.5.8-canary-cff2c4f-20240325162043"
+    "@rspack/binding": "0.5.8-canary-8598a50-20240326124040"
   },
   "peerDependencies": {
     "@swc/helpers": ">=0.5.1"