vike 0.4.227-commit-ff6dcd9 → 0.4.227-commit-77128be

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js

@@ -111,8 +111,6 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                 build.onResolve({ filter: /.*/ }, async (args) => {
                     if (args.kind !== 'import-statement')
                         return;
-                    if (debugEsbuildResolve.isActivated)
-                        debugEsbuildResolve('args', args);
                     // Avoid infinite loop: https://github.com/evanw/esbuild/issues/3095#issuecomment-1546916366
                     const useEsbuildResolver = 'useEsbuildResolver';
                     if (args.pluginData?.[useEsbuildResolver])
@@ -120,6 +118,8 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     const { path, ...opts } = args;
                     opts.pluginData = { [useEsbuildResolver]: true };
                     let resolved = await build.resolve(path, opts);
+                    if (debugEsbuildResolve.isActivated)
+                        debugEsbuildResolve('args', args);
                     if (debugEsbuildResolve.isActivated)
                         debugEsbuildResolve('resolved', resolved);
                     // Temporary workaround for https://github.com/evanw/esbuild/issues/3973
@@ -160,11 +160,25 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                         //      - vike@0.4.162 started soft-requiring Vike extensions to set the name config.
                         //    - In practice, it seems like it requires some (non-trivial?) refactoring.
                         isVikeExtensionImport;
-                    // Externalize npm package imports
                     (0, utils_js_1.assertPosixPath)(importPathResolved);
-                    const isNpmPkgImport = importPathResolved.includes('/node_modules/') ||
+                    // `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 = (() => {
+                        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.
+                            (0, utils_js_1.assert)((0, utils_js_1.isNpmPackageImport_unreliable)(importPathOriginal));
+                            return true;
+                        }
                         // Linked npm packages
-                        !importPathResolved.startsWith(userRootDir);
+                        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.
+                            (0, utils_js_1.isNpmPackageImport_unreliable)(importPathOriginal)) {
+                            return true;
+                        }
+                        return false;
+                    })();
                     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;
@@ -188,19 +202,19 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                             filePathAbsoluteFilesystem: importPathResolved,
                             userRootDir
                         });
-                        // We assuming that path aliases always resolve inside `userRootDir`.
                         if (filePathAbsoluteUserRootDir && !isNpmPkgImport) {
-                            // `importPathOriginal` is a path alias.
+                            // `importPathOriginal` is most likely a path alias.
                             // - We have to use esbuild's path alias resolution, because:
                             //   - Vike doesn't resolve path aliases at all.
                             //   - Node.js doesn't support `tsconfig.js#compilerOptions.paths`.
-                            // - Esbuild path alias resolution seems to be reliable, e.g. it supports `tsconfig.js#compilerOptions.paths`.
+                            // - Esbuild path alias resolution seems reliable, e.g. it supports `tsconfig.js#compilerOptions.paths`.
+                            (0, utils_js_1.assert)(!(0, utils_js_1.isNpmPackageImport_unreliable)(importPathOriginal));
                             importPathTranspiled = importPathResolved;
                         }
                         else {
-                            // `importPathOriginal` is an npm package import.
+                            // `importPathOriginal` is most likely an npm package import.
                             (0, utils_js_1.assertIsNpmPackageImport)(importPathOriginal);
-                            // For less confusing error messages, let the resolution be handled by Vike or Node.js.
+                            // For improved error messages, let the resolution be handled by Vike or Node.js.
                             importPathTranspiled = importPathOriginal;
                         }
                     }

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.227-commit-ff6dcd9';
+exports.PROJECT_VERSION = '0.4.227-commit-77128be';

package/dist/cjs/utils/isFilePathAbsoluteFilesystem.js

