vike 0.4.161 → 0.4.162-commit-8995471

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

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertClientEntryId = void 0;
-const globalContext_js_1 = require("../../globalContext.js");
 const utils_js_1 = require("../../utils.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 function assertClientEntryId(id) {
     (0, utils_js_1.assertPosixPath)(id);
     (0, utils_js_1.assert)(!id.startsWith('/@fs'), id);
-    const isPkg = (0, utils_js_1.isNpmPackageImport)(id);
     (0, utils_js_1.assert)(
     // Client entry
     id.startsWith('@@vike/') ||
@@ -15,11 +13,7 @@ function assertClientEntryId(id) {
         id.startsWith('/') ||
         // Page code importer
         (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id) ||
-        // Stem packages
-        isPkg, id);
-    if (isPkg) {
-        const { configVike } = (0, globalContext_js_1.getGlobalContext)();
-        (0, utils_js_1.assert)(configVike === null || configVike.extensions.some(({ npmPackageName }) => id.startsWith(npmPackageName)), id);
-    }
+        // Import
+        (0, utils_js_1.isNpmPackageImport)(id), id);
 }
 exports.assertClientEntryId = assertClientEntryId;

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

@@ -4,7 +4,8 @@ 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");
-function getManifestEntry(id, clientManifest, manifestKeyMap) {
+const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
+function getManifestEntry(id, clientManifest) {
     (0, assertClientEntryId_js_1.assertClientEntryId)(id);
     const debugInfo = getDebugInfo(id, clientManifest);
     // Vike client entry
@@ -42,13 +43,11 @@ function getManifestEntry(id, clientManifest, manifestKeyMap) {
         (0, utils_js_1.assert)(manifestEntry, debugInfo);
         return { manifestEntry, manifestKey };
     }
-    // extensions[number].pageConfigsDistFiles
+    // npm package import
     if ((0, utils_js_1.isNpmPackageImport)(id)) {
-        const manifestKey = manifestKeyMap[id];
-        const debugInfo2 = { ...debugInfo, manifestKey };
-        (0, utils_js_1.assert)(manifestKey, debugInfo2);
-        const manifestEntry = clientManifest[manifestKey];
-        (0, utils_js_1.assert)(manifestEntry, debugInfo2);
+        const found = Object.entries(clientManifest).find(([, e]) => e.name === (0, prependEntriesDir_js_1.prependEntriesDir)(id));
+        (0, utils_js_1.assert)(found);
+        const [manifestKey, manifestEntry] = found;
         return { manifestEntry, manifestKey };
     }
     // extensions[number].pageConfigsSrcDir

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

@@ -4,7 +4,7 @@ exports.retrieveAssetsProd = void 0;
 const utils_js_1 = require("../../utils.js");
 const getManifestEntry_js_1 = require("./getManifestEntry.js");
 const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
-function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImportedByServer, manifestKeyMap) {
+function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImportedByServer) {
     let assetUrls = new Set();
     (0, utils_js_1.assert)(clientManifest);
     const visistedAssets = new Set();
@@ -21,7 +21,7 @@ function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImp
                 id = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(id);
             }
         }
-        const { manifestKey } = (0, getManifestEntry_js_1.getManifestEntry)(id, clientManifest, manifestKeyMap);
+        const { manifestKey } = (0, getManifestEntry_js_1.getManifestEntry)(id, clientManifest);
         collectAssets(manifestKey, assetUrls, visistedAssets, clientManifest, onlyAssets);
     });
     collectSingleStyle(assetUrls, clientManifest);

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

@@ -16,15 +16,14 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     let assetUrls;
     let clientEntriesSrc;
     if (isDev) {
-        const { viteDevServer, configVike } = globalContext;
-        clientEntriesSrc = await Promise.all(clientEntries.map((clientEntry) => resolveClientEntriesDev(clientEntry, viteDevServer, configVike)));
+        const { viteDevServer } = globalContext;
+        clientEntriesSrc = await Promise.all(clientEntries.map((clientEntry) => resolveClientEntriesDev(clientEntry, viteDevServer)));
         assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
     }
     else {
-        const { pluginManifest, clientManifest } = globalContext;
-        const manifestKeyMap = pluginManifest.manifestKeyMap;
-        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, clientManifest, manifestKeyMap));
-        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, clientManifest, pageContext._includeAssetsImportedByServer, manifestKeyMap);
+        const { clientManifest } = globalContext;
+        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, clientManifest));
+        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, clientManifest, pageContext._includeAssetsImportedByServer);
     }
     let pageAssets = [];
     (0, utils_js_1.unique)([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
@@ -59,7 +58,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     return pageAssets;
 }
 exports.getPageAssets = getPageAssets;
-async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
+async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     (0, assertClientEntryId_js_1.assertClientEntryId)(clientEntry);
     let root = viteDevServer.config.root;
     (0, utils_js_1.assert)(root);
@@ -80,7 +79,7 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
         // User files
         filePath = (0, utils_js_1.pathJoin)(root, clientEntry);
     }
