vike 0.4.166 → 0.4.167

package/dist/esm/node/plugin/shared/getFilePath.d.ts

@@ -1,20 +1,21 @@
 export { getFilePathResolved };
 export { getFilePathUnresolved };
+export { getModuleFilePath };
+export { getFilePathToShowToUserFromUnkown };
+export { cleanFilePathUnkown };
 import type { FilePath, FilePathResolved } from '../../../shared/page-configs/FilePath.js';
-declare function getFilePathUnresolved(args: {
-    filePathAbsoluteFilesystem: string | null;
-    filePathAbsoluteUserRootDir: string | null;
-    importPathAbsolute: string | null;
-} & ({
-    filePathAbsoluteUserRootDir: string;
-} | {
+import type { ResolvedConfig } from 'vite';
+declare function getFilePathUnresolved({ importPathAbsolute }: {
     importPathAbsolute: string;
-})): FilePath;
+}): FilePath;
 declare function getFilePathResolved(args: {
     userRootDir: string;
-    importPathAbsolute: string | null;
+    importPathAbsolute?: string;
 } & ({
     filePathAbsoluteFilesystem: string;
 } | {
     filePathAbsoluteUserRootDir: string;
 })): FilePathResolved;
+declare function getModuleFilePath(moduleId: string, config: ResolvedConfig): string;
+declare function getFilePathToShowToUserFromUnkown(filePathUnkown: string, userRootDir: string): string;
+declare function cleanFilePathUnkown(filePathUnknown: string): string;

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

@@ -1,26 +1,16 @@
 export { getFilePathResolved };
 export { getFilePathUnresolved };
+export { getModuleFilePath };
+export { getFilePathToShowToUserFromUnkown };
+export { cleanFilePathUnkown };
 import path from 'path';
