vike 0.4.179 → 0.4.180

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

@@ -241,8 +241,7 @@ function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
     logRuntimeInfo?.(msg, httpRequestId, isNominal ? 'info' : 'error');
 }
 function getPageContextHttpResponseNullWithError(err, pageContextInit) {
-    const pageContextHttpResponseNull = {};
-    objectAssign(pageContextHttpResponseNull, pageContextInit);
+    const pageContextHttpResponseNull = createPageContext(pageContextInit);
     objectAssign(pageContextHttpResponseNull, {
         httpResponse: null,
         errorWhileRendering: err
@@ -250,14 +249,20 @@ function getPageContextHttpResponseNullWithError(err, pageContextInit) {
     return pageContextHttpResponseNull;
 }
 function getPageContextHttpResponseNull(pageContextInit) {
-    const pageContextHttpResponseNull = {};
-    objectAssign(pageContextHttpResponseNull, pageContextInit);
+    const pageContextHttpResponseNull = createPageContext(pageContextInit);
     objectAssign(pageContextHttpResponseNull, {
         httpResponse: null,
         errorWhileRendering: null
     });
     return pageContextHttpResponseNull;
 }
+function createPageContext(pageContextInit) {
+    const pageContext = {
+        _isPageContextObject: true
+    };
+    Object.assign(pageContext, pageContextInit);
+    return pageContext;
+}
 async function renderPageNominal(pageContext) {
     objectAssign(pageContext, { errorWhileRendering: null });
     // Route
@@ -341,8 +346,7 @@ function normalizeUrl(pageContextInit, httpRequestId) {
         return null;
     logRuntimeInfo?.(`URL normalized from ${pc.cyan(urlOriginal)} to ${pc.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');
     const httpResponse = createHttpResponseObjectRedirect({ url: urlNormalized, statusCode: 301 }, pageContextInit.urlOriginal);
-    const pageContextHttpResponse = {};
-    objectAssign(pageContextHttpResponse, pageContextInit);
+    const pageContextHttpResponse = createPageContext(pageContextInit);
     objectAssign(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
@@ -378,8 +382,7 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
     }
     logRuntimeInfo?.(`Permanent redirect defined by your config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
     const httpResponse = createHttpResponseObjectRedirect({ url: urlTarget, statusCode: 301 }, urlWithoutBase);
-    const pageContextHttpResponse = {};
-    objectAssign(pageContextHttpResponse, pageContextInit);
+    const pageContextHttpResponse = createPageContext(pageContextInit);
     objectAssign(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
@@ -395,9 +398,8 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
             const abortCall = pageContextAbort._abortCall;
             assert(abortCall);
             assertUsage(errorPageId, `You called ${pc.cyan(abortCall)} but you didn't define an error page, make sure to define one https://vike.dev/error-page`);
-            const pageContext = {
-                _pageId: errorPageId
-            };
+            const pageContext = createPageContext({});
+            objectAssign(pageContext, { _pageId: errorPageId });
             objectAssign(pageContext, pageContextAbort);
             objectAssign(pageContext, pageContextErrorPageInit);
             objectAssign(pageContext, renderContext);
@@ -421,8 +423,7 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
         return { pageContextReturn };
     }
     if (pageContextAbort._urlRedirect) {
-        const pageContextReturn = {};
-        objectAssign(pageContextReturn, pageContextInit);
+        const pageContextReturn = createPageContext(pageContextInit);
         objectAssign(pageContextReturn, pageContextAbort);
         const httpResponse = createHttpResponseObjectRedirect(pageContextAbort._urlRedirect, (() => {
             const { pathname, searchOriginal } = pageContextNominalPageInit.urlParsed;

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/shared/page-configs/Config.d.ts

@@ -354,6 +354,11 @@ type ConfigBuiltIn = {
      * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control
      */
     cacheControl?: string;
+    /** Where scripts are injected in the HTML.
+     *
+     * https://vike.dev/injectScriptsAt
+     */
+    injectScriptsAt?: 'HTML_BEGIN' | 'HTML_END' | 'STREAM' | null;
     /** Used by Vike extensions to set their name.
      *
      * https://vike.dev/extends

package/dist/esm/shared/page-configs/serialize/serializeConfigValues.js

@@ -151,6 +151,10 @@ function valueToJson(value, configName, definedAtData, importStatements) {
         configValueSerialized = stringify(value, {
             valueName,
             forbidReactElements: true,
+            // Replace import strings with import variables.
+            // - We don't need this anymore and could remove it.
+            //   - We temporarily needed it for nested document configs (`config.document.{title,description,favicon}`), but we finally decided to go for flat document configs instead (`config.{title,description,favicon}`).
+            //   - https://github.com/vikejs/vike-react/pull/113
             replacer(_, value) {
                 if (typeof value === 'string') {
                     const importData = parsePointerImportData(value);

package/dist/esm/shared/route/index.d.ts

@@ -30,4 +30,4 @@ type RouteMatch = {
     routeParams: Record<string, string>;
 };
 type RouteMatches = 'CUSTOM_ROUTING' | RouteMatch[];
-declare function route(pageContextForRoute: PageContextForRoute): Promise<PageContextFromRoute>;
+declare function route(pageContext: PageContextForRoute): Promise<PageContextFromRoute>;

package/dist/esm/shared/route/index.js

@@ -13,12 +13,12 @@ import { resolveRouteFunction } from './resolveRouteFunction.js';
 import { executeOnBeforeRouteHook } from './executeOnBeforeRouteHook.js';
 import { debug } from './debug.js';
 import pc from '@brillout/picocolors';
-async function route(pageContextForRoute) {
-    debug('Pages routes:', pageContextForRoute._pageRoutes);
-    assertPageContextUrl(pageContextForRoute);
+async function route(pageContext) {
+    debug('Pages routes:', pageContext._pageRoutes);
+    assertPageContextUrl(pageContext);
     const pageContextFromRoute = {};
     // onBeforeRoute()
-    const pageContextFromOnBeforeRouteHook = await executeOnBeforeRouteHook(pageContextForRoute);
+    const pageContextFromOnBeforeRouteHook = await executeOnBeforeRouteHook(pageContext);
     if (pageContextFromOnBeforeRouteHook) {
         if (pageContextFromOnBeforeRouteHook._routingProvidedByOnBeforeRouteHook) {
             assert(pageContextFromOnBeforeRouteHook._pageId);
@@ -29,8 +29,6 @@ async function route(pageContextForRoute) {
         }
     }
     // We take into account pageContext.urlLogical set by onBeforeRoute()
-    const pageContext = {};
-    objectAssign(pageContext, pageContextForRoute);
     objectAssign(pageContext, pageContextFromOnBeforeRouteHook);
     // Vike's routing
     const allPageIds = pageContext._allPageIds;

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

@@ -120,7 +120,7 @@ type PageContextBuiltInCommon<Data> = {
     pageExports: Record<string, unknown>;
 };
 type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextUrlServer;
-type PageContextBuiltInClientWithClientRouting<Data> = Partial<PageContextBuiltInCommon<Data>> & Pick<PageContextBuiltInCommon<Data>, 'Page' | 'pageExports' | 'config' | 'configEntries' | 'exports' | 'exportsAll' | 'abortReason' | 'data' | 'source' | 'sources' | 'from'> & {
+type PageContextBuiltInClientWithClientRouting<Data> = Partial<PageContextBuiltInCommon<Data>> & Pick<PageContextBuiltInCommon<Data>, 'Page' | 'routeParams' | 'pageExports' | 'config' | 'configEntries' | 'exports' | 'exportsAll' | 'abortReason' | 'data' | 'source' | 'sources' | 'from'> & {
     /** Whether the current page is already rendered to HTML */
     isHydration: boolean;
     /**

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

@@ -0,0 +1,3 @@
+export { augmentType };
+/** Help TypeScript augment the type of objects. */
+declare function augmentType<Thing, Clone>(thing: Thing, clone: Clone): asserts thing is Thing & Clone;

package/dist/esm/utils/augmentType.js

@@ -0,0 +1,7 @@
+export { augmentType };
+import { assert } from './assert.js';
+/** Help TypeScript augment the type of objects. */
+function augmentType(thing, clone) {
+    // @ts-ignore
+    assert(thing === clone);
+}

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/objectAssign.d.ts

@@ -1,2 +1,2 @@
 export { objectAssign };
-declare function objectAssign<Obj extends object, ObjAddendum>(obj: Obj, objAddendum: ObjAddendum): asserts obj is Obj & ObjAddendum;
+declare function objectAssign<Obj extends object, ObjAddendum extends object | null>(obj: Obj, objAddendum: ObjAddendum): asserts obj is Obj & ObjAddendum;

package/dist/esm/utils/objectAssign.js

@@ -1,9 +1,11 @@
 export { objectAssign };
+import { assert } from './assert.js';
 // Same as Object.assign() but:
 //  - With type inference
 //  - Preserves property descriptors, which we need for preserving the getters added by getPageContextUrlComputed()
 function objectAssign(obj, objAddendum) {
     if (objAddendum) {
+        assert(!('_isPageContextObject' in objAddendum));
         Object.defineProperties(obj, Object.getOwnPropertyDescriptors(objAddendum));
     }
 }

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

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

package/dist/esm/utils/projectInfo.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.179",
+  "version": "0.4.180",
   "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",
@@ -138,7 +138,7 @@
     }
   },
   "peerDependencies": {
-    "react-streaming": ">=0.3.41",
+    "react-streaming": ">=0.3.42",
     "vite": ">=4.4.0"
   },
   "peerDependenciesMeta": {
@@ -209,7 +209,7 @@
     "es-module-lexer": "^1.4.1",
     "esbuild": "^0.19.10",
     "fast-glob": "^3.3.2",
-    "react-streaming": "^0.3.41",
+    "react-streaming": "^0.3.42",
     "rimraf": "^5.0.5",
     "sirv": "^2.0.4",
     "source-map-support": "^0.5.21",