vike 0.4.165 → 0.4.166-commit-6a8acaa

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

@@ -0,0 +1,136 @@
+export { getFilePathResolved };
+export { getFilePathUnresolved };
+export { getModuleFilePath };
+export { getFilePathToShowToUserFromUnkown };
+export { cleanFilePathUnkown };
+import path from 'path';
+import { assert, assertPathIsFilesystemAbsolute, assertPosixPath, toPosixPath } from '../utils.js';
+function getFilePathUnresolved({ importPathAbsolute }) {
+    return getFilePath({ importPathAbsolute, filePathAbsoluteUserRootDir: null });
+}
+function getFilePathResolved(args) {
+    const { userRootDir } = args;
+    const importPathAbsolute = args.importPathAbsolute ?? null;
+    let filePathAbsoluteFilesystem;
+    let filePathAbsoluteUserRootDir;
+    if ('filePathAbsoluteFilesystem' in args) {
+        filePathAbsoluteFilesystem = args.filePathAbsoluteFilesystem;
+        filePathAbsoluteUserRootDir = getFilePathAbsoluteUserRootDir({ filePathAbsoluteFilesystem, userRootDir });
+    }
+    else {
+        filePathAbsoluteUserRootDir = args.filePathAbsoluteUserRootDir;
+        filePathAbsoluteFilesystem = getFilePathAbsoluteUserFilesystem({ filePathAbsoluteUserRootDir, userRootDir });
+    }
+    let filePath;
+    const common = {
+        filePathAbsoluteUserRootDir,
+        importPathAbsolute,
+        userRootDir
+    };
+    if (importPathAbsolute) {
+        filePath = getFilePath({
+            ...common,
+            importPathAbsolute
+        });
+    }
+    else {
+        assert(filePathAbsoluteUserRootDir);
+        filePath = getFilePath({
+            ...common,
+            filePathAbsoluteUserRootDir
+        });
+    }
+    assert(filePathAbsoluteFilesystem);
+    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('../'));
+        return null;
+    }
+    assert(!filePathRelative.startsWith('.') && !filePathRelative.startsWith('/'));
+    const filePathAbsoluteUserRootDir = `/${filePathRelative}`;
+    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/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, getFilePathRelativeToUserRootDir, 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(getFilePathRelativeToUserRootDir(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/injectAssets/getHtmlTags.js

@@ -138,6 +138,7 @@ async function mergeScriptEntries(pageAssets, isProduction) {
 function getPageContextJsonScriptTag(pageContext) {
     const pageContextSerialized = sanitizeJson(serializePageContextClientSide(pageContext));
     const htmlTag = `<script id="vike_pageContext" type="application/json">${pageContextSerialized}</script>`;
+    // Used by contra.com https://github.com/gajus
     // @ts-expect-error
     pageContext._pageContextHtmlTag = htmlTag;
     return htmlTag;

package/dist/esm/node/runtime/html/injectAssets/injectHtmlTags.js

@@ -94,7 +94,7 @@ function injectBreakLines(htmlFragment, before, after) {
     const whitespaceExtra = paddingParent ? '  ' : '';
     const whitespace = `${paddingParent}${whitespaceExtra}`;
     const padding = `\n${whitespace}`;
-    htmlFragment = htmlFragment.split(/<(?=[^\/])/).join(`${padding}<`);
+    htmlFragment = htmlFragment.replace(/<[^\/]/g, (match) => `${padding}${match}`);
     if (isBlankLine) {
         assert(htmlFragment.startsWith(padding), { htmlFragment });
         htmlFragment = whitespaceExtra + htmlFragment.slice(padding.length);

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,42 +40,42 @@ 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('/../')) {
-        let manifestKeyEnd = id.split('/node_modules/').slice(-1)[0];
-        assert(manifestKeyEnd, debugInfo);
-        assert(!manifestKeyEnd.startsWith('/'), debugInfo);
-        manifestKeyEnd = '/' + manifestKeyEnd;
-        {
-            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
-            if (manifestEntry) {
-                assert(manifestKey, debugInfo);
-                return { manifestEntry, manifestKey };
-            }
+      let manifestKeyEnd = id.split('/node_modules/').slice(-1)[0]
+      assert(manifestKeyEnd, debugInfo)
+      assert(!manifestKeyEnd.startsWith('/'), debugInfo)
+      manifestKeyEnd = '/' + manifestKeyEnd
+      {
+        const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id)
+        if (manifestEntry) {
+          assert(manifestKey, debugInfo)
+          return { manifestEntry, manifestKey }
         }
-        {
-            assert(manifestKeyEnd.startsWith('/'), debugInfo);
-            const dirS = manifestKeyEnd.split('/');
-            assert(dirS[0] === '', debugInfo);
-            manifestKeyEnd = '/' + dirS.slice(2).join('/');
-            assert(manifestKeyEnd.startsWith('/'), debugInfo);
-        }
-        {
-            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
-            if (manifestEntry) {
-                assert(manifestKey, debugInfo);
-                return { manifestEntry, manifestKey };
-            }
+      }
+      {
+        assert(manifestKeyEnd.startsWith('/'), debugInfo)
+        const dirS = manifestKeyEnd.split('/')
+        assert(dirS[0] === '', debugInfo)
+        manifestKeyEnd = '/' + dirS.slice(2).join('/')
+        assert(manifestKeyEnd.startsWith('/'), debugInfo)
+      }
+      {
+        const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id)
+        if (manifestEntry) {
+          assert(manifestKey, debugInfo)
+          return { manifestEntry, manifestKey }
         }
-        assert(false, debugInfo);
+      }
+      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/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/renderPage.js

@@ -51,7 +51,7 @@ async function renderPage(pageContextInit) {
 async function renderPageAndPrepare(pageContextInit, httpRequestId) {
     // Invalid config
     const handleInvalidConfig = () => {
-        logRuntimeInfo?.(pc.bold(pc.red("Couldn't load configuration: see error above.")), httpRequestId, 'error');
+        logRuntimeInfo?.(pc.bold(pc.red('Error while loading a Vike config file, see error above.')), httpRequestId, 'error');
         const pageContextHttpResponseNull = getPageContextHttpResponseNull(pageContextInit);
         return pageContextHttpResponseNull;
     };
@@ -203,29 +203,42 @@ function getRequestInfoMessage(urlOriginal) {
 }
 function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
     const statusCode = pageContextReturn.httpResponse?.statusCode ?? null;
+    let msg;
+    let isNominal;
     {
-        // If URL doesn't include Base URL
         const { errorWhileRendering } = pageContextReturn;
-        const isSkipped = statusCode === null && (errorWhileRendering === null || errorWhileRendering === undefined);
-        if (isSkipped)
-            return;
-    }
-    const isSuccess = statusCode !== null && statusCode >= 200 && statusCode <= 399;
-    const isNominal = isSuccess || statusCode === 404;
-    const color = (s) => pc.bold(isSuccess ? pc.green(String(s)) : pc.red(String(s)));
-    const isRedirect = statusCode && 300 <= statusCode && statusCode <= 399;
-    const type = isRedirect ? 'redirect' : 'response';
-    if (isRedirect) {
-        assert(pageContextReturn.httpResponse);
-        const headerRedirect = pageContextReturn.httpResponse.headers
-            .slice()
-            .reverse()
-            .find((header) => header[0] === 'Location');
-        assert(headerRedirect);
-        const urlRedirect = headerRedirect[1];
-        urlOriginal = urlRedirect;
+        const isSkipped = statusCode === null && !errorWhileRendering;
+        if (isSkipped) {
+            // - URL doesn't include Base URL
+            //   - Can we abort earlier so that `logHttpResponse()` and `logHttpRequest()` aren't even called?
+            // - Error loading a Vike config file
+            //   - We should show `HTTP response ${urlOriginal} ERR` instead.
+            //   - Maybe we can/should make the error available at pageContext.errorWhileRendering
+            assert(errorWhileRendering === null || errorWhileRendering === undefined);
+            msg = `HTTP response ${pc.bold(urlOriginal)} ${pc.dim('null')}`;
+            // Erroneous value (it shoud sometimes be `false`) but it's fine as it doesn't seem to have much of an impact.
+            isNominal = true;
+        }
+        else {
+            const isSuccess = statusCode !== null && statusCode >= 200 && statusCode <= 399;
+            isNominal = isSuccess || statusCode === 404;
+            const color = (s) => pc.bold(isSuccess ? pc.green(String(s)) : pc.red(String(s)));
+            const isRedirect = statusCode && 300 <= statusCode && statusCode <= 399;
+            const type = isRedirect ? 'redirect' : 'response';
+            if (isRedirect) {
+                assert(pageContextReturn.httpResponse);
+                const headerRedirect = pageContextReturn.httpResponse.headers
+                    .slice()
+                    .reverse()
+                    .find((header) => header[0] === 'Location');
+                assert(headerRedirect);
+                const urlRedirect = headerRedirect[1];
+                urlOriginal = urlRedirect;
+            }
+            msg = `HTTP ${type} ${pc.bold(urlOriginal)} ${color(statusCode ?? 'ERR')}`;
+        }
     }
-    logRuntimeInfo?.(`HTTP ${type} ${pc.bold(urlOriginal)} ${color(statusCode ?? 'ERR')}`, httpRequestId, isNominal ? 'info' : 'error');
+    logRuntimeInfo?.(msg, httpRequestId, isNominal ? 'info' : 'error');
 }
 function getPageContextHttpResponseNullWithError(err, pageContextInit) {
     const pageContextHttpResponseNull = {};

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/Config/PageContextConfig.d.ts

@@ -2,7 +2,7 @@ export type { PageContextConfig };
 import type { VikePackages } from '../../VikeNamespace.js';
 import type { ConfigBuiltIn } from '../Config.js';
 import type { Combine, IsNotEmpty, XOR5 } from './helpers.ts';
-type PageContextConfig = ConfigBuiltIn & (ConfigVikePackagesNotEmptyXor extends true ? ConfigVikePackagesIntersection : ConfigVikePackagesCombined);
+type PageContextConfig = ConfigBuiltIn & Vike.Config & (ConfigVikePackagesNotEmptyXor extends true ? ConfigVikePackagesIntersection : ConfigVikePackagesCombined);
 type ConfigVikePackagesIntersection = VikePackages.ConfigVikeReact & VikePackages.ConfigVikeVue & VikePackages.ConfigVikeSolid & VikePackages.ConfigVikeSvelte & VikePackages.ConfigVikeAngular;
 type ConfigVikePackagesCombined = Combine<VikePackages.ConfigVikeReact, Combine<VikePackages.ConfigVikeVue, Combine<VikePackages.ConfigVikeSolid, Combine<VikePackages.ConfigVikeSvelte, VikePackages.ConfigVikeAngular>>>>;
 type ConfigVikePackagesNotEmptyXor = XOR5<IsNotEmpty<VikePackages.ConfigVikeReact>, IsNotEmpty<VikePackages.ConfigVikeVue>, IsNotEmpty<VikePackages.ConfigVikeSolid>, IsNotEmpty<VikePackages.ConfigVikeSvelte>, IsNotEmpty<VikePackages.ConfigVikeAngular>>;