vike 0.4.171 → 0.4.172-commit-c1b0884

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

@@ -4,12 +4,16 @@ import { analyzePageClientSide } from '../../../shared/getPageFiles/analyzePageC
 import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { analyzeClientSide } from '../../../shared/getPageFiles/analyzeClientSide.js';
 import { getGlobalContext } from '../globalContext.js';
-import { getClientEntry } from '../../shared/getClientEntry.js';
+import { getConfigValueRuntime } from '../../../shared/page-configs/getConfigValue.js';
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
         const { isClientSideRenderable, isClientRouting } = analyzeClientSide(pageConfig, pageFilesAll, pageId);
-        const clientFilePath = getClientEntry(pageConfig);
-        const clientEntry = !isClientSideRenderable ? clientFilePath : getVikeClientEntry(isClientRouting);
+        const clientEntries = [];
+        const clientFilePath = getConfigValueRuntime(pageConfig, 'client', 'string')?.value ?? null;
+        if (clientFilePath)
+            clientEntries.push(clientFilePath);
+        if (isClientSideRenderable)
+            clientEntries.push(getVikeClientEntry(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
             id: getVirtualFileIdPageConfigValuesAll(pageConfig.pageId, true),
@@ -41,15 +45,13 @@ function analyzePage(pageFilesAll, pageConfig, pageId) {
           }
         })
         */
-        const clientEntries = [];
-        if (clientEntry) {
+        clientEntries.forEach((clientEntry) => {
             clientDependencies.push({
                 id: clientEntry,
                 onlyAssets: false,
                 eagerlyImported: false
             });
-            clientEntries.push(clientEntry);
-        }
+        });
         return {
             isHtmlOnly: !isClientSideRenderable,
             isClientRouting,

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

@@ -1,13 +1,13 @@
 export { getCacheControl };
 import { getPageConfig } from '../../../../shared/page-configs/helpers.js';
-import { getConfigValue } from '../../../../shared/page-configs/getConfigValue.js';
+import { getConfigValueRuntime } from '../../../../shared/page-configs/getConfigValue.js';
 const defaultValue = 'no-store, max-age=0';
 function getCacheControl(pageId, pageConfigs) {
     // TODO/v1-release: remove
     if (pageConfigs.length === 0)
         return defaultValue;
     const pageConfig = getPageConfig(pageId, pageConfigs);
-    const configValue = getConfigValue(pageConfig, 'cacheControl', 'string');
+    const configValue = getConfigValueRuntime(pageConfig, 'cacheControl', 'string');
     const value = configValue?.value;
     if (value)
         return value;

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

@@ -14,7 +14,7 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
     }
     preparePageContextForUserConsumptionServerSide(pageContext);
     if (dataHook) {
-        const hookResult = await executeHook(() => dataHook.hookFn(pageContext), dataHook);
+        const hookResult = await executeHook(() => dataHook.hookFn(pageContext), dataHook, pageContext);
         // Note: hookResult can be anything (e.g. an object) and is to be assigned to pageContext.data
         const pageContextFromHook = {
             data: hookResult
@@ -22,7 +22,7 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
         Object.assign(pageContext, pageContextFromHook);
     }
     if (onBeforeRenderHook) {
-        const hookResult = await executeHook(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook);
+        const hookResult = await executeHook(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook, pageContext);
         assertOnBeforeRenderHookReturn(hookResult, onBeforeRenderHook.hookFilePath);
         const pageContextFromHook = hookResult?.pageContext;
         Object.assign(pageContext, pageContextFromHook);

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

@@ -13,7 +13,7 @@ async function executeOnRenderHtmlHook(pageContext) {
     const { renderHook, hookFn } = getRenderHook(pageContext);
     objectAssign(pageContext, { _renderHook: renderHook });
     preparePageContextForUserConsumptionServerSide(pageContext);
-    const hookReturnValue = await executeHook(() => hookFn(pageContext), renderHook);
+    const hookReturnValue = await executeHook(() => hookFn(pageContext), renderHook, pageContext);
     const { documentHtml, pageContextProvidedByRenderHook, pageContextPromise, injectFilter } = processHookReturnValue(hookReturnValue, renderHook);
     Object.assign(pageContext, pageContextProvidedByRenderHook);
     objectAssign(pageContext, { _pageContextPromise: pageContextPromise });
@@ -63,13 +63,13 @@ function getRenderHook(pageContext) {
         assertUsage(false, [
             `No ${hookName}() hook found, see https://vike.dev/${hookName}`
             /*
-          'See https://vike.dev/render-modes for more information.',
-          [
-            // 'Loaded config files (none of them define the onRenderHtml() hook):',
-            'Loaded server-side page files (none of them `export { render }`):',
-            ...pageContext._pageFilePathsLoaded.map((f, i) => ` (${i + 1}): ${f}`)
-          ].join('\n')
-          */
+            'See https://vike.dev/render-modes for more information.',
+            [
+              // 'Loaded config files (none of them define the onRenderHtml() hook):',
+              'Loaded server-side page files (none of them `export { render }`):',
+              ...pageContext._pageFilePathsLoaded.map((f, i) => ` (${i + 1}): ${f}`)
+            ].join('\n')
+            */
         ].join(' '));
     }
     return hookFound;

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

@@ -95,8 +95,8 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             }
         }
     };
-    function getFixMsg(type, standard) {
-        const streamName = getStreamName(type, standard);
+    function getFixMsg(kind, type) {
+        const streamName = getStreamName(kind, type);
         assert(['a ', 'an ', 'the '].some((s) => streamName.startsWith(s)));
         assert(renderHook);
         const { hookFilePath, hookName } = renderHook;

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

@@ -1,9 +1,11 @@
 export { getPageAssets };
+export { setResolveClientEntriesDev };
 export type { PageAsset };
 export type { GetPageAssets };
 export type { PageContextGetPageAssets };
 import { type MediaType } from './inferMediaType.js';
 import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
+import type { ResolveClientEntriesDev } from '../../plugin/resolveClientEntriesDev.js';
 type PageAsset = {
     src: string;
     assetType: null | NonNullable<MediaType>['assetType'];
@@ -17,3 +19,4 @@ type PageContextGetPageAssets = {
     _includeAssetsImportedByServer: boolean;
 };
 declare function getPageAssets(pageContext: PageContextGetPageAssets, clientDependencies: ClientDependency[], clientEntries: string[]): Promise<PageAsset[]>;
+declare function setResolveClientEntriesDev(resolveClientEntriesDev: ResolveClientEntriesDev): void;

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

@@ -1,12 +1,15 @@
 export { getPageAssets };
-import { assert, prependBase, assertPosixPath, toPosixPath, unique, pathJoin, assertIsNpmPackageImport } from '../utils.js';
+export { setResolveClientEntriesDev };
+import { assert, prependBase, toPosixPath, unique, getGlobalObject } from '../utils.js';
 import { retrieveAssetsDev } from './getPageAssets/retrieveAssetsDev.js';
 import { retrieveAssetsProd } from './getPageAssets/retrieveAssetsProd.js';
 import { inferMediaType } from './inferMediaType.js';
 import { getManifestEntry } from './getPageAssets/getManifestEntry.js';
 import { sortPageAssetsForEarlyHintsHeader } from './getPageAssets/sortPageAssetsForEarlyHintsHeader.js';
 import { getGlobalContext } from '../globalContext.js';
-import { import_ } from '@brillout/import';
+const globalObject = getGlobalObject('getPageAssets.ts', {
+    resolveClientEntriesDev: null
+});
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = getGlobalContext();
     const isDev = !globalContext.isProduction;
@@ -14,7 +17,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     let clientEntriesSrc;
     if (isDev) {
         const { viteDevServer } = globalContext;
-        clientEntriesSrc = await Promise.all(clientEntries.map((clientEntry) => resolveClientEntriesDev(clientEntry, viteDevServer)));
+        clientEntriesSrc = await Promise.all(clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer)));
         assetUrls = await retrieveAssetsDev(clientDependencies, viteDevServer);
     }
     else {
@@ -54,62 +57,6 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     sortPageAssetsForEarlyHintsHeader(pageAssets);
     return pageAssets;
 }
-async function resolveClientEntriesDev(clientEntry, viteDevServer) {
-    let root = viteDevServer.config.root;
-    assert(root);
-    root = toPosixPath(root);
-    // The `?import` suffix is needed for MDX to be transpiled:
-    //   - Not transpiled: `/pages/markdown.page.mdx`
-    //   - Transpiled: `/pages/markdown.page.mdx?import`
-    // But `?import` doesn't work with `/@fs/`:
-    //   - Not transpiled: /@fs/home/runner/work/vike/vike/examples/react-full/pages/markdown.page.mdx
-    //   - Not transpiled: /@fs/home/runner/work/vike/vike/examples/react-full/pages/markdown.page.mdx?import
-    if (clientEntry.endsWith('?import')) {
-        assert(clientEntry.startsWith('/'));
-        return clientEntry;
-    }
-    assertPosixPath(clientEntry);
-    let filePath;
-    if (clientEntry.startsWith('/')) {
-        filePath = pathJoin(root, clientEntry);
-    }
-    else {
-        const { createRequire } = (await import_('module')).default;
-        const { dirname } = (await import_('path')).default;
-        const { fileURLToPath } = (await import_('url')).default;
-        // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
-        const importMetaUrl = import.meta.url;
-        const require_ = createRequire(importMetaUrl);
-        const __dirname_ = dirname(fileURLToPath(importMetaUrl));
-        // @ts-expect-error
-        // Bun workaround https://github.com/vikejs/vike/pull/1048
-        const res = typeof Bun !== 'undefined' ? (toPath) => Bun.resolveSync(toPath, __dirname_) : require_.resolve;
-        if (clientEntry.startsWith('@@vike/')) {
-            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 = 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 = toPosixPath(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
-            }
-        }
-        else {
-            assertIsNpmPackageImport(clientEntry);
-            filePath = res(clientEntry);
-        }
-    }
-    if (!filePath.startsWith('/')) {
-        assert(process.platform === 'win32');
-        filePath = '/' + filePath;
-    }
-    filePath = '/@fs' + filePath;
-    assertPosixPath(filePath);
-    return filePath;
-}
 function resolveClientEntriesProd(clientEntry, assetsManifest) {
     const { manifestEntry } = getManifestEntry(clientEntry, assetsManifest);
     assert(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });
@@ -117,3 +64,6 @@ function resolveClientEntriesProd(clientEntry, assetsManifest) {
     assert(!file.startsWith('/'));
     return '/' + file;
 }
+function setResolveClientEntriesDev(resolveClientEntriesDev) {
+    globalObject.resolveClientEntriesDev = resolveClientEntriesDev;
+}

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

@@ -14,16 +14,11 @@ type PageContext_loadUserFilesServerSide = PageContextGetPageAssets & PageContex
 type PageFiles = PromiseType<ReturnType<typeof loadUserFilesServerSide>>;
 declare function loadUserFilesServerSide(pageContext: {
     _pageId: string;
-} & PageContext_loadUserFilesServerSide): Promise<{
+} & PageContext_loadUserFilesServerSide): Promise<import("../../../shared/getPageFiles.js").PageContextExports & {
     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>;
 } & {
     __getPageAssets: () => Promise<PageAsset[]>;
 }>;

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

@@ -10,7 +10,7 @@ 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 [{ pageFilesLoaded, pageConfigLoaded, ...pageContextExports }] = await Promise.all([
+    const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
         loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext._pageId, !getGlobalContext().isProduction),
         analyzePageClientSideInit(pageContext._pageFilesAll, pageContext._pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
@@ -35,8 +35,8 @@ async function loadUserFilesServerSide(pageContext) {
         });
     }
     const pageContextAddendum = {};
+    objectAssign(pageContextAddendum, pageContextExports);
     objectAssign(pageContextAddendum, {
-        ...pageContextExports,
         Page: pageContextExports.exports.Page,
         _isHtmlOnly: isHtmlOnly,
         _passToClient: passToClient,
@@ -101,8 +101,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
     const pageContextExports = getPageContextExports(pageFilesServerSide, pageConfigLoaded);
     return {
-        ...pageContextExports,
-        pageFilesLoaded: pageFilesServerSide,
-        pageConfigLoaded
+        pageContextExports,
+        pageFilesLoaded: pageFilesServerSide
     };
 }

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

@@ -1,8 +1,4 @@
 export { logErrorHint };
-export { isCjsEsmError };
-export { isKnownError };
-export { getHint };
+export { getErrorHint };
 declare function logErrorHint(error: unknown): void;
-declare function getHint(error: unknown): null | string;
-declare function isKnownError(error: unknown): false | string;
-declare function isCjsEsmError(error: unknown): boolean | string[];
+declare function getErrorHint(error: unknown): null | string;