use resolverFactory.get with dep category option

This commit is contained in:
Ivan Kopeykin 2020-06-01 15:13:17 +03:00
parent 9ccdb38998
commit ca95eccbe6
2 changed files with 9 additions and 8 deletions

View File

@ -17,8 +17,6 @@ const { join } = require("./util/fs");
/** @typedef {import("./ModuleFactory").ModuleFactoryResult} ModuleFactoryResult */
/** @typedef {import("./dependencies/ContextDependency")} ContextDependency */
const EMPTY_RESOLVE_OPTIONS = {};
module.exports = class ContextModuleFactory extends ModuleFactory {
constructor(resolverFactory) {
super();
@ -111,12 +109,10 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
const contextResolver = this.resolverFactory.get(
"context",
resolveOptions || EMPTY_RESOLVE_OPTIONS
);
const loaderResolver = this.resolverFactory.get(
"loader",
EMPTY_RESOLVE_OPTIONS
resolveOptions || undefined,
dependencies.length > 0 ? dependencies[0].category : undefined
);
const loaderResolver = this.resolverFactory.get("loader");
asyncLib.parallel(
[

View File

@ -71,7 +71,12 @@ class OverridablesPlugin {
/** @type {LazySet<string>} */
missingDependencies: new LazySet()
};
const resolver = compilation.resolverFactory.get("normal");
const resolver = compilation.resolverFactory.get(
"normal",
undefined,
"esm"
);
/**
* @param {string} request imported request
* @param {string} name overridable name