vike 0.4.228-commit-4bed128 → 0.4.228-commit-0e9e0f2

package/dist/esm/node/plugin/plugins/build/pluginBuildConfig.js

@@ -2,7 +2,7 @@ export { pluginBuildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
-import { assert, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsNpmPackageImport, requireResolveNonUserFile } from '../../utils.js';
+import { assert, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsImportPathNpmPackage, requireResolveVikeDistFile } from '../../utils.js';
 import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { getVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
@@ -13,8 +13,6 @@ import { getConfigValueBuildTime } from '../../../../shared/page-configs/getConf
 import { isViteServerBuild } from '../../shared/isViteServerBuild.js';
 import { resolveOutDir } from '../../shared/getOutDirs.js';
 import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig } from './handleAssetsManifest.js';
-// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = import.meta.url;
 const manifestTempFile = '_temp_manifest.json';
 function pluginBuildConfig() {
     let config;
@@ -81,8 +79,8 @@ async function getEntries(config) {
             ...clientEntries,
             ...pageFileEntries
         };
-        const clientRoutingEntry = resolve(`dist/esm/client/client-routing-runtime/entry.js`);
-        const serverRoutingEntry = resolve(`dist/esm/client/server-routing-runtime/entry.js`);
+        const clientRoutingEntry = requireResolveVikeDistFile('dist/esm/client/client-routing-runtime/entry.js');
+        const serverRoutingEntry = requireResolveVikeDistFile('dist/esm/client/server-routing-runtime/entry.js');
         if (hasClientRouting) {
             entries['entries/entry-client-routing'] = clientRoutingEntry;
         }
@@ -156,7 +154,7 @@ async function getPageFileEntries(config, includeAssetsImportedByServer) {
 }
 function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
     if (!clientEntry.startsWith('/')) {
-        assertIsNpmPackageImport(clientEntry);
+        assertIsImportPathNpmPackage(clientEntry);
         const entryTarget = clientEntry;
         const entryName = prependEntriesDir(clientEntry);
         return { entryName, entryTarget };
@@ -192,11 +190,6 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
     assert(!entryName.endsWith('/'));
     return { entryName, entryTarget };
 }
-function resolve(filePath) {
-    assert(filePath.startsWith('dist/'));
-    // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/build/
-    return requireResolveNonUserFile(`../../../../../../${filePath}`, importMetaUrl);
-}
 function addLogHook() {
     const tty = process.stdout.isTTY && !process.env.CI; // Equals https://github.com/vitejs/vite/blob/193d55c7b9cbfec5b79ebfca276d4a721e7de14d/packages/vite/src/node/plugins/reporter.ts#L27
     if (!tty)

package/dist/esm/node/plugin/plugins/build/pluginBuildEntry.js

@@ -2,11 +2,9 @@ export { pluginBuildEntry };
 export { set_macro_ASSETS_MANIFEST };
 import { serverProductionEntryPlugin } from '@brillout/vite-plugin-server-entry/plugin';
 import { virtualFileIdImportUserCodeServer } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
-import { assert, PROJECT_VERSION, requireResolveNonUserFile } from '../../utils.js';
+import { assert, PROJECT_VERSION, requireResolveVikeDistFile } from '../../utils.js';
 import fs from 'fs/promises';
 import path from 'path';
-// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = import.meta.url;
 import { isUsingClientRouter } from '../extractExportNamesPlugin.js';
 import { assertBuildInfo } from '../../../runtime/globalContext.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
@@ -93,8 +91,7 @@ function find_ASSETS_MANIFEST(bundle) {
 }
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct
-    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/pluginBuildEntry/index.js
-    const filePathAbsolute = requireResolveNonUserFile(`../../../../../../dist/esm/__internal/index.js`, importMetaUrl);
+    const filePathAbsolute = requireResolveVikeDistFile('dist/esm/__internal/index.js');
     if (
     // Let's implement a new config if a user needs the import to be a relative path instead of 'vike/__internal' (AFAIK a relative path is needed only if a framework has npm package 'vike' as direct dependency instead of a peer dependency and if the user of that framework uses pnpm)
     true) {

package/dist/esm/node/plugin/plugins/commonConfig/assertResolveAlias.js

@@ -1,5 +1,5 @@
 export { assertResolveAlias };
-import { assert, assertUsage, assertWarning, isArray, isValidPathAlias } from '../../utils.js';
+import { assert, assertUsage, assertWarning, isArray, isPathAliasRecommended } from '../../utils.js';
 import pc from '@brillout/picocolors';
 // Recommend users to avoid un-distinguishable path aliases.
 // There are a lot of libraries that don't or cannot follow that recommendation, for example:
@@ -59,7 +59,7 @@ function assertResolveAlias(config) {
             //  - determineOptimizeDeps()
             //  - extractAssets
             //  - in general: using un-distinguishable path aliases is asking for trouble
-            if (!isValidPathAlias(find)) {
+            if (!isPathAliasRecommended(find)) {
                 if (find.startsWith('@')) {
                     const msg = `${errPrefix} defines an invalid resolve.alias ${deprecation}: a path alias cannot start with ${pc.cyan('@')}, ${errSuffix1}`;
                     assertWarning(false, msg, { onlyOnce: true });

package/dist/esm/node/plugin/plugins/commonConfig.d.ts

@@ -1,5 +1,6 @@
 export { commonConfig };
 export { getVikeConfigPublic };
+export { getVikeConfigInternal };
 export type { VikeConfigPublic };
 import { type InlineConfig, type Plugin, type ResolvedConfig, type UserConfig } from 'vite';
 import { type VikeConfigObject } from './importUserCode/v1-design/getVikeConfig.js';
@@ -34,4 +35,5 @@ declare function commonConfig(vikeVitePluginOptions: unknown): Plugin[];
  *
  * https://vike.dev/getVikeConfig
  */
+declare function getVikeConfigInternal(config: ResolvedConfig | UserConfig): VikeConfigPublic;
 declare function getVikeConfigPublic(config: ResolvedConfig | UserConfig): VikeConfigPublic;

package/dist/esm/node/plugin/plugins/commonConfig.js

@@ -1,6 +1,7 @@
 export { commonConfig };
 export { getVikeConfigPublic };
-import { assert, assertUsage, assertWarning, findPackageJson, hasProp, isDevCheck, isDocker, isObject } from '../utils.js';
+export { getVikeConfigInternal };
+import { assert, assertUsage, assertWarning, findPackageJson, hasProp, isDevCheck, isDocker, isObject, isVitest } from '../utils.js';
 import { assertRollupInput } from './build/pluginBuildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
@@ -85,7 +86,7 @@ function commonConfig(vikeVitePluginOptions) {
                 order: 'post',
                 handler(configFromUser) {
                     let configFromVike = { server: {}, preview: {} };
-                    const vike = getVikeConfigPublic(configFromUser);
+                    const vike = getVikeConfigInternal(configFromUser);
                     if (vike.config.port !== undefined) {
                         // https://vike.dev/port
                         setDefault('port', vike.config.port, configFromUser, configFromVike);
@@ -152,6 +153,8 @@ function assertSingleInstance(config) {
 function assertVikeCliOrApi(config) {
     if (isVikeCliOrApi())
         return;
+    if (isVitest())
+        return;
     if (isViteCliCall()) {
         assertWarning(false, `Vite's CLI is deprecated ${pc.underline('https://vike.dev/migration/cli')}`, {
             onlyOnce: true
@@ -191,7 +194,7 @@ function temp_supportOldInterface(config) {
 }
 // TODO/soon rename:
 // - `getVikeConfig()` => `resolveVikeConfig()` ?
-// - `getVikeConfigPublic()` => `getVikeConfig()`
+// - `getVikeConfigInternal()` => `getVikeConfig()`
 // - `VikeConfigPublic` => `VikeConfig` ?
 // - `VikeConfigObject` => `VikeConfigInternal` ?
 /**
@@ -199,11 +202,16 @@ function temp_supportOldInterface(config) {
  *
  * https://vike.dev/getVikeConfig
  */
-function getVikeConfigPublic(config) {
+function getVikeConfigInternal(config) {
     const vikeConfig = config._vike;
     assert(vikeConfig);
     return vikeConfig;
 }
+function getVikeConfigPublic(config) {
+    const vikeConfig = config._vike;
+    assertUsage(vikeConfig, "getVikeConfig() can only be used when Vite is running with Vike's Vite plugin");
+    return vikeConfig;
+}
 // Only emit dist/server/entry.mjs if necessary
 function emitServerEntryOnlyIfNeeded(config) {
     if (config.vitePluginServerEntry?.inject &&

package/dist/esm/node/plugin/plugins/devConfig/determineFsAllowList.js

@@ -1,7 +1,7 @@
 export { determineFsAllowList };
 import { searchForWorkspaceRoot } from 'vite';
 import path from 'node:path';
-import { assert, assertPosixPath, requireResolveNonUserFile } from '../../utils.js';
+import { assert, assertPosixPath, getVikeNodeModulesRoot } from '../../utils.js';
 import { fileURLToPath } from 'url';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
@@ -18,11 +18,6 @@ async function determineFsAllowList(config) {
     // We add it again just to be sure.
     fsAllow.push(searchForWorkspaceRoot(process.cwd()));
     // Add node_modules/vike/
-    {
-        // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/config/
-        const vikeRoot = path.posix.join(__dirname_, '../../../../../../');
-        // Assert that `vikeRoot` is indeed pointing to `node_modules/vike/`
-        requireResolveNonUserFile(`${vikeRoot}/dist/esm/node/plugin/plugins/devConfig/index.js`, importMetaUrl);
-        fsAllow.push(vikeRoot);
-    }
+    const vikeNodeModulesRoot = getVikeNodeModulesRoot();
+    fsAllow.push(vikeNodeModulesRoot);
 }

package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -1,6 +1,6 @@
 export { determineOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
-import { assert, assertIsNpmPackageImport, createDebugger, isArray, unique } from '../../utils.js';
+import { assert, assertIsImportPathNpmPackage, createDebugger, isArray, unique } from '../../utils.js';
 import { getVikeConfig, isOverriden } from '../importUserCode/v1-design/getVikeConfig.js';
 import { analyzeClientEntries } from '../build/pluginBuildConfig.js';
 import { virtualFileIdImportUserCodeClientCR, virtualFileIdImportUserCodeClientSR } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
@@ -38,7 +38,7 @@ async function getPageDeps(config, pageConfigs) {
     const addInclude = (e) => {
         assert(e);
         // Shouldn't be a path alias, as path aliases would need to be added to config.optimizeDeps.entries instead of config.optimizeDeps.include
-        assertIsNpmPackageImport(e);
+        assertIsImportPathNpmPackage(e);
         include.push(e);
     };
     // V1 design

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

@@ -7,7 +7,7 @@ import { transpileAndExecuteFile } from './transpileAndExecuteFile.js';
 import { getConfigDefinitionOptional } from '../getVikeConfig.js';
 import { assertPlusFileExport } from '../../../../../../shared/page-configs/assertPlusFileExport.js';
 import pc from '@brillout/picocolors';
-import { parsePointerImportData } from './transformPointerImports.js';
+import { parsePointerImportData } from './pointerImports.js';
 import { getConfigFileExport } from './getConfigFileExport.js';
 import { resolvePointerImportData } from './resolvePointerImport.js';
 import { getConfigDefinedAt } from '../../../../../../shared/page-configs/getConfigDefinedAt.js';

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/{transformPointerImports.d.ts → pointerImports.d.ts}

@@ -1,6 +1,7 @@
 export { transformPointerImports };
 export { parsePointerImportData };
 export { isPointerImportData };
+export { assertPointerImportPath };
 export type { PointerImportData };
 declare function transformPointerImports(code: string, filePathToShowToUser2: string, pointerImports: Record<string, boolean> | 'all', skipWarnings?: true): string | null;
 /**
@@ -23,6 +24,7 @@ type PointerImportData = {
 };
 declare function isPointerImportData(str: string): boolean;
 declare function parsePointerImportData(importString: string): null | PointerImportData;
+declare function assertPointerImportPath(importPath: string): boolean;
 declare module 'estree' {
     interface BaseNodeWithoutComments {
         start: number;

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/{transformPointerImports.js → pointerImports.js}

@@ -1,6 +1,7 @@
 export { transformPointerImports };
 export { parsePointerImportData };
 export { isPointerImportData };
+export { assertPointerImportPath };
 // Playground: https://github.com/brillout/acorn-playground
 // Notes about `with { type: 'pointer' }`
 // - It works well with TypeScript: it doesn't complain upon `with { type: 'unknown-to-typescript' }` and go-to-definition & types are preserved: https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-3.html#import-attributes
@@ -17,7 +18,7 @@ export { isPointerImportData };
 //   - Esbuild removes comments: https://github.com/evanw/esbuild/issues/1439#issuecomment-877656182
 //   - Using source maps to track these magic comments is brittle (source maps can easily break)
 import { parse } from 'acorn';
-import { assert, assertUsage, assertWarning, styleFileRE } from '../../../../utils.js';
+import { assert, assertUsage, assertWarning, isFilePathAbsolute, isImportPath, styleFileRE } from '../../../../utils.js';
 import pc from '@brillout/picocolors';
 function transformPointerImports(code, filePathToShowToUser2, pointerImports, 
 // For ./transformPointerImports.spec.ts
@@ -144,8 +145,20 @@ function parsePointerImportData(importString) {
     assert(parts.length >= 2);
     const exportName = parts[parts.length - 1];
     const importPath = parts.slice(0, -1).join(SEP);
+    if (importPath.startsWith('.') && !(importPath.startsWith('./') || importPath.startsWith('../'))) {
+        assert(!importStringWasGenerated);
+        assertUsage(false, `Invalid relative import path ${pc.code(importPath)} defined by ${pc.code(JSON.stringify(importString))} because it should start with ${pc.code('./')} or ${pc.code('../')}, or use an npm package import instead.`);
+    }
+    assertPointerImportPath(importPath);
     return { importPath, exportName, importStringWasGenerated, importString };
 }
+// `importPath` is one of the following:
+// - A relative import path
+// - An npm package import
+// - A filesystem absolute path, see transpileWithEsbuild()
+function assertPointerImportPath(importPath) {
+    return isImportPath(importPath) || isFilePathAbsolute(importPath);
+}
 function spliceMany(str, operations) {
     let strMod = '';
     let endPrev;

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolvePointerImport.d.ts

@@ -2,7 +2,7 @@ export { resolvePointerImport };
 export { resolvePointerImportData };
 export type { PointerImport };
 import type { DefinedAtFilePath } from '../../../../../../shared/page-configs/PageConfig.js';
-import { type PointerImportData } from './transformPointerImports.js';
+import { type PointerImportData } from './pointerImports.js';
 import type { FilePath, FilePathResolved } from '../../../../../../shared/page-configs/FilePath.js';
 type PointerImport = {
     fileExportPath: FileExportPath;

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

@@ -1,9 +1,8 @@
 export { resolvePointerImport };
 export { resolvePointerImportData };
 import pc from '@brillout/picocolors';
-import { assert, assertPosixPath, assertUsage, isFilePathAbsolute, pathIsRelative, requireResolveOptional } from '../../../../utils.js';
-import { parsePointerImportData } from './transformPointerImports.js';
-import path from 'path';
+import { assert, assertPosixPath, assertUsage, isFilePathAbsolute, isImportPathRelative, isImportPathNpmPackageOrPathAlias, requireResolveOptional } from '../../../../utils.js';
+import { assertPointerImportPath, parsePointerImportData } from './pointerImports.js';
 import { getFilePathAbsoluteUserRootDir, getFilePathResolved, getFilePathUnresolved } from '../../../../shared/getFilePath.js';
 function resolvePointerImport(configValue, importerFilePath, userRootDir, configName) {
     if (typeof configValue !== 'string')
@@ -22,24 +21,18 @@ function resolvePointerImport(configValue, importerFilePath, userRootDir, config
     return { fileExportPath };
 }
 function resolvePointerImportData(pointerImportData, importerFilePath, userRootDir) {
-    // `importPath` should be one of the following:
-    // - A relative import path
-    // - A filesystem absolute path
-    // - An npm package import
     const { importPath } = pointerImportData;
-    const filePathAbsoluteFilesystem = resolveImportPathWithNode(pointerImportData, importerFilePath);
+    assertPointerImportPath(importPath);
+    const filePathAbsoluteFilesystem = resolveImportPathWithNode(pointerImportData, importerFilePath, userRootDir);
     let filePath;
     assertPosixPath(importPath);
-    if (importPath.startsWith('.') || isFilePathAbsolute(importPath)) {
-        if (importPath.startsWith('.')) {
-            assertUsage(pathIsRelative(importPath), `Invalid relative import path ${pc.code(importPath)} defined by ${importerFilePath.filePathToShowToUser} because it should start with ${pc.code('./')} or ${pc.code('../')}, or use an npm package import instead.`);
-        }
+    if (isImportPathRelative(importPath) || isFilePathAbsolute(importPath)) {
         // Pointer imports are included in virtual files, thus relative imports need to be resolved. (Virtual modules cannot contain relative imports.)
         assertUsageResolutionSuccess(filePathAbsoluteFilesystem, pointerImportData, importerFilePath);
         // Pointer imports are included in virtual files, and we need filePathAbsoluteUserRootDir because we didn't find a way to have filesystem absolute import paths in virtual files: https://gist.github.com/brillout/2315231c9a8164f950c64b4b4a7bbd39
         const errSuffix = `outside of the ${userRootDir} directory which is forbidden: make sure your import paths resolve inside the ${userRootDir} directory, or import from an npm package.`;
         const filePathAbsoluteUserRootDir = getFilePathAbsoluteUserRootDir({ filePathAbsoluteFilesystem, userRootDir });
-        if (importPath.startsWith('.')) {
+        if (isImportPathRelative(importPath)) {
             assertUsage(filePathAbsoluteUserRootDir, `The relative import ${pc.cyan(importPath)} defined by ${importerFilePath.filePathToShowToUser} resolves to ${filePathAbsoluteFilesystem} ${errSuffix}`);
         }
         else {
@@ -51,6 +44,7 @@ function resolvePointerImportData(pointerImportData, importerFilePath, userRootD
         filePath = getFilePathResolved({ filePathAbsoluteUserRootDir, userRootDir });
     }
     else {
+        assert(isImportPathNpmPackageOrPathAlias(importPath));
         const importPathAbsolute = importPath;
         if (filePathAbsoluteFilesystem) {
             filePath = getFilePathResolved({
@@ -68,12 +62,20 @@ function resolvePointerImportData(pointerImportData, importerFilePath, userRootD
     }
     return filePath;
 }
-function resolveImportPathWithNode(pointerImportData, importerFilePath) {
+function resolveImportPathWithNode(pointerImportData, importerFilePath, userRootDir) {
     const importerFilePathAbsolute = importerFilePath.filePathAbsoluteFilesystem;
     assertPosixPath(importerFilePathAbsolute);
-    const cwd = path.posix.dirname(importerFilePathAbsolute);
-    // filePathAbsoluteFilesystem is expected to be null when pointerImportData.importPath is a Vite path alias
-    const filePathAbsoluteFilesystem = requireResolveOptional(pointerImportData.importPath, cwd);
+    // filePathAbsoluteFilesystem is null when pointerImportData.importPath is a path alias that Node.js doesn't know about
+    const filePathAbsoluteFilesystem = requireResolveOptional({
+        importPath: pointerImportData.importPath,
+        importerFilePath: importerFilePathAbsolute,
+        userRootDir
+    });
+    if (!filePathAbsoluteFilesystem) {
+        assert(!isImportPathRelative(pointerImportData.importPath));
+        // Libraries don't use path aliases => filePathAbsoluteFilesystem should be defined
+        assert(!importerFilePathAbsolute.includes('node_modules'));
+    }
     return filePathAbsoluteFilesystem;
 }
 function assertUsageResolutionSuccess(filePathAbsoluteFilesystem, pointerImportData, importerFilePath) {
@@ -85,8 +87,7 @@ function assertUsageResolutionSuccess(filePathAbsoluteFilesystem, pointerImportD
             ? `The import path ${importPathString} in ${filePathToShowToUser}`
             : `The import ${pc.code(importString)} defined by ${filePathToShowToUser}`;
         const errIntro2 = `${errIntro} couldn't be resolved: does ${importPathString}`;
-        if (importPath.startsWith('.')) {
-            assert(pathIsRelative(importPath));
+        if (isImportPathRelative(importPath)) {
             assertUsage(false, `${errIntro2} point to an existing file?`);
         }
         else {

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

@@ -7,8 +7,8 @@ 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, isNpmPackageImport_unreliable } from '../../../../utils.js';
-import { transformPointerImports } from './transformPointerImports.js';
+import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainJavaScriptFile, createDebugger, assertFilePathAbsoluteFilesystem, assertIsImportPathNpmPackage, genPromise, isVitest, isImportPathNpmPackageOrPathAlias, isImportPathRelative, requireResolveOptionalDir } from '../../../../utils.js';
+import { transformPointerImports } from './pointerImports.js';
 import sourceMapSupport from 'source-map-support';
 import { getFilePathAbsoluteUserRootDir } from '../../../../shared/getFilePath.js';
 assertIsNotProductionRuntime();
@@ -121,7 +121,11 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     // - Sitll required for esbuild@0.24.0 (November 2024).
                     // - Let's try to remove this workaround again later.
                     if (resolved.errors.length > 0) {
-                        const resolvedWithNode = requireResolveOptional(path, toPosixPath(args.resolveDir));
+                        const resolvedWithNode = requireResolveOptionalDir({
+                            importPath: path,
+                            importerDir: toPosixPath(args.resolveDir),
+                            userRootDir
+                        });
                         if (debugEsbuildResolve.isActivated)
                             debugEsbuildResolve('resolvedWithNode', resolvedWithNode);
                         if (resolvedWithNode)
@@ -141,8 +145,8 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     const importPathOriginal = args.path;
                     // Esbuild resolves path aliases.
                     // - Enabling us to use:
-                    //   - assertIsNpmPackageImport()
-                    //   - isNpmPackageImport(str, { cannotBePathAlias: true })
+                    //   - assertIsImportPathNpmPackage()
+                    //   - isImportPathNpmPackage(str, { cannotBePathAlias: true })
                     assertFilePathAbsoluteFilesystem(importPathResolved);
                     //  Should be remove this? See comment below.
                     const isVikeExtensionImport = (path.startsWith('vike-') && path.endsWith('/config')) || importPathResolved.endsWith('+config.js');
@@ -160,7 +164,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     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));
+                            assert(isImportPathNpmPackageOrPathAlias(importPathOriginal));
                             return true;
                         }
                         // Linked npm packages
@@ -169,7 +173,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                         // - 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)) {
+                            isImportPathNpmPackageOrPathAlias(importPathOriginal)) {
                             return true;
                         }
                         return false;
@@ -186,7 +190,7 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     }
                     let importPathTranspiled;
                     assertPosixPath(importPathOriginal);
-                    if (importPathOriginal.startsWith('./') || importPathOriginal.startsWith('../')) {
+                    if (isImportPathRelative(importPathOriginal)) {
                         importPathTranspiled = importPathResolved;
                     }
                     else {
@@ -203,12 +207,12 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                             //   - Vike doesn't resolve path aliases at all.
                             //   - Node.js doesn't support `tsconfig.js#compilerOptions.paths`.
                             // - Esbuild path alias resolution seems reliable, e.g. it supports `tsconfig.js#compilerOptions.paths`.
-                            assert(!isNpmPackageImport_unreliable(importPathOriginal));
+                            assert(!isImportPathNpmPackageOrPathAlias(importPathOriginal));
                             importPathTranspiled = importPathResolved;
                         }
                         else {
                             // `importPathOriginal` is most likely an npm package import.
-                            assertIsNpmPackageImport(importPathOriginal);
+                            assertIsImportPathNpmPackage(importPathOriginal);
                             // For improved error messages, let the resolution be handled by Vike or Node.js.
                             importPathTranspiled = importPathOriginal;
                         }

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

@@ -70,7 +70,7 @@ async function handleReloadSideEffects() {
         }
     }
 }
-// TODO/soon: predominantly use getVikeConfigPublic() instead of getVikeConfig() then maybe refector?
+// TODO/soon: predominantly use getVikeConfigInternal() instead of getVikeConfig() then maybe refector?
 async function getVikeConfig(config, { doNotRestartViteOnError } = {}) {
     const userRootDir = config.root;
     const vikeVitePluginOptions = config._vikeVitePluginOptions;

package/dist/esm/node/plugin/shared/getFilePath.js

@@ -7,7 +7,7 @@ export { getModuleFilePathRelative };
 export { cleanFilePathUnkown };
 export { assertModuleId };
 import path from 'path';
-import { assert, assertIsNpmPackageImport, assertFilePathAbsoluteFilesystem, assertPosixPath, toPosixPath } from '../utils.js';
+import { assert, assertIsImportPathNpmPackage, assertFilePathAbsoluteFilesystem, assertPosixPath, toPosixPath } from '../utils.js';
 function getFilePathResolved(args) {
     const { userRootDir } = args;
     let filePathAbsoluteFilesystem;
@@ -39,7 +39,7 @@ function getComputedProps(args) {
         const importPathAbsolute = args.importPathAbsolute ?? null;
         const { filePathAbsoluteUserRootDir } = args;
         if (importPathAbsolute)
-            assertIsNpmPackageImport(importPathAbsolute);
+            assertIsImportPathNpmPackage(importPathAbsolute);
         return {
             importPathAbsolute,
             filePathAbsoluteUserRootDir,
@@ -53,7 +53,7 @@ function getComputedProps(args) {
 }
 function getComputedPropsImportPathAbsolute(args) {
     const { importPathAbsolute } = args;
-    assertIsNpmPackageImport(importPathAbsolute);
+    assertIsImportPathNpmPackage(importPathAbsolute);
     return {
         filePathAbsoluteUserRootDir: null,
         importPathAbsolute,

package/dist/esm/node/plugin/shared/resolveClientEntriesDev.js

@@ -1,12 +1,10 @@
 export { resolveClientEntriesDev };
-import { assert, assertPosixPath, toPosixPath, pathJoin, assertIsNpmPackageImport, assertIsNotProductionRuntime, requireResolveOptionalNonUserFile, requireResolve } from '../utils.js';
-// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = import.meta.url;
+import { assert, assertPosixPath, toPosixPath, pathJoin, assertIsImportPathNpmPackage, assertIsNotProductionRuntime, requireResolveNpmPackage, requireResolveVikeDistFile } from '../utils.js';
 assertIsNotProductionRuntime();
 async function resolveClientEntriesDev(clientEntry, viteDevServer) {
-    let root = viteDevServer.config.root;
-    assert(root);
-    root = toPosixPath(root);
+    let userRootDir = viteDevServer.config.root;
+    assert(userRootDir);
+    userRootDir = toPosixPath(userRootDir);
     // The `?import` suffix is needed for MDX to be transpiled:
     //   - Not transpiled: `/pages/markdown.page.mdx`
     //   - Transpiled: `/pages/markdown.page.mdx?import`
@@ -20,26 +18,16 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     assertPosixPath(clientEntry);
     let filePath;
     if (clientEntry.startsWith('/')) {
-        filePath = pathJoin(root, clientEntry);
+        filePath = pathJoin(userRootDir, clientEntry);
     }
     else {
         if (clientEntry.startsWith('@@vike/')) {
             assert(clientEntry.endsWith('.js'));
-            let filePath_;
-            // For Vitest (which doesn't resolve vike to its dist but to its source files)
-            // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/plugin/shared/resolveClientEntriesDev.js
-            filePath_ = requireResolveOptionalNonUserFile(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts'), importMetaUrl);
-            if (!filePath_) {
-                // For users
-                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/shared/resolveClientEntriesDev.js
-                filePath_ = requireResolveOptionalNonUserFile(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/'), importMetaUrl);
-            }
-            assert(filePath_);
-            filePath = filePath_;
+            filePath = requireResolveVikeDistFile(`dist/esm/${clientEntry.replace('@@vike/dist/esm/', '')}`);
         }
         else {
-            assertIsNpmPackageImport(clientEntry);
-            filePath = requireResolve(clientEntry, root);
+            assertIsImportPathNpmPackage(clientEntry);
+            filePath = requireResolveNpmPackage({ importPathNpmPackage: clientEntry, userRootDir });
         }
     }
     if (!filePath.startsWith('/')) {

package/dist/esm/node/plugin/utils.d.ts

@@ -24,3 +24,4 @@ export * from '../../utils/isEqualStringList.js';
 export * from '../../utils/isDocker.js';
 export * from '../../utils/isVitest.js';
 export * from '../../utils/rollupSourceMap.js';
+export * from '../../utils/isImportPath.js';

package/dist/esm/node/plugin/utils.js

@@ -30,3 +30,4 @@ export * from '../../utils/isEqualStringList.js';
 export * from '../../utils/isDocker.js';
 export * from '../../utils/isVitest.js';
 export * from '../../utils/rollupSourceMap.js';
+export * from '../../utils/isImportPath.js';

package/dist/esm/node/prerender/runPrerender.d.ts

@@ -75,6 +75,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
 } & {
     globalContext: GlobalContextServer;
     _globalContext: {
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -100,8 +101,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         };
         baseServer: string;
         baseAssets: string;
+        isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -128,8 +131,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _usesClientRouter: boolean;
         baseServer: string;
         baseAssets: string;
+        isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -156,8 +161,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _usesClientRouter: boolean;
         baseServer: string;
         baseAssets: string;
+        isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -190,7 +197,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
     _sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
     _from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
-    _isPageContextObject: boolean;
+    isPageContext: true;
 } & {
     _urlHandler: null;
     _httpRequestId: null;
@@ -209,6 +216,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
 } & {
     globalContext: GlobalContextServer;
     _globalContext: {
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -234,8 +242,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         };
         baseServer: string;
         baseAssets: string;
+        isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -262,8 +272,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _usesClientRouter: boolean;
         baseServer: string;
         baseAssets: string;
+        isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -290,8 +302,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _usesClientRouter: boolean;
         baseServer: string;
         baseAssets: string;
+        isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -324,7 +338,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
     _sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
     _from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
-    _isPageContextObject: boolean;
+    isPageContext: true;
 } & {
     _urlHandler: null;
     _httpRequestId: null;