From e60715ea99ade3bb2e9c783a0fbd21fd759b90cd Mon Sep 17 00:00:00 2001 From: Omri Bernstein Date: Wed, 22 Dec 2021 17:34:10 -0500 Subject: [PATCH] Use typeTest in isExternalModule and isExternalModuleMain --- src/core/importType.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/importType.js b/src/core/importType.js index c241da834b..05e5a84d14 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)) && (isExternalPath(path, context) || isExternalLookingName(name)); + return (isModule(name) || isScoped(name)) && typeTest(name, context, path) === 'external'; } export function isExternalModuleMain(name, settings, path, context) { - return isModuleMain(name) && (isExternalPath(path, context) || isExternalLookingName(name)); + return isModuleMain(name) && typeTest(name, context, path) === 'external'; } const moduleRegExp = /^\w/; @@ -106,7 +106,7 @@ function isExternalLookingName(name) { return isModule(name) || isScoped(name); } -function typeTest(name, context, path) { +function typeTest(name, context, path, settings) { const { settings } = context; if (isInternalRegexMatch(name, settings)) { return 'internal'; } if (isAbsolute(name, settings, path)) { return 'absolute'; }