vike 0.4.239-commit-4d0d950 → 0.4.239-commit-9dcde6d

package/dist/esm/client/index.d.ts

@@ -1 +1 @@
-export { getGlobalContext, getGlobalContext as getGlobalContextAsync, getGlobalContextSync, } from './shared/createGetGlobalContextClient.js';
+export { getGlobalContext, getGlobalContext as getGlobalContextAsync, getGlobalContextSync, } from './shared/getGlobalContextClientInternalShared.js';

package/dist/esm/client/index.js

@@ -1,4 +1,4 @@
 import { isBrowser } from '../utils/isBrowser.js';
 import { assert } from '../utils/assert.js';
 assert(isBrowser());
-export { getGlobalContext, getGlobalContext as getGlobalContextAsync, getGlobalContextSync, } from './shared/createGetGlobalContextClient.js';
+export { getGlobalContext, getGlobalContext as getGlobalContextAsync, getGlobalContextSync, } from './shared/getGlobalContextClientInternalShared.js';

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

@@ -2,7 +2,7 @@ export { createPageContextClientSide };
 import { createPageContextObject, createPageContextShared } from '../../shared/createPageContextShared.js';
 import { getPageContextUrlComputed } from '../../shared/getPageContextUrlComputed.js';
 import { getBaseServer } from './getBaseServer.js';
-import { getGlobalContextClientInternal } from './globalContext.js';
+import { getGlobalContextClientInternal } from './getGlobalContextClientInternal.js';
 import { assert, updateType, isBaseServer, objectAssign } from './utils.js';
 async function createPageContextClientSide(urlOriginal) {
     const globalContext = await getGlobalContextClientInternal();

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

@@ -3,14 +3,11 @@ assertClientRouting();
 import { initClientRouter } from './initClientRouter.js';
 import { assertSingleInstance_onClientEntryClientRouting } from './utils.js';
 import { removeFoucBuster } from '../shared/removeFoucBuster.js';
-import { setVirtualFileExportsGlobalEntry } from '../shared/createGetGlobalContextClient.js';
+import { setVirtualFileExportsGlobalEntry } from '../shared/getGlobalContextClientInternalShared.js';
 // @ts-expect-error
 import * as virtualFileExportsGlobalEntry from 'virtual:vike:global-entry:client:client-routing';
-// TODO/now: remove this ts-ignore
-// @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
-const isProd = import.meta.env.PROD;
-assertSingleInstance_onClientEntryClientRouting(isProd);
-setVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry, true);
+assertSingleInstance_onClientEntryClientRouting(import.meta.env.PROD);
+setVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry);
 initClientRouter();
 if (import.meta.env.DEV)
     removeFoucBuster();

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

