Merge branch 'modules-proxy-patches' into immediate-finds-modules-proxy
This commit is contained in:
commit
a19fb71c70
|
@ -71,12 +71,12 @@ define(Function.prototype, "m", {
|
||||||
|
|
||||||
set(this: WebpackRequire, bundlePath: WebpackRequire["p"]) {
|
set(this: WebpackRequire, bundlePath: WebpackRequire["p"]) {
|
||||||
define(this, "p", { value: bundlePath });
|
define(this, "p", { value: bundlePath });
|
||||||
|
clearTimeout(setterTimeout);
|
||||||
|
|
||||||
if (bundlePath !== "/assets/") return;
|
if (bundlePath !== "/assets/") return;
|
||||||
|
|
||||||
logger.info("Main Webpack found" + interpolateIfDefined` in ${fileName}` + ", initializing internal references to WebpackRequire");
|
logger.info("Main Webpack found" + interpolateIfDefined` in ${fileName}` + ", initializing internal references to WebpackRequire");
|
||||||
_initWebpack(this);
|
_initWebpack(this);
|
||||||
clearTimeout(setterTimeout);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
// setImmediate to clear this property setter if this is not the main Webpack.
|
// setImmediate to clear this property setter if this is not the main Webpack.
|
||||||
|
|
Loading…
Reference in a new issue