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

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/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/renderPage/logErrorHint.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHint = exports.isKnownError = exports.isCjsEsmError = exports.logErrorHint = void 0;
 const utils_js_1 = require("../utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const knownErrors = [
     {
         errMsg: 'jsxDEV is not a function',
@@ -44,6 +48,7 @@ function getHint(error) {
 exports.getHint = getHint;
 function logHint(hint) {
     hint = (0, utils_js_1.formatHintLog)(hint);
+    hint = picocolors_1.default.bold(hint);
     console.error(hint);
 }
 function isKnownError(error) {

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/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/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/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/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/parseUrl.js

@@ -10,7 +10,14 @@ exports.isUriWithProtocol = exports.createUrlFromComponents = exports.assertUrlC
 const slice_js_1 = require("./slice.js");
 const assert_js_1 = require("./assert.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const PROTOCOLS = ['http://', 'https://', 'tauri://', 'file://'];
+const PROTOCOLS = [
+    'http://',
+    'https://',
+    // For [Tauri](https://tauri.app/)
+    'tauri://',
+    // For Electron: https://github.com/vikejs/vike/issues/1557
+    'file://'
+];
 function isParsable(url) {
     // `parseUrl()` works with these URLs
     return (PROTOCOLS.some((p) => url.startsWith(p)) ||

package/dist/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.165-commit-8eba585';
+const PROJECT_VERSION = '0.4.166-commit-6a8acaa';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/client/client-routing-runtime/history.d.ts

@@ -2,7 +2,7 @@ export { initHistoryState, getHistoryState, pushHistory, ScrollPosition, saveScr
 type HistoryState = {
     timestamp?: number;
     scrollPosition?: null | ScrollPosition;
-    triggedBy?: 'user' | 'vike' | 'browser';
+    triggeredBy?: 'user' | 'vike' | 'browser';
 };
 type ScrollPosition = {
     x: number;

package/dist/esm/client/client-routing-runtime/history.js

@@ -21,8 +21,8 @@ function initHistoryState() {
         hasModifications = true;
         state.scrollPosition = getScrollPosition();
     }
-    if (!('triggedBy' in state)) {
-        state.triggedBy = 'browser';
+    if (!('triggeredBy' in state)) {
+        state.triggeredBy = 'browser';
     }
     assertState(state);
     if (hasModifications) {
@@ -49,7 +49,7 @@ function saveScrollPosition() {
 function pushHistory(url, overwriteLastHistoryEntry) {
     if (!overwriteLastHistoryEntry) {
         const timestamp = getTimestamp();
-        pushHistoryState({ timestamp, scrollPosition: null, triggedBy: 'vike' }, url);
+        pushHistoryState({ timestamp, scrollPosition: null, triggeredBy: 'vike' }, url);
     }
     else {
         replaceHistoryState(getHistoryState(), url);
@@ -82,8 +82,8 @@ function monkeyPatchHistoryPushState() {
             scrollPosition: getScrollPosition(),
             timestamp: getTimestamp(),
             ...stateFromUser,
-            // Don't allow user to overwrite triggedBy as it would break Vike's handling of the 'popstate' event
-            triggedBy: 'user'
+            // Don't allow user to overwrite triggeredBy as it would break Vike's handling of the 'popstate' event
+            triggeredBy: 'user'
         };
         return pushStateOriginal(state, ...rest);
     };

package/dist/esm/client/client-routing-runtime/onBrowserHistoryNavigation.js

@@ -18,7 +18,7 @@ function onBrowserHistoryNavigation() {
     window.addEventListener('popstate', async () => {
         const currentState = getState();
         const scrollTarget = currentState.historyState.scrollPosition || 'scroll-to-top-or-hash';
-        const isUserLandPushStateNavigation = currentState.historyState.triggedBy === 'user';
+        const isUserLandPushStateNavigation = currentState.historyState.triggeredBy === 'user';
         const isHashNavigation = currentState.urlWithoutHash === globalObject.previousState.urlWithoutHash;
         const isBackwardNavigation = !currentState.historyState.timestamp || !globalObject.previousState.historyState.timestamp
             ? null

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

@@ -2,7 +2,7 @@ export { buildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
-import { assert, resolveOutDir, viteIsSSR, getFilePathAbsoluteFilesystem, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage, injectRollupInputs, normalizeRollupInput, getOutDirs, isNpmPackageImport, assertNodeEnv_build } from '../utils.js';
+import { assert, resolveOutDir, viteIsSSR, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, getOutDirs, assertNodeEnv_build, assertIsNpmPackageImport } from '../utils.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { getConfigValue } from '../../../shared/page-configs/helpers.js';
 import { findPageFiles } from '../shared/findPageFiles.js';
@@ -16,6 +16,7 @@ import path from 'path';
 import { fixServerAssets, fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
 import { set_constant_ASSETS_MAP } from './importBuild/index.js';
 import { prependEntriesDir } from '../../shared/prependEntriesDir.js';
+import { getFilePathResolved } from '../shared/getFilePath.js';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
@@ -200,18 +201,22 @@ async function getPageFileEntries(config, includeAssetsImportedByServer) {
     return pageFileEntries;
 }
 function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
-    if (isNpmPackageImport(clientEntry)) {
+    if (!clientEntry.startsWith('/')) {
+        assertIsNpmPackageImport(clientEntry);
         const entryTarget = clientEntry;
         const entryName = prependEntriesDir(clientEntry);
         return { entryName, entryTarget };
     }
-    const filePath = clientEntry;
-    assertPosixPath(filePath);
-    assert(filePath.startsWith('/'));
-    let entryTarget = getFilePathAbsoluteFilesystem(filePath, config);
+    const filePathAbsoluteUserRootDir = clientEntry;
+    assert(filePathAbsoluteUserRootDir.startsWith('/'));
+    const filePath = getFilePathResolved({
+        filePathAbsoluteUserRootDir,
+        userRootDir: config.root
+    });
+    let entryTarget = filePath.filePathAbsoluteFilesystem;
     if (addExtractAssetsQuery)
         entryTarget = extractAssetsAddQuery(entryTarget);
-    let entryName = filePath;
+    let entryName = filePathAbsoluteUserRootDir;
     if (addExtractAssetsQuery)
         entryName = extractAssetsAddQuery(entryName);
     entryName = removeFileExtention(entryName);

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

@@ -13,8 +13,9 @@ import pc from '@brillout/picocolors';
 //   - Aliases react imports
 // - @vitejs/plugin-vue2
 //   - https://github.com/vikejs/vike/issues/1329
-// TODO/v1-release: replace assertWarning() with assertUsage()
 function assertResolveAlias(config) {
+    // TODO: re-implement warning https://github.com/vikejs/vike/issues/1567
+    return;
     const aliases = getAliases(config);
     const errPrefix = config.configFile || 'Your Vite configuration';
     const errSuffix1 = 'see https://vike.dev/path-aliases#vite';

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

@@ -1,10 +1,12 @@
 export { determineOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
-import { assert, getFilePathAbsoluteFilesystem, isNpmPackageImport, unique } from '../../utils.js';
+import { assert, assertIsNpmPackageImport, createDebugger, unique } from '../../utils.js';
 import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
 import { getConfigValueSourcesNotOverriden } from '../../shared/getConfigValueSourcesNotOverriden.js';
 import { analyzeClientEntries } from '../buildConfig.js';
 import { virtualFileIdImportUserCodeClientCR, virtualFileIdImportUserCodeClientSR } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
+import { getFilePathResolved } from '../../shared/getFilePath.js';
+const debug = createDebugger('vike:optimizeDeps');
 async function determineOptimizeDeps(config, isDev) {
     const { pageConfigs } = await getVikeConfig(config, isDev);
     const { entries, include } = await getPageDeps(config, pageConfigs, isDev);
@@ -21,7 +23,11 @@ async function determineOptimizeDeps(config, isDev) {
     */
     config.optimizeDeps.include = [...include, ...normalizeInclude(config.optimizeDeps.include)];
     config.optimizeDeps.entries = [...entries, ...normalizeEntries(config.optimizeDeps.entries)];
-    // console.log('config.optimizeDeps', { entries: config.optimizeDeps.entries, include: config.optimizeDeps.include })
+    if (debug.isEnabled)
+        debug('config.optimizeDeps', {
+            'config.optimizeDeps.entries': config.optimizeDeps.entries,
+            'config.optimizeDeps.include': config.optimizeDeps.include
+        });
 }
 async function getPageDeps(config, pageConfigs, isDev) {
     let entries = [];
@@ -44,24 +50,10 @@ async function getPageDeps(config, pageConfigs, isDev) {
                 else {
                     // Adding definedAt.filePathAbsoluteFilesystem doesn't work for npm packages, I guess because of Vite's config.server.fs.allow
                     const { importPathAbsolute } = definedAt;
-                    assert(importPathAbsolute);
-                    // We need to differentiate between npm package imports and path aliases.
-                    // There are path aliases that cannot be distinguished from npm package names.
-                    // We recommend users to use the '#' prefix convention for path aliases, see https://vike.dev/path-aliases#vite and assertResolveAlias()
-                    if (isNpmPackageImport(importPathAbsolute)) {
-                        // isNpmPackageImport() returns false for a path alias like #root/renderer/onRenderClient
-                        assert(!importPathAbsolute.startsWith('#'));
-                        include.push(importPathAbsolute);
-                    }
-                    else {
-                        /* Path aliases, e.g.:
-                         * ```js
-                         * // /renderer/+config.js
-                         * import onRenderClient from '#root/renderer/onRenderClient'
-                         * ```
-                         */
-                        entries.push(importPathAbsolute);
-                    }
+                    assert(importPathAbsolute); // Help TS
+                    // Shouldn't be a path alias, as path aliases would need to be added to config.optimizeDeps.entries instead of config.optimizeDeps.include
+                    assertIsNpmPackageImport(importPathAbsolute);
+                    include.push(importPathAbsolute);
                 }
             });
         });
@@ -69,9 +61,12 @@ async function getPageDeps(config, pageConfigs, isDev) {
     // V0.4 design
     {
         const pageFiles = await findPageFiles(config, ['.page', '.page.client'], isDev);
-        pageFiles.forEach((filePath) => {
-            const entry = getFilePathAbsoluteFilesystem(filePath, config);
-            entries.push(entry);
+        const userRootDir = config.root;
+        pageFiles.forEach((filePathAbsoluteUserRootDir) => {
+            const entry = getFilePathResolved({ filePathAbsoluteUserRootDir, userRootDir });
+            const { filePathAbsoluteFilesystem } = entry;
+            assert(filePathAbsoluteFilesystem);
+            entries.push(filePathAbsoluteFilesystem);
         });
     }
     entries = unique(entries);

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

@@ -2,8 +2,9 @@ export { envVarsPlugin };
 // For ./envVars.spec.ts
 export { applyEnvVar };
 import { loadEnv } from 'vite';
-import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, getFilePathAbsoluteUserRootDir, lowerFirst } from '../utils.js';
+import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, lowerFirst } from '../utils.js';
 import { sourceMapPassthrough } from '../shared/rollupSourceMap.js';
+import { getModuleFilePath } from '../shared/getFilePath.js';
 function envVarsPlugin() {
     let envsAll;
     let config;
@@ -45,10 +46,10 @@ function envVarsPlugin() {
                     if (isPrivate && isClientSide) {
                         if (!code.includes(envStatement))
                             return;
-                        const filePathToShowToUser = getFilePathAbsoluteUserRootDir(id, config.root);
+                        const modulePath = getModuleFilePath(id, config);
                         const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
                         const keyPublic = `${publicPrefix}${envName}`;
-                        const errMsg = `${envStatement} is used in client-side file ${filePathToShowToUser} which means that the environment variable ${envName} will be included in client-side bundles and, therefore, ${envName} will be publicly exposed which can be a security leak${errMsgAddendum}. Use ${envStatement} only in server-side files, or rename ${envName} to ${keyPublic}, see https://vike.dev/env`;
+                        const errMsg = `${envStatement} is used in client-side file ${modulePath} which means that the environment variable ${envName} will be included in client-side bundles and, therefore, ${envName} will be publicly exposed which can be a security leak${errMsgAddendum}. Use ${envStatement} only in server-side files, or rename ${envName} to ${keyPublic}, see https://vike.dev/env`;
                         if (isBuild) {
                             assertUsage(false, errMsg);
                         }