vike 0.4.166 → 0.4.167

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

@@ -9,6 +9,7 @@ exports.getPrettyErrMessage = exports.isEquivalentErrorWithCodeSnippet = exports
 // Copied & adapted from https://github.com/vitejs/vite/blob/9c114c5c72a6af87e3330d5573362554b4511265/packages/vite/src/node/server/middlewares/error.ts
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../../utils.js");
+const getFilePath_js_1 = require("../getFilePath.js");
 function isErrorWithCodeSnippet(err) {
     if (!(0, utils_js_1.isObject)(err)) {
         return false;
@@ -48,7 +49,7 @@ function getPrettyErrorWithCodeSnippet(err, userRootDir) {
     let { id, frame } = err;
     const msgFirstLine = [
         picocolors_1.default.red('Failed to transpile'),
-        picocolors_1.default.bold(picocolors_1.default.red((0, utils_js_1.getFilePathAbsoluteUserRootDir)(normalizeId(id), userRootDir))),
+        picocolors_1.default.bold(picocolors_1.default.red((0, getFilePath_js_1.getFilePathToShowToUserFromUnkown)(id, userRootDir))),
         picocolors_1.default.red('because:')
     ].join(' ');
     const errMsg = getPrettyErrMessage(err);
@@ -88,7 +89,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([(0, getFilePath_js_1.cleanFilePathUnkown)(id), pos, pos, trail], 'gi')).join('');
     // Remove "ERROR:" (useless)
     errMsg = errMsg.split(reg(['ERROR:', trail])).join('');
     // Remove "Internal server error:" (useless)
@@ -160,9 +161,3 @@ exports.isEquivalentErrorWithCodeSnippet = isEquivalentErrorWithCodeSnippet;
 function isDefinedAndSame(val1, val2) {
     return val1 && val1 === val2;
 }
-function normalizeId(id) {
-    id = (0, utils_js_1.toPosixPath)(id);
-    // remove query
-    id = id.split('?')[0];
-    return id;
-}

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

@@ -23,6 +23,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isNewError_js_1 = require("../../runtime/renderPage/isNewError.js");
 const isConfigInvalid_js_1 = require("../../runtime/renderPage/isConfigInvalid.js");
 const loggerProd_js_1 = require("../../runtime/renderPage/loggerProd.js");
+const executeHook_js_1 = require("../../../shared/hooks/executeHook.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 (0, loggerRuntime_js_1.overwriteRuntimeProductionLogger)(logRuntimeError, logRuntimeInfo);
 (0, utils_js_1.overwriteAssertProductionLogger)(assertLogger);
@@ -99,7 +100,7 @@ function logErr(err, httpRequestId = null, errorComesFromVite) {
         }
     }
     // Needs to be after assertion messages handling, because user hooks may throw an assertion error
-    const hook = (0, utils_js_1.isUserHookError)(err);
+    const hook = (0, executeHook_js_1.isUserHookError)(err);
     if (hook) {
         const { hookName, hookFilePath } = hook;
         (0, log_js_1.logWithVikeTag)(picocolors_1.default.red(`Following error was thrown by the ${hookName}() hook defined at ${hookFilePath}`), 'error', category);

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

@@ -22,7 +22,6 @@ const onLoad_js_1 = require("./onLoad.js");
 __exportStar(require("../runtime/utils.js"), exports);
 // Utils only needed by `plugin/*`
 __exportStar(require("../../utils/viteIsSSR.js"), exports);
-__exportStar(require("../../utils/getFilePathAbsolute.js"), exports);
 __exportStar(require("../../utils/requireResolve.js"), exports);
 __exportStar(require("../../utils/arrayIncludes.js"), exports);
 __exportStar(require("../../utils/isDev.js"), exports);
@@ -42,3 +41,4 @@ __exportStar(require("../../utils/injectRollupInputs.js"), exports);
 __exportStar(require("../../utils/humanizeTime.js"), exports);
 __exportStar(require("../../utils/pLimit.js"), exports);
 __exportStar(require("../../utils/assertVersion.js"), exports);
+__exportStar(require("../../utils/assertPathIsFilesystemAbsolute.js"), exports);

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

@@ -31,7 +31,6 @@ require("../runtime/page-files/setup.js");
 const path_1 = __importDefault(require("path"));
 const index_js_1 = require("../../shared/route/index.js");
 const utils_js_1 = require("./utils.js");
-const pLimit_js_1 = require("../../utils/pLimit.js");
 const renderPageAlreadyRouted_js_1 = require("../runtime/renderPage/renderPageAlreadyRouted.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const os_1 = require("os");
@@ -45,13 +44,13 @@ const helpers_js_1 = require("../../shared/page-configs/helpers.js");
 const loadConfigValues_js_1 = require("../../shared/page-configs/loadConfigValues.js");
 const error_page_js_1 = require("../../shared/error-page.js");
 const addUrlComputedProps_js_1 = require("../../shared/addUrlComputedProps.js");
-const assertPathIsFilesystemAbsolute_js_1 = require("../../utils/assertPathIsFilesystemAbsolute.js");
 const abort_js_1 = require("../../shared/route/abort.js");
 const loadUserFilesServerSide_js_1 = require("../runtime/renderPage/loadUserFilesServerSide.js");
 const getHook_js_1 = require("../../shared/hooks/getHook.js");
 const noRouteMatch_js_1 = require("../../shared/route/noRouteMatch.js");
 const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
 const logErrorHint_js_1 = require("../runtime/renderPage/logErrorHint.js");
+const executeHook_js_1 = require("../../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.
@@ -103,8 +102,8 @@ async function runPrerender(options, manuallyTriggered) {
         });
     }
     const { partial = false, noExtraDir = false, parallel = true } = prerenderConfig || {};
-    const concurrencyLimit = (0, pLimit_js_1.pLimit)(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? (0, os_1.cpus)().length : parallel);
-    (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
+    const concurrencyLimit = (0, utils_js_1.pLimit)(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? (0, os_1.cpus)().length : parallel);
+    (0, utils_js_1.assertPathIsFilesystemAbsolute)(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
     await (0, globalContext_js_1.initGlobalContext)(true, outDirRoot);
     const renderContext = await (0, renderPageAlreadyRouted_js_1.getRenderContext)();
     renderContext.pageFilesAll.forEach(assertExportNames);
@@ -245,7 +244,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, renderContext,
         if (doNotPrerenderList.find((p) => p.pageId === pageId)) {
             return;
         }
-        const prerenderResult = await (0, utils_js_1.executeHook)(() => hookFn(), { hookName, hookFilePath, hookTimeout });
+        const prerenderResult = await (0, executeHook_js_1.executeHook)(() => hookFn(), { hookName, hookFilePath, hookTimeout });
         const result = normalizeOnPrerenderHookResult(prerenderResult, hookFilePath, hookName);
         result.forEach(({ url, pageContext }) => {
             {
@@ -410,7 +409,7 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
         pageContext._urlOriginalBeforeHook = pageContext.urlOriginal;
     });
     const docLink = 'https://vike.dev/i18n#pre-rendering';
-    let result = await (0, utils_js_1.executeHook)(() => hookFn({
+    let result = await (0, executeHook_js_1.executeHook)(() => hookFn({
         pageContexts: prerenderContext.pageContexts,
         // TODO/v1-release: remove warning
         get prerenderPageContexts() {
@@ -734,7 +733,7 @@ function assertIsNotAbort(err, urlOr404) {
     if (!(0, abort_js_1.isAbortError)(err))
         return;
     const pageContextAbort = err._pageContextAbort;
-    const hookLoc = (0, utils_js_1.isUserHookError)(err);
+    const hookLoc = (0, executeHook_js_1.isUserHookError)(err);
     (0, utils_js_1.assert)(hookLoc);
     const thrownBy = ` by ${picocolors_1.default.cyan(`${hookLoc.hookName}()`)} hook defined at ${hookLoc.hookFilePath}`;
     const abortCaller = pageContextAbort._abortCaller;

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

@@ -26,6 +26,7 @@ __exportStar(require("../../utils/getOutDirs.js"), exports);
 __exportStar(require("../../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../../utils/filesystemPathHandling.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
-__exportStar(require("../../shared/hooks/executeHook.js"), exports);
 __exportStar(require("../../utils/isPlainObject.js"), exports);
 __exportStar(require("../../utils/assertNodeEnv.js"), exports);
+__exportStar(require("../../utils/pLimit.js"), exports);
+__exportStar(require("../../utils/assertPathIsFilesystemAbsolute.js"), exports);

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

@@ -375,7 +375,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         const writeChunk = (chunk) => {
             (0, utils_js_1.assert)(writableOriginal);
             writableOriginal.write(chunk);
-            if (debug.isEnabled) {
+            if (debug.isActivated) {
                 debug('data written (Node.js Writable)', String(chunk));
             }
         };
@@ -448,7 +448,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         const writeChunk = (chunk) => {
             (0, utils_js_1.assert)(writerOriginal);
             writerOriginal.write(encodeForWebStream(chunk));
-            if (debug.isEnabled) {
+            if (debug.isActivated) {
                 debug('data written (Web Writable)', String(chunk));
             }
         };
@@ -541,12 +541,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));
                 }
             }
@@ -568,7 +568,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/cjs/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeOnBeforeRenderAndDataHooks = void 0;
 const getHook_js_1 = require("../../../shared/hooks/getHook.js");
 const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePageContextForUserConsumptionServerSide.js");
-const utils_js_1 = require("../utils.js");
 const assertOnBeforeRenderHookReturn_js_1 = require("../../../shared/assertOnBeforeRenderHookReturn.js");
+const executeHook_js_1 = require("../../../shared/hooks/executeHook.js");
 async function executeOnBeforeRenderAndDataHooks(pageContext) {
     if (pageContext._pageContextAlreadyProvidedByOnPrerenderHook) {
         return;
@@ -16,7 +16,7 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
     }
     (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext);
     if (dataHook) {
-        const hookResult = await (0, utils_js_1.executeHook)(() => dataHook.hookFn(pageContext), dataHook);
+        const hookResult = await (0, executeHook_js_1.executeHook)(() => dataHook.hookFn(pageContext), dataHook);
         // Note: hookResult can be anything (e.g. an object) and is to be assigned to pageContext.data
         const pageContextFromHook = {
             data: hookResult
@@ -24,7 +24,7 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
         Object.assign(pageContext, pageContextFromHook);
     }
     if (onBeforeRenderHook) {
-        const hookResult = await (0, utils_js_1.executeHook)(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook);
+        const hookResult = await (0, executeHook_js_1.executeHook)(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook);
         (0, assertOnBeforeRenderHookReturn_js_1.assertOnBeforeRenderHookReturn)(hookResult, onBeforeRenderHook.hookFilePath);
         const pageContextFromHook = hookResult?.pageContext;
         Object.assign(pageContext, pageContextFromHook);

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

@@ -13,11 +13,12 @@ const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePa
 const assertHookReturnedObject_js_1 = require("../../../shared/assertHookReturnedObject.js");
 const loggerRuntime_js_1 = require("./loggerRuntime.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const executeHook_js_1 = require("../../../shared/hooks/executeHook.js");
 async function executeOnRenderHtmlHook(pageContext) {
     const { renderHook, hookFn } = getRenderHook(pageContext);
     (0, utils_js_1.objectAssign)(pageContext, { _renderHook: renderHook });
     (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext);
-    const hookReturnValue = await (0, utils_js_1.executeHook)(() => hookFn(pageContext), renderHook);
+    const hookReturnValue = await (0, executeHook_js_1.executeHook)(() => hookFn(pageContext), renderHook);
     const { documentHtml, pageContextProvidedByRenderHook, pageContextPromise, injectFilter } = processHookReturnValue(hookReturnValue, renderHook);
     Object.assign(pageContext, pageContextProvidedByRenderHook);
     (0, utils_js_1.objectAssign)(pageContext, { _pageContextPromise: pageContextPromise });

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

@@ -2,11 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getManifestEntry = void 0;
 const utils_js_1 = require("../../utils.js");
-const assertClientEntryId_js_1 = require("./assertClientEntryId.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
 function getManifestEntry(id, assetsManifest) {
-    (0, assertClientEntryId_js_1.assertClientEntryId)(id);
     const debugInfo = getDebugInfo(id, assetsManifest);
     // Vike client entry
     if (id.startsWith('@@vike/')) {
@@ -44,12 +42,11 @@ function getManifestEntry(id, assetsManifest) {
         return { manifestEntry, manifestKey };
     }
     // npm package import
-    if ((0, utils_js_1.isNpmPackageImport)(id)) {
-        const found = Object.entries(assetsManifest).find(([, e]) => e.name === (0, prependEntriesDir_js_1.prependEntriesDir)(id));
-        (0, utils_js_1.assert)(found);
-        const [manifestKey, manifestEntry] = found;
-        return { manifestEntry, manifestKey };
-    }
+    (0, utils_js_1.assertIsNpmPackageImport)(id);
+    const found = Object.entries(assetsManifest).find(([, e]) => e.name === (0, prependEntriesDir_js_1.prependEntriesDir)(id));
+    (0, utils_js_1.assert)(found);
+    const [manifestKey, manifestEntry] = found;
+    return { manifestEntry, manifestKey };
     /* Can we remove this?
     // extensions[number].pageConfigsSrcDir
     if (id.startsWith('/node_modules/') || id.startsWith('/../')) {
@@ -81,7 +78,6 @@ function getManifestEntry(id, assetsManifest) {
       assert(false, debugInfo)
     }
     */
-    (0, utils_js_1.assert)(false, debugInfo);
 }
 exports.getManifestEntry = getManifestEntry;
 function findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id) {

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

@@ -11,15 +11,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 ((0, utils_js_1.isNpmPackageImport)(id))
-                return;
-            if (id.includes('.page.server.')) {
-                id = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(id);
-            }
+            !(0, utils_js_1.isNpmPackageImport)(id, {
+                // I presume Vite already resolves path aliases when Vite sets the module's id
+                cannotBePathAlias: true
+            })) {
+            id = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(id);
         }
         const { manifestKey } = (0, getManifestEntry_js_1.getManifestEntry)(id, assetsManifest);
         collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyAssets);

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

@@ -8,7 +8,6 @@ const inferMediaType_js_1 = require("./inferMediaType.js");
 const getManifestEntry_js_1 = require("./getPageAssets/getManifestEntry.js");
 const sortPageAssetsForEarlyHintsHeader_js_1 = require("./getPageAssets/sortPageAssetsForEarlyHintsHeader.js");
 const globalContext_js_1 = require("../globalContext.js");
-const assertClientEntryId_js_1 = require("./getPageAssets/assertClientEntryId.js");
 const import_1 = require("@brillout/import");
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
@@ -59,7 +58,6 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
 }
 exports.getPageAssets = getPageAssets;
 async function resolveClientEntriesDev(clientEntry, viteDevServer) {
-    (0, assertClientEntryId_js_1.assertClientEntryId)(clientEntry);
     let root = viteDevServer.config.root;
     (0, utils_js_1.assert)(root);
     root = (0, utils_js_1.toPosixPath)(root);
@@ -76,11 +74,9 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     (0, utils_js_1.assertPosixPath)(clientEntry);
     let filePath;
     if (clientEntry.startsWith('/')) {
-        // User files
         filePath = (0, utils_js_1.pathJoin)(root, clientEntry);
     }
-    else if (clientEntry.startsWith('@@vike/') || (0, utils_js_1.isNpmPackageImport)(clientEntry)) {
-        // Vike client entry
+    else {
         const { createRequire } = (await (0, import_1.import_)('module')).default;
         const { dirname } = (await (0, import_1.import_)('path')).default;
         const { fileURLToPath } = (await (0, import_1.import_)('url')).default;
@@ -91,10 +87,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 ((0, utils_js_1.isNpmPackageImport)(clientEntry)) {
-            filePath = res(clientEntry);
-        }
-        else {
+        if (clientEntry.startsWith('@@vike/')) {
             (0, utils_js_1.assert)(clientEntry.endsWith('.js'));
             try {
                 // For Vitest (which doesn't resolve vike to its dist but to its source files)
@@ -107,9 +100,10 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
                 filePath = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
             }
         }
-    }
-    else {
-        (0, utils_js_1.assert)(false);
+        else {
+            (0, utils_js_1.assertIsNpmPackageImport)(clientEntry);
+            filePath = res(clientEntry);
+        }
     }
     if (!filePath.startsWith('/')) {
         (0, utils_js_1.assert)(process.platform === 'win32');

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

@@ -48,7 +48,6 @@ __exportStar(require("../../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../../utils/debug.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);
-__exportStar(require("../../shared/hooks/executeHook.js"), exports);
 __exportStar(require("../../utils/freezePartial.js"), exports);
 __exportStar(require("../../utils/isNpmPackage.js"), exports);
 __exportStar(require("../../utils/isNotNullish.js"), exports);

package/dist/cjs/shared/page-configs/assertPlusFileExport.js

@@ -28,9 +28,7 @@ function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
         }
         else {
             (0, utils_js_1.assert)(exportsAll.length === 2); // because `exportsInvalid.length === 0`
-            (0, utils_js_1.assertWarning)(false, `${filePathToShowToUser} remove ${exportNamed} or ${exportDefault}`, {
-                onlyOnce: true
-            });
+            (0, utils_js_1.assertWarning)(false, `The exports of ${filePathToShowToUser} are ambiguous: remove ${exportDefault} or ${exportNamed}`, { onlyOnce: true });
         }
     }
     else {

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

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertNoInfiniteAbortLoop = exports.AbortRender = exports.getPageContextFromAllRewrites = exports.logAbortErrorHandled = exports.isAbortPageContext = exports.isAbortError = exports.RenderErrorPage = exports.render = exports.redirect = void 0;
+const executeHook_js_1 = require("../hooks/executeHook.js");
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 /**
@@ -121,7 +122,7 @@ function logAbortErrorHandled(err, isProduction, pageContext) {
     (0, utils_js_1.assert)(urlCurrent);
     const abortCall = err._pageContextAbort._abortCall;
     (0, utils_js_1.assert)(abortCall);
-    const hookLoc = (0, utils_js_1.isUserHookError)(err);
+    const hookLoc = (0, executeHook_js_1.isUserHookError)(err);
     let thrownBy = '';
     if (hookLoc) {
         thrownBy = ` by ${picocolors_1.default.cyan(`${hookLoc.hookName}()`)} hook defined at ${hookLoc.hookFilePath}`;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeGuardHook = void 0;
 const getHook_js_1 = require("../hooks/getHook.js");
 const utils_js_1 = require("./utils.js");
+const executeHook_js_1 = require("../hooks/executeHook.js");
 const errIntro = 'The guard() hook defined by';
 async function executeGuardHook(pageContext, prepareForUserConsumption) {
     let hook;
@@ -22,7 +23,7 @@ async function executeGuardHook(pageContext, prepareForUserConsumption) {
     const res = prepareForUserConsumption(pageContext);
     if (res)
         pageContextForUserConsumption = res;
-    const hookResult = await (0, utils_js_1.executeHook)(() => guard(pageContextForUserConsumption), hook);
+    const hookResult = await (0, executeHook_js_1.executeHook)(() => guard(pageContextForUserConsumption), hook);
     (0, utils_js_1.assertUsage)(hookResult === undefined, `${errIntro} ${hook.hookFilePath} returns a value, but guard() shouldn't return any value`);
 }
 exports.executeGuardHook = executeGuardHook;

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

@@ -8,6 +8,7 @@ const assertPageContextProvidedByUser_js_1 = require("../assertPageContextProvid
 const utils_js_1 = require("./utils.js");
 const resolveRouteFunction_js_1 = require("./resolveRouteFunction.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const executeHook_js_1 = require("../hooks/executeHook.js");
 async function executeOnBeforeRouteHook(pageContext) {
     const pageContextFromOnBeforeRouteHook = {};
     if (!pageContext._onBeforeRouteHook)
@@ -41,7 +42,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     let hookReturn = onBeforeRouteHook.hookFn(pageContext);
     (0, resolveRouteFunction_js_1.assertSyncRouting)(hookReturn, `The onBeforeRoute() hook ${onBeforeRouteHook.hookFilePath}`);
     // TODO/v1-release: make executeOnBeforeRouteHook() and route() sync
-    hookReturn = await (0, utils_js_1.executeHook)(() => hookReturn, onBeforeRouteHook);
+    hookReturn = await (0, executeHook_js_1.executeHook)(() => hookReturn, onBeforeRouteHook);
     const errPrefix = `The onBeforeRoute() hook defined by ${onBeforeRouteHook.hookFilePath}`;
     (0, utils_js_1.assertUsage)(hookReturn === null ||
         hookReturn === undefined ||

package/dist/cjs/shared/route/index.js

@@ -39,9 +39,8 @@ async function route(pageContextForRoute) {
     (0, utils_js_1.objectAssign)(pageContext, pageContextFromOnBeforeRouteHook);
     // Vike's routing
     const allPageIds = pageContext._allPageIds;
-    (0, utils_js_1.assert)(allPageIds.length >= 0);
-    (0, utils_js_1.assertUsage)(pageContext._pageFilesAll.length > 0 || pageContext._pageConfigs.length > 0, 'No *.page.js file found. You must create at least one *.page.js file.');
-    (0, utils_js_1.assertUsage)(allPageIds.length > 0, "You must create at least one *.page.js file that isn't _default.page.*");
+    (0, utils_js_1.assertUsage)(allPageIds.length > 0, 'No page found. You must create at least one page.');
+    (0, utils_js_1.assert)(pageContext._pageFilesAll.length > 0 || pageContext._pageConfigs.length > 0);
     const { urlPathname } = pageContext;
     (0, utils_js_1.assert)(urlPathname.startsWith('/'));
     const routeMatches = [];

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

@@ -35,7 +35,6 @@ __exportStar(require("../../utils/isStringRecord.js"), exports);
 __exportStar(require("../../utils/unique.js"), exports);
 __exportStar(require("../../utils/isBrowser.js"), exports);
 __exportStar(require("../../utils/parseUrl.js"), exports);
-__exportStar(require("../hooks/executeHook.js"), exports);
 __exportStar(require("../../utils/checkType.js"), exports);
 __exportStar(require("../../utils/joinEnglish.js"), exports);
 __exportStar(require("../../utils/projectInfo.js"), exports);

package/dist/cjs/utils/assertIsNotProductionRuntime.js

@@ -14,35 +14,35 @@ exports.vikeVitePluginLoadedInProductionError = vikeVitePluginLoadedInProduction
 const env = (0, getGlobalObject_js_1.getGlobalObject)('utils/assertIsNotProductionRuntime.ts', {});
 // Called by Vike modules that want to ensure that they aren't loaded by the server runtime in production
 function assertIsNotProductionRuntime() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('assertIsNotProductionRuntime()', new Error().stack);
     env.shouldNotBeProduction = true;
 }
 exports.assertIsNotProductionRuntime = assertIsNotProductionRuntime;
 // Called by Vite hook configureServer()
 function markEnvAsViteDev() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('markEnvAsViteDev()', new Error().stack);
     env.isViteDev = true;
 }
 exports.markEnvAsViteDev = markEnvAsViteDev;
 // Called by Vite hook configurePreviewServer()
 function markEnvAsVitePreview() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('markEnvAsVitePreview()', new Error().stack);
     env.isVitePreview = true;
 }
 exports.markEnvAsVitePreview = markEnvAsVitePreview;
 // Called by ../node/plugin/index.ts
 function markEnvAsVikePluginLoaded() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('markEnvAsVikePluginLoaded()', new Error().stack);
     env.isVikePluginLoaded = true;
 }
 exports.markEnvAsVikePluginLoaded = markEnvAsVikePluginLoaded;
 // Called by ../node/runtime/index.ts
 function assertEnv() {
-    if (debug.isEnabled)
+    if (debug.isActivated)
         debug('assertEnv()', new Error().stack);
     if ((0, isVitest_js_1.isVitest)())
         return;

package/dist/cjs/utils/assertPathIsFilesystemAbsolute.js

@@ -10,6 +10,7 @@ const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
 /** Assert path is absolute from the filesystem root */
 function assertPathIsFilesystemAbsolute(p) {
     (0, filesystemPathHandling_js_1.assertPosixPath)(p);
+    (0, assert_js_1.assert)(!p.startsWith('/@fs/'));
     if (process.platform === 'win32') {
         (0, assert_js_1.assert)(path_1.default.win32.isAbsolute(p));
     }

package/dist/cjs/utils/debug.js

@@ -1,17 +1,39 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDebugEnabled = exports.createDebugger = void 0;
+exports.isDebugActivated = exports.createDebugger = void 0;
 const isBrowser_js_1 = require("./isBrowser.js");
 const isCallable_js_1 = require("./isCallable.js");
 const objectAssign_js_1 = require("./objectAssign.js");
 const assert_js_1 = require("./assert.js");
 const checkType_js_1 = require("./checkType.js");
 const getTerminWidth_js_1 = require("./getTerminWidth.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 // Avoid this to be loaded in the browser. For isomorphic code: instead of `import { createDebugger } from './utils.js'`, use `globalThis.createDebugger()`.
 (0, assert_js_1.assert)(!(0, isBrowser_js_1.isBrowser)());
 globalThis.__brillout_debug_createDebugger = createDebugger;
+const flags = [
+    'vike:error',
+    'vike:extractAssets',
+    'vike:extractExportNames',
+    'vike:glob',
+    'vike:log',
+    'vike:optimizeDeps',
+    'vike:outDir',
+    'vike:pageFiles',
+    'vike:pointer-imports',
+    'vike:routing',
+    'vike:setup',
+    'vike:stream',
+    'vike:virtual-files'
+];
+const flagRegex = /\bvike:[a-zA-Z-]+/g;
+assertDEBUG();
 function createDebugger(flag, optionsGlobal) {
     (0, checkType_js_1.checkType)(flag);
+    (0, assert_js_1.assert)(flags.includes(flag));
     const debugWithOptions = (optionsLocal) => {
         return (...msgs) => {
             const options = { ...optionsGlobal, ...optionsLocal };
@@ -19,12 +41,12 @@ function createDebugger(flag, optionsGlobal) {
         };
     };
     const debug = (...msgs) => debugWithOptions({})(...msgs);
-    (0, objectAssign_js_1.objectAssign)(debug, { options: debugWithOptions, isEnabled: isDebugEnabled(flag) });
+    (0, objectAssign_js_1.objectAssign)(debug, { options: debugWithOptions, isActivated: isDebugActivated(flag) });
     return debug;
 }
 exports.createDebugger = createDebugger;
 function debug_(flag, options, ...msgs) {
-    if (!isDebugEnabled(flag))
+    if (!isDebugActivated(flag))
         return;
     let [msgFirst, ...msgsRest] = msgs;
     const padding = ' '.repeat(flag.length + 1);
@@ -49,19 +71,14 @@ function debug_(flag, options, ...msgs) {
         console.log(msg);
     });
 }
-function isDebugEnabled(flag) {
+function isDebugActivated(flag) {
     (0, checkType_js_1.checkType)(flag);
-    let DEBUG;
-    // - `process` can be undefined in edge workers
-    // - We want bundlers to be able to statically replace `process.env.*`
-    try {
-        DEBUG = process.env.DEBUG;
-    }
-    catch { }
-    const isEnabled = DEBUG?.includes(flag) ?? false;
-    return isEnabled;
+    (0, assert_js_1.assert)(flags.includes(flag));
+    const DEBUG = getDEBUG();
+    const isActivated = DEBUG?.includes(flag) ?? false;
+    return isActivated;
 }
-exports.isDebugEnabled = isDebugEnabled;
+exports.isDebugActivated = isDebugActivated;
 function formatMsg(info, options, padding, position) {
     if (info === undefined) {
         return undefined;
@@ -122,3 +139,20 @@ function replaceFunctionSerializer(_key, value) {
     }
     return value;
 }
+function assertDEBUG() {
+    const DEBUG = getDEBUG() ?? '';
+    const flagsActivated = DEBUG.match(flagRegex) ?? [];
+    flagsActivated.forEach((flag) => {
+        (0, assert_js_1.assertUsage)(flags.includes(flag), `Unknown DEBUG flag ${picocolors_1.default.cyan(flag)}. Valid flags:\n${flags.map((f) => `  ${picocolors_1.default.cyan(f)}`).join('\n')}`);
+    });
+}
+function getDEBUG() {
+    let DEBUG;
+    // - `process` can be undefined in edge workers
+    // - We want bundlers to be able to statically replace `process.env.*`
+    try {
+        DEBUG = process.env.DEBUG;
+    }
+    catch { }
+    return DEBUG;
+}

package/dist/cjs/utils/isNpmPackage.js

@@ -1,14 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDistinguishable = exports.parse = exports.isValidPathAlias = exports.isNpmPackageImport = void 0;
+exports.isDistinguishable = exports.parse = exports.isValidPathAlias = exports.assertIsNpmPackageImport = exports.isNpmPackageImport = void 0;
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
-function isNpmPackageImport(str) {
+function isNpmPackageImport(str, { cannotBePathAlias }) {
+    // We cannot distinguish path alises that look like npm package imports
+    (0, assert_js_1.assert)(cannotBePathAlias);
     const res = parse(str);
     return res !== null;
 }
 exports.isNpmPackageImport = isNpmPackageImport;
+function assertIsNpmPackageImport(str) {
+    (0, assert_js_1.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
+    }));
+}
+exports.assertIsNpmPackageImport = assertIsNpmPackageImport;
 function isNpmPackageName(str) {
     const res = parse(str);
     return res !== null && res.importPath === null;

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.166';
+const PROJECT_VERSION = '0.4.167';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',