Merge branch 'modules-proxy-patches' into immediate-finds-modules-proxy
This commit is contained in:
commit
a2bda05211
|
@ -161,7 +161,7 @@ Reflect.defineProperty(Function.prototype, "m", {
|
|||
}
|
||||
});
|
||||
|
||||
let wreqNotInitializedLogged = false;
|
||||
let wreqFallbackApplied = false;
|
||||
|
||||
function patchFactory(id: PropertyKey, factory: ModuleFactory) {
|
||||
const originalFactory = factory;
|
||||
|
@ -302,6 +302,9 @@ function patchFactory(id: PropertyKey, factory: ModuleFactory) {
|
|||
let [module, exports, require] = args;
|
||||
|
||||
if (wreq == null) {
|
||||
if (!wreqFallbackApplied) {
|
||||
wreqFallbackApplied = true;
|
||||
|
||||
// Make sure the require argument is actually the WebpackRequire function
|
||||
if (typeof require === "function" && require.m != null) {
|
||||
const { stack } = new Error();
|
||||
|
@ -313,11 +316,11 @@ function patchFactory(id: PropertyKey, factory: ModuleFactory) {
|
|||
);
|
||||
_initWebpack(require);
|
||||
} else if (IS_DEV) {
|
||||
if (!wreqNotInitializedLogged) {
|
||||
wreqNotInitializedLogged = true;
|
||||
logger.error("WebpackRequire was not initialized, running modules without patches instead.");
|
||||
}
|
||||
}
|
||||
|
||||
if (IS_DEV) {
|
||||
return originalFactory.apply(this, args);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue