vike 0.4.235-commit-7b1ab35 → 0.4.235-commit-8f42b16

package/dist/cjs/node/runtime/html/injectAssets/injectHtmlTags.js

@@ -150,6 +150,8 @@ function getTagClosing(tag) {
     return tagClosing;
 }
 function injectAtPlaceholder(htmlFragment, htmlString, isFirst) {
+    // TO-DO/eventually: soft deprecate in favor of https://github.com/vikejs/vike/issues/695
+    // Used by BurdaForward https://github.com/vikejs/vike/discussions/2528#discussioncomment-13637156
     const placeholder = isFirst ? '__VITE_PLUGIN_SSR__ASSETS_FIRST__' : '__VITE_PLUGIN__SSR_ASSETS_LAST__';
     const parts = htmlString.split(placeholder);
     if (parts.length === 1)

package/dist/cjs/node/runtime/html/serializeContext.js

@@ -108,7 +108,20 @@ function serializeObject(obj, objName, passToClient) {
     return serialized;
 }
 function serializeValue(value, varName) {
-    return (0, stringify_1.stringify)(value, { forbidReactElements: true, valueName: varName });
+    return (0, stringify_1.stringify)(value, {
+        forbidReactElements: true,
+        valueName: varName,
+        // Prevent Google from crawling URLs in JSON:
+        //  - https://github.com/vikejs/vike/discussions/2541#discussioncomment-13660198
+        //  - https://github.com/vikejs/vike/discussions/2277
+        //  - https://github.com/vikejs/vike/pull/2542
+        replacer(_key, value) {
+            if (typeof value === 'string' && value.startsWith('/')) {
+                // No need to use a reviver: https://github.com/brillout/json-serializer/blob/70fc8ed3741306391b51655b05df24e6963d1fdb/test/main.spec.ts#L74-L80
+                return { replacement: (value = '!' + value) };
+            }
+        },
+    });
 }
 function getPassToClientPageContext(pageContext) {
     let passToClient = [...pageContext._passToClient, ...passToClientBuiltInPageContext];

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.235-commit-7b1ab35';
+exports.PROJECT_VERSION = '0.4.235-commit-8f42b16';

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

@@ -2,7 +2,8 @@ export { pushHistoryState };
 export { replaceHistoryStateOriginal };
 export { onPopStateBegin };
 export { saveScrollPosition };
-export { initHistory };
+export { initHistoryState };
+export { monkeyPatchHistoryAPI };
 export type { HistoryInfo };
 export type { ScrollPosition };
 type StateEnhanced = {
@@ -18,6 +19,7 @@ type ScrollPosition = {
 declare function saveScrollPosition(): void;
 declare function pushHistoryState(url: string, overwriteLastHistoryEntry: boolean): void;
 declare function replaceHistoryStateOriginal(state: unknown, url: string): void;
+declare function monkeyPatchHistoryAPI(): void;
 type HistoryInfo = {
     url: `/${string}`;
     state: StateEnhanced;
@@ -27,4 +29,4 @@ declare function onPopStateBegin(): {
     previous: HistoryInfo;
     current: HistoryInfo;
 };
-declare function initHistory(): void;
+declare function initHistoryState(): void;

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

@@ -2,15 +2,12 @@ export { pushHistoryState };
 export { replaceHistoryStateOriginal };
 export { onPopStateBegin };
 export { saveScrollPosition };
-export { initHistory };
+export { initHistoryState };
+export { monkeyPatchHistoryAPI };
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { assert, assertUsage, getGlobalObject, isObject } from './utils.js';
-const globalObject = getGlobalObject('history.ts', {
-    monkeyPatched: false,
-    previous: undefined,
-});
-initHistory(); // we redundantly call initHistory() to ensure it's called early
-globalObject.previous = getHistoryInfo();
+initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
+const globalObject = getGlobalObject('runtime-client-routing/history.ts', { previous: getHistoryInfo() });
 // `window.history.state === null` when:
 // - The very first render
 // - Click on `<a href="#some-hash" />`
@@ -44,7 +41,7 @@ function enhance(stateNotEnhanced) {
             _isVikeEnhanced: true,
         };
     }
-    assertIsVikeEnhanced(stateVikeEnhanced);
+    assert(isVikeEnhanced(stateVikeEnhanced));
     return stateVikeEnhanced;
 }
 function getState() {
@@ -54,7 +51,7 @@ function getState() {
     // - Therefore, we have to monkey patch history.pushState() and history.replaceState()
     // - Therefore, we need the assert() below to ensure history.state has been enhanced by Vike
     //   - If users stumble upon this assert() then let's make it a assertUsage()
-    assertIsVikeEnhanced(state);
+    assert(isVikeEnhanced(state), { state });
     return state;
 }
 function getStateNotEnhanced() {
@@ -93,7 +90,6 @@ function pushHistoryState(url, overwriteLastHistoryEntry) {
 function replaceHistoryState(state, url) {
     const url_ = url ?? null; // Passing `undefined` chokes older Edge versions.
     window.history.replaceState(state, '', url_);
-    assertIsVikeEnhanced(getState());
 }
 function replaceHistoryStateOriginal(state, url) {
     // Bypass all monkey patches.
@@ -104,11 +100,7 @@ function replaceHistoryStateOriginal(state, url) {
 // - history.pushState()
 // - history.replaceState()
 function monkeyPatchHistoryAPI() {
-    if (globalObject.monkeyPatched)
-        return;
-    globalObject.monkeyPatched = true;
-    // Ensure Vike's monkey patch is the first.
-    assert(window.history.pushState === History.prototype.pushState);
+    ;
     ['pushState', 'replaceState'].forEach((funcName) => {
         const funcOriginal = window.history[funcName].bind(window.history);
         window.history[funcName] = (stateOriginal = {}, ...rest) => {
@@ -122,14 +114,11 @@ function monkeyPatchHistoryAPI() {
                     triggeredBy: 'user',
                     ...stateOriginal,
                 };
-            assertIsVikeEnhanced(stateEnhanced);
-            funcOriginal(stateEnhanced, ...rest);
-            assertIsVikeEnhanced(getState());
+            assert(isVikeEnhanced(stateEnhanced));
+            const ret = funcOriginal(stateEnhanced, ...rest);
             globalObject.previous = getHistoryInfo();
+            return ret;
         };
-        window.history[funcName]._isVikeMonkeyPatch = true;
-        // Ensure assert() above isn't a false positive
-        assert(window.history.pushState !== History.prototype.pushState);
     });
 }
 function isVikeEnhanced(state) {
@@ -147,16 +136,6 @@ function isVikeEnhanced(state) {
     }
     return false;
 }
-function assertIsVikeEnhanced(state) {
-    if (isVikeEnhanced(state))
-        return;
-    assert(false, {
-        state,
-        // TO-DO/eventually: remove _isVikeMonkeyPatch debug info to save KBs
-        pushStateIsVikeMonkeyPatch: window.history.pushState._isVikeMonkeyPatch,
-        replaceStateIsVikeMonkeyPatch: window.history.replaceState._isVikeMonkeyPatch,
-    });
-}
 function getHistoryInfo() {
     return {
         url: getCurrentUrl(),
@@ -168,12 +147,11 @@ function onPopStateBegin() {
     const isHistoryStateEnhanced = window.history.state !== null;
     if (!isHistoryStateEnhanced)
         enhanceHistoryState();
-    assertIsVikeEnhanced(window.history.state);
+    assert(isVikeEnhanced(window.history.state));
     const current = getHistoryInfo();
     globalObject.previous = current;
     return { isHistoryStateEnhanced, 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)
-    enhanceHistoryState(); // enhance very first window.history.state which is `null`
+function initHistoryState() {
+    enhanceHistoryState();
 }

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

@@ -6,7 +6,7 @@ import { initOnLinkClick } from './initOnLinkClick.js';
 import { scrollRestoration_init } from './scrollRestoration.js';
 import { autoSaveScrollPosition } from './setScrollPosition.js';
 import { initLinkPrefetchHandlers } from './prefetch.js';
-import { initHistory } from './history.js';
+import { initHistoryState, monkeyPatchHistoryAPI } from './history.js';
 async function initClientRouter() {
     // Init navigation history and scroll restoration
     initHistoryAndScroll();
@@ -29,7 +29,8 @@ async function renderFirstPage() {
 }
 function initHistoryAndScroll() {
     scrollRestoration_init();
-    initHistory(); // we redundantly call initHistory() to ensure it's called early
+    monkeyPatchHistoryAPI();
+    initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
     autoSaveScrollPosition();
     // Handle back-/forward navigation
     initOnPopState();

package/dist/esm/node/runtime/html/injectAssets/injectHtmlTags.js

@@ -149,6 +149,8 @@ function getTagClosing(tag) {
     return tagClosing;
 }
 function injectAtPlaceholder(htmlFragment, htmlString, isFirst) {
+    // TO-DO/eventually: soft deprecate in favor of https://github.com/vikejs/vike/issues/695
+    // Used by BurdaForward https://github.com/vikejs/vike/discussions/2528#discussioncomment-13637156
     const placeholder = isFirst ? '__VITE_PLUGIN_SSR__ASSETS_FIRST__' : '__VITE_PLUGIN__SSR_ASSETS_LAST__';
     const parts = htmlString.split(placeholder);
     if (parts.length === 1)

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

@@ -103,7 +103,20 @@ function serializeObject(obj, objName, passToClient) {
     return serialized;
 }
 function serializeValue(value, varName) {
-    return stringify(value, { forbidReactElements: true, valueName: varName });
+    return stringify(value, {
+        forbidReactElements: true,
+        valueName: varName,
+        // Prevent Google from crawling URLs in JSON:
+        //  - https://github.com/vikejs/vike/discussions/2541#discussioncomment-13660198
+        //  - https://github.com/vikejs/vike/discussions/2277
+        //  - https://github.com/vikejs/vike/pull/2542
+        replacer(_key, value) {
+            if (typeof value === 'string' && value.startsWith('/')) {
+                // No need to use a reviver: https://github.com/brillout/json-serializer/blob/70fc8ed3741306391b51655b05df24e6963d1fdb/test/main.spec.ts#L74-L80
+                return { replacement: (value = '!' + value) };
+            }
+        },
+    });
 }
 function getPassToClientPageContext(pageContext) {
     let passToClient = [...pageContext._passToClient, ...passToClientBuiltInPageContext];

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.235-commit-7b1ab35";
+export declare const PROJECT_VERSION: "0.4.235-commit-8f42b16";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.235-commit-7b1ab35';
+export const PROJECT_VERSION = '0.4.235-commit-8f42b16';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.235-commit-7b1ab35",
+  "version": "0.4.235-commit-8f42b16",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -120,7 +120,7 @@
   },
   "dependencies": {
     "@brillout/import": "^0.2.6",
-    "@brillout/json-serializer": "^0.5.15",
+    "@brillout/json-serializer": "^0.5.16",
     "@brillout/picocolors": "^1.0.26",
     "@brillout/require-shim": "^0.1.2",
     "@brillout/vite-plugin-server-entry": "^0.7.8",