From 105545b501f0406d20c5142b32056ec2d317d2f7 Mon Sep 17 00:00:00 2001 From: Omri Bernstein Date: Wed, 22 Dec 2021 17:38:34 -0500 Subject: [PATCH] Use settings if provided in isExternalModule and isExternalModuleMain --- src/core/importType.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/importType.js b/src/core/importType.js index bc56ca8c4e..ef67b28cca 100644 --- a/src/core/importType.js +++ b/src/core/importType.js @@ -34,11 +34,11 @@ export function isExternalModule(name, settings, path, context) { if (arguments.length < 4) { throw new TypeError('isExternalModule: name, settings, path, and context are all required'); } - return (isModule(name) || isScoped(name)) && typeTest(name, context, path) === 'external'; + return (isModule(name) || isScoped(name)) && typeTest(name, context, path, settings) === 'external'; } export function isExternalModuleMain(name, settings, path, context) { - return isModuleMain(name) && typeTest(name, context, path) === 'external'; + return isModuleMain(name) && typeTest(name, context, path, settings) === 'external'; } const moduleRegExp = /^\w/; @@ -106,8 +106,7 @@ function isExternalLookingName(name) { return isModule(name) || isScoped(name); } -function typeTest(name, context, path) { - const { settings } = context; +function typeTest(name, context, path, settings = context.settings) { if (isInternalRegexMatch(name, settings)) { return 'internal'; } if (isAbsolute(name, settings, path)) { return 'absolute'; } if (isBuiltIn(name, settings, path)) { return 'builtin'; }