-import { assert, assertPosixPath, hasProp } from '../utils.js';
-function getFilePathUnresolved(args) {
-    const { filePathAbsoluteFilesystem, filePathAbsoluteUserRootDir } = args;
-    let filePathAbsoluteVite;
-    if (args.filePathAbsoluteUserRootDir !== null) {
-        filePathAbsoluteVite = args.filePathAbsoluteUserRootDir;
-    }
-    else {
-        assert(args.importPathAbsolute !== null); // Help TS
-        filePathAbsoluteVite = args.importPathAbsolute;
-    }
-    return {
-        ...args,
-        filePathAbsoluteVite,
-        filePathToShowToUser: filePathAbsoluteVite,
-        filePathToShowToUserResolved: filePathAbsoluteUserRootDir || filePathAbsoluteFilesystem
-    };
+import { assert, assertPathIsFilesystemAbsolute, assertPosixPath, toPosixPath } from '../utils.js';
+function getFilePathUnresolved({ importPathAbsolute }) {
+    return getFilePath({ importPathAbsolute, filePathAbsoluteUserRootDir: null });
 }
 function getFilePathResolved(args) {
-    const { userRootDir, importPathAbsolute } = args;
+    const { userRootDir } = args;
+    const importPathAbsolute = args.importPathAbsolute ?? null;
     let filePathAbsoluteFilesystem;
     let filePathAbsoluteUserRootDir;
     if ('filePathAbsoluteFilesystem' in args) {
@@ -31,40 +21,67 @@ function getFilePathResolved(args) {
         filePathAbsoluteUserRootDir = args.filePathAbsoluteUserRootDir;
         filePathAbsoluteFilesystem = getFilePathAbsoluteUserFilesystem({ filePathAbsoluteUserRootDir, userRootDir });
     }
-    let filePathResolved;
+    let filePath;
     const common = {
         filePathAbsoluteUserRootDir,
-        filePathAbsoluteFilesystem,
         importPathAbsolute,
         userRootDir
     };
     if (importPathAbsolute) {
-        filePathResolved = getFilePathUnresolved({
+        filePath = getFilePath({
             ...common,
             importPathAbsolute
         });
     }
     else {
         assert(filePathAbsoluteUserRootDir);
-        filePathResolved = getFilePathUnresolved({
+        filePath = getFilePath({
             ...common,
             filePathAbsoluteUserRootDir
         });
     }
     assert(filePathAbsoluteFilesystem);
-    assert(hasProp(filePathResolved, 'filePathAbsoluteFilesystem', 'string'));
-    assert(hasProp(filePathResolved, 'filePathToShowToUserResolved', 'string'));
+    assertPathIsFilesystemAbsolute(filePathAbsoluteFilesystem);
+    const filePathToShowToUserResolved = filePathAbsoluteUserRootDir || filePathAbsoluteFilesystem;
+    assert(filePathToShowToUserResolved);
+    const filePathResolved = {
+        ...filePath,
+        filePathAbsoluteFilesystem,
+        filePathToShowToUserResolved
+    };
     return filePathResolved;
 }
+function getFilePath(args) {
+    let filePathAbsoluteVite;
+    if (args.filePathAbsoluteUserRootDir !== null) {
+        filePathAbsoluteVite = args.filePathAbsoluteUserRootDir;
+    }
+    else {
+        assert(args.importPathAbsolute !== null); // Help TS
+        filePathAbsoluteVite = args.importPathAbsolute;
+    }
+    const filePathToShowToUser = filePathAbsoluteVite;
+    assert(filePathToShowToUser);
+    return {
+        ...args,
+        filePathAbsoluteFilesystem: null,
+        filePathAbsoluteVite,
+        filePathToShowToUser
+    };
+}
 function getFilePathAbsoluteUserFilesystem({ filePathAbsoluteUserRootDir, userRootDir }) {
     assertPosixPath(filePathAbsoluteUserRootDir);
     assertPosixPath(userRootDir);
+    assertPathIsFilesystemAbsolute(userRootDir);
     const filePathAbsoluteFilesystem = path.posix.join(userRootDir, filePathAbsoluteUserRootDir);
+    assertPathIsFilesystemAbsolute(userRootDir);
     return filePathAbsoluteFilesystem;
 }
 function getFilePathAbsoluteUserRootDir({ filePathAbsoluteFilesystem, userRootDir }) {
     assertPosixPath(filePathAbsoluteFilesystem);
     assertPosixPath(userRootDir);
+    assertPathIsFilesystemAbsolute(filePathAbsoluteFilesystem);
+    assertPathIsFilesystemAbsolute(userRootDir);
     const filePathRelative = path.posix.relative(userRootDir, filePathAbsoluteFilesystem);
     if (!filePathAbsoluteFilesystem.startsWith(userRootDir)) {
         assert(filePathRelative.startsWith('../'));
@@ -72,11 +89,48 @@ function getFilePathAbsoluteUserRootDir({ filePathAbsoluteFilesystem, userRootDi
     }
     assert(!filePathRelative.startsWith('.') && !filePathRelative.startsWith('/'));
     const filePathAbsoluteUserRootDir = `/${filePathRelative}`;
-    {
-        let check = filePathAbsoluteFilesystem.slice(userRootDir.length);
-        if (!check.startsWith('/'))
-            check = '/' + check;
-        assert(filePathAbsoluteUserRootDir === check);
+    assert(filePathAbsoluteUserRootDir === getFilePathAbsoluteUserRootDir2(filePathAbsoluteFilesystem, userRootDir));
+    return filePathAbsoluteUserRootDir;
+}
+function getModuleFilePath(moduleId, config) {
+    const userRootDir = config.root;
+    assertPosixPath(moduleId);
+    assertPosixPath(userRootDir);
+    const filePathAbsoluteFilesystem = cleanModuleId(moduleId);
+    assertPathIsFilesystemAbsolute(filePathAbsoluteFilesystem);
+    const filePath = getFilePathResolved({ filePathAbsoluteFilesystem, userRootDir });
+    return filePath.filePathToShowToUserResolved;
+}
+function getFilePathToShowToUserFromUnkown(
+// We don't have any guarentee about filePath, e.g. about whether is filePathAbsoluteFilesystem or filePathAbsoluteUserRootDir
+filePathUnkown, userRootDir) {
+    assertPosixPath(userRootDir);
+    assertPathIsFilesystemAbsolute(userRootDir);
+    filePathUnkown = cleanFilePathUnkown(filePathUnkown);
+    if (!filePathUnkown.startsWith(userRootDir)) {
+        return filePathUnkown;
     }
+    else {
+        return getFilePathAbsoluteUserRootDir2(filePathUnkown, userRootDir);
+    }
+}
+function getFilePathAbsoluteUserRootDir2(filePathAbsoluteFilesystem, userRootDir) {
+    assert(filePathAbsoluteFilesystem.startsWith(userRootDir));
+    let filePathAbsoluteUserRootDir = filePathAbsoluteFilesystem.slice(userRootDir.length);
+    if (!filePathAbsoluteUserRootDir.startsWith('/'))
+        filePathAbsoluteUserRootDir = '/' + filePathAbsoluteUserRootDir;
     return filePathAbsoluteUserRootDir;
 }
+function cleanFilePathUnkown(filePathUnknown) {
+    filePathUnknown = toPosixPath(filePathUnknown);
+    filePathUnknown = cleanModuleId(filePathUnknown);
+    return filePathUnknown;
+}
+function cleanModuleId(moduleId) {
+    // remove query
+    const parts = moduleId.split('?');
+    if (parts.length > 1)
+        parts.pop();
+    assert(parts.length >= 1);
+    return parts.join('?');
+}

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

@@ -1,5 +1,5 @@
 export { isErrorDebug };
-import { isDebugEnabled } from '../utils.js';
+import { isDebugActivated } from '../utils.js';
 function isErrorDebug() {
-    return isDebugEnabled('vike:error');
+    return isDebugActivated('vike:error');
 }

package/dist/esm/node/plugin/shared/loggerNotProd/errorWithCodeSnippet.js

@@ -7,7 +7,8 @@ export { isEquivalentErrorWithCodeSnippet };
 export { getPrettyErrMessage };
 // Copied & adapted from https://github.com/vitejs/vite/blob/9c114c5c72a6af87e3330d5573362554b4511265/packages/vite/src/node/server/middlewares/error.ts
 import pc from '@brillout/picocolors';
-import { assert, escapeRegex, getFilePathAbsoluteUserRootDir, isObject, removeEmptyLines, stripAnsi, toPosixPath } from '../../utils.js';
+import { assert, escapeRegex, isObject, removeEmptyLines, stripAnsi } from '../../utils.js';
+import { cleanFilePathUnkown, getFilePathToShowToUserFromUnkown } from '../getFilePath.js';
 function isErrorWithCodeSnippet(err) {
     if (!isObject(err)) {
         return false;
@@ -46,7 +47,7 @@ function getPrettyErrorWithCodeSnippet(err, userRootDir) {
     let { id, frame } = err;
     const msgFirstLine = [
         pc.red('Failed to transpile'),
-        pc.bold(pc.red(getFilePathAbsoluteUserRootDir(normalizeId(id), userRootDir))),
+        pc.bold(pc.red(getFilePathToShowToUserFromUnkown(id, userRootDir))),
         pc.red('because:')
     ].join(' ');
     const errMsg = getPrettyErrMessage(err);
@@ -85,7 +86,7 @@ function getPrettyErrMessage(err) {
     // Remove "/home/rom/code/vike/examples/react-full/components/Counter.tsx:1:8:" (redundant since we already print the filename)
     const pos = /(?:\:\d+|)/;
     errMsg = errMsg.split(reg([id, pos, pos, trail], 'gi')).join('');
-    errMsg = errMsg.split(reg([normalizeId(id), pos, pos, trail], 'gi')).join('');
+    errMsg = errMsg.split(reg([cleanFilePathUnkown(id), pos, pos, trail], 'gi')).join('');
     // Remove "ERROR:" (useless)
     errMsg = errMsg.split(reg(['ERROR:', trail])).join('');
     // Remove "Internal server error:" (useless)
@@ -155,9 +156,3 @@ function isEquivalentErrorWithCodeSnippet(err1, err2) {
 function isDefinedAndSame(val1, val2) {
     return val1 && val1 === val2;
 }
-function normalizeId(id) {
-    id = toPosixPath(id);
-    // remove query
-    id = id.split('?')[0];
-    return id;
-}

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

@@ -14,7 +14,7 @@ export { clearLogs };
 import { isAbortError } from '../../../shared/route/abort.js';
 import { getViteConfig } from '../../runtime/globalContext.js';
 import { overwriteRuntimeProductionLogger } from '../../runtime/renderPage/loggerRuntime.js';
-import { assert, assertIsNotProductionRuntime, formatHintLog, getAssertErrMsg, isUserHookError, overwriteAssertProductionLogger, stripAnsi, warnIfErrorIsNotObject } from '../utils.js';
+import { assert, assertIsNotProductionRuntime, formatHintLog, getAssertErrMsg, overwriteAssertProductionLogger, stripAnsi, warnIfErrorIsNotObject } from '../utils.js';
 import { getHttpRequestAsyncStore } from './getHttpRequestAsyncStore.js';
 import { isErrorDebug } from './isErrorDebug.js';
 import { isErrorWithCodeSnippet, getPrettyErrorWithCodeSnippet } from './loggerNotProd/errorWithCodeSnippet.js';
@@ -24,6 +24,7 @@ import pc from '@brillout/picocolors';
 import { setAlreadyLogged } from '../../runtime/renderPage/isNewError.js';
 import { isConfigInvalid } from '../../runtime/renderPage/isConfigInvalid.js';
 import { onRuntimeError } from '../../runtime/renderPage/loggerProd.js';
+import { isUserHookError } from '../../../shared/hooks/executeHook.js';
 assertIsNotProductionRuntime();
 overwriteRuntimeProductionLogger(logRuntimeError, logRuntimeInfo);
 overwriteAssertProductionLogger(assertLogger);

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

@@ -1,6 +1,5 @@
 export * from '../runtime/utils.js';
 export * from '../../utils/viteIsSSR.js';
-export * from '../../utils/getFilePathAbsolute.js';
 export * from '../../utils/requireResolve.js';
 export * from '../../utils/arrayIncludes.js';
 export * from '../../utils/isDev.js';
@@ -20,3 +19,4 @@ export * from '../../utils/injectRollupInputs.js';
 export * from '../../utils/humanizeTime.js';
 export * from '../../utils/pLimit.js';
 export * from '../../utils/assertVersion.js';
+export * from '../../utils/assertPathIsFilesystemAbsolute.js';

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

@@ -6,7 +6,6 @@ onLoad();
 export * from '../runtime/utils.js';
 // Utils only needed by `plugin/*`
 export * from '../../utils/viteIsSSR.js';
-export * from '../../utils/getFilePathAbsolute.js';
 export * from '../../utils/requireResolve.js';
 export * from '../../utils/arrayIncludes.js';
 export * from '../../utils/isDev.js';
@@ -26,3 +25,4 @@ export * from '../../utils/injectRollupInputs.js';
 export * from '../../utils/humanizeTime.js';
 export * from '../../utils/pLimit.js';
 export * from '../../utils/assertVersion.js';
+export * from '../../utils/assertPathIsFilesystemAbsolute.js';

package/dist/esm/node/prerender/runPrerender.js

@@ -5,8 +5,7 @@ export { runPrerender_forceExit };
 import '../runtime/page-files/setup.js';
 import path from 'path';
 import { route } from '../../shared/route/index.js';
-import { assert, assertUsage, assertWarning, hasProp, projectInfo, objectAssign, isObjectWithKeys, isCallable, getOutDirs, isPropertyGetter, assertPosixPath, urlToFile, executeHook, isPlainObject, isUserHookError, handleNodeEnv_prerender } from './utils.js';
-import { pLimit } from '../../utils/pLimit.js';
+import { assert, assertUsage, assertWarning, hasProp, projectInfo, objectAssign, isObjectWithKeys, isCallable, getOutDirs, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, handleNodeEnv_prerender, pLimit, assertPathIsFilesystemAbsolute } from './utils.js';
 import { prerenderPage, prerender404Page, getRenderContext, getPageContextInitEnhanced } from '../runtime/renderPage/renderPageAlreadyRouted.js';
 import pc from '@brillout/picocolors';
 import { cpus } from 'os';
@@ -20,13 +19,13 @@ import { getConfigValue, getConfigValueFilePathToShowToUser } from '../../shared
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { isErrorPage } from '../../shared/error-page.js';
 import { addUrlComputedProps } from '../../shared/addUrlComputedProps.js';
-import { assertPathIsFilesystemAbsolute } from '../../utils/assertPathIsFilesystemAbsolute.js';
 import { isAbortError } from '../../shared/route/abort.js';
 import { loadUserFilesServerSide } from '../runtime/renderPage/loadUserFilesServerSide.js';
 import { getHookFromPageConfig, getHookFromPageConfigGlobal, getHookTimeoutDefault, setIsPrerenderering } from '../../shared/hooks/getHook.js';
 import { noRouteMatch } from '../../shared/route/noRouteMatch.js';
 import { getVikeConfig } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
 import { logErrorHint } from '../runtime/renderPage/logErrorHint.js';
+import { executeHook, isUserHookError } from '../../shared/hooks/executeHook.js';
 async function runPrerenderFromAPI(options = {}) {
     await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.

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

@@ -8,6 +8,7 @@ export * from '../../utils/getOutDirs.js';
 export * from '../../utils/isPropertyGetter.js';
 export * from '../../utils/filesystemPathHandling.js';
 export * from '../../utils/urlToFile.js';
-export * from '../../shared/hooks/executeHook.js';
 export * from '../../utils/isPlainObject.js';
 export * from '../../utils/assertNodeEnv.js';
+export * from '../../utils/pLimit.js';
+export * from '../../utils/assertPathIsFilesystemAbsolute.js';

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

@@ -10,6 +10,7 @@ export * from '../../utils/getOutDirs.js';
 export * from '../../utils/isPropertyGetter.js';
 export * from '../../utils/filesystemPathHandling.js';
 export * from '../../utils/urlToFile.js';
-export * from '../../shared/hooks/executeHook.js';
 export * from '../../utils/isPlainObject.js';
 export * from '../../utils/assertNodeEnv.js';
+export * from '../../utils/pLimit.js';
+export * from '../../utils/assertPathIsFilesystemAbsolute.js';

package/dist/esm/node/runtime/html/stream.js

@@ -379,7 +379,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         const writeChunk = (chunk) => {
             assert(writableOriginal);
             writableOriginal.write(chunk);
-            if (debug.isEnabled) {
+            if (debug.isActivated) {
                 debug('data written (Node.js Writable)', String(chunk));
             }
         };
@@ -452,7 +452,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         const writeChunk = (chunk) => {
             assert(writerOriginal);
             writerOriginal.write(encodeForWebStream(chunk));
-            if (debug.isEnabled) {
+            if (debug.isActivated) {
                 debug('data written (Web Writable)', String(chunk));
             }
         };
@@ -545,12 +545,12 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
             // If readableOriginal doesn't implement readableOriginal.cancel() then it may still emit data after we close the stream. We therefore need to check whether we closed `controllerProxy`.
             !controllerProxyIsClosed) {
                 controllerProxy.enqueue(encodeForWebStream(chunk));
-                if (debug.isEnabled) {
+                if (debug.isActivated) {
                     debug('data written (Web Readable)', String(chunk));
                 }
             }
             else {
-                if (debug.isEnabled) {
+                if (debug.isActivated) {
                     debug('data emitted but not written (Web Readable)', String(chunk));
                 }
             }
@@ -572,7 +572,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         }
         const writeChunk = (chunk) => {
             readableProxy.push(chunk);
-            if (debug.isEnabled) {
+            if (debug.isActivated) {
                 debug('data written (Node.js Readable)', String(chunk));
             }
         };

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

@@ -1,8 +1,8 @@
 export { executeOnBeforeRenderAndDataHooks };
 import { getHook } from '../../../shared/hooks/getHook.js';
 import { preparePageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
-import { executeHook } from '../utils.js';
 import { assertOnBeforeRenderHookReturn } from '../../../shared/assertOnBeforeRenderHookReturn.js';
+import { executeHook } from '../../../shared/hooks/executeHook.js';
 async function executeOnBeforeRenderAndDataHooks(pageContext) {
     if (pageContext._pageContextAlreadyProvidedByOnPrerenderHook) {
         return;

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

@@ -1,13 +1,14 @@
 export { executeOnRenderHtmlHook };
 import { isDocumentHtml, renderDocumentHtml, dangerouslySkipEscape } from '../html/renderHtml.js';
 import { getHook } from '../../../shared/hooks/getHook.js';
-import { assert, assertUsage, assertWarning, isObject, objectAssign, isPromise, executeHook, isCallable } from '../utils.js';
+import { assert, assertUsage, assertWarning, isObject, objectAssign, isPromise, isCallable } from '../utils.js';
 import { isStream } from '../html/stream.js';
 import { assertPageContextProvidedByUser } from '../../../shared/assertPageContextProvidedByUser.js';
 import { preparePageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
 import { assertHookReturnedObject } from '../../../shared/assertHookReturnedObject.js';
 import { logRuntimeError } from './loggerRuntime.js';
 import pc from '@brillout/picocolors';
+import { executeHook } from '../../../shared/hooks/executeHook.js';
 async function executeOnRenderHtmlHook(pageContext) {
     const { renderHook, hookFn } = getRenderHook(pageContext);
     objectAssign(pageContext, { _renderHook: renderHook });

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

@@ -1,10 +1,8 @@
 export { getManifestEntry };
-import { assert, slice, isNpmPackageImport } from '../../utils.js';
-import { assertClientEntryId } from './assertClientEntryId.js';
+import { assert, slice, assertIsNpmPackageImport } from '../../utils.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { prependEntriesDir } from '../../../shared/prependEntriesDir.js';
 function getManifestEntry(id, assetsManifest) {
-    assertClientEntryId(id);
     const debugInfo = getDebugInfo(id, assetsManifest);
     // Vike client entry
     if (id.startsWith('@@vike/')) {
@@ -42,12 +40,11 @@ function getManifestEntry(id, assetsManifest) {
         return { manifestEntry, manifestKey };
     }
     // npm package import
-    if (isNpmPackageImport(id)) {
-        const found = Object.entries(assetsManifest).find(([, e]) => e.name === prependEntriesDir(id));
-        assert(found);
-        const [manifestKey, manifestEntry] = found;
-        return { manifestEntry, manifestKey };
-    }
+    assertIsNpmPackageImport(id);
+    const found = Object.entries(assetsManifest).find(([, e]) => e.name === prependEntriesDir(id));
+    assert(found);
+    const [manifestKey, manifestEntry] = found;
+    return { manifestEntry, manifestKey };
     /* Can we remove this?
     // extensions[number].pageConfigsSrcDir
     if (id.startsWith('/node_modules/') || id.startsWith('/../')) {
@@ -79,7 +76,6 @@ function getManifestEntry(id, assetsManifest) {
       assert(false, debugInfo)
     }
     */
-    assert(false, debugInfo);
 }
 function findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id) {
     const debugInfo = getDebugInfo(id, assetsManifest, manifestKeyEnd);

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

@@ -9,15 +9,16 @@ function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImp
     clientDependencies.forEach(({ id, onlyAssets, eagerlyImported }) => {
         if (eagerlyImported)
             return; // Eagerly imported assets aren't imported with import() and therefore don't create a new Rollup entry and aren't listed in the manifest file
-        if (onlyAssets) {
-            if (!includeAssetsImportedByServer)
-                return;
+        // TODO/v1-release: remove
+        if (includeAssetsImportedByServer &&
+            onlyAssets &&
+            id.includes('.page.server.') &&
             // We assume that all npm packages have already built their files: bundlers (Rollup, esbuild, tsup, ...) extract the CSS out of JavaScript => we can assume JavaScript to not import any CSS/assets.
-            if (isNpmPackageImport(id))
-                return;
-            if (id.includes('.page.server.')) {
-                id = extractAssetsAddQuery(id);
-            }
+            !isNpmPackageImport(id, {
+                // I presume Vite already resolves path aliases when Vite sets the module's id
+                cannotBePathAlias: true
+            })) {
+            id = extractAssetsAddQuery(id);
         }
         const { manifestKey } = getManifestEntry(id, assetsManifest);
         collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyAssets);

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/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;
-});
+};