vike 0.4.259-commit-fc34c43 → 0.4.259-commit-c9d00d4

package/dist/node/vite/plugins/build/pluginBuildApp.js

@@ -20,6 +20,7 @@ const globalObject = getGlobalObject('build/pluginBuildApp.ts', {
 });
 function pluginBuildApp() {
     let config;
+    let alreadyBuilt = false;
     return [
         {
             name: 'vike:build:pluginBuildApp:pre',
@@ -32,11 +33,15 @@ function pluginBuildApp() {
                         builder: {
                             // Can be overridden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
                             async buildApp(builder) {
+                                if (alreadyBuilt)
+                                    return;
+                                alreadyBuilt = true;
                                 assert(builder.environments.client);
                                 assert(builder.environments.ssr);
                                 await builder.build(builder.environments.client);
                                 await builder.build(builder.environments.ssr);
                                 if (isPrerenderForceExit()) {
+                                    await builder.buildApp();
                                     runPrerender_forceExit();
                                     assert(false);
                                 }

package/dist/node/vite/plugins/build/pluginBuildConfig.d.ts

@@ -3,11 +3,16 @@ export { assertRollupInput };
 export { analyzeClientEntries };
 import type { ResolvedConfig, Plugin } from 'vite';
 import type { PageConfigBuildTime } from '../../../../types/PageConfig.js';
+import type { FilePath } from '../../../../types/FilePath.js';
 import '../../assertEnvVite.js';
 declare function pluginBuildConfig(): Plugin[];
+type ClientEntry = {
+    entryTarget: string;
+    entryFilePath: null | FilePath;
+};
 declare function analyzeClientEntries(pageConfigs: PageConfigBuildTime[], config: ResolvedConfig): {
     hasClientRouting: boolean;
     hasServerRouting: boolean;
-    clientEntries: Record<string, string>;
+    clientEntries: Record<string, ClientEntry>;
 };
 declare function assertRollupInput(config: ResolvedConfig): void;

package/dist/node/vite/plugins/build/pluginBuildConfig.js

@@ -8,12 +8,13 @@ import { assertImportIsNpmPackage } from '../../../../utils/parseNpmPackage.js';
 import { removeFileExtension } from '../../../../utils/removeFileExtension.js';
 import { requireResolveDistFile } from '../../../../utils/requireResolve.js';
 import { unique } from '../../../../utils/unique.js';
+import { objectMap } from '../../../../utils/objectMap.js';
 import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { generateVirtualFileId } from '../../../../shared-server-node/virtualFileId.js';
 import { extractAssetsAddQuery } from '../../../../shared-server-node/extractAssetsQuery.js';
 import { prependEntriesDir } from '../../../../shared-server-node/prependEntriesDir.js';
-import { getFilePathResolved } from '../../shared/getFilePath.js';
+import { getFilePathResolved, getFilePathUnresolved } from '../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../shared-server-client/page-configs/getConfigValueBuildTime.js';
 import { isViteServerSide_viteEnvOptional } from '../../shared/isViteServerSide.js';
 import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig, handleAssetsManifest_alignCssTarget, } from './handleAssetsManifest.js';
@@ -76,7 +77,7 @@ async function getEntries(config) {
             hasServerRouting = true;
         }
         const entries = {
-            ...clientEntries,
+            ...objectMap(clientEntries, (clientEntry) => clientEntry.entryTarget),
             ...pageFileEntries,
         };
         const clientRoutingEntry = requireResolveDistFile('dist/client/runtime-client-routing/entry.js');
@@ -113,8 +114,8 @@ function analyzeClientEntries(pageConfigs, config) {
         }
         {
             // Ensure Rollup generates a bundle per page: https://github.com/vikejs/vike/issues/349#issuecomment-1166247275
-            const { entryName, entryTarget } = getEntryFromPageConfig(pageConfig, true);
-            clientEntries[entryName] = entryTarget;
+            const { entryName, entryTarget, entryFilePath } = getEntryFromPageConfig(pageConfig, true);
+            clientEntries[entryName] = { entryTarget, entryFilePath };
         }
         {
             const clientEntry = getConfigValueBuildTime(pageConfig, 'client', 'string')?.value ?? null;
@@ -125,8 +126,8 @@ function analyzeClientEntries(pageConfigs, config) {
     });
     clientEntryList = unique(clientEntryList);
     clientEntryList.forEach((clientEntry) => {
-        const { entryName, entryTarget } = getEntryFromClientEntry(clientEntry, config);
-        clientEntries[entryName] = entryTarget;
+        const { entryName, entryTarget, entryFilePath } = getEntryFromClientEntry(clientEntry, config);
+        clientEntries[entryName] = { entryTarget, entryFilePath };
     });
     return { hasClientRouting, hasServerRouting, clientEntries };
 }
@@ -157,7 +158,8 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
         assertImportIsNpmPackage(clientEntry);
         const entryTarget = clientEntry;
         const entryName = prependEntriesDir(clientEntry);
-        return { entryName, entryTarget };
+        const entryFilePath = getFilePathUnresolved({ importPathAbsolute: clientEntry });
+        return { entryName, entryTarget, entryFilePath };
     }
     const filePathAbsoluteUserRootDir = clientEntry;
     assert(filePathAbsoluteUserRootDir.startsWith('/'));
@@ -173,7 +175,7 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
         entryName = extractAssetsAddQuery(entryName);
     entryName = removeFileExtension(entryName);
     entryName = prependEntriesDir(entryName);
-    return { entryName, entryTarget };
+    return { entryName, entryTarget, entryFilePath: filePath };
 }
 function getEntryFromPageConfig(pageConfig, isForClientSide) {
     let { pageId } = pageConfig;
@@ -188,7 +190,7 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
         entryName = 'root';
     entryName = prependEntriesDir(entryName);
     assert(!entryName.endsWith('/'));
-    return { entryName, entryTarget };
+    return { entryName, entryTarget, entryFilePath: null };
 }
 function addLogHook() {
     const tty = process.stdout.isTTY && !process.env.CI; // Equals https://github.com/vitejs/vite/blob/193d55c7b9cbfec5b79ebfca276d4a721e7de14d/packages/vite/src/node/plugins/reporter.ts#L27

package/dist/node/vite/plugins/pluginDev/optimizeDeps.js

@@ -158,6 +158,14 @@ async function getPageDeps(config, pageConfigs) {
             includeServer.push(e);
         }
     };
+    const addEntryOrInclude = (filePath, isForClientSide, definedAt) => {
+        if (filePath.filePathAbsoluteUserRootDir !== null) {
+            addEntry(filePath.filePathAbsoluteFilesystem, isForClientSide, definedAt);
+        }
+        else {
+            addInclude(filePath.importPathAbsolute, isForClientSide, definedAt);
+        }
+    };
     const isExcluded = (e, isForClientSide, definedAt) => {
         const exclude = isForClientSide ? config.optimizeDeps.exclude : config.ssr.optimizeDeps.exclude;
         if (!exclude)
@@ -188,16 +196,7 @@ async function getPageDeps(config, pageConfigs) {
                         const { definedAt } = configValueSource;
                         if (definedAt.definedBy)
                             return;
-                        if (definedAt.filePathAbsoluteUserRootDir !== null) {
-                            addEntry(
-                            // optimizeDeps.entries expects filesystem absolute paths
-                            definedAt.filePathAbsoluteFilesystem, isForClientSide, definedAt);
-                        }
-                        else {
-                            addInclude(
-                            // optimizeDeps.include expects npm packages
-                            definedAt.importPathAbsolute, isForClientSide, definedAt);
-                        }
+                        addEntryOrInclude(definedAt, isForClientSide, definedAt);
                     });
                 });
             });
