vike 0.4.168 → 0.4.169

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

@@ -5,7 +5,7 @@ export { runPrerender_forceExit };
 import '../runtime/page-files/setup.js';
 import path from 'path';
 import { route } from '../../shared/route/index.js';
-import { assert, assertUsage, assertWarning, hasProp, projectInfo, objectAssign, isObjectWithKeys, isCallable, getOutDirs, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, handleNodeEnv_prerender, pLimit, assertPathIsFilesystemAbsolute } from './utils.js';
+import { assert, assertUsage, assertWarning, hasProp, projectInfo, objectAssign, isObjectWithKeys, isCallable, getOutDirs, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, handleNodeEnv_prerender, pLimit, assertPathFilesystemAbsolute, isArray } from './utils.js';
 import { prerenderPage, prerender404Page, getRenderContext, getPageContextInitEnhanced } from '../runtime/renderPage/renderPageAlreadyRouted.js';
 import pc from '@brillout/picocolors';
 import { cpus } from 'os';
@@ -15,7 +15,8 @@ import { getConfigVike } from '../shared/getConfigVike.js';
 import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
 import { getUrlFromRouteString } from '../../shared/route/resolveRouteString.js';
-import { getConfigValue, getConfigValueFilePathToShowToUser } from '../../shared/page-configs/helpers.js';
+import { getConfigValueFilePathToShowToUser } from '../../shared/page-configs/helpers.js';
+import { getConfigValue } from '../../shared/page-configs/getConfigValue.js';
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { isErrorPage } from '../../shared/error-page.js';
 import { addUrlComputedProps } from '../../shared/addUrlComputedProps.js';
@@ -75,7 +76,7 @@ async function runPrerender(options, manuallyTriggered) {
     }
     const { partial = false, noExtraDir = false, parallel = true } = prerenderConfig || {};
     const concurrencyLimit = pLimit(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? cpus().length : parallel);
-    assertPathIsFilesystemAbsolute(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
+    assertPathFilesystemAbsolute(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
     await initGlobalContext(true, outDirRoot);
     const renderContext = await getRenderContext();
     renderContext.pageFilesAll.forEach(assertExportNames);
@@ -115,7 +116,7 @@ async function collectDoNoPrerenderList(renderContext, pageConfigs, doNotPrerend
         const configName = 'prerender';
         const configValue = getConfigValue(pageConfig, configName, 'boolean');
         if (configValue?.value === false) {
-            const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser(configValue);
+            const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser(configValue.definedAtData);
             assert(configValueFilePathToShowToUser);
             doNotPrerenderList.push({
                 pageId: pageConfig.pageId,
@@ -609,7 +610,7 @@ async function write(urlOriginal, pageContext, fileExtension, fileContent, root,
     }
 }
 function normalizeOnPrerenderHookResult(prerenderResult, prerenderHookFile, hookName) {
-    if (Array.isArray(prerenderResult)) {
+    if (isArray(prerenderResult)) {
         return prerenderResult.map(normalize);
     }
     else {

package/dist/esm/node/prerender/utils.d.ts

@@ -11,4 +11,5 @@ export * from '../../utils/urlToFile.js';
 export * from '../../utils/isPlainObject.js';
 export * from '../../utils/assertNodeEnv.js';
 export * from '../../utils/pLimit.js';
-export * from '../../utils/assertPathIsFilesystemAbsolute.js';
+export * from '../../utils/assertPathFilesystemAbsolute.js';
+export * from '../../utils/isArray.js';

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

@@ -13,4 +13,5 @@ export * from '../../utils/urlToFile.js';
 export * from '../../utils/isPlainObject.js';
 export * from '../../utils/assertNodeEnv.js';
 export * from '../../utils/pLimit.js';
-export * from '../../utils/assertPathIsFilesystemAbsolute.js';
+export * from '../../utils/assertPathFilesystemAbsolute.js';
+export * from '../../utils/isArray.js';

package/dist/esm/node/runtime/html/serializePageContextClientSide.d.ts

@@ -5,6 +5,7 @@ import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.
 import type { UrlRedirect } from '../../../shared/route/abort.js';
 type PageContextSerialization = {
     _pageId: string;
+    routeParams: Record<string, string>;
     _passToClient: string[];
     _pageConfigs: PageConfigRuntime[];
     is404: null | boolean;

package/dist/esm/node/runtime/html/serializePageContextClientSide.js

@@ -19,6 +19,7 @@ const PASS_TO_CLIENT = [
     */
     pageContextInitIsPassedToClient,
     '_pageId',
+    'routeParams',
     'data' // for data() hook
 ];
 const PASS_TO_CLIENT_ERROR_PAGE = ['pageProps', 'is404', isServerSideError];

package/dist/esm/node/runtime/index-common.d.ts

@@ -5,8 +5,4 @@ export { PROJECT_VERSION as version } from './utils.js';
 export { getGlobalContextSync, getGlobalContextAsync } from './globalContext.js';
 export { injectAssets__public as _injectAssets } from './html/injectAssets/injectAssets__public.js';
 export { createPageRenderer } from '../createPageRenderer.js';
-declare global {
-    var _isVitePluginSsr: true;
-    var _isVike: true;
-}
 import './page-files/setup.js';

package/dist/esm/node/runtime/index-common.js

@@ -7,7 +7,18 @@ export { getGlobalContextSync, getGlobalContextAsync } from './globalContext.js'
 export { injectAssets__public as _injectAssets } from './html/injectAssets/injectAssets__public.js';
 // TODO/v1-release: remove
 export { createPageRenderer } from '../createPageRenderer.js';
-// Help Telefunc detect the user's stack
-globalThis._isVitePluginSsr = true;
-globalThis._isVike = true;
+addEcosystemStamp();
 import './page-files/setup.js';
+// Used by:
+// - Telefunc (to detect the user's stack https://github.com/brillout/telefunc/blob/8288310e88e06a42b710d39c39fb502364ca6d30/telefunc/utils/isVikeApp.ts#L4)
+function addEcosystemStamp() {
+    const g = globalThis;
+    g._isVikeApp =
+        /* Don't set to true so that consumers do `!!globalThis._isVikeApp` instead of `globalThis._isVikeApp === true`.
+        true
+        */
+        // We use an object so that we can eventually, in the future, add helpful information as needed. (E.g. the Vike version, or global settings.)
+        {};
+    // We keep the old stamp for older Telefunc versions
+    g._isVitePluginSsr = true;
+}

package/dist/esm/node/runtime/renderPage/createHttpResponseObject/getCacheControl.js

@@ -1,5 +1,6 @@
 export { getCacheControl };
-import { getConfigValue, getPageConfig } from '../../../../shared/page-configs/helpers.js';
+import { getPageConfig } from '../../../../shared/page-configs/helpers.js';
+import { getConfigValue } from '../../../../shared/page-configs/getConfigValue.js';
 const defaultValue = 'no-store, max-age=0';
 function getCacheControl(pageId, pageConfigs) {
     // TODO/v1-release: remove

package/dist/esm/node/runtime/renderPage/loadUserFilesServerSide.d.ts

@@ -15,15 +15,15 @@ type PageFiles = PromiseType<ReturnType<typeof loadUserFilesServerSide>>;
 declare function loadUserFilesServerSide(pageContext: {
     _pageId: string;
 } & PageContext_loadUserFilesServerSide): Promise<{
+    Page: unknown;
+    _isHtmlOnly: boolean;
+    _passToClient: string[];
+    _pageFilePathsLoaded: string[];
     config: Record<string, unknown>;
     configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
     exports: Record<string, unknown>;
     exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
     pageExports: Record<string, unknown>;
-    Page: unknown;
-    _isHtmlOnly: boolean;
-    _passToClient: string[];
-    _pageFilePathsLoaded: string[];
 } & {
     __getPageAssets: () => Promise<PageAsset[]>;
 }>;

package/dist/esm/node/runtime/renderPage/loadUserFilesServerSide.js

@@ -1,7 +1,7 @@
 export { loadUserFilesServerSide };
-import { getExportUnion, getPageFilesServerSide, getExports } from '../../../shared/getPageFiles.js';
+import { getPageFilesServerSide, getPageContextExports } from '../../../shared/getPageFiles.js';
 import { analyzePageClientSideInit } from '../../../shared/getPageFiles/analyzePageClientSide.js';
-import { assertWarning, objectAssign } from '../utils.js';
+import { assert, assertUsage, assertWarning, hasProp, isArrayOfStrings, objectAssign, isArray } from '../utils.js';
 import { getPageAssets } from './getPageAssets.js';
 import { debugPageFiles } from './debugPageFiles.js';
 import { findPageConfig } from '../../../shared/page-configs/findPageConfig.js';
@@ -10,21 +10,36 @@ import { getGlobalContext } from '../globalContext.js';
 import { loadConfigValues } from '../../../shared/page-configs/loadConfigValues.js';
 async function loadUserFilesServerSide(pageContext) {
     const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext._pageId); // Make pageConfig globally available as pageContext._pageConfig?
-    const [{ config, configEntries, exports, exportsAll, pageExports, pageFilesLoaded, pageConfigLoaded }] = await Promise.all([
+    const [{ pageFilesLoaded, pageConfigLoaded, ...pageContextExports }] = await Promise.all([
         loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext._pageId, !getGlobalContext().isProduction),
         analyzePageClientSideInit(pageContext._pageFilesAll, pageContext._pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
     const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = analyzePage(pageContext._pageFilesAll, pageConfig, pageContext._pageId);
+    const isV1Design = !!pageConfig;
+    const passToClient = [];
+    const errMsg = ' should be an array of strings.';
+    if (!isV1Design) {
+        pageContextExports.exportsAll.passToClient?.forEach((e) => {
+            assertUsage(hasProp(e, 'exportValue', 'string[]'), `${e.exportSource}${errMsg}`);
+            passToClient.push(...e.exportValue);
+        });
+    }
+    else {
+        pageContextExports.configEntries.passToClient?.forEach((e) => {
+            const { configValue } = e;
+            assert(isArray(configValue));
+            const vals = configValue.flat(1);
+            // TODO: improve error message by using (upcoming) new data structure instead of configEntries
+            assertUsage(isArrayOfStrings(vals), `${e.configDefinedAt}${errMsg}`);
+            passToClient.push(...vals);
+        });
+    }
     const pageContextAddendum = {};
     objectAssign(pageContextAddendum, {
-        config,
-        configEntries,
-        exports,
-        exportsAll,
-        pageExports,
-        Page: exports.Page,
+        ...pageContextExports,
+        Page: pageContextExports.exports.Page,
         _isHtmlOnly: isHtmlOnly,
-        _passToClient: getExportUnion(exportsAll, 'passToClient'),
+        _passToClient: passToClient,
         _pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath)
     });
     objectAssign(pageContextAddendum, {
@@ -84,13 +99,9 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     const pageFilesServerSide = getPageFilesServerSide(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await loadConfigValues(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const { config, configEntries, exports, exportsAll, pageExports } = getExports(pageFilesServerSide, pageConfigLoaded);
+    const pageContextExports = getPageContextExports(pageFilesServerSide, pageConfigLoaded);
     return {
-        config,
-        configEntries,
-        exports,
-        exportsAll,
-        pageExports,
+        ...pageContextExports,
         pageFilesLoaded: pageFilesServerSide,
         pageConfigLoaded
     };

package/dist/esm/node/runtime/renderPage/log404/index.js

@@ -38,8 +38,8 @@ function getRoutesInfo(pageRoutes) {
             routeDefinedBy = pageRoute.routeFilesystemDefinedBy;
         }
         else {
-            assert(pageRoute.routeDefinedAt);
-            routeDefinedBy = pageRoute.routeDefinedAt;
+            assert(pageRoute.routeDefinedAtString);
+            routeDefinedBy = pageRoute.routeDefinedAtString;
         }
         if (pageRoute.routeType === 'STRING') {
             routeStr = pageRoute.routeString;

package/dist/esm/node/runtime/renderPage/logErrorHint.js

@@ -3,7 +3,7 @@ export { logErrorHint };
 export { isCjsEsmError };
 export { isKnownError };
 export { getHint };
-import { assert, formatHintLog, isNotNullish, isObject, unique } from '../utils.js';
+import { assert, formatHintLog, isArray, isNotNullish, isObject, unique } from '../utils.js';
 import pc from '@brillout/picocolors';
 const knownErrors = [
     {
@@ -78,7 +78,7 @@ function isCjsEsmError(error) {
     return packageNames;
 }
 function normalizeRes(res) {
-    let packageNames = Array.isArray(res) ? res : [res];
+    let packageNames = isArray(res) ? res : [res];
     packageNames = unique(packageNames.filter(isNotNullish).filter((packageName) => packageName !== '@brillout/import'));
     if (packageNames.length === 0)
         return false;

package/dist/esm/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.d.ts

@@ -2,9 +2,9 @@ export { preparePageContextForUserConsumptionServerSide };
 export type { PageContextForUserConsumptionServerSide };
 import { PageContextUrlComputedPropsInternal } from '../../../shared/addUrlComputedProps.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
-import type { ConfigEntries, ExportsAll } from '../../../shared/getPageFiles/getExports.js';
+import type { PageContextExports } from '../../../shared/getPageFiles/getExports.js';
 import { PageContextBuiltInServerInternal } from '../../../shared/types.js';
-type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & {
+type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & PageContextExports & {
     urlOriginal: string;
     /** @deprecated */
     url: string;
@@ -12,11 +12,6 @@ type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal
     urlParsed: PageContextUrlComputedPropsInternal['urlParsed'];
     routeParams: Record<string, string>;
     Page: unknown;
-    pageExports: Record<string, unknown>;
-    config: Record<string, unknown>;
-    configEntries: ConfigEntries;
-    exports: Record<string, unknown>;
-    exportsAll: ExportsAll;
     _pageId: string;
     _pageConfigs: PageConfigRuntime[];
     is404: null | boolean;

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -57,15 +57,15 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
     } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
         _urlRewrite: string | null;
     } & {
+        Page: unknown;
+        _isHtmlOnly: boolean;
+        _passToClient: string[];
+        _pageFilePathsLoaded: string[];
         config: Record<string, unknown>;
         configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
         exports: Record<string, unknown>;
         exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
         pageExports: Record<string, unknown>;
-        Page: unknown;
-        _isHtmlOnly: boolean;
-        _passToClient: string[];
-        _pageFilePathsLoaded: string[];
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -104,15 +104,15 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
     } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
         _urlRewrite: string | null;
     } & {
+        Page: unknown;
+        _isHtmlOnly: boolean;
+        _passToClient: string[];
+        _pageFilePathsLoaded: string[];
         config: Record<string, unknown>;
         configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
         exports: Record<string, unknown>;
         exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
         pageExports: Record<string, unknown>;
-        Page: unknown;
-        _isHtmlOnly: boolean;
-        _passToClient: string[];
-        _pageFilePathsLoaded: string[];
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -152,15 +152,15 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
     } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
         _urlRewrite: string | null;
     } & {
+        Page: unknown;
+        _isHtmlOnly: boolean;
+        _passToClient: string[];
+        _pageFilePathsLoaded: string[];
         config: Record<string, unknown>;
         configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
         exports: Record<string, unknown>;
         exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
         pageExports: Record<string, unknown>;
-        Page: unknown;
-        _isHtmlOnly: boolean;
-        _passToClient: string[];
-        _pageFilePathsLoaded: string[];
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {
@@ -199,15 +199,15 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
     } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
         _urlRewrite: string | null;
     } & {
+        Page: unknown;
+        _isHtmlOnly: boolean;
+        _passToClient: string[];
+        _pageFilePathsLoaded: string[];
         config: Record<string, unknown>;
         configEntries: import("../../../shared/getPageFiles/getExports.js").ConfigEntries;
         exports: Record<string, unknown>;
         exportsAll: import("../../../shared/getPageFiles/getExports.js").ExportsAll;
         pageExports: Record<string, unknown>;
-        Page: unknown;
-        _isHtmlOnly: boolean;
-        _passToClient: string[];
-        _pageFilePathsLoaded: string[];
     } & {
         __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
     } & {

package/dist/esm/node/runtime/utils.d.ts

@@ -12,6 +12,7 @@ export * from '../../utils/parseUrl-extras.js';
 export * from '../../utils/slice.js';
 export * from '../../utils/sorter.js';
 export * from '../../utils/projectInfo.js';
+export * from '../../utils/isArray.js';
 export * from '../../utils/isObject.js';
 export * from '../../utils/objectAssign.js';
 export * from '../../utils/PromiseType.js';
@@ -35,7 +36,6 @@ export * from '../../utils/isNotNullish.js';
 export * from '../../utils/isScriptFile.js';
 export * from '../../utils/removeFileExtention.js';
 export * from '../../utils/objectKeys.js';
-export * from '../../utils/isStringRecord.js';
 export * from '../../utils/getFileExtension.js';
 export * from '../../utils/assertIsNotProductionRuntime.js';
 export * from '../../utils/virtual-files.js';
@@ -48,3 +48,4 @@ export * from '../../utils/getTerminWidth.js';
 export * from '../../utils/truncateString.js';
 export * from '../../utils/formatHintLog.js';
 export * from '../../utils/joinEnglish.js';
+export * from '../../utils/isArrayOfStrings.js';

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

@@ -15,6 +15,7 @@ export * from '../../utils/parseUrl-extras.js';
 export * from '../../utils/slice.js';
 export * from '../../utils/sorter.js';
 export * from '../../utils/projectInfo.js';
+export * from '../../utils/isArray.js';
 export * from '../../utils/isObject.js';
 export * from '../../utils/objectAssign.js';
 export * from '../../utils/PromiseType.js';
@@ -38,7 +39,6 @@ export * from '../../utils/isNotNullish.js';
 export * from '../../utils/isScriptFile.js';
 export * from '../../utils/removeFileExtention.js';
 export * from '../../utils/objectKeys.js';
-export * from '../../utils/isStringRecord.js';
 export * from '../../utils/getFileExtension.js';
 export * from '../../utils/assertIsNotProductionRuntime.js';
 export * from '../../utils/virtual-files.js';
@@ -51,3 +51,4 @@ export * from '../../utils/getTerminWidth.js';
 export * from '../../utils/truncateString.js';
 export * from '../../utils/formatHintLog.js';
 export * from '../../utils/joinEnglish.js';
+export * from '../../utils/isArrayOfStrings.js';

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

@@ -10,7 +10,7 @@ function assertV1Design(isOldDesign, pageConfigs, pageFilesAll) {
             const indent = '- ';
             const filesV1 = unique(pageConfigs
                 .map((p) => Object.values(p.configValues)
-                .map(getConfigValueFilePathToShowToUser)
+                .map((c) => getConfigValueFilePathToShowToUser(c.definedAtData))
                 .filter(isNotNullish)
                 .map((filePathToShowToUser) => indent + filePathToShowToUser))
                 .flat(2));

package/dist/esm/node/shared/getClientEntry.js

@@ -1,5 +1,5 @@
 export { getClientEntry };
-import { getConfigValue } from '../../shared/page-configs/helpers.js';
+import { getConfigValue } from '../../shared/page-configs/getConfigValue.js';
 function getClientEntry(pageConfig) {
     const configName = 'client';
     const configValue = getConfigValue(pageConfig, configName, 'string');

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

@@ -5,6 +5,7 @@ function prependEntriesDir(entryName) {
         entryName = entryName.slice(1);
     }
     assert(!entryName.startsWith('/'));
+    assert(entryName);
     entryName = `entries/${entryName}`;
     return entryName;
 }

package/dist/esm/node/shared/utils.d.ts

@@ -4,7 +4,6 @@ export * from '../../utils/isPlainObject.js';
 export * from '../../utils/projectInfo.js';
 export * from '../../utils/checkType.js';
 export * from '../../utils/hasProp.js';
-export * from '../../utils/isStringRecord.js';
 export * from '../../utils/objectAssign.js';
 export * from '../../utils/checkType.js';
 export * from '../../utils/hasProp.js';

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

@@ -6,7 +6,6 @@ export * from '../../utils/isPlainObject.js';
 export * from '../../utils/projectInfo.js';
 export * from '../../utils/checkType.js';
 export * from '../../utils/hasProp.js';
-export * from '../../utils/isStringRecord.js';
 export * from '../../utils/objectAssign.js';
 export * from '../../utils/checkType.js';
 export * from '../../utils/hasProp.js';

package/dist/esm/shared/getPageFiles/analyzeClientSide.js

@@ -1,5 +1,5 @@
 export { analyzeClientSide };
-import { getConfigValue } from '../page-configs/helpers.js';
+import { getConfigValue } from '../page-configs/getConfigValue.js';
 import { analyzePageClientSide } from './analyzePageClientSide.js';
 function analyzeClientSide(pageConfig, pageFilesAll, pageId) {
     // V1 design

package/dist/esm/shared/getPageFiles/getExports.d.ts

@@ -1,11 +1,11 @@
-export { getExportUnion };
-export { getExports };
+export { getPageContextExports };
 export type { ExportsAll };
 export type { PageContextExports };
 export type { ConfigEntries };
 import type { FileType } from './fileTypes.js';
 import type { PageConfigRuntimeLoaded } from './../page-configs/PageConfig.js';
 import type { PageFile } from './getPageFileObject.js';
+import { type ConfigDefinedAtOptional } from '../page-configs/getConfigDefinedAt.js';
 type ExportsAll = Record<string, {
     exportValue: unknown;
     exportSource: string;
@@ -23,7 +23,7 @@ type ExportsAll = Record<string, {
  */
 type ConfigEntries = Record<string, {
     configValue: unknown;
-    configDefinedAt: string;
+    configDefinedAt: ConfigDefinedAtOptional;
     configDefinedByFile: string | null;
 }[]>;
 type PageContextExports = {
@@ -34,5 +34,4 @@ type PageContextExports = {
     /** @deprecated */
     pageExports: Record<string, unknown>;
 };
-declare function getExports(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null): PageContextExports;
-declare function getExportUnion(exportsAll: ExportsAll, propName: string): string[];
+declare function getPageContextExports(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null): PageContextExports;

package/dist/esm/shared/getPageFiles/getExports.js

@@ -1,11 +1,11 @@
-export { getExportUnion };
-export { getExports };
+export { getPageContextExports };
 import { isScriptFile, isTemplateFile } from '../../utils/isScriptFile.js';
-import { assert, hasProp, isObject, assertWarning, assertUsage, makeLast, isBrowser } from '../utils.js';
+import { assert, isObject, assertWarning, assertUsage, makeLast, isBrowser } from '../utils.js';
 import { assertDefaultExports, forbiddenDefaultExports } from './assert_exports_old_design.js';
-import { getConfigDefinedAtString, getConfigValueFilePathToShowToUser } from '../page-configs/helpers.js';
+import { getConfigDefinedAtOptional } from '../page-configs/getConfigDefinedAt.js';
+import { getConfigValueFilePathToShowToUser } from '../page-configs/helpers.js';
 import pc from '@brillout/picocolors';
-function getExports(pageFiles, pageConfig) {
+function getPageContextExports(pageFiles, pageConfig) {
     const configEntries = {};
     const config = {};
     const exportsAll = {};
@@ -30,8 +30,8 @@ function getExports(pageFiles, pageConfig) {
     if (pageConfig) {
         Object.entries(pageConfig.configValues).forEach(([configName, configValue]) => {
             const { value } = configValue;
-            const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser(configValue);
-            const configDefinedAt = getConfigDefinedAtString('Config', configName, configValue);
+            const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser(configValue.definedAtData);
+            const configDefinedAt = getConfigDefinedAtOptional('Config', configName, configValue.definedAtData);
             config[configName] = config[configName] ?? value;
             configEntries[configName] = configEntries[configName] ?? [];
             // Currently each configName has only one entry. Adding an entry for each overriden config value isn't implemented yet. (This is an isomorphic file and it isn't clear whether this can/should be implemented on the client-side. We should load a minimum amount of code on the client-side.)
@@ -69,7 +69,7 @@ function getExports(pageFiles, pageConfig) {
     });
     assert(!('default' in exports));
     assert(!('default' in exportsAll));
-    return {
+    const pageContextExports = {
         config,
         configEntries,
         // TODO/v1-release: remove
@@ -77,6 +77,7 @@ function getExports(pageFiles, pageConfig) {
         exportsAll,
         pageExports
     };
+    return pageContextExports;
 }
 function getExportValues(pageFile) {
     const { filePath, fileExports } = pageFile;
@@ -127,11 +128,3 @@ function createObjectWithDeprecationWarning() {
         }
     });
 }
-function getExportUnion(exportsAll, propName) {
-    return (exportsAll[propName]
-        ?.map((e) => {
-        assertUsage(hasProp(e, 'exportValue', 'string[]'), `${e.exportSource} should be an array of strings.`);
-        return e.exportValue;
-    })
-        .flat() ?? []);
-}

package/dist/esm/shared/getPageFiles.d.ts

@@ -1,9 +1,8 @@
 export type { PageFile } from './getPageFiles/getPageFileObject.js';
 export type { ExportsAll, PageContextExports } from './getPageFiles/getExports.js';
-export { getExportUnion } from './getPageFiles/getExports.js';
 export { getPageFilesAll } from './getPageFiles/setPageFiles.js';
 export { setPageFiles } from './getPageFiles/setPageFiles.js';
 export { setPageFilesAsync } from './getPageFiles/setPageFiles.js';
 export { getPageFilesClientSide } from './getPageFiles/getAllPageIdFiles.js';
 export { getPageFilesServerSide } from './getPageFiles/getAllPageIdFiles.js';
-export { getExports } from './getPageFiles/getExports.js';
+export { getPageContextExports } from './getPageFiles/getExports.js';

package/dist/esm/shared/getPageFiles.js

@@ -1,8 +1,6 @@
-// Utils
-export { getExportUnion } from './getPageFiles/getExports.js';
 export { getPageFilesAll } from './getPageFiles/setPageFiles.js';
 export { setPageFiles } from './getPageFiles/setPageFiles.js';
 export { setPageFilesAsync } from './getPageFiles/setPageFiles.js';
 export { getPageFilesClientSide } from './getPageFiles/getAllPageIdFiles.js';
 export { getPageFilesServerSide } from './getPageFiles/getAllPageIdFiles.js';
-export { getExports } from './getPageFiles/getExports.js';
+export { getPageContextExports } from './getPageFiles/getExports.js';

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

@@ -7,7 +7,8 @@ export { setIsPrerenderering };
 // We export for old V0.4 design which doesn't support configooksTimeout
 export { getHookTimeoutDefault };
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
-import { getConfigValue, getHookFilePathToShowToUser } from '../page-configs/helpers.js';
+import { getHookFilePathToShowToUser } from '../page-configs/helpers.js';
+import { getConfigValue } from '../page-configs/getConfigValue.js';
 import { assert, assertUsage, checkType, isCallable, isObject } from '../utils.js';
 import pc from '@brillout/picocolors';
 const globalObject = getGlobalObject('getHook.ts', {
@@ -38,8 +39,8 @@ function getHookFromPageConfig(pageConfig, hookName) {
     const hookFn = configValue.value;
     if (!hookFn)
         return null;
-    const hookFilePath = getHookFilePathToShowToUser(configValue);
-    // hook isn't a computed nor a cumulative config => definedAt should always be defined
+    const hookFilePath = getHookFilePathToShowToUser(configValue.definedAtData);
+    // hook isn't a computed nor a cumulative config => hookFilePath should always be defined
     assert(hookFilePath);
     assertHookFn(hookFn, { hookName, hookFilePath });
     const hookTimeout = getHookTimeout(hooksTimeout, hookName);
@@ -52,8 +53,8 @@ function getHookFromPageConfigGlobal(pageConfigGlobal, hookName) {
     const hookFn = configValue.value;
     if (!hookFn)
         return null;
-    const hookFilePath = getHookFilePathToShowToUser(configValue);
-    // hook isn't a computed nor a cumulative config => definedAt should always be defined
+    const hookFilePath = getHookFilePathToShowToUser(configValue.definedAtData);
+    // hook isn't a computed nor a cumulative config => hookFilePath should always be defined
     assert(hookFilePath);
     assertHookFn(hookFn, { hookName, hookFilePath });
     // We could use the global value of configooksTimeout but it requires some non-trivial refactoring

package/dist/esm/shared/page-configs/Config.d.ts

@@ -241,7 +241,7 @@ type ConfigBuiltIn = {
      */
     prerender?: boolean | ImportString;
     /**
-     * Inherit from other configurations.
+     * Install Vike extensions.
      *
      * https://vike.dev/extends
      */
@@ -316,7 +316,7 @@ type ConfigBuiltIn = {
      * https://vike.dev/hydrationCanBeAborted
      */
     hydrationCanBeAborted?: boolean | ImportString;
-    /** Additional client code.
+    /** Add client code.
      *
      * https://vike.dev/client
      */