vike 0.4.179-commit-3ede699 → 0.4.179-commit-9384166

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

@@ -46,17 +46,27 @@ function serializePageContextClientSide(pageContext) {
         let hasWarned = false;
         const propsNonSerializable = [];
         passToClient.forEach((prop) => {
-            const propName = JSON.stringify(prop);
-            const varName = h(`pageContext[${propName}]`);
+            const propName1 = (0, utils_js_1.getPropAccessNotation)(prop);
+            const propName2 = JSON.stringify(prop);
+            const varName = `pageContext${propName1}`;
             try {
                 serialize(pageContext[prop], varName);
             }
             catch (err) {
                 hasWarned = true;
                 propsNonSerializable.push(prop);
+                // useConfig() wrong usage
+                if (prop === '_configFromHook') {
+                    let pathString = '';
+                    if ((0, stringify_1.isJsonSerializerError)(err)) {
+                        pathString = err.pathString;
+                    }
+                    (0, utils_js_1.assertUsage)(false, `Cannot serialize config ${h(pathString)} set by useConfig(), see https://vike.dev/useConfig#serialization-error`);
+                }
+                // Non-serializable pageContext set by the user
                 let msg = [
-                    `${varName} cannot be serialized and, therefore, cannot be passed to the client.`,
-                    `Make sure that ${varName} is serializable, or remove ${h(propName)} from ${h('passToClient')}.`
+                    `${h(varName)} can't be serialized and, therefore, can't be passed to the client side.`,
+                    `Make sure ${h(varName)} is serializable, or remove ${h(propName2)} from ${h('passToClient')}.`
                 ].join(' ');
                 if ((0, stringify_1.isJsonSerializerError)(err)) {
                     msg = `${msg} Serialization error: ${err.messageCore}.`;

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

@@ -28,7 +28,7 @@ async function executeOnRenderHtmlHook(pageContext) {
     const onErrorWhileStreaming = (err) => {
         // Should the stream inject the following?
         // ```
-        // <script>console.error("An error occurred on the server while streaming the app to HTML. Check the server logs for more information.")</script>
+        // <script>console.error("An error occurred on the server side while streaming the page to HTML, see server logs.")</script>
         // ```
         (0, loggerRuntime_js_1.logRuntimeError)(err, pageContext._httpRequestId);
         if (!pageContext.errorWhileRendering) {

package/dist/cjs/node/runtime/utils.js

@@ -71,3 +71,4 @@ __exportStar(require("../../utils/isArrayOfStrings.js"), exports);
 __exportStar(require("../../utils/escapeHtml.js"), exports);
 __exportStar(require("../../utils/normalizeHeaders.js"), exports);
 __exportStar(require("../../utils/isVikeReactApp.js"), exports);
+__exportStar(require("../../utils/getPropAccessNotation.js"), exports);

package/dist/cjs/utils/getPropAccessNotation.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPropAccessNotation = void 0;
 function getPropAccessNotation(key) {
-    return typeof key === 'string' && /^[a-z0-9\$_]+$/i.test(key) ? `.${key}` : `[${JSON.stringify(key)}]`;
+    return typeof key === 'string' && isKeyDotNotationCompatible(key) ? `.${key}` : `[${JSON.stringify(key)}]`;
 }
 exports.getPropAccessNotation = getPropAccessNotation;
+function isKeyDotNotationCompatible(key) {
+    return /^[a-z0-9\$_]+$/i.test(key);
+}

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.179-commit-3ede699';
+const PROJECT_VERSION = '0.4.179-commit-9384166';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -221,7 +221,7 @@ async function fetchPageContextFromServer(pageContext) {
     }
     // Is there a reason for having two different properties? Can't we use only one property? I guess/think the isServerSideError property was an attempt (a bad idea really) for rendering the error page even though an error occured on the server-side (which is a bad idea because the added complexity is non-negligible while the added value is minuscule since the error page usually doesn't have any (meaningful / server-side) hooks).
     if ('serverSideError' in pageContextFromServer || isServerSideError in pageContextFromServer) {
-        throw getProjectError(`pageContext couldn't be fetched from server: an error occurred on the server-side (see your server logs)`);
+        throw getProjectError(`pageContext couldn't be fetched because an error occurred on the server-side`);
     }
     assert(hasProp(pageContextFromServer, '_pageId', 'string'));
     processPageContextFromServer(pageContextFromServer);

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

@@ -14,7 +14,7 @@ function getPageContextProxyForUser(pageContext) {
         get(_, prop) {
             const val = pageContext[prop];
             const propName = getPropAccessNotation(prop);
-            assertUsage(val !== notSerializable, `pageContext${propName} couldn't be serialized and, therefore, is missing on the client-side. Check the server logs for more information.`);
+            assertUsage(val !== notSerializable, `Can't access pageContext${propName} on the client side. Because it can't be serialized, see server logs.`);
             passToClientHint(pageContext, prop, propName);
             return val;
         }

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

@@ -1,7 +1,7 @@
 export { serializePageContextClientSide };
 export { serializePageContextAbort };
 import { stringify, isJsonSerializerError } from '@brillout/json-serializer/stringify';
-import { assert, assertWarning, hasProp, unique } from '../utils.js';
+import { assert, assertUsage, assertWarning, getPropAccessNotation, hasProp, unique } from '../utils.js';
 import { isErrorPage } from '../../../shared/error-page.js';
 import { addIs404ToPageProps } from '../../../shared/addIs404ToPageProps.js';
 import pc from '@brillout/picocolors';
@@ -42,17 +42,27 @@ function serializePageContextClientSide(pageContext) {
         let hasWarned = false;
         const propsNonSerializable = [];
         passToClient.forEach((prop) => {
-            const propName = JSON.stringify(prop);
-            const varName = h(`pageContext[${propName}]`);
+            const propName1 = getPropAccessNotation(prop);
+            const propName2 = JSON.stringify(prop);
+            const varName = `pageContext${propName1}`;
             try {
                 serialize(pageContext[prop], varName);
             }
             catch (err) {
                 hasWarned = true;
                 propsNonSerializable.push(prop);
+                // useConfig() wrong usage
+                if (prop === '_configFromHook') {
+                    let pathString = '';
+                    if (isJsonSerializerError(err)) {
+                        pathString = err.pathString;
+                    }
+                    assertUsage(false, `Cannot serialize config ${h(pathString)} set by useConfig(), see https://vike.dev/useConfig#serialization-error`);
+                }
+                // Non-serializable pageContext set by the user
                 let msg = [
-                    `${varName} cannot be serialized and, therefore, cannot be passed to the client.`,
-                    `Make sure that ${varName} is serializable, or remove ${h(propName)} from ${h('passToClient')}.`
+                    `${h(varName)} can't be serialized and, therefore, can't be passed to the client side.`,
+                    `Make sure ${h(varName)} is serializable, or remove ${h(propName2)} from ${h('passToClient')}.`
                 ].join(' ');
                 if (isJsonSerializerError(err)) {
                     msg = `${msg} Serialization error: ${err.messageCore}.`;

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

@@ -23,7 +23,7 @@ async function executeOnRenderHtmlHook(pageContext) {
     const onErrorWhileStreaming = (err) => {
         // Should the stream inject the following?
         // ```
-        // <script>console.error("An error occurred on the server while streaming the app to HTML. Check the server logs for more information.")</script>
+        // <script>console.error("An error occurred on the server side while streaming the page to HTML, see server logs.")</script>
         // ```
         logRuntimeError(err, pageContext._httpRequestId);
         if (!pageContext.errorWhileRendering) {

package/dist/esm/node/runtime/utils.d.ts

@@ -52,3 +52,4 @@ export * from '../../utils/isArrayOfStrings.js';
 export * from '../../utils/escapeHtml.js';
 export * from '../../utils/normalizeHeaders.js';
 export * from '../../utils/isVikeReactApp.js';
+export * from '../../utils/getPropAccessNotation.js';

package/dist/esm/node/runtime/utils.js

@@ -55,3 +55,4 @@ export * from '../../utils/isArrayOfStrings.js';
 export * from '../../utils/escapeHtml.js';
 export * from '../../utils/normalizeHeaders.js';
 export * from '../../utils/isVikeReactApp.js';
+export * from '../../utils/getPropAccessNotation.js';

package/dist/esm/utils/getPropAccessNotation.js

@@ -1,3 +1,6 @@
 export function getPropAccessNotation(key) {
-    return typeof key === 'string' && /^[a-z0-9\$_]+$/i.test(key) ? `.${key}` : `[${JSON.stringify(key)}]`;
+    return typeof key === 'string' && isKeyDotNotationCompatible(key) ? `.${key}` : `[${JSON.stringify(key)}]`;
+}
+function isKeyDotNotationCompatible(key) {
+    return /^[a-z0-9\$_]+$/i.test(key);
 }

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.179-commit-3ede699";
+declare const PROJECT_VERSION: "0.4.179-commit-9384166";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.179-commit-3ede699";
+    projectVersion: "0.4.179-commit-9384166";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.179-commit-3ede699';
+const PROJECT_VERSION = '0.4.179-commit-9384166';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.179-commit-3ede699",
+  "version": "0.4.179-commit-9384166",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@brillout/import": "^0.2.3",
-    "@brillout/json-serializer": "^0.5.10",
+    "@brillout/json-serializer": "^0.5.13",
     "@brillout/picocolors": "^1.0.13",
     "@brillout/require-shim": "^0.1.2",
     "@brillout/vite-plugin-server-entry": "^0.4.5",