vike 0.4.165-commit-8eba585 → 0.4.166-commit-6a8acaa

package/dist/esm/node/runtime/renderPage/getPageAssets.js

@@ -1,12 +1,11 @@
 export { getPageAssets };
-import { assert, prependBase, assertPosixPath, toPosixPath, isNpmPackageImport, unique, pathJoin } from '../utils.js';
+import { assert, prependBase, assertPosixPath, toPosixPath, unique, pathJoin, assertIsNpmPackageImport } from '../utils.js';
 import { retrieveAssetsDev } from './getPageAssets/retrieveAssetsDev.js';
 import { retrieveAssetsProd } from './getPageAssets/retrieveAssetsProd.js';
 import { inferMediaType } from './inferMediaType.js';
 import { getManifestEntry } from './getPageAssets/getManifestEntry.js';
 import { sortPageAssetsForEarlyHintsHeader } from './getPageAssets/sortPageAssetsForEarlyHintsHeader.js';
 import { getGlobalContext } from '../globalContext.js';
-import { assertClientEntryId } from './getPageAssets/assertClientEntryId.js';
 import { import_ } from '@brillout/import';
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = getGlobalContext();
@@ -56,7 +55,6 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     return pageAssets;
 }
 async function resolveClientEntriesDev(clientEntry, viteDevServer) {
-    assertClientEntryId(clientEntry);
     let root = viteDevServer.config.root;
     assert(root);
     root = toPosixPath(root);
@@ -73,11 +71,9 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     assertPosixPath(clientEntry);
     let filePath;
     if (clientEntry.startsWith('/')) {
-        // User files
         filePath = pathJoin(root, clientEntry);
     }
-    else if (clientEntry.startsWith('@@vike/') || isNpmPackageImport(clientEntry)) {
-        // Vike client entry
+    else {
         const { createRequire } = (await import_('module')).default;
         const { dirname } = (await import_('path')).default;
         const { fileURLToPath } = (await import_('url')).default;
@@ -88,10 +84,7 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
         // @ts-expect-error
         // Bun workaround https://github.com/vikejs/vike/pull/1048
         const res = typeof Bun !== 'undefined' ? (toPath) => Bun.resolveSync(toPath, __dirname_) : require_.resolve;
-        if (isNpmPackageImport(clientEntry)) {
-            filePath = res(clientEntry);
-        }
-        else {
+        if (clientEntry.startsWith('@@vike/')) {
             assert(clientEntry.endsWith('.js'));
             try {
                 // For Vitest (which doesn't resolve vike to its dist but to its source files)
@@ -104,9 +97,10 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
                 filePath = toPosixPath(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
             }
         }
-    }
-    else {
-        assert(false);
+        else {
+            assertIsNpmPackageImport(clientEntry);
+            filePath = res(clientEntry);
+        }
     }
     if (!filePath.startsWith('/')) {
         assert(process.platform === 'win32');

package/dist/esm/node/runtime/renderPage/logErrorHint.js

@@ -4,6 +4,7 @@ export { isCjsEsmError };
 export { isKnownError };
 export { getHint };
 import { assert, formatHintLog, isNotNullish, isObject, unique } from '../utils.js';
+import pc from '@brillout/picocolors';
 const knownErrors = [
     {
         errMsg: 'jsxDEV is not a function',
@@ -44,6 +45,7 @@ function getHint(error) {
 }
 function logHint(hint) {
     hint = formatHintLog(hint);
+    hint = pc.bold(hint);
     console.error(hint);
 }
 function isKnownError(error) {

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

@@ -29,7 +29,6 @@ export * from '../../utils/isPropertyGetter.js';
 export * from '../../utils/debug.js';
 export * from '../../utils/urlToFile.js';
 export * from '../../utils/getGlobalObject.js';
-export * from '../../shared/hooks/executeHook.js';
 export * from '../../utils/freezePartial.js';
 export * from '../../utils/isNpmPackage.js';
 export * from '../../utils/isNotNullish.js';

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

@@ -32,7 +32,6 @@ export * from '../../utils/isPropertyGetter.js';
 export * from '../../utils/debug.js';
 export * from '../../utils/urlToFile.js';
 export * from '../../utils/getGlobalObject.js';
-export * from '../../shared/hooks/executeHook.js';
 export * from '../../utils/freezePartial.js';
 export * from '../../utils/isNpmPackage.js';
 export * from '../../utils/isNotNullish.js';

package/dist/esm/shared/page-configs/FilePath.d.ts

@@ -2,51 +2,63 @@ export type { FilePath };
 export type { FilePathResolved };
 type FilePathResolved = FilePath & {
     filePathAbsoluteFilesystem: string;
+    /**
+     * The file's path, shown to the user in logs.
+     *
+     * Resolved: it always shows a file path. (It nevers shows an import path such as `vike-react/config`.)
+     *
+     * Its value is equivalent to `filePath.filePathAbsoluteUserRootDir ?? filePath.filePathAbsoluteFilesystem`.
+     */
     filePathToShowToUserResolved: string;
 };
-type FilePath = {
-    /** The file's path, non-relative from Vite's perspective.
+type IsReferencedByUserLandFile = {
+    filePathAbsoluteUserRootDir: string;
+} | {
+    importPathAbsolute: string;
+};
+type FilePath = FilePathProps & IsReferencedByUserLandFile;
+type FilePathProps = {
+    /**
+     * The file's path, absolute starting from the filesystem root.
      *
-     * Its value is equivalent to `filePath.filePathAbsoluteUserRootDir ?? filePath.importPathAbsolute`, for example:
-     *   - `vike-react/config`, or
-     *   - `/pages/+config.js`.
+     * Example: `/home/rom/code/my-app/pages/some-page/+Page.js`
      *
-     * We use it to generate import paths in virtual modules. (Since virtual modules cannot have relative import paths.)
+     * The value is `null` for imports using path aliases. (Because Vike cannot resolve path aliases, otherwise Vike would need to re-implement https://www.npmjs.com/package/@rollup/plugin-alias.)
      */
-    filePathAbsoluteVite: string;
-    /** The file's path, absolute starting from the filesystem root.
+    filePathAbsoluteFilesystem: string | null;
+    /**
+     * The file's path, absolute starting from the user root directory (i.e. Vite's `config.root`).
+     *
+     * Example: `/pages/some-page/+Page.js`.
      *
-     * Example: `/home/rom/code/my-app/pages/some-page/Page.js`
+     * Its value is `null` if the file is outside of the user root directory (i.e. Vite's `config.root`).
      *
-     * The value is `null` upon aliased import paths which we cannot resolve (we'd need to re-implement https://www.npmjs.com/package/@rollup/plugin-alias).
      */
-    filePathAbsoluteFilesystem: string | null;
-    /** The file's path, shown to user upon logging.
+    filePathAbsoluteUserRootDir: string | null;
+    /**
+     * The file's path, shown to the user in logs.
      *
-     * Unresolved: it may show an import path of a package e.g. `vike-react/config`.
+     * Unresolved: it may show an import path instead of a file path such as `vike-react/config`.
      *
-     * Currently, its value is equivalent to `FilePath['filePathAbsoluteVite']`.
+     * Its value is equivalent to `filePath.filePathAbsoluteUserRootDir ?? filePath.importPathAbsolute`.
      */
     filePathToShowToUser: string;
-    /** The file's path, shown to user upon logging.
+    /**
+     * The file's non-relative path, from Vite's perspective.
      *
-     * Resolved: it always shows an absolute file path.
+     * Examples:
+     *   - `/pages/+config.js`
+     *   - `vike-react/config`
      *
-     * Currently, its value is equivalent to `FilePath['filePathAbsoluteUserRootDir'] | FilePath['filePathAbsoluteFilesystem'] `.
-     */
-    filePathToShowToUserResolved: string | null;
-    /** The file's path, absolute starting from the user root directory (i.e. Vite's `config.root`).
+     * We use it to generate import paths in virtual modules. (Since import paths in virtual modules cannot be relative.)
      *
-     * Example: `/pages/some-page/Page.js`
+     * Its value is equivalent to `filePath.filePathAbsoluteUserRootDir ?? filePath.importPathAbsolute`.
      */
-    filePathAbsoluteUserRootDir: string | null;
-    /** The file's path, as absolute import path. It's either:
+    filePathAbsoluteVite: string;
+    /**
+     * The file's non-relative import path. It's either:
      *  - an npm package import (e.g. `vike-react/config`), or
-     *  - an alias (`#components/Counter').
+     *  - a path alias import (e.g. `#components/Counter').
      */
     importPathAbsolute: string | null;
-} & ({
-    importPathAbsolute: string;
-} | {
-    filePathAbsoluteUserRootDir: string;
-});
+};

package/dist/esm/shared/route/abort.js

@@ -7,7 +7,8 @@ export { logAbortErrorHandled };
 export { getPageContextFromAllRewrites };
 export { AbortRender };
 export { assertNoInfiniteAbortLoop };
-import { assert, assertInfo, assertUsage, assertWarning, checkType, hasProp, isUriWithProtocol, isUserHookError, joinEnglish, objectAssign, truncateString } from './utils.js';
+import { isUserHookError } from '../hooks/executeHook.js';
+import { assert, assertInfo, assertUsage, assertWarning, checkType, hasProp, isUriWithProtocol, joinEnglish, objectAssign, truncateString } from './utils.js';
 import pc from '@brillout/picocolors';
 /**
  * Abort the rendering of the current page, and redirect the user to another URL instead.

package/dist/esm/shared/route/executeGuardHook.js

@@ -1,6 +1,7 @@
 export { executeGuardHook };
 import { getHook, getHookTimeoutDefault } from '../hooks/getHook.js';
-import { assert, assertUsage, executeHook, isCallable } from './utils.js';
+import { assert, assertUsage, isCallable } from './utils.js';
+import { executeHook } from '../hooks/executeHook.js';
 const errIntro = 'The guard() hook defined by';
 async function executeGuardHook(pageContext, prepareForUserConsumption) {
     let hook;

package/dist/esm/shared/route/executeOnBeforeRouteHook.js

@@ -1,8 +1,9 @@
 export { executeOnBeforeRouteHook };
 import { assertPageContextProvidedByUser } from '../assertPageContextProvidedByUser.js';
-import { assertUsage, hasProp, isObjectWithKeys, objectAssign, assertWarning, assertUsageUrl, joinEnglish, assert, executeHook } from './utils.js';
+import { assertUsage, hasProp, isObjectWithKeys, objectAssign, assertWarning, assertUsageUrl, joinEnglish, assert } from './utils.js';
 import { assertRouteParams, assertSyncRouting } from './resolveRouteFunction.js';
 import pc from '@brillout/picocolors';
+import { executeHook } from '../hooks/executeHook.js';
 async function executeOnBeforeRouteHook(pageContext) {
     const pageContextFromOnBeforeRouteHook = {};
     if (!pageContext._onBeforeRouteHook)

package/dist/esm/shared/route/utils.d.ts

@@ -10,7 +10,6 @@ export * from '../../utils/isStringRecord.js';
 export * from '../../utils/unique.js';
 export * from '../../utils/isBrowser.js';
 export * from '../../utils/parseUrl.js';
-export * from '../hooks/executeHook.js';
 export * from '../../utils/checkType.js';
 export * from '../../utils/joinEnglish.js';
 export * from '../../utils/projectInfo.js';

package/dist/esm/shared/route/utils.js

@@ -19,7 +19,6 @@ export * from '../../utils/isStringRecord.js';
 export * from '../../utils/unique.js';
 export * from '../../utils/isBrowser.js';
 export * from '../../utils/parseUrl.js';
-export * from '../hooks/executeHook.js';
 export * from '../../utils/checkType.js';
 export * from '../../utils/joinEnglish.js';
 export * from '../../utils/projectInfo.js';

package/dist/esm/utils/assertPathIsFilesystemAbsolute.js

@@ -5,6 +5,7 @@ import { assertPosixPath } from './filesystemPathHandling.js';
 /** Assert path is absolute from the filesystem root */
 function assertPathIsFilesystemAbsolute(p) {
     assertPosixPath(p);
+    assert(!p.startsWith('/@fs/'));
     if (process.platform === 'win32') {
         assert(path.win32.isAbsolute(p));
     }

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

@@ -1,7 +1,7 @@
 export { createDebugger };
 export { isDebugEnabled };
 export type { Debug };
-type Flag = 'vike:routing' | 'vike:error' | 'vike:stream' | 'vike:log' | 'vike:virtual-files' | 'vike:outDir' | 'vike:extractExportNames' | 'vike:extractAssets' | 'vike:glob' | 'vike:pageFiles' | 'vike:setup' | 'vike:pointer-imports';
+type Flag = 'vike:routing' | 'vike:error' | 'vike:stream' | 'vike:log' | 'vike:virtual-files' | 'vike:outDir' | 'vike:extractExportNames' | 'vike:extractAssets' | 'vike:glob' | 'vike:pageFiles' | 'vike:setup' | 'vike:pointer-imports' | 'vike:optimizeDeps';
 type Debug = ReturnType<typeof createDebugger>;
 type Options = {
     serialization?: {

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

@@ -1,8 +1,12 @@
 export { isNpmPackageImport };
+export { assertIsNpmPackageImport };
 export { isValidPathAlias };
 export { parse };
 export { isDistinguishable };
-declare function isNpmPackageImport(str: string): boolean;
+declare function isNpmPackageImport(str: string, { cannotBePathAlias }: {
+    cannotBePathAlias: true;
+}): boolean;
+declare function assertIsNpmPackageImport(str: string): void;
 declare function isValidPathAlias(alias: string): boolean;
 declare function isDistinguishable(alias: string): boolean;
 declare function parse(str: string | undefined): null | {

package/dist/esm/utils/isNpmPackage.js

@@ -1,4 +1,5 @@
 export { isNpmPackageImport };
+export { assertIsNpmPackageImport };
 export { isValidPathAlias };
 /* Currently not used
 export { isNpmPackageName }
@@ -11,10 +12,18 @@ export { isDistinguishable };
 import { assert } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 assertIsNotBrowser();
-function isNpmPackageImport(str) {
+function isNpmPackageImport(str, { cannotBePathAlias }) {
+    // We cannot distinguish path alises that look like npm package imports
+    assert(cannotBePathAlias);
     const res = parse(str);
     return res !== null;
 }
+function assertIsNpmPackageImport(str) {
+    assert(isNpmPackageImport(str, {
+        // If `str` is a path alias that looks like an npm package => assertIsNpmPackageImport() is erroneous but that's okay because the assertion will eventually fail for some other user using a disambiguated path alias.
+        cannotBePathAlias: true
+    }));
+}
 function isNpmPackageName(str) {
     const res = parse(str);
     return res !== null && res.importPath === null;

package/dist/esm/utils/parseUrl.js

@@ -12,7 +12,14 @@ export { isUriWithProtocol };
 import { slice } from './slice.js';
 import { assert, assertUsage } from './assert.js';
 import pc from '@brillout/picocolors';
-const PROTOCOLS = ['http://', 'https://', 'tauri://', 'file://'];
+const PROTOCOLS = [
+    'http://',
+    'https://',
+    // For [Tauri](https://tauri.app/)
+    'tauri://',
+    // For Electron: https://github.com/vikejs/vike/issues/1557
+    'file://'
+];
 function isParsable(url) {
     // `parseUrl()` works with these URLs
     return (PROTOCOLS.some((p) => url.startsWith(p)) ||

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.165-commit-8eba585";
+declare const PROJECT_VERSION: "0.4.166-commit-6a8acaa";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.165-commit-8eba585";
+    projectVersion: "0.4.166-commit-6a8acaa";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.165-commit-8eba585';
+const PROJECT_VERSION = '0.4.166-commit-6a8acaa';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.165-commit-8eba585",
+  "version": "0.4.166-commit-6a8acaa",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -33,7 +33,8 @@
       "require": "./dist/cjs/node/runtime/index-deprecated.js",
       "node": "./dist/esm/node/runtime/index-deprecated.js",
       "browser": "./dist/esm/client/node.js",
-      "types": "./dist/esm/node/runtime/index-deprecated.d.ts"
+      "types": "./dist/esm/node/runtime/index-deprecated.d.ts",
+      "default": "./dist/esm/node/runtime/index-deprecated.js"
     },
     "./server": {
       "worker": "./dist/esm/node/runtime/index.js",
@@ -41,7 +42,8 @@
       "require": "./dist/cjs/node/runtime/index.js",
       "node": "./dist/esm/node/runtime/index.js",
       "browser": "./dist/esm/client/node.js",
-      "types": "./dist/esm/node/runtime/index.d.ts"
+      "types": "./dist/esm/node/runtime/index.d.ts",
+      "default": "./dist/esm/node/runtime/index.js"
     },
     "./client": {
       "types": "./dist/esm/client/server-routing-runtime/index.d.ts"
@@ -55,7 +57,8 @@
       "require": "./dist/cjs/node/client/router.js",
       "node": "./dist/esm/node/client/router.js",
       "browser": "./dist/esm/client/client-routing-runtime/index.js",
-      "types": "./dist/esm/client/client-routing-runtime/index.d.ts"
+      "types": "./dist/esm/client/client-routing-runtime/index.d.ts",
+      "default": "./dist/esm/client/client-routing-runtime/index.js"
     },
     "./routing": {
       "worker": "./dist/esm/shared/route/routing.js",
@@ -63,22 +66,26 @@
       "require": "./dist/cjs/shared/route/routing.js",
       "node": "./dist/esm/shared/route/routing.js",
       "browser": "./dist/esm/shared/route/routing.js",
-      "types": "./dist/esm/shared/route/routing.d.ts"
+      "types": "./dist/esm/shared/route/routing.d.ts",
+      "default": "./dist/esm/shared/route/routing.js"
     },
     "./cli": {
       "require": "./dist/cjs/node/cli/index.js",
       "node": "./dist/esm/node/cli/index.js",
-      "types": "./dist/esm/node/cli/index.d.ts"
+      "types": "./dist/esm/node/cli/index.d.ts",
+      "default": "./dist/esm/node/cli/index.js"
     },
     "./prerender": {
       "require": "./dist/cjs/node/prerender/index.js",
       "node": "./dist/esm/node/prerender/index.js",
-      "types": "./dist/esm/node/prerender/index.d.ts"
+      "types": "./dist/esm/node/prerender/index.d.ts",
+      "default": "./dist/esm/node/prerender/index.js"
     },
     "./plugin": {
       "require": "./dist/cjs/node/plugin/index.js",
       "node": "./dist/esm/node/plugin/index.js",
-      "types": "./dist/esm/node/plugin/index.d.ts"
+      "types": "./dist/esm/node/plugin/index.d.ts",
+      "default": "./dist/esm/node/plugin/index.js"
     },
     "./RenderErrorPage": {
       "worker": "./dist/esm/shared/RenderErrorPage.js",
@@ -86,7 +93,8 @@
       "require": "./dist/cjs/shared/RenderErrorPage.js",
       "node": "./dist/esm/shared/RenderErrorPage.js",
       "browser": "./dist/esm/shared/RenderErrorPage.js",
-      "types": "./dist/esm/shared/RenderErrorPage.d.ts"
+      "types": "./dist/esm/shared/RenderErrorPage.d.ts",
+      "default": "./dist/esm/shared/RenderErrorPage.js"
     },
     "./abort": {
       "worker": "./dist/esm/shared/abort.js",
@@ -94,24 +102,28 @@
       "require": "./dist/cjs/shared/abort.js",
       "node": "./dist/esm/shared/abort.js",
       "browser": "./dist/esm/shared/abort.js",
-      "types": "./dist/esm/shared/abort.d.ts"
+      "types": "./dist/esm/shared/abort.d.ts",
+      "default": "./dist/esm/shared/abort.js"
     },
     "./__internal": {
       "require": "./dist/cjs/__internal/index.js",
       "node": "./dist/esm/__internal/index.js",
-      "types": "./dist/esm/__internal/index.d.ts"
+      "types": "./dist/esm/__internal/index.d.ts",
+      "default": "./dist/esm/__internal/index.js"
     },
     "./__internal/setup": {
       "require": "./dist/cjs/node/runtime/page-files/setup.js",
       "node": "./dist/esm/node/runtime/page-files/setup.js",
-      "types": "./dist/esm/node/runtime/page-files/setup.d.ts"
+      "types": "./dist/esm/node/runtime/page-files/setup.d.ts",
+      "default": "./dist/esm/node/runtime/page-files/setup.js"
     },
     "./__internal/loadImportBuild": {
       "worker": "./dist/esm/node/runtime/globalContext/loadImportBuild.js",
       "edge-light": "./dist/esm/node/runtime/globalContext/loadImportBuild.js",
       "require": "./dist/cjs/node/runtime/globalContext/loadImportBuild.js",
       "node": "./dist/esm/node/runtime/globalContext/loadImportBuild.js",
-      "types": "./dist/esm/node/runtime/globalContext/loadImportBuild.d.ts"
+      "types": "./dist/esm/node/runtime/globalContext/loadImportBuild.d.ts",
+      "default": "./dist/esm/node/runtime/globalContext/loadImportBuild.js"
     }
   },
   "peerDependencies": {

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

@@ -1,90 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFilePathUnresolved = exports.getFilePathResolved = void 0;
-const path_1 = __importDefault(require("path"));
-const utils_js_1 = require("../../../../utils.js");
-function getFilePathUnresolved(args) {
-    const { filePathAbsoluteFilesystem, filePathAbsoluteUserRootDir } = args;
-    let filePathAbsoluteVite;
-    if (args.filePathAbsoluteUserRootDir !== null) {
-        filePathAbsoluteVite = args.filePathAbsoluteUserRootDir;
-    }
-    else {
-        (0, utils_js_1.assert)(args.importPathAbsolute !== null); // Help TS
-        filePathAbsoluteVite = args.importPathAbsolute;
-    }
-    return {
-        ...args,
-        filePathAbsoluteVite,
-        filePathToShowToUser: filePathAbsoluteVite,
-        filePathToShowToUserResolved: filePathAbsoluteUserRootDir || filePathAbsoluteFilesystem
-    };
-}
-exports.getFilePathUnresolved = getFilePathUnresolved;
-function getFilePathResolved(args) {
-    const { userRootDir, importPathAbsolute } = args;
-    let filePathAbsoluteFilesystem;
-    let filePathAbsoluteUserRootDir;
-    if ('filePathAbsoluteFilesystem' in args) {
-        filePathAbsoluteFilesystem = args.filePathAbsoluteFilesystem;
-        filePathAbsoluteUserRootDir = getFilePathAbsoluteUserRootDir({ filePathAbsoluteFilesystem, userRootDir });
-    }
-    else {
-        filePathAbsoluteUserRootDir = args.filePathAbsoluteUserRootDir;
-        filePathAbsoluteFilesystem = getFilePathAbsoluteUserFilesystem({ filePathAbsoluteUserRootDir, userRootDir });
-    }
-    let filePathResolved;
-    const common = {
-        filePathAbsoluteUserRootDir,
-        filePathAbsoluteFilesystem,
-        importPathAbsolute,
-        userRootDir
-    };
-    if (importPathAbsolute) {
-        filePathResolved = getFilePathUnresolved({
-            ...common,
-            importPathAbsolute
-        });
-    }
-    else {
-        (0, utils_js_1.assert)(filePathAbsoluteUserRootDir);
-        filePathResolved = getFilePathUnresolved({
-            ...common,
-            filePathAbsoluteUserRootDir
-        });
-    }
-    (0, utils_js_1.assert)(filePathAbsoluteFilesystem);
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(filePathResolved, 'filePathAbsoluteFilesystem', 'string'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(filePathResolved, 'filePathToShowToUserResolved', 'string'));
-    return filePathResolved;
-}
-exports.getFilePathResolved = getFilePathResolved;
-function getFilePathAbsoluteUserFilesystem({ filePathAbsoluteUserRootDir, userRootDir }) {
-    (0, utils_js_1.assertPosixPath)(filePathAbsoluteUserRootDir);
-    (0, utils_js_1.assertPosixPath)(userRootDir);
-    const filePathAbsoluteFilesystem = path_1.default.posix.join(userRootDir, filePathAbsoluteUserRootDir);
-    return filePathAbsoluteFilesystem;
-}
-function getFilePathAbsoluteUserRootDir({ filePathAbsoluteFilesystem, userRootDir }) {
-    (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
-    (0, utils_js_1.assertPosixPath)(userRootDir);
-    let filePathAbsoluteUserRootDir = null;
-    if (filePathAbsoluteFilesystem.startsWith(userRootDir)) {
-        {
-            let filePathAbsoluteUserRootDir1 = filePathAbsoluteFilesystem.slice(userRootDir.length);
-            if (!filePathAbsoluteUserRootDir1.startsWith('/'))
-                filePathAbsoluteUserRootDir1 = '/' + filePathAbsoluteUserRootDir1;
-            filePathAbsoluteUserRootDir = filePathAbsoluteUserRootDir1;
-        }
-        {
-            let filePathAbsoluteUserRootDir2 = path_1.default.posix.relative(userRootDir, filePathAbsoluteFilesystem);
-            (0, utils_js_1.assert)(!filePathAbsoluteUserRootDir2.startsWith('.') && !filePathAbsoluteUserRootDir2.startsWith('/'));
-            filePathAbsoluteUserRootDir2 = '/' + filePathAbsoluteUserRootDir2;
-            (0, utils_js_1.assert)(filePathAbsoluteFilesystem === filePathAbsoluteUserRootDir2);
-        }
-    }
-    return filePathAbsoluteUserRootDir;
-}

package/dist/cjs/node/runtime/renderPage/getPageAssets/assertClientEntryId.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertClientEntryId = void 0;
-const utils_js_1 = require("../../utils.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
-function assertClientEntryId(id) {
-    (0, utils_js_1.assertPosixPath)(id);
-    (0, utils_js_1.assert)(!id.startsWith('/@fs'), id);
-    (0, utils_js_1.assert)(
-    // Client entry
-    id.startsWith('@@vike/') ||
-        // User files
-        id.startsWith('/') ||
-        // Page code importer
-        (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id) ||
-        // Import
-        (0, utils_js_1.isNpmPackageImport)(id), id);
-}
-exports.assertClientEntryId = assertClientEntryId;

package/dist/cjs/utils/getFilePathAbsolute.js

@@ -1,70 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFilePathAbsoluteUserRootDir = exports.getFilePathAbsoluteFilesystem = void 0;
-const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
-const assert_js_1 = require("./assert.js");
-const path_1 = __importDefault(require("path"));
-const assertIsNotProductionRuntime_js_1 = require("./assertIsNotProductionRuntime.js");
-const isNpmPackage_js_1 = require("./isNpmPackage.js");
-const assertPathIsFilesystemAbsolute_js_1 = require("./assertPathIsFilesystemAbsolute.js");
-const module_1 = require("module");
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
-const importMetaUrl = `file://${__filename}`;
-const require_ = (0, module_1.createRequire)(importMetaUrl);
-(0, assertIsNotProductionRuntime_js_1.assertIsNotProductionRuntime)();
-// Vite handles paths such as /pages/index.page.js which are relative to `config.root`.
-// Make them absolute starting from the filesystem root.
-// Also resolve plus files living in npm packages such as restack/renderer/+onRenderHtml.js
-function getFilePathAbsoluteFilesystem(filePath, config) {
-    (0, filesystemPathHandling_js_1.assertPosixPath)(filePath);
-    if (filePath.startsWith('/@fs/')) {
-        return filePath;
-    }
-    let filePathUnresolved;
-    if ((0, isNpmPackage_js_1.isNpmPackageImport)(filePath)) {
-        filePathUnresolved = filePath;
-    }
-    else {
-        (0, assert_js_1.assert)(filePath.startsWith('/'));
-        const { root } = config;
-        (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(root);
-        filePathUnresolved = path_1.default.posix.join(root, filePath);
-        (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(filePathUnresolved);
-    }
-    let filePathAbsoluteFilesystem;
-    try {
-        filePathAbsoluteFilesystem = require_.resolve(filePathUnresolved, { paths: [config.root] });
-    }
-    catch (err) {
-        console.error(err);
-        (0, assert_js_1.assert)(false);
-    }
-    filePathAbsoluteFilesystem = (0, filesystemPathHandling_js_1.toPosixPath)(filePathAbsoluteFilesystem);
-    (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(filePathAbsoluteFilesystem);
-    return filePathAbsoluteFilesystem;
-}
-exports.getFilePathAbsoluteFilesystem = getFilePathAbsoluteFilesystem;
-function getFilePathAbsoluteUserRootDir(filePathAbsoluteFilesystem, userRootDir, alwaysRelative = false) {
-    (0, filesystemPathHandling_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
-    (0, filesystemPathHandling_js_1.assertPosixPath)(userRootDir);
-    let filePathAbsoluteUserRootDir = path_1.default.posix.relative(userRootDir, filePathAbsoluteFilesystem);
-    if (filePathAbsoluteFilesystem.startsWith(userRootDir)) {
-        (0, assert_js_1.assert)(!filePathAbsoluteUserRootDir.startsWith('.') && !filePathAbsoluteUserRootDir.startsWith('/'), 
-        // Surprinsingly, this assertion seem to fail sometimes: https://github.com/vikejs/vike/issues/1139
-        { filePathAbsoluteUserRootDir, filePathAbsoluteFilesystem, userRootDir });
-        filePathAbsoluteUserRootDir = `/${filePathAbsoluteUserRootDir}`;
-        return filePathAbsoluteUserRootDir;
-    }
-    else {
-        if (alwaysRelative) {
-            return filePathAbsoluteUserRootDir;
-        }
-        else {
-            return filePathAbsoluteFilesystem;
-        }
-    }
-}
-exports.getFilePathAbsoluteUserRootDir = getFilePathAbsoluteUserRootDir;