fix: improve config external heuristic

packages/vike/src/node/vite/shared/resolveVikeConfigInternal/pointerImports.ts

@@ -1,6 +1,5 @@
 export { transformPointerImports }
 export { parsePointerImportData }
-export { isPointerImportData }
 export { assertPointerImportPath }
 export type { PointerImportData }
 

packages/vike/src/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.ts

@@ -26,7 +26,7 @@ import { genPromise } from '../../../../utils/genPromise.js'
 import { assertFilePathAbsoluteFilesystem } from '../../../../utils/isFilePathAbsoluteFilesystem.js'
 import { isImportPathRelative } from '../../../../utils/isImportPath.js'
 import { isObject } from '../../../../utils/isObject.js'
-import { isPlainScriptFile } from '../../../../utils/isScriptFile.js'
+import { isPlainJavaScriptFile, isPlainScriptFile } from '../../../../utils/isScriptFile.js'
 import { isVitest } from '../../../../utils/isVitest.js'
 import { assertIsImportPathNpmPackage, isImportPathNpmPackageOrPathAlias } from '../../../../utils/parseNpmPackage.js'
 import { assertPosixPath, toPosixPath } from '../../../../utils/path.js'
@@ -254,34 +254,22 @@ async function transpileWithEsbuild(
             args.with?.['type'] === 'vike-pointer'
 
           assertPosixPath(importPathResolved)
-          // `isNpmPkgImport` => `importPathOriginal` is most likely an npm package import, but it can also be a path alias that a) looks like an npm package import and b) resolves outside of `userRootDir`.
-          const isNpmPkgImport: boolean = (() => {
-            if (importPathResolved.includes('/node_modules/')) {
-              // So far I can't think of a use case where this assertion would fail, but let's eventually remove it to avoid artificially restricting the user.
-              assert(isImportPathNpmPackageOrPathAlias(importPathOriginal))
-              return true
-            }
-            // Linked npm packages
-            if (
-              // Assuming path aliases usually resolve inside `userRootDir`.
-              // - This isn't always the case: https://github.com/vikejs/vike/issues/2326
-              !importPathResolved.startsWith(userRootDir) &&
-              // False positive if `importPathOriginal` is a path alias that a) looks like an npm package import and b) resolves outside of `userRootDir` => we then we wrongfully assume that `importPathOriginal` is an npm package import.
-              isImportPathNpmPackageOrPathAlias(importPathOriginal)
-            ) {
-              return true
-            }
-            return false
-          })()
+          // False positive if `importPathOriginal` is a path alias that a) looks like an npm package import and b) resolves outside of `userRootDir` => we then we wrongfully assume that `importPathOriginal` is an npm package import.
+          // - For example: https://github.com/vikejs/vike/issues/2326
+          const isNpmPkgImport =
+            isImportPathNpmPackageOrPathAlias(importPathOriginal) &&
+            (importPathResolved.includes('/node_modules/') ||
+              // Linked npm package
+              !importPathResolved.startsWith(userRootDir))
 
           const isExternal =
             isPointerImport ||
             // Performance: npm package imports can be externalized. (We could as well let esbuild transpile /node_modules/ code but it's useless as /node_modules/ code is already built. It would unnecessarily slow down transpilation.)
-            isNpmPkgImport
+            (isNpmPkgImport && isPlainJavaScriptFile(importPathResolved))
 
           if (!isExternal) {
             // User-land config code (i.e. not runtime code) => let esbuild transpile it
-            assert(!isPointerImport && !isNpmPkgImport)
+            assert(!isPointerImport)
             if (debug.isActivated) debug('onResolve() [non-external]', { args, resolved, isPointerImport, isExternal })
             return resolved
           }

packages/vike/src/utils/isScriptFile.ts

@@ -1,5 +1,6 @@
 export { isScriptFile }
 export { isPlainScriptFile }
+export { isPlainJavaScriptFile }
 export { isTemplateFile }
 export { scriptFileExtensionList }
 export { scriptFileExtensionPattern }
@@ -67,6 +68,10 @@ function isPlainScriptFile(filePath: string) {
   return extJsOrTs.some((ext) => filePath.endsWith('.' + ext))
 }
 
+function isPlainJavaScriptFile(filePath: string) {
+  return extJs.some((ext) => filePath.endsWith('.' + ext))
+}
+
 function isTemplateFile(filePath: string) {
   return extTemplates.some((ext) => filePath.endsWith('.' + ext))
 }

packages/vike/src/utils/parseNpmPackage.ts

@@ -1,3 +1,5 @@
+// TODO/now: rename isImportPath isImport
+
 export { isImportPathNpmPackage }
 export { isImportPathNpmPackageOrPathAlias }
 export { assertIsImportPathNpmPackage }