@@ -1,7 +1,6 @@
 export { getBaseServer };
 import { assert } from '../runtime-server-routing/utils.js';
 function getBaseServer() {
-    // @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
     const baseServer = import.meta.env.BASE_SERVER;
     assert(isBaseServer(baseServer));
     return baseServer;

package/dist/esm/client/runtime-client-routing/{globalContext.js → getGlobalContextClientInternal.js}

@@ -1,11 +1,9 @@
-// TODO/now: rename file
-// TODO/now: rename export
 export { getGlobalContextClientInternal };
-import { createGetGlobalContextClient } from '../shared/createGetGlobalContextClient.js';
+import { getGlobalContextClientInternalShared } from '../shared/getGlobalContextClientInternalShared.js';
 import { loadPageRoutes } from '../../shared/route/loadPageRoutes.js';
 import { objectAssign } from './utils.js';
 async function getGlobalContextClientInternal() {
-    const globalContext = await createGetGlobalContextClient();
+    const globalContext = await getGlobalContextClientInternalShared();
     objectAssign(globalContext, await addGlobalContext(globalContext));
     return globalContext;
 }

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

@@ -145,7 +145,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
         isHydration: boolean;
         isBackwardNavigation: boolean | null;
         previousPageContext: import("../../types/PageContext.js").PageContextClient<unknown> | null;
-        globalContext: import("./globalContext.js").GlobalContextClient;
+        globalContext: import("./getGlobalContextClientInternal.js").GlobalContextClient;
     } & {
         urlOriginal: string;
     } & {
@@ -210,7 +210,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     isHydration: boolean;
     isBackwardNavigation: boolean | null;
     previousPageContext: import("../../types/PageContext.js").PageContextClient<unknown> | null;
-    globalContext: import("./globalContext.js").GlobalContextClient;
+    globalContext: import("./getGlobalContextClientInternal.js").GlobalContextClient;
 } & {
     urlOriginal: string;
 } & {
@@ -366,7 +366,7 @@ declare function getPageContextFromClientHooks(pageContext: {
         isHydration: boolean;
         isBackwardNavigation: boolean | null;
         previousPageContext: import("../../types/PageContext.js").PageContextClient<unknown> | null;
-        globalContext: import("./globalContext.js").GlobalContextClient;
+        globalContext: import("./getGlobalContextClientInternal.js").GlobalContextClient;
     } & {
         urlOriginal: string;
     } & {
@@ -429,7 +429,7 @@ declare function getPageContextFromClientHooks(pageContext: {
     isHydration: boolean;
     isBackwardNavigation: boolean | null;
     previousPageContext: import("../../types/PageContext.js").PageContextClient<unknown> | null;
-    globalContext: import("./globalContext.js").GlobalContextClient;
+    globalContext: import("./getGlobalContextClientInternal.js").GlobalContextClient;
 } & {
     urlOriginal: string;
 } & {

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

@@ -1,5 +1,5 @@
 export { isClientSideRoutable };
-import type { GlobalContextClientInternal } from './globalContext.js';
+import type { GlobalContextClientInternal } from './getGlobalContextClientInternal.js';
 import type { PageFile } from '../../shared/getPageFiles.js';
 declare function isClientSideRoutable(pageId: string, pageContext: {
     _globalContext: GlobalContextClientInternal;

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

@@ -156,7 +156,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         isHydration: boolean;
         isBackwardNavigation: boolean | null;
         previousPageContext: PageContextClient<unknown> | null;
-        globalContext: import("./globalContext.js").GlobalContextClient;
+        globalContext: import("./getGlobalContextClientInternal.js").GlobalContextClient;
     } & {
         urlOriginal: string;
     } & {

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

@@ -511,11 +511,9 @@ function disableClientRouting(err, log) {
         // We don't use console.error() to avoid flooding error trackers such as Sentry
         console.log(err);
     }
-    // @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
-    const isProd = import.meta.env.PROD;
     assertInfo(false, [
         'Failed to fetch static asset.',
-        isProd ? 'This usually happens when a new frontend is deployed.' : null,
+        import.meta.env.PROD ? 'This usually happens when a new frontend is deployed.' : null,
         'Falling back to Server Routing.',
         '(The next page navigation will use Server Routing instead of Client Routing.)',
     ]
@@ -646,8 +644,7 @@ function handleErrorFetchingStaticAssets(err, pageContext, isFirstRender) {
 }
 // [HMR] If error page is shown => re-render whole page
 if (import.meta.env.DEV && import.meta.hot)
-    // TODO/now use after event
-    import.meta.hot.on('vite:beforeUpdate', () => {
+    import.meta.hot.on('vite:afterUpdate', () => {
         const pageContext = globalObject.renderedPageContext;
         if (pageContext?.pageId && isErrorPage(pageContext.pageId, pageContext._globalContext._pageConfigs)) {
             renderPageClientSide({

package/dist/esm/client/runtime-server-routing/createPageContextClientSide.js

@@ -4,7 +4,7 @@ import { getPageContextSerializedInHtml } from '../shared/getJsonSerializedInHtm
 import { loadPageConfigsLazyClientSide, } from '../shared/loadPageConfigsLazyClientSide.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { createPageContextObject, createPageContextShared } from '../../shared/createPageContextShared.js';
-import { getGlobalContextClientInternal } from './globalContext.js';
+import { getGlobalContextClientInternal } from './getGlobalContextClientInternal.js';
 import { preparePageContextForPublicUsageClient, } from './preparePageContextForPublicUsageClient.js';
 import { execHook } from '../../shared/hooks/execHook.js';
 const urlFirst = getCurrentUrl({ withoutHash: true });

package/dist/esm/client/runtime-server-routing/entry.js

@@ -6,14 +6,11 @@ import { assertSingleInstance_onClientEntryServerRouting } from './utils.js';
 import { removeFoucBuster } from '../shared/removeFoucBuster.js';
 import { execHook } from '../../shared/hooks/execHook.js';
 import { preparePageContextForPublicUsageClient } from './preparePageContextForPublicUsageClient.js';
-import { setVirtualFileExportsGlobalEntry } from '../shared/createGetGlobalContextClient.js';
+import { setVirtualFileExportsGlobalEntry } from '../shared/getGlobalContextClientInternalShared.js';
 // @ts-expect-error
 import * as virtualFileExportsGlobalEntry from 'virtual:vike:global-entry:client:server-routing';
-// TODO/now: remove this ts-ignore
-// @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
-const isProd = import.meta.env.PROD;
-assertSingleInstance_onClientEntryServerRouting(isProd);
-setVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry, false);
+assertSingleInstance_onClientEntryServerRouting(import.meta.env.PROD);
+setVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry);
 if (import.meta.env.DEV)
     removeFoucBuster();
 hydrate();

package/dist/esm/client/runtime-server-routing/getGlobalContextClientInternal.js

@@ -0,0 +1,6 @@
+export { getGlobalContextClientInternal };
+import { getGlobalContextClientInternalShared } from '../shared/getGlobalContextClientInternalShared.js';
+async function getGlobalContextClientInternal() {
+    const globalContext = await getGlobalContextClientInternalShared();
+    return globalContext;
+}

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

@@ -2,7 +2,7 @@ export { execHookOnRenderClient };
 export type { PageContextBeforeRenderClient };
 import type { PageFile, PageContextConfig } from '../../shared/getPageFiles.js';
 import type { PageContextForPublicUsageClientShared } from './preparePageContextForPublicUsageClientShared.js';
-import type { GlobalContextClientInternalShared } from './createGetGlobalContextClient.js';
+import type { GlobalContextClientInternalShared } from './getGlobalContextClientInternalShared.js';
 type PageContextBeforeRenderClient = {
     _pageFilesLoaded: PageFile[];
     urlOriginal?: string;

package/dist/esm/client/shared/{createGetGlobalContextClient.d.ts → getGlobalContextClientInternalShared.d.ts}

@@ -1,11 +1,11 @@
 export { getGlobalContext };
 export { getGlobalContextSync };
 export { setVirtualFileExportsGlobalEntry };
-export { createGetGlobalContextClient };
+export { getGlobalContextClientInternalShared };
 export type GlobalContextClientInternalShared = GlobalContextClientInternal | GlobalContextClientInternalWithServerRouting;
-import type { GlobalContextClientInternal } from '../runtime-client-routing/globalContext.js';
-import type { GlobalContextClientInternalWithServerRouting } from '../runtime-server-routing/globalContext.js';
-declare function createGetGlobalContextClient(): Promise<{
+import type { GlobalContextClientInternal } from '../runtime-client-routing/getGlobalContextClientInternal.js';
+import type { GlobalContextClientInternalWithServerRouting } from '../runtime-server-routing/getGlobalContextClientInternal.js';
+declare function getGlobalContextClientInternalShared(): Promise<{
     _globalConfigPublic: {
         pages: {
             [k: string]: {
@@ -53,13 +53,15 @@ declare function createGetGlobalContextClient(): Promise<{
     _allPageIds: string[];
 } & {
     /**
-     * Whether the environment is client-side or server-side / pre-rendering.
+     * Whether the environment is the client-side:
+     * - In the browser, the value is `true`.
+     * - Upon SSR and pre-rendering, the value is `false`.
      *
-     * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
+     * https://vike.dev/globalContext#isClientSide
      */
     isClientSide: true;
 }>;
 type NeverExported = never;
 declare function getGlobalContext(): Promise<NeverExported>;
 declare function getGlobalContextSync(): NeverExported;
-declare function setVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry: unknown, isClientRouting: boolean): Promise<void>;
+declare function setVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry: unknown): Promise<void>;

package/dist/esm/client/shared/{createGetGlobalContextClient.js → getGlobalContextClientInternalShared.js}

@@ -3,32 +3,32 @@ export { getGlobalContext };
 export { getGlobalContextSync };
 export { setVirtualFileExportsGlobalEntry };
 // Internal usage
-// TODO/now rename export
-// TODO/now rename file
-export { createGetGlobalContextClient };
-import { createGlobalContextShared, getGlobalContextSyncErrMsg, } from '../../shared/createGlobalContextShared.js';
+export { getGlobalContextClientInternalShared };
+import { createGlobalContextShared, getGlobalContextSyncErrMsg } from '../../shared/createGlobalContextShared.js';
 import { getGlobalContextSerializedInHtml } from './getJsonSerializedInHtml.js';
 import { assert, assertUsage, genPromise, getGlobalObject, objectAssign, checkType } from './utils.js';
-const globalObject = getGlobalObject('createGetGlobalContextClient.ts', (() => {
+const globalObject = getGlobalObject('getGlobalContextClientInternalShared.ts', (() => {
     const { promise: globalContextInitialPromise, resolve: globalContextInitialPromiseResolve } = genPromise();
     return {
         globalContextInitialPromise,
         globalContextInitialPromiseResolve,
     };
 })());
-async function createGetGlobalContextClient() {
+async function getGlobalContextClientInternalShared() {
+    // Get
     if (globalObject.globalContextPromise) {
         const globalContext = await globalObject.globalContextPromise;
         return globalContext;
     }
     // Create
-    const globalContextPromise = createGlobalContextShared(globalObject.virtualFileExportsGlobalEntry, globalObject, undefined, async (globalContext) => {
+    const globalContextPromise = createGlobalContextShared(globalObject.virtualFileExportsGlobalEntry, globalObject, () => {
         const globalContextAddendum = {
-            // TODO/now update JSDocs
             /**
-             * Whether the environment is client-side or server-side / pre-rendering.
+             * Whether the environment is the client-side:
+             * - In the browser, the value is `true`.
+             * - Upon SSR and pre-rendering, the value is `false`.
              *
-             * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
+             * https://vike.dev/globalContext#isClientSide
              */
             isClientSide: true,
         };
@@ -55,15 +55,12 @@ function getGlobalContextSync() {
     checkType(globalContext);
     return globalContext;
 }
-async function setVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry, isClientRouting) {
-    // TODO/now: remove unused globalObject.isClientRouting
-    assert(globalObject.isClientRouting === undefined || globalObject.isClientRouting === isClientRouting);
-    globalObject.isClientRouting = isClientRouting;
+async function setVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry) {
     // HMR => virtualFileExportsGlobalEntry differ
     if (globalObject.virtualFileExportsGlobalEntry !== virtualFileExportsGlobalEntry) {
         delete globalObject.globalContextPromise;
         globalObject.virtualFileExportsGlobalEntry = virtualFileExportsGlobalEntry;
         // Eagerly call +onCreateGlobalContext() hooks
-        await createGetGlobalContextClient();
+        await getGlobalContextClientInternalShared();
     }
 }

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

@@ -10,13 +10,11 @@ async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs,
     const pageFilesClientSide = getPageFilesClientSide(pageFilesAll, pageId);
     const pageConfig = findPageConfig(pageConfigs, pageId);
     let pageConfigLoaded;
-    // @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
-    const isDev = import.meta.env.DEV;
     try {
         // prettier-ignore
         // biome-ignore format:
         const result = await Promise.all([
-            pageConfig && loadAndParseVirtualFilePageEntry(pageConfig, isDev),
+            pageConfig && loadAndParseVirtualFilePageEntry(pageConfig, import.meta.env.DEV),
             ...pageFilesClientSide.map((p) => p.loadFile?.()),
         ]);
         pageConfigLoaded = result[0];

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

@@ -715,12 +715,14 @@ async function prerenderRedirects(globalContext, onComplete, showWarningUponDyna
 }
 function getRedirectHtml(urlTarget) {
     const urlTargetSafe = escapeHtml(urlTarget);
-    // To test it: /test/playground => http://localhost:3000/download
+    // - Test: /test/playground => http://localhost:3000/download
+    // - Adding `<link rel="canonical">` for SEO, see https://github.com/vikejs/vike/pull/2711
     const htmlString = `<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="UTF-8">
   <meta http-equiv="refresh" content="0;url=${urlTargetSafe}">
+  <link rel="canonical" href="${urlTargetSafe}" />
   <title>Redirect ${urlTargetSafe}</title>
   <style>body{opacity:0}</style>
   <noscript>

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

@@ -6,7 +6,7 @@ export type GlobalContextInternal = GlobalContextServerInternal | GlobalContextC
 import type { PageFile } from './getPageFiles.js';
 import type { PageConfigRuntime } from '../types/PageConfig.js';
 import type { GlobalContextServerInternal } from '../node/runtime/globalContext.js';
-import type { GlobalContextClientInternal } from '../client/runtime-client-routing/globalContext.js';
+import type { GlobalContextClientInternal } from '../client/runtime-client-routing/getGlobalContextClientInternal.js';
 import { type Hook } from './hooks/getHook.js';
 declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 declare function createGlobalContextShared<GlobalContextAdded extends {}, GlobalContextAddedAsync extends {}>(virtualFileExportsGlobalEntry: unknown, globalObject: {

package/dist/esm/shared/createGlobalContextShared.js

@@ -9,7 +9,6 @@ import { getHookFromPageConfigGlobalCumulative } from './hooks/getHook.js';
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 // TO-DO/eventually use flat globalContext — like flat pageContext
 async function createGlobalContextShared(virtualFileExportsGlobalEntry, globalObject, addGlobalContext, 
-// TODO/now can we remove it now?
 // TO-DO/next-major-release: we'll be able to remove addGlobalContextTmp after loadPageRoutes() is sync (it will be sync after we remove the old design)
 addGlobalContextTmp, addGlobalContextAsync) {
     const { previousCreateGlobalContextPromise } = globalObject;

package/dist/esm/types/PageContext.d.ts

@@ -19,8 +19,8 @@ import type { From, PageContextConfig, Source, Sources } from '../shared/page-co
 import type { Config } from './Config.js';
 import type { AbortStatusCode } from '../shared/route/abort.js';
 import type { GlobalContextServer } from '../node/runtime/globalContext.js';
-import type { GlobalContextClient } from '../client/runtime-client-routing/globalContext.js';
-import type { GlobalContextClientWithServerRouting } from '../client/runtime-server-routing/globalContext.js';
+import type { GlobalContextClient } from '../client/runtime-client-routing/getGlobalContextClientInternal.js';
+import type { GlobalContextClientWithServerRouting } from '../client/runtime-server-routing/getGlobalContextClientInternal.js';
 type PageContextServer<Data = unknown> = PageContextBuiltInServer<Data> & Vike.PageContext & Vike.PageContextServer;
 type PageContext<Data = unknown> = PageContextClient<Data> | PageContextServer<Data>;
 type PageContextClient<Data = unknown> = PageContextBuiltInClientWithClientRouting<Data> & Vike.PageContext & Vike.PageContextClient;
@@ -137,9 +137,9 @@ type PageContextBuiltInCommon<Data> = PageContextConfig & {
 };
 type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextUrlServer & {
     /**
-     * Whether the page is being rendered on the client-side or server-side / pre-rendered.
-     *
-     * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/pageContext#isClientSide
+     * Whether the environment is the client-side:
+     * - In the browser, the value is `true`.
+     * - Upon SSR and pre-rendering, the value is `false`.
      *
      * https://vike.dev/pageContext#isClientSide
      */
@@ -210,9 +210,9 @@ type PageContextBuiltInClientWithServerRouting<Data> = Partial<PageContextBuiltI
 };
 type PageContextClientCommon = {
     /**
-     * Whether the page is being rendered on the client-side, or rendered on the server-side / pre-rendered.
-     *
-     * In order to save client-side KBs, we recommend using `import.meta.env.SSR` whenever possible instead, see https://vike.dev/pageContext#isClientSide
+     * Whether the environment is the client-side:
+     * - In the browser, the value is `true`.
+     * - Upon SSR and pre-rendering, the value is `false`.
      *
      * https://vike.dev/pageContext#isClientSide
      */

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.239-commit-4d0d950";
+export declare const PROJECT_VERSION: "0.4.239-commit-9dcde6d";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.239-commit-4d0d950';
+export const PROJECT_VERSION = '0.4.239-commit-9dcde6d';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.239-commit-4d0d950",
+  "version": "0.4.239-commit-9dcde6d",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {

package/dist/esm/client/runtime-server-routing/globalContext.js

@@ -1,9 +0,0 @@
-// TODO/now: rename file
-// TODO/now: rename export
-export { getGlobalContextClientInternal };
-import { createGetGlobalContextClient } from '../shared/createGetGlobalContextClient.js';
-// TODO/now: remove this useless function and re-export instead?
-async function getGlobalContextClientInternal() {
-    const globalContext = await createGetGlobalContextClient();
-    return globalContext;
-}