@@ -24,8 +24,8 @@ function assertFilePathAbsoluteFilesystem(filePath) {
     // - For Linux users assertFilePathAbsoluteFilesystem() will erroneously succeed if `p` is a path absolute from the user root dir.
     //   - But that's okay because the assertion will eventually fail for Windows users.
     //   - On Linux there doesn't seem to be a way to distinguish between an absolute path starting from the filesystem root or starting from the user root directory, see comment at isFilePathAbsoluteFilesystem()
-    (0, assert_js_1.assert)(isFilePathAbsoluteFilesystem(filePath));
     (0, path_js_1.assertPosixPath)(filePath);
+    (0, assert_js_1.assert)(isFilePathAbsoluteFilesystem(filePath));
 }
 /**
  * Whether `filePath` is an absolute file path starting from the filesystem root.

package/dist/cjs/utils/isNpmPackage.js

@@ -10,10 +10,10 @@ const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 function isNpmPackageImport(str, { cannotBePathAlias }) {
-    // We cannot distinguish path alises that look like npm package imports
     (0, assert_js_1.assert)(cannotBePathAlias);
     return isNpmPackageImport_unreliable(str);
 }
+// We cannot distinguish path aliases that look like npm package imports
 function isNpmPackageImport_unreliable(str) {
     const res = parse(str);
     return res !== null;

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js

@@ -7,7 +7,7 @@ import fs from 'fs';
 import path from 'path';
 import pc from '@brillout/picocolors';
 import { import_ } from '@brillout/import';
-import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainJavaScriptFile, createDebugger, assertFilePathAbsoluteFilesystem, assertIsNpmPackageImport, genPromise, isVitest, requireResolveOptional } from '../../../../utils.js';
+import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainJavaScriptFile, createDebugger, assertFilePathAbsoluteFilesystem, assertIsNpmPackageImport, genPromise, isVitest, requireResolveOptional, isNpmPackageImport_unreliable } from '../../../../utils.js';
 import { transformPointerImports } from './transformPointerImports.js';
 import sourceMapSupport from 'source-map-support';
 import { getFilePathAbsoluteUserRootDir } from '../../../../shared/getFilePath.js';
@@ -106,8 +106,6 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                 build.onResolve({ filter: /.*/ }, async (args) => {
                     if (args.kind !== 'import-statement')
                         return;
-                    if (debugEsbuildResolve.isActivated)
-                        debugEsbuildResolve('args', args);
                     // Avoid infinite loop: https://github.com/evanw/esbuild/issues/3095#issuecomment-1546916366
                     const useEsbuildResolver = 'useEsbuildResolver';
                     if (args.pluginData?.[useEsbuildResolver])
@@ -115,6 +113,8 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     const { path, ...opts } = args;
                     opts.pluginData = { [useEsbuildResolver]: true };
                     let resolved = await build.resolve(path, opts);
+                    if (debugEsbuildResolve.isActivated)
+                        debugEsbuildResolve('args', args);
                     if (debugEsbuildResolve.isActivated)
                         debugEsbuildResolve('resolved', resolved);
                     // Temporary workaround for https://github.com/evanw/esbuild/issues/3973
@@ -155,11 +155,25 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                         //      - vike@0.4.162 started soft-requiring Vike extensions to set the name config.
                         //    - In practice, it seems like it requires some (non-trivial?) refactoring.
                         isVikeExtensionImport;
-                    // Externalize npm package imports
                     assertPosixPath(importPathResolved);
-                    const isNpmPkgImport = importPathResolved.includes('/node_modules/') ||
+                    // `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 = (() => {
+                        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(isNpmPackageImport_unreliable(importPathOriginal));
+                            return true;
+                        }
                         // Linked npm packages
-                        !importPathResolved.startsWith(userRootDir);
+                        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.
+                            isNpmPackageImport_unreliable(importPathOriginal)) {
+                            return true;
+                        }
+                        return false;
+                    })();
                     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;
@@ -183,19 +197,19 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                             filePathAbsoluteFilesystem: importPathResolved,
                             userRootDir
                         });
-                        // We assuming that path aliases always resolve inside `userRootDir`.
                         if (filePathAbsoluteUserRootDir && !isNpmPkgImport) {
-                            // `importPathOriginal` is a path alias.
+                            // `importPathOriginal` is most likely a path alias.
                             // - We have to use esbuild's path alias resolution, because:
                             //   - Vike doesn't resolve path aliases at all.
                             //   - Node.js doesn't support `tsconfig.js#compilerOptions.paths`.
-                            // - Esbuild path alias resolution seems to be reliable, e.g. it supports `tsconfig.js#compilerOptions.paths`.
+                            // - Esbuild path alias resolution seems reliable, e.g. it supports `tsconfig.js#compilerOptions.paths`.
+                            assert(!isNpmPackageImport_unreliable(importPathOriginal));
                             importPathTranspiled = importPathResolved;
                         }
                         else {
-                            // `importPathOriginal` is an npm package import.
+                            // `importPathOriginal` is most likely an npm package import.
                             assertIsNpmPackageImport(importPathOriginal);
-                            // For less confusing error messages, let the resolution be handled by Vike or Node.js.
+                            // For improved error messages, let the resolution be handled by Vike or Node.js.
                             importPathTranspiled = importPathOriginal;
                         }
                     }

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.227-commit-ff6dcd9";
+export declare const PROJECT_VERSION: "0.4.227-commit-77128be";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.227-commit-ff6dcd9';
+export const PROJECT_VERSION = '0.4.227-commit-77128be';

package/dist/esm/utils/isFilePathAbsoluteFilesystem.js

@@ -19,8 +19,8 @@ function assertFilePathAbsoluteFilesystem(filePath) {
     // - For Linux users assertFilePathAbsoluteFilesystem() will erroneously succeed if `p` is a path absolute from the user root dir.
     //   - But that's okay because the assertion will eventually fail for Windows users.
     //   - On Linux there doesn't seem to be a way to distinguish between an absolute path starting from the filesystem root or starting from the user root directory, see comment at isFilePathAbsoluteFilesystem()
-    assert(isFilePathAbsoluteFilesystem(filePath));
     assertPosixPath(filePath);
+    assert(isFilePathAbsoluteFilesystem(filePath));
 }
 /**
  * Whether `filePath` is an absolute file path starting from the filesystem root.

package/dist/esm/utils/isNpmPackage.js

@@ -14,10 +14,10 @@ import { assert } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 assertIsNotBrowser();
 function isNpmPackageImport(str, { cannotBePathAlias }) {
-    // We cannot distinguish path alises that look like npm package imports
     assert(cannotBePathAlias);
     return isNpmPackageImport_unreliable(str);
 }
+// We cannot distinguish path aliases that look like npm package imports
 function isNpmPackageImport_unreliable(str) {
     const res = parse(str);
     return res !== null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.227-commit-ff6dcd9",
+  "version": "0.4.227-commit-77128be",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {