vike 0.4.228 → 0.4.229-commit-2a06dcc

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

@@ -1,6 +1,6 @@
 export { executeOnRenderHtmlHook };
 import { isDocumentHtml, renderDocumentHtml, dangerouslySkipEscape } from '../html/renderHtml.js';
-import { getHook } from '../../../shared/hooks/getHook.js';
+import { getHookFromPageContext } from '../../../shared/hooks/getHook.js';
 import { assert, assertUsage, assertWarning, isObject, objectAssign, isPromise, isCallable } from '../utils.js';
 import { isStream } from '../html/stream.js';
 import { assertPageContextProvidedByUser } from '../../../shared/assertPageContextProvidedByUser.js';
@@ -36,12 +36,12 @@ function getRenderHook(pageContext) {
     {
         let hook;
         let hookName = undefined;
-        hook = getHook(pageContext, 'onRenderHtml');
+        hook = getHookFromPageContext(pageContext, 'onRenderHtml');
         if (hook) {
             hookName = 'onRenderHtml';
         }
         else {
-            hook = getHook(pageContext, 'render');
+            hook = getHookFromPageContext(pageContext, 'render');
             if (hook) {
                 hookName = 'render';
             }

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

@@ -1,5 +1,5 @@
 export { getManifestEntry };
-import { assert, slice, assertIsNpmPackageImport } from '../../utils.js';
+import { assert, slice, assertIsImportPathNpmPackage } from '../../utils.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { prependEntriesDir } from '../../../shared/prependEntriesDir.js';
 function getManifestEntry(id, assetsManifest) {
@@ -40,7 +40,7 @@ function getManifestEntry(id, assetsManifest) {
         return { manifestEntry, manifestKey };
     }
     // npm package import
-    assertIsNpmPackageImport(id);
+    assertIsImportPathNpmPackage(id);
     const found = Object.entries(assetsManifest).find(([, e]) => e.name === prependEntriesDir(id));
     assert(found);
     const [manifestKey, manifestEntry] = found;

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

@@ -1,7 +1,6 @@
 export { retrieveAssetsDev };
 import { assert, styleFileRE } from '../../utils.js';
 async function retrieveAssetsDev(clientDependencies, viteDevServer) {
-    const visitedModules = new Set();
     const assetUrls = new Set();
     await Promise.all(clientDependencies.map(async ({ id }) => {
         if (id.startsWith('@@vike'))
@@ -20,7 +19,7 @@ async function retrieveAssetsDev(clientDependencies, viteDevServer) {
             return;
         }
         assert(mod, { id });
-        collectCss(mod, assetUrls, visitedModules);
+        collectCss(mod, assetUrls, new Set());
     }));
     return Array.from(assetUrls);
 }
@@ -50,9 +49,6 @@ function collectCss(mod, styleUrls, visitedModules, importer) {
             // Is this useful? Maybe for virtual modules that don't respect the \0 virtual module convention?
             styleUrls.add(`/@id/${mod.url}`);
         }
-        /* Debug:
-        logModule(mod)
-        //*/
     }
     mod.importedModules.forEach((dep) => {
         collectCss(dep, styleUrls, visitedModules, mod);
@@ -67,15 +63,3 @@ function isStyle(mod) {
         // CSS of .vue files
         (mod.id && /\?vue&type=style/.test(mod.id)));
 }
-/*
-function logModule(mod: ModuleNode) {
-  const redacted = 'redacted'
-  console.log({
-    ...mod,
-    ssrModule: redacted,
-    ssrTransformResult: redacted,
-    importedModules: redacted,
-    importers: redacted
-  })
-}
-//*/

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

@@ -1,5 +1,5 @@
 export { retrieveAssetsProd };
-import { assert, isNpmPackageImport } from '../../utils.js';
+import { assert, isImportPathNpmPackage } from '../../utils.js';
 import { getManifestEntry } from './getManifestEntry.js';
 import { extractAssetsAddQuery } from '../../../shared/extractAssetsQuery.js';
 function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImportedByServer) {
@@ -14,7 +14,7 @@ function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImp
             onlyAssets &&
             id.includes('.page.server.') &&
             // We assume that all npm packages have already built their files: bundlers (Rollup, esbuild, tsup, ...) extract the CSS out of JavaScript => we can assume JavaScript to not import any CSS/assets.
-            !isNpmPackageImport(id, {
+            !isImportPathNpmPackage(id, {
                 // I presume Vite already resolves path aliases when Vite sets the module's id
                 cannotBePathAlias: true
             })) {

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

@@ -5,7 +5,7 @@ export type { GetPageAssets };
 export type { PageContextGetPageAssets };
 import { type MediaType } from './inferMediaType.js';
 import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
-import type { GlobalContextInternal } from '../globalContext.js';
+import type { GlobalContextServerInternal } from '../globalContext.js';
 import type { ResolveClientEntriesDev } from '../../plugin/shared/resolveClientEntriesDev.js';
 type PageAsset = {
     src: string;
@@ -18,7 +18,7 @@ type PageContextGetPageAssets = {
     _baseServer: string;
     _baseAssets: string | null;
     _includeAssetsImportedByServer: boolean;
-    _globalContext: GlobalContextInternal;
+    _globalContext: GlobalContextServerInternal;
 };
 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

@@ -11,12 +11,12 @@ const globalObject = getGlobalObject('renderPage/getPageAssets.ts', {
 });
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = pageContext._globalContext;
-    const { isProduction } = globalContext;
+    const { _isProduction: isProduction } = globalContext;
     const isDev = !isProduction;
     let assetUrls;
     let clientEntriesSrc;
     if (isDev) {
-        const { viteDevServer } = globalContext;
+        const { _viteDevServer: viteDevServer } = globalContext;
         clientEntriesSrc = await Promise.all(clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer)));
         assetUrls = await retrieveAssetsDev(clientDependencies, viteDevServer);
     }

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

@@ -1,5 +1,5 @@
 export { handleErrorWithoutErrorPage };
-import type { GlobalContextInternal } from '../globalContext.js';
+import type { GlobalContextServerInternal } from '../globalContext.js';
 import type { PageContextAfterRender } from './renderPageAlreadyRouted.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageFile } from '../../../shared/getPageFiles.js';
@@ -10,6 +10,6 @@ declare function handleErrorWithoutErrorPage<PageContext extends {
     pageId: null;
     _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];
-    _globalContext: GlobalContextInternal;
+    _globalContext: GlobalContextServerInternal;
     urlOriginal: string;
 }>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;

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

@@ -9,7 +9,7 @@ async function handleErrorWithoutErrorPage(pageContext) {
     assert(pageContext.errorWhileRendering || pageContext.is404);
     {
         const isV1 = pageContext._pageConfigs.length > 0;
-        await warnMissingErrorPage(isV1, pageContext._globalContext.isProduction);
+        await warnMissingErrorPage(isV1, pageContext._globalContext._isProduction);
     }
     if (!pageContext.isClientSideNavigation) {
         const httpResponse = createHttpResponseError(pageContext);

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

@@ -6,12 +6,12 @@ import { PromiseType } from '../utils.js';
 import { PageContextGetPageAssets, type PageAsset } from './getPageAssets.js';
 import { type PageContextDebugRouteMatches } from './debugPageFiles.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
-import type { GlobalContextInternal } from '../globalContext.js';
+import type { GlobalContextServerInternal } from '../globalContext.js';
 type PageContext_loadUserFilesServerSide = PageContextGetPageAssets & PageContextDebugRouteMatches & {
     urlOriginal: string;
     _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];
-    _globalContext: GlobalContextInternal;
+    _globalContext: GlobalContextServerInternal;
 };
 type PageFiles = PromiseType<ReturnType<typeof loadUserFilesServerSide>>;
 declare function loadUserFilesServerSide(pageContext: {

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

@@ -12,7 +12,7 @@ async function loadUserFilesServerSide(pageContext) {
     const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
     const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
-        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext.pageConfigGlobal, pageContext.pageId, !globalContext.isProduction),
+        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
         analyzePageClientSideInit(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
     const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await analyzePage(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);

package/dist/esm/node/runtime/renderPage/log404/index.d.ts

@@ -1,12 +1,12 @@
 export { log404 };
 export { getRoutesInfo };
 import type { PageRoutes } from '../../../../shared/route/index.js';
-import type { GlobalContextInternal } from '../../globalContext.js';
+import type { GlobalContextServerInternal } from '../../globalContext.js';
 declare function log404(pageContext: {
     urlPathname: string;
     errorWhileRendering: null | Error;
     isClientSideNavigation: boolean;
     _pageRoutes: PageRoutes;
-    _globalContext: GlobalContextInternal;
+    _globalContext: GlobalContextServerInternal;
 }): Promise<void>;
 declare function getRoutesInfo(pageRoutes: PageRoutes): string | null;

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

@@ -13,7 +13,7 @@ async function log404(pageContext) {
     */
     );
     const globalContext = pageContext._globalContext;
-    if (!globalContext.isProduction && !isFileRequest(urlPathname) && !pageContext.isClientSideNavigation) {
+    if (!globalContext._isProduction && !isFileRequest(urlPathname) && !pageContext.isClientSideNavigation) {
         const routesInfo = getRoutesInfo(pageRoutes);
         let msg = `URL ${pc.cyan(urlPathname)} ${noRouteMatch}`;
         const outro = 'See https://vike.dev/routing for more information about routing.';

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

@@ -4,7 +4,7 @@ import { PageContextUrlInternal } from '../../../shared/getPageContextUrlCompute
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { PageConfigUserFriendlyOld } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { PageContextBuiltInServerInternal } from '../../../shared/types.js';
-import type { GlobalContextInternal, GlobalContextPublic } from '../globalContext.js';
+import type { GlobalContextServerInternal, GlobalContextServer } from '../globalContext.js';
 type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & PageConfigUserFriendlyOld & {
     urlOriginal: string;
     /** @deprecated */
@@ -18,7 +18,7 @@ type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal
     is404: null | boolean;
     isClientSideNavigation: boolean;
     pageProps?: Record<string, unknown>;
-    _globalContext: GlobalContextInternal;
-    globalContext: GlobalContextPublic;
+    _globalContext: GlobalContextServerInternal;
+    globalContext: GlobalContextServer;
 } & Record<string, unknown>;
 declare function preparePageContextForUserConsumptionServerSide(pageContext: PageContextForUserConsumptionServerSide): void;

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

@@ -7,7 +7,7 @@ function preparePageContextForUserConsumptionServerSide(pageContext) {
     assert(isPlainObject(pageContext.routeParams));
     assert('Page' in pageContext);
     assert(typeof pageContext.isClientSideNavigation === 'boolean');
-    assert(pageContext._isPageContextObject);
+    assert(pageContext.isPageContext);
     assert(pageContext.isClientSide === false);
     assert(typeof pageContext.isPrerendering === 'boolean');
     preparePageContextForUserConsumption(pageContext);