vike 0.4.222 → 0.4.223

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

@@ -18,7 +18,7 @@ import { executeGuardHook } from '../../shared/route/executeGuardHook.js';
 import { AbortRender, isAbortPageContext } from '../../shared/route/abort.js';
 import { pageContextInitIsPassedToClient } from '../../shared/misc/pageContextInitIsPassedToClient.js';
 import { isServerSideError } from '../../shared/misc/isServerSideError.js';
-const globalObject = getGlobalObject('router/getPageContext.ts', {});
+const globalObject = getGlobalObject('client-routing-runtime/getPageContextFromHooks.ts', {});
 // TODO/eventually: rename
 function getPageContextFromHooks_serialized() {
     const pageContextSerialized = getPageContextSerializedInHtml();

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

@@ -7,7 +7,7 @@ export { monkeyPatchHistoryAPI };
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { assert, assertUsage, getGlobalObject, isObject } from './utils.js';
 initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
-const globalObject = getGlobalObject('history.ts', { previous: getHistoryInfo() });
+const globalObject = getGlobalObject('client-routing-runtime/history.ts', { previous: getHistoryInfo() });
 // `window.history.state === null` when:
 // - The very first render
 // - Click on `<a href="#some-hash" />`

package/dist/esm/client/client-routing-runtime/prefetch/getPrefetchSettings.d.ts

@@ -1,10 +1,10 @@
 export { getPrefetchSettings };
 export { PAGE_CONTEXT_MAX_AGE_DEFAULT };
 export type { PrefetchSettingResolved };
-import type { PageConfigUserFriendly } from '../../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld } from '../../../shared/getPageFiles.js';
 declare const PAGE_CONTEXT_MAX_AGE_DEFAULT = 5000;
 type PrefetchSettingResolved = {
     staticAssets: false | 'hover' | 'viewport';
     pageContext: false | number;
 };
-declare function getPrefetchSettings(pageContext: PageConfigUserFriendly, linkTag: null | HTMLElement): PrefetchSettingResolved;
+declare function getPrefetchSettings(pageContext: PageConfigUserFriendlyOld, linkTag: null | HTMLElement): PrefetchSettingResolved;

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

@@ -6,7 +6,7 @@ export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
 import { type PageContextFromServerHooks, getPageContextFromServerHooks } from './getPageContextFromHooks.js';
-import type { PageConfigUserFriendly, PageFile } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld, PageFile } from '../../shared/getPageFiles.js';
 import { type PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromServerHooks>>;
 type PageContextForPrefetch = {
@@ -19,7 +19,7 @@ type PageContextForPrefetch = {
 };
 declare function getPageContextPrefetched(pageContext: {
     urlPathname: string;
-} & PageConfigUserFriendly): null | PageContextFromServerHooks;
+} & PageConfigUserFriendlyOld): null | PageContextFromServerHooks;
 declare function populatePageContextPrefetchCache(pageContext: PageContextForPrefetch, result: ResultPageContextFromServer): void;
 /**
  * Programmatically prefetch client assets.

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

@@ -19,7 +19,7 @@ import { PAGE_CONTEXT_MAX_AGE_DEFAULT, getPrefetchSettings } from './prefetch/ge
 import pc from '@brillout/picocolors';
 import { normalizeUrlArgument } from './normalizeUrlArgument.js';
 assertClientRouting();
-const globalObject = getGlobalObject('prefetch.ts', {
+const globalObject = getGlobalObject('client-routing-runtime/prefetch.ts', {
     linkPrefetchHandlerAdded: new WeakSet(),
     addLinkPrefetchHandlers_debounce: null,
     mutationObserver: new MutationObserver(addLinkPrefetchHandlers),
@@ -60,8 +60,8 @@ async function prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge)
     const result = await getPageContextFromServerHooks(pageContextLink, false);
     setPageContextPrefetchCache(pageContextLink, result, resultMaxAge);
 }
-function populatePageContextPrefetchCache(pageContext /*& PageConfigUserFriendly*/, result) {
-    // TODO/pageContext-prefetch: replace with using pageContext.config.prerender instead. (For being able to do that: eager configs need to be accessible without have to use PageConfigUserFriendly as it isn't available here.)
+function populatePageContextPrefetchCache(pageContext /*& PageConfigUserFriendlyOld*/, result) {
+    // TODO/pageContext-prefetch: replace with using pageContext.config.prerender instead. (For being able to do that: eager configs need to be accessible without have to use PageConfigUserFriendlyOld as it isn't available here.)
     if (!isBrilloutDocpress())
         return;
     setPageContextPrefetchCache(pageContext, result, null);

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

@@ -20,7 +20,7 @@ import { getErrorPageId } from '../../shared/error-page.js';
 import { setPageContextCurrent } from './getPageContextCurrent.js';
 import { getRouteStringParameterList } from '../../shared/route/resolveRouteString.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
-const globalObject = getGlobalObject('renderPageClientSide.ts', (() => {
+const globalObject = getGlobalObject('client-routing-runtime/renderPageClientSide.ts', (() => {
     const { promise: firstRenderStartPromise, resolve: firstRenderStartPromiseResolve } = genPromise();
     return {
         previousPageContext: null,
@@ -488,7 +488,7 @@ async function renderPageClientSide(renderArgs) {
     }
 }
 // For Vike tests (but also potentially for Vike users)
-// TODO/now add comment linking to usage example
+// https://github.com/vikejs/vike/blob/ffbc5cf16407bcc075f414447e50d997c87c0c94/test/playground/pages/nested-layout/e2e-test.ts#L59
 function stampFinished(urlOriginal) {
     window._vike ?? (window._vike = {});
     window._vike.fullyRenderedUrl = urlOriginal;

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

@@ -6,7 +6,7 @@ export { scrollRestoration_initialRenderIsDone };
 // - Firefox doesn't restore the scroll position upon page reload but does upon Cmd-Shift-T
 // See also: https://github.com/cyco130/knave/blob/e9e1bc7687848504293197f1b314b7d12ad0d228/design.md#scroll-restoration
 import { getGlobalObject, onPageHide, onPageShow } from './utils.js';
-const globalObject = getGlobalObject('scrollRestoration.ts', {});
+const globalObject = getGlobalObject('client-routing-runtime/scrollRestoration.ts', {});
 function scrollRestoration_init() {
     // Use the native scroll restoration mechanism only for the first render
     scrollRestoration_enable();

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

@@ -49,8 +49,8 @@ function isSameAsCurrentUrl(href) {
 function hasBaseServer(href) {
     const baseServer = getBaseServer();
     assert(isBaseServer(baseServer));
-    const { hasBaseServer } = parseUrl(href, baseServer);
-    return hasBaseServer;
+    const { isBaseMissing } = parseUrl(href, baseServer);
+    return !isBaseMissing;
 }
 function isDisableAutomaticLinkInterception() {
     // @ts-ignore

package/dist/esm/client/server-routing-runtime/getPageContext.d.ts

@@ -11,6 +11,6 @@ declare function getPageContext(): Promise<{
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../__internal/index.js").PageConfig[];
     _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-} & import("../../shared/getPageFiles.js").PageConfigUserFriendly & {
+} & import("../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
     _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
 }>;

package/dist/esm/client/shared/executeOnRenderClientHook.d.ts

@@ -1,6 +1,6 @@
 export { executeOnRenderClientHook };
 export type { PageContextBeforeRenderClient };
-import type { PageFile, PageConfigUserFriendly } from '../../shared/getPageFiles.js';
+import type { PageFile, PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
 import { type PageContextForUserConsumptionClientSide } from './preparePageContextForUserConsumptionClientSide.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type PageContextBeforeRenderClient = {
@@ -9,5 +9,5 @@ type PageContextBeforeRenderClient = {
     urlPathname?: string;
     pageId: string;
     _pageConfigs: PageConfigRuntime[];
-} & PageConfigUserFriendly & PageContextForUserConsumptionClientSide;
+} & PageConfigUserFriendlyOld & PageContextForUserConsumptionClientSide;
 declare function executeOnRenderClientHook<PC extends PageContextBeforeRenderClient>(pageContext: PC, isClientRouting: boolean): Promise<void>;

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

@@ -1,7 +1,7 @@
 export { getPageContextProxyForUser };
 import { assert, assertUsage, assertWarning, getGlobalObject, getPropAccessNotation } from '../server-routing-runtime/utils.js';
 import { notSerializable } from '../../shared/notSerializable.js';
-const globalObject = getGlobalObject('getPageContextProxyForUser.ts', {});
+const globalObject = getGlobalObject('shared/getPageContextProxyForUser.ts', {});
 /**
  * Throw error when pageContext value isn't:
  * - serializable, or

package/dist/esm/client/shared/loadUserFilesClientSide.d.ts

@@ -1,9 +1,9 @@
 export { loadUserFilesClientSide };
 export { isErrorFetchingStaticAssets };
 export type { PageContextUserFiles };
-import { type PageFile, type PageConfigUserFriendly } from '../../shared/getPageFiles.js';
+import { type PageFile, type PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
 import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
-type PageContextUserFilesLoaded = PageConfigUserFriendly & {
+type PageContextUserFilesLoaded = PageConfigUserFriendlyOld & {
     _pageFilesLoaded: PageFile[];
 };
 type PageContextUserFiles = {

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

@@ -1,7 +1,7 @@
 export { loadUserFilesClientSide };
 export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared/getPageFiles.js';
-import { getPageConfigUserFriendlyOld } from '../../shared/page-configs/getPageConfigUserFriendly.js';
+import { getPageConfigUserFriendly_oldDesign } from '../../shared/page-configs/getPageConfigUserFriendly.js';
 import { findPageConfig } from '../../shared/page-configs/findPageConfig.js';
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { objectAssign } from '../server-routing-runtime/utils.js';
@@ -30,7 +30,7 @@ async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs, pageCo
         }
         throw err;
     }
-    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = getPageConfigUserFriendly_oldDesign(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
     const pageContextAddendum = {};
     objectAssign(pageContextAddendum, pageContextExports);
     objectAssign(pageContextAddendum, { _pageFilesLoaded: pageFilesClientSide });

package/dist/esm/client/shared/preparePageContextForUserConsumptionClientSide.d.ts

@@ -1,9 +1,9 @@
 export { preparePageContextForUserConsumptionClientSide };
 export type { PageContextForUserConsumptionClientSide };
-import type { PageConfigUserFriendly } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 import { PageContextForPassToClientWarning } from './getPageContextProxyForUser.js';
-type PageContextForUserConsumptionClientSide = PageConfigUserFriendly & PageContextForPassToClientWarning & {
+type PageContextForUserConsumptionClientSide = PageConfigUserFriendlyOld & PageContextForPassToClientWarning & {
     pageId: string;
     _pageConfigs: PageConfigRuntime[];
 };

package/dist/esm/node/api/prepareViteApiCall.js

@@ -10,7 +10,7 @@ import path from 'path';
 import { assert, assertUsage, getGlobalObject, isObject, toPosixPath } from './utils.js';
 import pc from '@brillout/picocolors';
 import { clearGlobalContext } from '../runtime/globalContext.js';
-const globalObject = getGlobalObject('prepareViteApiCall.ts', {});
+const globalObject = getGlobalObject('api/prepareViteApiCall.ts', {});
 async function prepareViteApiCall(viteConfigFromOptions, operation) {
     clear();
     setContextApiOperation(operation);

package/dist/esm/node/plugin/index.d.ts

@@ -4,7 +4,10 @@ export { plugin as ssr };
 export type { VikeVitePluginOptions as UserConfig };
 export type { VikeVitePluginOptions };
 export { PROJECT_VERSION as version } from './utils.js';
-declare function plugin(vikeVitePluginOptions?: VikeVitePluginOptions): any;
+type PluginInterop = Record<string, unknown> & {
+    name: string;
+};
+declare function plugin(vikeVitePluginOptions?: VikeVitePluginOptions): PluginInterop[];
 /** @deprecated Define Vike settings in +config.js instead of vite.config.js */
 type VikeVitePluginOptions = {
     /** @deprecated Define Vike settings in +config.js instead of vite.config.js */

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

@@ -29,7 +29,7 @@ import { workaroundVite6HmrRegression } from './plugins/workaroundVite6HmrRegres
 import { buildApp } from './plugins/buildApp.js';
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 setResolveClientEntriesDev(resolveClientEntriesDev);
-// Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
+// Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
 function plugin(vikeVitePluginOptions = {}) {
     const plugins = [
         ...commonConfig(vikeVitePluginOptions),

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

@@ -1,5 +1,5 @@
 export { baseUrls };
-import { resolveBase, resolveBaseFromResolvedConfig } from '../../shared/resolveBase.js';
+import { resolveBase } from '../../shared/resolveBase.js';
 import { assert } from '../utils.js';
 import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
 function baseUrls() {
@@ -38,3 +38,8 @@ function baseUrls() {
         }
     };
 }
+function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
+    let baseViteOriginal = config._baseViteOriginal;
+    assert(baseViteOriginal === null || typeof baseViteOriginal == 'string');
+    return resolveBase(baseViteOriginal, baseServer, baseAssets);
+}

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

@@ -7,6 +7,9 @@ import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
 import { getFullBuildInlineConfig } from '../shared/getFullBuildInlineConfig.js';
 function buildApp() {
     let config;
+    // `builder.buildApp` can be overriden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
+    // In that case, we should'nt `forceExit`.
+    let forceExit = false;
     return [
         {
             name: 'vike:buildApp',
@@ -21,6 +24,10 @@ function buildApp() {
                             assert(builder.environments.ssr);
                             await builder.build(builder.environments.client);
                             await builder.build(builder.environments.ssr);
+                            if (forceExit) {
+                                runPrerender_forceExit();
+                                assert(false);
+                            }
                         }
                     },
                     environments: {
@@ -59,11 +66,8 @@ function buildApp() {
                 if (!isPrerenderAutoRunEnabled(vikeConfig))
                     return;
                 const configInline = getFullBuildInlineConfig(config);
-                const { forceExit } = await runPrerenderFromAutoRun(configInline, config);
-                if (forceExit) {
-                    runPrerender_forceExit();
-                    assert(false);
-                }
+                const res = await runPrerenderFromAutoRun(configInline, config);
+                forceExit = res.forceExit;
             }
         }
     ];

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

@@ -80,6 +80,9 @@ function buildConfig() {
         {
             name: 'vike:buildConfig:pre',
             apply: 'build',
+            applyToEnvironment(env) {
+                return env.name === 'ssr';
+            },
             // Make sure other writeBundle() hooks are called after this writeBundle() hook.
             //  - set_ASSETS_MANIFEST() needs to be called before dist/server/ code is executed.
             //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527

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

@@ -4,6 +4,7 @@ import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArr
 import { sourceMapPassthrough } from '../shared/rollupSourceMap.js';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
+import { viteIsSSR_safe } from '../shared/viteIsSSR.js';
 // TODO/enventually: (after we implemented vike.config.js)
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -36,7 +37,7 @@ function envVarsPlugin() {
             if (!code.includes('import.meta.env.'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = getIsClientSide(config, options);
+            const isClientSide = !viteIsSSR_safe(config, options);
             Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite
@@ -82,20 +83,3 @@ function envVarsPlugin() {
 function applyEnvVar(envStatementRegEx, envVal, code) {
     return code.replace(envStatementRegEx, JSON.stringify(envVal));
 }
-function getIsClientSide(config, options) {
-    const isBuild = config.command === 'build';
-    if (isBuild) {
-        assert(typeof config.build.ssr === 'boolean');
-        const isServerSide = config.build.ssr;
-        if (options !== undefined) {
-            assert(options.ssr === isServerSide);
-        }
-        return !isServerSide;
-    }
-    else {
-        assert(config.build.ssr === false);
-        assert(typeof options?.ssr === 'boolean');
-        const isServerSide = options.ssr;
-        return !isServerSide;
-    }
-}

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

@@ -17,7 +17,7 @@ import { fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { assertV1Design } from '../../shared/assertV1Design.js';
 import { normalizeId } from '../shared/normalizeId.js';
-import { viteIsSSR_options } from '../shared/viteIsSSR.js';
+import { viteIsSSR_safe } from '../shared/viteIsSSR.js';
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
@@ -46,7 +46,7 @@ function extractAssetsPlugin() {
                 }
                 // TODO/now: add meta.default
                 assert(vikeConfig.global.config.includeAssetsImportedByServer ?? true);
-                assert(!viteIsSSR_options(options));
+                assert(!viteIsSSR_safe(config, options));
                 const importStatements = await getImportStatements(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -63,7 +63,7 @@ function extractAssetsPlugin() {
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
             async resolveId(source, importer, options) {
-                if (viteIsSSR_options(options)) {
+                if (viteIsSSR_safe(config, options)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     assert(!extractAssetsRE.test(source));
                     assert(importer === undefined || !extractAssetsRE.test(importer));

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

@@ -8,7 +8,7 @@ import { normalizeId } from '../shared/normalizeId.js';
 import { viteIsSSR_options } from '../shared/viteIsSSR.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 const debug = createDebugger('vike:extractExportNames');
-const globalObject = getGlobalObject('extractExportNamesPlugin.ts', {});
+const globalObject = getGlobalObject('plugins/extractExportNamesPlugin.ts', {});
 function extractExportNamesPlugin() {
     let isDev = false;
     return {

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles.js

@@ -11,7 +11,7 @@ import { getEnvVarObject } from '../../../../shared/getEnvVarObject.js';
 const execA = promisify(exec);
 const debug = createDebugger('vike:crawl');
 assertIsNotProductionRuntime();
-assertIsSingleModuleInstance('crawlPlusFiles.ts');
+assertIsSingleModuleInstance('getVikeConfig/crawlPlusFiles.ts');
 let gitIsNotUsable = false;
 async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
     assertPosixPath(userRootDir);

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.d.ts

@@ -9,12 +9,12 @@ export type { VikeConfigObject };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
 import { type ConfigDefinitions, type ConfigDefinitionInternal } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import type { ResolvedConfig } from 'vite';
-import { type ConfigUserFriendly, type PageConfigsUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
+import { type PageConfigUserFriendly, type PageConfigsUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { type PlusFile } from './getVikeConfig/getPlusFilesAll.js';
 type VikeConfigObject = {
     pageConfigs: PageConfigBuildTime[];
     pageConfigGlobal: PageConfigGlobalBuildTime;
-    global: ConfigUserFriendly;
+    global: PageConfigUserFriendly;
     pages: PageConfigsUserFriendly;
 };
 declare const vikeConfigDependencies: Set<string>;

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -8,7 +8,7 @@ export { getConfigDefinitionOptional };
 import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, assertKeys, objectKeys, objectFromEntries, unique, isCallable, makeFirst, lowerFirst } from '../../../utils.js';
 import { configDefinitionsBuiltIn } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, applyFilesystemRoutingRootEffect } from './getVikeConfig/filesystemRouting.js';
-import { isConfigInvalid, isConfigInvalid_set } from '../../../../runtime/renderPage/isConfigInvalid.js';
+import { isVikeConfigInvalid, isVikeConfigInvalid_set } from '../../../../runtime/renderPage/isVikeConfigInvalid.js';
 import { getViteDevServer } from '../../../../runtime/globalContext.js';
 import { logConfigError, logConfigErrorRecover } from '../../../shared/loggerNotProd.js';
 import { removeSuperfluousViteLog_enable, removeSuperfluousViteLog_disable } from '../../../shared/loggerVite/removeSuperfluousViteLog.js';
@@ -19,7 +19,7 @@ import { resolvePointerImport } from './getVikeConfig/resolvePointerImport.js';
 import { getFilePathResolved } from '../../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../../shared/page-configs/getConfigValueBuildTime.js';
 import { assertExtensionsRequire } from './getVikeConfig/assertExtensions.js';
-import { getPageConfigUserFriendlyNew } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
+import { getPageConfigGlobalUserFriendly, getPageConfigUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { getConfigValuesBase } from '../../../../../shared/page-configs/serialize/serializeConfigValues.js';
 import { getPlusFilesAll } from './getVikeConfig/getPlusFilesAll.js';
 assertIsNotProductionRuntime();
@@ -37,7 +37,7 @@ function reloadVikeConfig(config) {
     handleReloadSideEffects();
 }
 async function handleReloadSideEffects() {
-    wasConfigInvalid = !!isConfigInvalid;
+    wasConfigInvalid = !!isVikeConfigInvalid;
     const vikeConfigPromisePrevious = vikeConfigPromise;
     try {
         await vikeConfigPromise;
@@ -52,7 +52,7 @@ async function handleReloadSideEffects() {
         // Let the next handleReloadSideEffects() call handle side effects
         return;
     }
-    if (!isConfigInvalid) {
+    if (!isVikeConfigInvalid) {
         if (wasConfigInvalid) {
             wasConfigInvalid = false;
             logConfigErrorRecover();
@@ -105,13 +105,13 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
     if (!hasError) {
         assert(ret);
         assert(err === undefined);
-        isConfigInvalid_set(false);
+        isVikeConfigInvalid_set(false);
         return ret;
     }
     else {
         assert(ret === undefined);
         assert(err);
-        isConfigInvalid_set({ err });
+        isVikeConfigInvalid_set({ err });
         if (!isDev) {
             assert(getViteDevServer() === null);
             throw err;
@@ -127,7 +127,7 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
                     configDefinitions: {},
                     configValueSources: {}
                 },
-                global: getPageConfigUserFriendlyNew({ configValues: {} }),
+                global: getPageConfigGlobalUserFriendly({ pageConfigGlobalValues: {} }),
                 pages: {}
             };
             return dummyData;
@@ -143,18 +143,12 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     // interop vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     // global
-    const configValuesGlobal = getConfigValues(pageConfigGlobal);
-    const global = getPageConfigUserFriendlyNew({ configValues: configValuesGlobal });
-    // TODO/now DEDUPE
+    const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
+    const global = getPageConfigGlobalUserFriendly({ pageConfigGlobalValues });
     // pages
     const pages = objectFromEntries(pageConfigs.map((pageConfig) => {
-        const configValuesLocal = getConfigValues(pageConfig, true);
-        const configValues = { ...configValuesGlobal, ...configValuesLocal };
-        const page = {
-            ...getPageConfigUserFriendlyNew({ configValues }),
-            route: pageConfig.routeFilesystem?.routeString ?? null
-        };
-        return [pageConfig.pageId, page];
+        const pageConfigValues = getConfigValues(pageConfig, true);
+        return getPageConfigUserFriendly(pageConfigGlobalValues, pageConfig, pageConfigValues);
     }));
     return { pageConfigs, pageConfigGlobal, global, pages };
 }
@@ -219,13 +213,12 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
                 return;
             configValueSources[configName] = sources;
         });
-        const { routeFilesystem, isErrorPage } = determineRouteFilesystem(locationId, configValueSources);
+        const pageConfigRoute = determineRouteFilesystem(locationId, configValueSources);
         applyEffectsAll(configValueSources, configDefinitionsLocal);
         const configValuesComputed = getComputed(configValueSources, configDefinitionsLocal);
         const pageConfig = {
             pageId: locationId,
-            isErrorPage,
-            routeFilesystem,
+            ...pageConfigRoute,
             configDefinitions: configDefinitionsLocal,
             plusFiles: plusFilesRelevant,
             configValueSources,
@@ -424,20 +417,10 @@ function getPlusFilesOrdered(configName, plusFilesRelevant) {
             const plusFilesConfig = plusFilesForConfigName.filter((plusFile) => plusFile.isConfigFile &&
                 // We consider extensions (e.g. vike-react) later (i.e. with less priority)
                 !plusFile.isExtensionConfig);
-            // Make this value:
-            //   /pages/some-page/+{configName}.js > `export default`
-            // override that value:
-            //   /pages/some-page/+config.js > `export default { someConfig }`
-            const plusFileWinner = plusFilesValue[0] ?? plusFilesConfig[0];
-            if (plusFileWinner) {
-                const plusFilesOverriden = [...plusFilesValue, ...plusFilesConfig].filter((f) => f !== plusFileWinner);
-                // A user-land conflict of plusFiles with the same `locationId` (we are iterating over `plusFilesRelevant: PlusFilesByLocationId`) means that the user has superfluously defined the config twice; the user should remove such redundancy as it makes things unnecessarily ambiguous.
-                assertOverwrittenConfigFile(plusFileWinner, plusFilesOverriden, configName);
-                [plusFileWinner, ...plusFilesOverriden].forEach((plusFile) => {
-                    assert(plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it's a user-land plus file
-                    populate(plusFile);
-                });
-            }
+            [...plusFilesValue, ...plusFilesConfig].forEach((plusFile) => {
+                assert(plusFile.filePath.filePathAbsoluteUserRootDir); // ensure it's a user-land plus file
+                populate(plusFile);
+            });
         }
         // ==========================
         // Side-effect configs (next)
@@ -589,14 +572,6 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir, isHi
     }
     assert(false);
 }
-function assertOverwrittenConfigFile(plusFileWinner, plusFilesOverriden, configName) {
-    plusFilesOverriden.forEach((plusFileLoser) => {
-        const loserFilePath = plusFileLoser.filePath.filePathToShowToUser;
-        const winnerFilePath = plusFileWinner.filePath.filePathToShowToUser;
-        const confName = pc.cyan(configName);
-        assertWarning(false, `The value of the config ${confName} defined at ${loserFilePath} is always overwritten by the value defined at ${winnerFilePath}, remove the superfluous value defined at ${loserFilePath}`, { onlyOnce: true });
-    });
-}
 function isDefiningPage(plusFiles) {
     for (const plusFile of plusFiles) {
         const configNames = getDefiningConfigNames(plusFile);

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

@@ -10,7 +10,7 @@
 // - We dedupe errors ourself with getHttpRequestAsyncStore().shouldErrorBeSwallowed()
 export { getHttpRequestAsyncStore };
 export { installHttpRequestAsyncStore };
-import { renderPage_addWrapper } from '../../runtime/renderPage.js';
+import { renderPage_addAsyncHookwrapper } from '../../runtime/renderPage.js';
 import { assert, assertIsNotProductionRuntime, isObject, unique } from '../utils.js';
 import { getConfigBuildErrorFormatted } from '../plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js';
 import { logErrorDebugNote } from './loggerNotProd.js';
@@ -27,7 +27,7 @@ async function installHttpRequestAsyncStore() {
         return;
     }
     asyncLocalStorage = new mod.AsyncLocalStorage();
-    renderPage_addWrapper(async (httpRequestId, renderPage) => {
+    renderPage_addAsyncHookwrapper(async (httpRequestId, renderPage) => {
         assert(asyncLocalStorage);
         const loggedErrors = new Set();
         const markErrorAsLogged = (err) => {

package/dist/esm/node/plugin/shared/viteIsSSR.d.ts

@@ -1,8 +1,11 @@
-import type { ResolvedConfig, UserConfig } from 'vite';
 export { viteIsSSR };
 export { viteIsSSR_options };
+export { viteIsSSR_safe };
+import type { ResolvedConfig, UserConfig } from 'vite';
 declare function viteIsSSR(config: ResolvedConfig | UserConfig): boolean;
-type Options = undefined | boolean | {
+declare function viteIsSSR_options(options: {
+    ssr?: boolean;
+} | undefined): boolean;
+declare function viteIsSSR_safe(config: ResolvedConfig, options: {
     ssr?: boolean;
-};
-declare function viteIsSSR_options(options: Options): boolean;
+} | undefined): boolean;

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

@@ -1,20 +1,29 @@
-import { assert } from '../../../utils/assert.js';
-import { isObject } from '../../../utils/isObject.js';
 export { viteIsSSR };
 export { viteIsSSR_options };
+export { viteIsSSR_safe };
+import { assert } from '../../../utils/assert.js';
 function viteIsSSR(config) {
     return !!config?.build?.ssr;
 }
-// https://github.com/vitejs/vite/discussions/5109#discussioncomment-1450726
 function viteIsSSR_options(options) {
-    if (options === undefined) {
-        return false;
-    }
-    if (typeof options === 'boolean') {
-        return options;
+    return !!options?.ssr;
+}
+// Vite is quite messy about setting `ssr: boolean`, thus we use an extra safe implemention for security purposes.
+// It's used for .client.js and .server.js guarantee thus we use agressive assert() calls for added safety.
+function viteIsSSR_safe(config, options) {
+    if (config.command === 'build') {
+        assert(typeof config.build.ssr === 'boolean');
+        const val = config.build.ssr;
+        if (options?.ssr !== undefined)
+            assert(val === options.ssr);
+        return val;
     }
-    if (isObject(options)) {
-        return !!options.ssr;
+    else {
+        assert(typeof options?.ssr === 'boolean');
+        const val = options.ssr;
+        /* This assert() fails (which is very unexpected).
+        if (typeof config.build.ssr === 'boolean') assert(val === config.build.ssr)
+        //*/
+        return val;
     }
-    assert(false);
 }