-    else if (clientEntry.startsWith('@@vike/')) {
+    else if (clientEntry.startsWith('@@vike/') || (0, utils_js_1.isNpmPackageImport)(clientEntry)) {
         // Vike client entry
         const { createRequire } = (await (0, import_1.import_)('module')).default;
         const { dirname } = (await (0, import_1.import_)('path')).default;
@@ -92,27 +91,23 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
         // @ts-expect-error
         // Bun workaround https://github.com/vikejs/vike/pull/1048
         const res = typeof Bun !== 'undefined' ? (toPath) => Bun.resolveSync(toPath, __dirname_) : require_.resolve;
-        (0, utils_js_1.assert)(clientEntry.endsWith('.js'));
-        try {
-            // For Vitest (which doesn't resolve vike to its dist but to its source files)
-            // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/runtime/renderPage/getPageAssets.js
-            filePath = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
+        if ((0, utils_js_1.isNpmPackageImport)(clientEntry)) {
+            filePath = res(clientEntry);
         }
-        catch {
-            // For users
-            // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/runtime/renderPage/getPageAssets.js
-            filePath = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
+        else {
+            (0, utils_js_1.assert)(clientEntry.endsWith('.js'));
+            try {
+                // For Vitest (which doesn't resolve vike to its dist but to its source files)
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/runtime/renderPage/getPageAssets.js
+                filePath = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
+            }
+            catch {
+                // For users
+                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/runtime/renderPage/getPageAssets.js
+                filePath = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
+            }
         }
     }
-    else if ((0, utils_js_1.isNpmPackageImport)(clientEntry)) {
-        const extensionPageFile = configVike.extensions
-            .map(({ pageConfigsDistFiles }) => pageConfigsDistFiles)
-            .flat()
-            .filter(utils_js_1.isNotNullish)
-            .find((e) => e.importPath === clientEntry);
-        (0, utils_js_1.assert)(extensionPageFile, clientEntry);
-        filePath = extensionPageFile.filePath;
-    }
     else {
         (0, utils_js_1.assert)(false);
     }
@@ -124,8 +119,8 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
     (0, utils_js_1.assertPosixPath)(filePath);
     return filePath;
 }
-function resolveClientEntriesProd(clientEntry, clientManifest, manifestKeyMap) {
-    const { manifestEntry } = (0, getManifestEntry_js_1.getManifestEntry)(clientEntry, clientManifest, manifestKeyMap);
+function resolveClientEntriesProd(clientEntry, clientManifest) {
+    const { manifestEntry } = (0, getManifestEntry_js_1.getManifestEntry)(clientEntry, clientManifest);
     (0, utils_js_1.assert)(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });
     let { file } = manifestEntry;
     (0, utils_js_1.assert)(!file.startsWith('/'));

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

@@ -21,8 +21,8 @@ const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePa
 const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js");
 const loadPageRoutes_js_1 = require("../../../shared/route/loadPageRoutes.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const helpers_js_1 = require("../../../shared/page-configs/helpers.js");
 const isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
+const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext._pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -156,7 +156,7 @@ async function getRenderContext() {
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
     const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal } = await (0, getPageFiles_js_1.getPageFilesAll)(false, globalContext.isProduction);
     const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
-    assertV1Design(pageFilesAll, pageConfigs);
+    (0, assertV1Design_js_1.assertV1Design)(pageFilesAll.length > 0, pageConfigs, pageFilesAll);
     const renderContext = {
         pageFilesAll: pageFilesAll,
         pageConfigs,
@@ -168,24 +168,3 @@ async function getRenderContext() {
     return renderContext;
 }
 exports.getRenderContext = getRenderContext;
-function assertV1Design(pageFilesAll, pageConfigs) {
-    const isV1Design = pageConfigs.length !== 0;
-    const isDesignOld = pageFilesAll.length !== 0;
-    if (isV1Design && isDesignOld) {
-        const indent = '- ';
-        const v1Files = (0, utils_js_1.unique)(pageConfigs
-            .map((p) => Object.values(p.configValues)
-            .map(helpers_js_1.getConfigValueFilePathToShowToUser)
-            .filter(utils_js_1.isNotNullish)
-            .map((filePathToShowToUser) => indent + filePathToShowToUser))
-            .flat(2));
-        (0, utils_js_1.assertUsage)(false, [
-            'Mixing the new V1 design with the old V0.4 design is forbidden.',
-            'V1 files:',
-            ...v1Files,
-            'V0.4 files:',
-            ...pageFilesAll.map((p) => indent + p.filePath)
-        ].join('\n'));
-    }
-    (0, utils_js_1.assertWarning)(!isDesignOld, "You are using Vike's deprecated design. Update to the new V1 design, see https://vike.dev/migration/v1-design for how to migrate.", { onlyOnce: true });
-}

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

@@ -49,7 +49,6 @@ __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/isStemPackageName.js"), exports);
 __exportStar(require("../../utils/freezePartial.js"), exports);
 __exportStar(require("../../utils/isNpmPackage.js"), exports);
 __exportStar(require("../../utils/isNotNullish.js"), exports);
@@ -61,7 +60,7 @@ __exportStar(require("../../utils/getFileExtension.js"), exports);
 __exportStar(require("../../utils/assertIsNotProductionRuntime.js"), exports);
 __exportStar(require("../../utils/virtual-files.js"), exports);
 __exportStar(require("../../utils/path-shim.js"), exports);
-__exportStar(require("../../utils/nodeEnv.js"), exports);
+__exportStar(require("../../utils/assertNodeEnv.js"), exports);
 __exportStar(require("../../utils/isHtml.js"), exports);
 __exportStar(require("../../utils/warnIfErrorIsNotObject.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);

package/dist/cjs/node/shared/assertPluginManifest.js

@@ -9,16 +9,13 @@ function assertPluginManifest(pluginManifest) {
     (0, assertRuntimeManifest_js_1.assertRuntimeManifest)(pluginManifest);
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pluginManifest, 'usesClientRouter', 'boolean'));
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pluginManifest, 'version', 'string'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pluginManifest, 'manifestKeyMap', 'object'));
-    const { manifestKeyMap } = pluginManifest;
-    (0, utils_js_1.assert)((0, utils_js_1.isStringRecord)(manifestKeyMap));
     // Avoid:
     // ```
     // Uncaught (in promise) TypeError: Cannot set property manifestKeyMap of #<Object> which has only a getter
     // ```
+    // We removed manifestKeyMap, maybe this isn't needed anymore.
     // See https://github.com/vikejs/vike/issues/596
     const pluginManifestClone = { ...pluginManifest };
-    (0, utils_js_1.objectAssign)(pluginManifestClone, { manifestKeyMap });
     (0, utils_js_1.checkType)(pluginManifestClone);
 }
 exports.assertPluginManifest = assertPluginManifest;

package/dist/cjs/node/shared/assertV1Design.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertV1Design = void 0;
+const helpers_js_1 = require("../../shared/page-configs/helpers.js");
+const utils_js_1 = require("./utils.js");
+function assertV1Design(isOldDesign, pageConfigs, pageFilesAll) {
+    const isV1Design = pageConfigs.length > 0;
+    if (isV1Design && isOldDesign) {
+        const lines = ['Mixing the new V1 design with the old V0.4 design is forbidden.'];
+        if (pageFilesAll) {
+            (0, utils_js_1.assert)(pageFilesAll.length > 0);
+            const indent = '- ';
+            const filesV1 = (0, utils_js_1.unique)(pageConfigs
+                .map((p) => Object.values(p.configValues)
+                .map(helpers_js_1.getConfigValueFilePathToShowToUser)
+                .filter(utils_js_1.isNotNullish)
+                .map((filePathToShowToUser) => indent + filePathToShowToUser))
+                .flat(2));
+            const filesOld = pageFilesAll.map((p) => indent + p.filePath);
+            lines.push(...['V1 design files:', ...filesV1, 'Old design files:', ...filesOld]);
+        }
+        (0, utils_js_1.assertUsage)(false, lines.join('\n'));
+    }
+    (0, utils_js_1.assertWarning)(!isOldDesign, "You are using Vike's deprecated design. Update to the new V1 design, see https://vike.dev/migration/v1-design for how to migrate.", { onlyOnce: true });
+}
+exports.assertV1Design = assertV1Design;

package/dist/cjs/node/shared/{getClientEntryFilePath.js → getClientEntry.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getClientEntryFilePath = void 0;
+exports.getClientEntry = void 0;
 const helpers_js_1 = require("../../shared/page-configs/helpers.js");
-function getClientEntryFilePath(pageConfig) {
+function getClientEntry(pageConfig) {
     const configName = 'client';
     const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, configName, 'string');
     if (!configValue)
         return null;
     return configValue.value;
 }
-exports.getClientEntryFilePath = getClientEntryFilePath;
+exports.getClientEntry = getClientEntry;

package/dist/cjs/node/shared/prependEntriesDir.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prependEntriesDir = void 0;
+const utils_js_1 = require("./utils.js");
+function prependEntriesDir(entryName) {
+    if (entryName.startsWith('/')) {
+        entryName = entryName.slice(1);
+    }
+    (0, utils_js_1.assert)(!entryName.startsWith('/'));
+    entryName = `entries/${entryName}`;
+    return entryName;
+}
+exports.prependEntriesDir = prependEntriesDir;

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

@@ -31,3 +31,5 @@ __exportStar(require("../../utils/parseUrl-extras.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
 __exportStar(require("../../utils/virtual-files.js"), exports);
 __exportStar(require("../../utils/assertIsNotBrowser.js"), exports);
+__exportStar(require("../../utils/isNotNullish.js"), exports);
+__exportStar(require("../../utils/unique.js"), exports);

package/dist/cjs/node/shared/virtual-files/virtualFileImportUserCode.js

@@ -15,6 +15,7 @@ function isVirtualFileIdImportUserCode(id) {
         return false;
     (0, utils_js_1.assert)(
     // prettier-ignore
+    // biome-ignore format:
     [
         virtualFileIdImportUserCodeServer,
         virtualFileIdImportUserCodeClientCR,

package/dist/cjs/shared/hooks/getHook.js

@@ -56,7 +56,7 @@ function getHookFromPageConfigGlobal(pageConfigGlobal, hookName) {
     // hook isn't a computed nor a cumulative config => definedAt should always be defined
     (0, utils_js_1.assert)(hookFilePath);
     assertHookFn(hookFn, { hookName, hookFilePath });
-    // We could use the global value of config.hooksTimeout but it requires some non-trivial refactoring
+    // We could use the global value of configooksTimeout but it requires some non-trivial refactoring
     const hookTimeout = getHookTimeoutDefault(hookName);
     return { hookFn, hookName, hookFilePath, hookTimeout };
 }

package/dist/cjs/shared/page-configs/helpers/getConfigValue.js

@@ -8,6 +8,7 @@ const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getConfigDefinedAtString_js_1 = require("./getConfigDefinedAtString.js");
 // prettier-ignore
+// biome-ignore format:
 function getConfigValue(pageConfig, configName, type) {
     const configValue = getConfigValueEntry(pageConfig, configName);
     if (configValue === null)

package/dist/cjs/shared/page-configs/serialize/parseConfigValuesImported.js

@@ -78,7 +78,7 @@ function assertIsNotNull(configValue, configName, importPath) {
      *  - for cumulative values in the future: we don't need this for now because, currently, cumulative values are never imported.
     assertUsage(
       configValue !== null,
-      `Set ${pc.cyan(configName)} to ${pc.cyan('null')} in a +config.h.js file instead of ${importPath}`
+      `Set ${pc.cyan(configName)} to ${pc.cyan('null')} in a +config.js file instead of ${importPath}`
     )
     */
 }

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

@@ -164,6 +164,7 @@ function assertNoInfiniteLoop(pageContextsFromRewrite) {
 function assertNoInfiniteAbortLoop(rewriteCount, redirectCount) {
     const abortCalls = [
         // prettier-ignore
+        // biome-ignore format:
         rewriteCount > 0 && picocolors_1.default.cyan("throw render('/some-url')"),
         redirectCount > 0 && picocolors_1.default.cyan("throw redirect('/some-url')")
     ]

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

@@ -9,6 +9,7 @@ const resolveRouteString_js_2 = require("./resolveRouteString.js");
 // See https://vike.dev/route-function#precedence
 function resolvePrecendence(routeMatches) {
     // prettier-ignore
+    // biome-ignore format:
     routeMatches
         .sort(sortMatches)
         .sort((0, utils_js_2.makeFirst)((routeMatch) => routeMatch.routeType === 'FUNCTION' && !!routeMatch.precedence && routeMatch.precedence < 0))

package/dist/cjs/utils/{nodeEnv.js → assertNodeEnv.js}

@@ -1,4 +1,7 @@
 "use strict";
+// Utils to manage process.env.NODE_ENV and, most notably, to assert correct usage, which is crucial:
+//  - https://github.com/vikejs/vike/issues/1469#issuecomment-1919518096
+//  - https://github.com/vitejs/vite/blob/76f30ae23b92f9af910ec02d98e2baaefa12141f/packages/vite/src/node/config.ts#L567
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/cjs/utils/formatHintLog.js

@@ -9,6 +9,7 @@ function formatHintLog(msg) {
     const sep = '─'.repeat(msgLength);
     return [
         // prettier-ignore
+        // biome-ignore format:
         `┌─${sep}─┐`,
         `│ ${msg} │`,
         `└─${sep}─┘`

package/dist/cjs/utils/hasProp.js

@@ -6,6 +6,7 @@ exports.hasProp = void 0;
 const isCallable_js_1 = require("./isCallable.js");
 const isObject_js_1 = require("./isObject.js");
 // prettier-ignore
+// biome-ignore format:
 function hasProp(obj, prop, type = 'unknown') {
     if (!(0, isObject_js_1.isObject)(obj))
         return false;

package/dist/cjs/utils/isScriptFile.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scriptFileExtensionList = exports.scriptFileExtensions = exports.isTemplateFile = exports.isScriptFile = void 0;
+exports.scriptFileExtensionList = exports.scriptFileExtensions = exports.isTemplateFile = exports.isJavaScriptFile = exports.isScriptFile = void 0;
 const assert_js_1 = require("./assert.js");
 // We can't use a RegExp:
 //  - Needs to work with Micromatch: https://github.com/micromatch/micromatch because:
@@ -12,6 +12,7 @@ const assert_js_1 = require("./assert.js");
 //     - We cannot implement a blacklist with a glob pattern.
 //     - A post `import.meta.glob()` blacklist filtering doesn't work because Vite would still process the files (e.g. including them in the bundle).
 // prettier-ignore
+// biome-ignore format:
 const extJavaScript = [
     'js',
     'ts',
@@ -19,6 +20,10 @@ const extJavaScript = [
     'cts',
     'mjs',
     'mts',
+];
+// prettier-ignore
+// biome-ignore format:
+const extJsx = [
     'jsx',
     'tsx',
     'cjsx',
@@ -27,6 +32,7 @@ const extJavaScript = [
     'mtsx',
 ];
 // prettier-ignore
+// biome-ignore format:
 const extTemplates = [
     'vue',
     'svelte',
@@ -34,19 +40,24 @@ const extTemplates = [
     'md',
     'mdx'
 ];
-const scriptFileExtensionList = [...extJavaScript, ...extTemplates];
+const scriptFileExtensionList = [...extJavaScript, ...extJsx, ...extTemplates];
 exports.scriptFileExtensionList = scriptFileExtensionList;
 const scriptFileExtensions = '(' + scriptFileExtensionList.join('|') + ')';
 exports.scriptFileExtensions = scriptFileExtensions;
 function isScriptFile(filePath) {
     const yes = scriptFileExtensionList.some((ext) => filePath.endsWith('.' + ext));
-    (0, assert_js_1.assert)(!isJavaScriptFile(filePath) || yes);
+    if (isJavaScriptFile(filePath))
+        (0, assert_js_1.assert)(yes);
     return yes;
 }
 exports.isScriptFile = isScriptFile;
 function isJavaScriptFile(filePath) {
-    return /\.(c|m)?(j|t)sx?$/.test(filePath);
+    const yes1 = /\.(c|m)?(j|t)s$/.test(filePath);
+    const yes2 = extJavaScript.some((ext) => filePath.endsWith('.' + ext));
+    (0, assert_js_1.assert)(yes1 === yes2);
+    return yes1;
 }
+exports.isJavaScriptFile = isJavaScriptFile;
 function isTemplateFile(filePath) {
     return extTemplates.some((ext) => filePath.endsWith('.' + ext));
 }

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.161';
+const PROJECT_VERSION = '0.4.162-commit-8995471';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/__internal/index.js

@@ -2,7 +2,7 @@
 export { route, getPagesAndRoutes };
 import { route as routeInternal } from '../shared/route/index.js';
 import { getGlobalContext, initGlobalContext } from '../node/runtime/globalContext.js';
-import { setNodeEnvToProduction } from '../utils/nodeEnv.js';
+import { setNodeEnvToProduction } from '../utils/assertNodeEnv.js';
 import { assert } from '../utils/assert.js';
 import { getRenderContext } from '../node/runtime/renderPage/renderPageAlreadyRouted.js';
 /**

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

@@ -308,35 +308,41 @@ async function renderPageClientSide(renderArgs) {
                 }
             }
         };
-        // We use globalObject.renderPromise in order to ensure that there is never two concurrent onRenderClient() calls
-        if (globalObject.renderPromise) {
+        // We use globalObject.onRenderClientPromise in order to ensure that there is never two concurrent onRenderClient() calls
+        if (globalObject.onRenderClientPromise) {
             // Make sure that the previous render has finished
-            await globalObject.renderPromise;
-            assert(globalObject.renderPromise === undefined);
+            await globalObject.onRenderClientPromise;
+            assert(globalObject.onRenderClientPromise === undefined);
             if (isRenderOutdated())
                 return;
         }
         changeUrl(urlOriginal, overwriteLastHistoryEntry);
         globalObject.previousPageContext = pageContext;
-        assert(globalObject.renderPromise === undefined);
-        globalObject.renderPromise = (async () => {
+        assert(globalObject.onRenderClientPromise === undefined);
+        globalObject.onRenderClientPromise = (async () => {
+            let onRenderClientError;
             try {
                 await executeOnRenderClientHook(pageContext, true);
             }
             catch (err) {
-                await onError(err);
-                return;
+                onRenderClientError = err;
             }
-            addLinkPrefetchHandlers(pageContext);
-            globalObject.renderPromise = undefined;
+            globalObject.onRenderClientPromise = undefined;
+            return onRenderClientError;
         })();
-        await globalObject.renderPromise;
-        assert(globalObject.renderPromise === undefined);
+        const onRenderClientError = await globalObject.onRenderClientPromise;
+        assert(globalObject.onRenderClientPromise === undefined);
+        if (onRenderClientError) {
+            await onError(onRenderClientError);
+            if (!isErrorPage)
+                return;
+        }
         /* We don't abort in order to ensure that onHydrationEnd() is called: we abort only after onHydrationEnd() is called.
         if (isRenderOutdated(true)) return
         */
+        addLinkPrefetchHandlers(pageContext);
         // onHydrationEnd()
-        if (isHydrationRender) {
+        if (isHydrationRender && !onRenderClientError) {
             assertHook(pageContext, 'onHydrationEnd');
             const hook = getHook(pageContext, 'onHydrationEnd');
             if (hook) {
@@ -353,7 +359,7 @@ async function renderPageClientSide(renderArgs) {
                     return;
             }
         }
-        // We abort *after* onHydrationEnd() is called
+        // We purposely abort *after* onHydrationEnd() is called (see comment above).
         if (isRenderOutdated(true))
             return;
         // onPageTransitionEnd()

package/dist/esm/client/shared/getPageContextProxyForUser.js

@@ -1,5 +1,5 @@
 export { getPageContextProxyForUser };
-import { assert, assertUsage, getGlobalObject } from '../server-routing-runtime/utils.js';
+import { assert, assertUsage, assertWarning, getGlobalObject } from '../server-routing-runtime/utils.js';
 import { notSerializable } from '../../shared/notSerializable.js';
 const globalObject = getGlobalObject('getPageContextProxyForUser.ts', {});
 /**
@@ -30,6 +30,10 @@ function assertIsDefined(pageContext, prop) {
         return;
     if (isExpected(prop))
         return;
+    // - If no pageContext was fetchd from the server, then adding props to passToClient is useless.
+    // - Showing a warning, even though no pageContext was fetched from the server, is actually erroneous as the client runtime cannot deduce the passToClient list.
+    if (!pageContext._hasPageContextFromServer)
+        return;
     const propName = JSON.stringify(prop);
     /* This handling would be the clearest but, unfortunately, it's fundamentally problematic:
      *  - It would force the pageContext value consumer to be synchronized with the pageContext value provider. For example, if vike-react wants to conditionally do something dependening on wehther some optional pageContext value was provided by some optional vike-react-* integration package.
@@ -37,7 +41,7 @@ function assertIsDefined(pageContext, prop) {
     const errMsg = `pageContext[${propName}] is \`undefined\` on the client-side. If it's defined on the server-side then add ${propName} to passToClient (https://vike.dev/passToClient), otherwise make sure your client-side hooks always define it (e.g. set it to \`null\` instead of \`undefined\`).`
     assertUsage(false, errMsg)
     */
-    if (pageContext._hasPageContextFromServer && !pageContext._hasPageContextFromClient) {
+    if (!pageContext._hasPageContextFromClient) {
         // We can safely assume that the property is missing in passToClient, because the server-side defines all passToClient properties even if they have an undefined value:
         // ```
         // <script id="vike_pageContext" type="application/json">{"_pageId":"/pages/admin","user":"!undefined","pageProps":"!undefined","title":"!undefined","abortReason":"!undefined","_urlRewrite":null}</script>
@@ -47,6 +51,19 @@ function assertIsDefined(pageContext, prop) {
     }
     else {
         // Do nothing, not even a warning, because we don't know whether the user expects that the pageContext value can be undefined. (E.g. a pageContext value that is defined by an optional hook.)
+        // TODO/next-major-release make it an assertUsage()
+        assertWarning(false, [
+            `pageContext[${propName}] isn't defined on the client-side:`,
+            `1. if it's defined by the server-side then add ${propName} to passToClient (https://vike.dev/passToClient), or`,
+            `2. if it's expected that it may not be defined:`,
+            '   ```js',
+            '   // ❌ Replace code like this:',
+            `   const val = pageContext[${propName}] ?? someDefaultValue`,
+            '   // ✅ With that:',
+            `   const val = ${propName} in pageContext ? pageContext[${propName}] : someDefaultValue`,
+            '   ```',
+            `See stack track below to find where pageContext[${propName}] is being accessed.`
+        ].join('\n'), { showStackTrace: true, onlyOnce: false });
     }
 }
 const IGNORE_LIST = [

package/dist/esm/client/shared/loadUserFilesClientSide.js

@@ -12,6 +12,7 @@ async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs) {
     const isDev = import.meta.env.DEV;
     try {
         // prettier-ignore
+        // biome-ignore format:
         const result = await Promise.all([
             pageConfig && loadConfigValues(pageConfig, isDev),
             ...pageFilesClientSide.map((p) => p.loadFile?.()),

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

@@ -19,7 +19,6 @@ import { suppressRollupWarning } from './plugins/suppressRollupWarning.js';
 import { setGlobalContext } from './plugins/setGlobalContext.js';
 import { importBuild } from './plugins/importBuild/index.js';
 import { commonConfig } from './plugins/commonConfig.js';
-import { extensionsAssets } from './plugins/extensionsAssets.js';
 import { baseUrls } from './plugins/baseUrls.js';
 import { envVarsPlugin } from './plugins/envVars.js';
 import pc from '@brillout/picocolors';
@@ -44,7 +43,6 @@ function plugin(vikeConfig) {
         suppressRollupWarning(),
         setGlobalContext(),
         ...importBuild(),
-        extensionsAssets(),
         baseUrls(vikeConfig),
         envVarsPlugin(),
         fileEnv()