vike 0.4.245-commit-4d0629e → 0.4.245-commit-6880dc7

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

@@ -23,8 +23,12 @@ type HistoryInfo = {
     state: StateEnhanced;
 };
 declare function onPopStateBegin(): {
-    isHistoryStateEnhanced: boolean;
+    skip: true;
+    previous?: undefined;
+    current?: undefined;
+} | {
     previous: HistoryInfo;
     current: HistoryInfo;
+    skip?: undefined;
 };
 declare function initHistory(): void;

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

@@ -4,7 +4,7 @@ export { onPopStateBegin };
 export { saveScrollPosition };
 export { initHistory };
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
-import { assert, assertUsage, getGlobalObject, isObject, deepEqual, cast } from './utils.js';
+import { assert, assertUsage, getGlobalObject, isObject, deepEqual, cast, redirectHard } from './utils.js';
 const globalObject = getGlobalObject('history.ts', {
     monkeyPatched: false,
     previous: undefined,
@@ -66,6 +66,10 @@ function getTimestamp() {
 }
 function saveScrollPosition() {
     const scrollPosition = getScrollPosition();
+    // Don't overwrite history.state if it was set by a non-Vike history.pushState() call.
+    // https://github.com/vikejs/vike/issues/2801#issuecomment-3490431479
+    if (!isVikeEnhanced(window.history.state))
+        return;
     const state = getState();
     replaceHistoryState({ ...state, scrollPosition });
 }
@@ -160,13 +164,31 @@ function getHistoryInfo() {
 }
 function onPopStateBegin() {
     const { previous } = globalObject;
-    const isHistoryStateEnhanced = window.history.state !== null;
+    const isHistoryStateEnhanced = isVikeEnhanced(window.history.state);
+    // Either:
+    // - `window.history.pushState(null, '', '/some-path')` , or
+    // - hash navigation
+    //   - Click on `<a href="#some-hash">`
+    //   - Using the `location` API (only hash navigation)
+    // See comments a the top of the ./initOnPopState.ts file.
+    const isHistoryStatePristine = window.history.state === null;
+    if (!isHistoryStateEnhanced && !isHistoryStatePristine) {
+        // Going to a history entry not created by Vike — entering another "SPA realm" => hard reload
+        // https://github.com/vikejs/vike/issues/2801#issuecomment-3490431479
+        redirectHard(getCurrentUrl());
+        return { skip: true };
+    }
     if (!isHistoryStateEnhanced)
         enhanceHistoryState();
     assertIsVikeEnhanced(window.history.state);
     const current = getHistoryInfo();
     globalObject.previous = current;
-    return { isHistoryStateEnhanced, previous, current };
+    // Let the browser handle hash navigations.
+    // - Upon hash navigation: `isHistoryStatePristine===true` (see comment above).
+    if (isHistoryStatePristine) {
+        return { skip: true };
+    }
+    return { previous, current };
 }
 function initHistory() {
     monkeyPatchHistoryAPI(); // the earlier we call it the better (Vike can workaround erroneous library monkey patches if Vike is the last one in the monkey patch chain)

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

@@ -23,7 +23,6 @@ async function renderFirstPage() {
     assert(getRenderCount() === 0);
     await renderPageClientSide({
         scrollTarget: { preserveScroll: true },
-        isBackwardNavigation: null,
         isClientSideNavigation: false,
     });
 }

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

@@ -38,7 +38,6 @@ async function onLinkClick(ev) {
     await renderPageClientSide({
         scrollTarget,
         urlOriginal: href,
-        isBackwardNavigation: false,
     });
 }
 function isNormalLeftClick(ev) {

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

@@ -23,24 +23,18 @@ import { catchInfiniteLoop } from './utils.js';
 // - It isn't possible to monkey patch the `location` APIs. (Chrome throws `TypeError: Cannot redefine property` when attempt to overwrite any `location` property.)
 // - Text links aren't supported: https://github.com/vikejs/vike/issues/2114
 // - docs/ is a good playground to test all this.
+// - No 'popstate' event is fired upon Server Routing — when the user clicks on a link before the page's JavaScript loaded.
+// - On a pristine page without JavaScript such as https://brillout.com we have `window.history.state === null`.
 function initOnPopState() {
     window.addEventListener('popstate', onPopState);
 }
 async function onPopState() {
     catchInfiniteLoop('onPopState()');
-    const { isHistoryStateEnhanced, previous, current } = onPopStateBegin();
-    // - `isHistoryStateEnhanced===false` <=> new hash navigation:
-    //   - Click on `<a href="#some-hash">`
-    //   - Using the `location` API (only hash navigation, see comments above).
-    // - `isHistoryStateEnhanced===true` <=> back-/forward navigation (including back-/forward hash navigation).
-    //   > Only back-/forward client-side navigation: no 'popstate' event is fired upon Server Routing (when the user clicks on a link before the page's JavaScript loaded), see comments above.
-    if (!isHistoryStateEnhanced) {
-        // Let the browser handle it
+    const res = onPopStateBegin();
+    if (res.skip)
         return;
-    }
-    else {
-        await handleHistoryNavigation(previous, current);
-    }
+    const { previous, current } = res;
+    await handleHistoryNavigation(previous, current);
 }
 async function handleHistoryNavigation(previous, current) {
     const scrollTarget = current.state.scrollPosition || undefined;

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

@@ -26,7 +26,6 @@ async function navigate(url, options) {
         scrollTarget,
         urlOriginal: url,
         overwriteLastHistoryEntry,
-        isBackwardNavigation: false,
         pageContextInitClient: pageContext,
     });
 }

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

@@ -19,7 +19,7 @@ type PageContextRouted = {
 type PageContextBegin = Awaited<ReturnType<typeof getPageContextBegin>>;
 type RenderArgs = {
     scrollTarget: ScrollTarget;
-    isBackwardNavigation: boolean | null;
+    isBackwardNavigation?: boolean | null;
     isHistoryNavigation?: true;
     urlOriginal?: string;
     overwriteLastHistoryEntry?: boolean;

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

@@ -36,7 +36,7 @@ const globalObject = getGlobalObject('runtime-client-routing/renderPageClientSid
 const { firstRenderStartPromise } = globalObject;
 async function renderPageClientSide(renderArgs) {
     catchInfiniteLoop('renderPageClientSide()');
-    const { urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation, isHistoryNavigation = false, pageContextsFromRewrite = [], redirectCount = 0, doNotRenderIfSamePage, isClientSideNavigation = true, pageContextInitClient, } = renderArgs;
+    const { urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation = false, isHistoryNavigation = false, pageContextsFromRewrite = [], redirectCount = 0, doNotRenderIfSamePage, isClientSideNavigation = true, pageContextInitClient, } = renderArgs;
     let { scrollTarget } = renderArgs;
     const { previousPageContext } = globalObject;
     addLinkPrefetchHandlers_unwatch();
@@ -370,7 +370,6 @@ async function renderPageClientSide(renderArgs) {
                     scrollTarget: undefined,
                     urlOriginal: urlRedirect,
                     overwriteLastHistoryEntry: false,
-                    isBackwardNavigation: false,
                     redirectCount: redirectCount + 1,
                 });
             }
@@ -664,7 +663,6 @@ if (import.meta.env.DEV && import.meta.hot)
                 scrollTarget: { preserveScroll: false },
                 urlOriginal: getCurrentUrl(),
                 overwriteLastHistoryEntry: true,
-                isBackwardNavigation: false,
             });
         }
     });

package/dist/esm/node/vite/shared/resolveVikeConfigInternal.js

@@ -263,8 +263,7 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
             return;
         pageConfigGlobal.configValueSources[configName] = sources;
     });
-    applyEffectsMetaEnv(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal);
-    applyEffectsConfVal(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal, plusFilesAll);
+    applyEffects(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal, plusFilesAll);
     sortConfigValueSources(pageConfigGlobal.configValueSources, null);
     assertPageConfigGlobal(pageConfigGlobal, plusFilesAll);
     const pageConfigs = objectEntries(configDefinitionsResolved.configDefinitionsLocal)
@@ -281,8 +280,7 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
             configValueSources[configName] = sources;
         });
         const pageConfigRoute = determineRouteFilesystem(locationId, configValueSources);
-        applyEffectsMetaEnv(configValueSources, configDefinitionsLocal);
-        applyEffectsConfVal(configValueSources, configDefinitionsLocal, plusFilesAll);
+        applyEffects(configValueSources, configDefinitionsLocal, plusFilesAll);
         sortConfigValueSources(configValueSources, locationId);
         const pageConfig = {
             pageId: locationId,
@@ -802,7 +800,7 @@ function assertMetaUsage(metaVal, metaConfigDefinedAt) {
     });
 }
 // Test: https://github.com/vikejs/vike/blob/441a37c4c1a3b07bb8f6efb1d1f7be297a53974a/test/playground/vite.config.ts#L39
-function applyEffectsConfVal(configValueSources, configDefinitions, plusFilesAll) {
+function applyEffects(configValueSources, configDefinitions, plusFilesAll) {
     objectEntries(configDefinitions).forEach(([configNameEffect, configDefEffect]) => {
         const sourceEffect = configValueSources[configNameEffect]?.[0];
         if (!sourceEffect)
@@ -811,19 +809,8 @@ function applyEffectsConfVal(configValueSources, configDefinitions, plusFilesAll
         if (!effect)
             return;
         const configModFromEffect = effect;
+        // Apply config value changes first to create sources, then meta.env changes to modify their env
         applyEffectConfVal(configModFromEffect, sourceEffect, configValueSources, configNameEffect, configDefEffect, configDefinitions, plusFilesAll);
-    });
-}
-// Test: https://github.com/vikejs/vike/blob/441a37c4c1a3b07bb8f6efb1d1f7be297a53974a/test/playground/pages/config-meta/effect/e2e-test.ts#L16
-function applyEffectsMetaEnv(configValueSources, configDefinitions) {
-    objectEntries(configDefinitions).forEach(([configNameEffect, configDefEffect]) => {
-        const sourceEffect = configValueSources[configNameEffect]?.[0];
-        if (!sourceEffect)
-            return;
-        const effect = runEffect(configNameEffect, configDefEffect, sourceEffect);
-        if (!effect)
-            return;
-        const configModFromEffect = effect;
         applyEffectMetaEnv(configModFromEffect, configValueSources, configDefEffect);
     });
 }

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.245-commit-4d0629e";
+export declare const PROJECT_VERSION: "0.4.245-commit-6880dc7";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.245-commit-4d0629e';
+export const PROJECT_VERSION = '0.4.245-commit-6880dc7';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.245-commit-4d0629e",
+  "version": "0.4.245-commit-6880dc7",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -115,7 +115,7 @@
   "dependencies": {
     "@brillout/import": "^0.2.6",
     "@brillout/json-serializer": "^0.5.21",
-    "@brillout/picocolors": "^1.0.26",
+    "@brillout/picocolors": "^1.0.29",
     "@brillout/require-shim": "^0.1.2",
     "@brillout/vite-plugin-server-entry": "^0.7.15",
     "acorn": "^8.0.0",