@@ -220,7 +219,15 @@ async function getPageDeps(config, pageConfigs) {
     //     - If we do, then we need to adjust include/entries (maybe by making include === entries -> will Vite complain?)
     {
         const { hasClientRouting, hasServerRouting, clientEntries } = analyzeClientEntries(pageConfigs, config);
-        Object.values(clientEntries).forEach((e) => addEntry(e, true));
+        Object.values(clientEntries).forEach(({ entryTarget, entryFilePath }) => {
+            if (entryFilePath) {
+                addEntryOrInclude(entryFilePath, true);
+            }
+            else {
+                // Page-entry virtual IDs have no file path.
+                addEntry(entryTarget, true);
+            }
+        });
         if (hasClientRouting)
             addEntry(virtualFileIdGlobalEntryClientCR, true);
         if (hasServerRouting)

package/dist/node/vite/shared/loggerDev.js

@@ -29,7 +29,6 @@ import { getBetterError } from '../../../utils/getBetterError.js';
 import { getRequestId_withAsyncHook } from '../../../server/runtime/asyncHook.js';
 import { getRequestTag } from '../../../server/runtime/renderPageServer.js';
 import '../assertEnvVite.js';
-import { isDeno } from '../../../utils/isDeno.js';
 assertIsNotProductionRuntime();
 setLogRuntimeDev(logErrorServerDev, logRuntimeInfoDev);
 setAssertOnBeforeErr((err) => {
@@ -139,14 +138,16 @@ function logDev(msg, logType, tagSource, tagTool, doNotAddTags) {
 }
 function getTagSource(requestId = null) {
     const requestIdFromStore = getRequestId_withAsyncHook();
-    if (requestIdFromStore !== null &&
-        // Workaround for Deno bug: https://github.com/vikejs/vike/issues/3240
-        !isDeno()) {
+    if (requestIdFromStore !== null) {
         if (requestId === null) {
             requestId = requestIdFromStore;
         }
         else {
-            assert(requestId === requestIdFromStore);
+            /* Surprisingly, this assert can fail:
+             *  - https://github.com/vikejs/vike/issues/3240
+             *  - https://github.com/vikejs/vike/issues/3289
+            assert(requestId === requestIdFromStore)
+            */
         }
     }
     if (requestId === null)

package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.js

@@ -41,7 +41,7 @@ async function renderPageServerAfterRoute(pageContext) {
             await execHookDataAndOnBeforeRender(pageContext);
         }
         catch (err) {
-            if (isSameErrorMessage(err, pageContext.errorWhileRendering)) {
+            if (!isSameErrorMessage(err, pageContext.errorWhileRendering)) {
                 logRuntimeError(err, pageContext);
             }
         }

package/dist/server/runtime/renderPageServer.js

@@ -231,7 +231,7 @@ async function renderPageServerEntryRecursive_onError(err, pageContextBegin, pag
                 return pageContextHttpErrorFallback;
             }
         }
-        if (isSameErrorMessage(errErrorPage, err)) {
+        if (!isSameErrorMessage(errErrorPage, err)) {
             logRuntimeError(errErrorPage, pageContextErrorPageInit);
         }
         const pageContextHttpErrorFallback = getPageContextHttpErrorFallback(err, pageContextBegin);

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.259-commit-fc34c43";
+export declare const PROJECT_VERSION: "0.4.259-commit-c9d00d4";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.259-commit-fc34c43';
+export const PROJECT_VERSION = '0.4.259-commit-c9d00d4';

package/dist/utils/objectMap.d.ts

@@ -0,0 +1,2 @@
+/** Same as Array#map() but for an object's values (keys preserved), with type inference. */
+export declare function objectMap<T, U>(obj: Record<string, T>, mapper: (value: T, key: string) => U): Record<string, U>;

package/dist/utils/objectMap.js

@@ -0,0 +1,4 @@
+/** Same as Array#map() but for an object's values (keys preserved), with type inference. */
+export function objectMap(obj, mapper) {
+    return Object.fromEntries(Object.entries(obj).map(([key, value]) => [key, mapper(value, key)]));
+}

package/dist/utils/parseNpmPackage.js

@@ -39,7 +39,10 @@ function isImportNpmPackageOrPathAlias(str) {
 }
 function assertImportIsNpmPackage(str) {
     assert(isImportNpmPackage(str, {
-        // If `str` is a path alias that looks like an npm package => assertImportIsNpmPackage() is erroneous but that's okay because the assertion will eventually fail for some other user using a disambiguated path alias.
+        // We cannot always distinguish npm packages from path aliases (some path aliases look like npm package imports).
+        // => we cannot have an if-condition based on "is the string an npm package?" — that would be buggy for path aliases that look like npm package imports.
+        //
+        // However, we *can* rely on assertImportIsNpmPackage() — even if it incorrectly accepts path aliases that look like npm package imports, it *will* eventually fail for path aliases that don't look like npm package imports.
         cannotBePathAlias: true,
     }), str);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.259-commit-fc34c43",
+  "version": "0.4.259-commit-c9d00d4",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {