vike 0.4.158 → 0.4.159

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.158';
+const PROJECT_VERSION = '0.4.159';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -3,33 +3,26 @@ export { PageContextServer };
 export { PageContextClient };
 export { PageContextWithServerRouting };
 export { PageContextClientWithServerRouting };
-export { PageContextBuiltInServer };
 export { PageContextBuiltInServerInternal };
-export { PageContextBuiltInClientWithClientRouting };
-export { PageContextBuiltInClientWithServerRouting };
+export { PageContextBuiltInServer_deprecated as PageContextBuiltInServer };
+export { PageContextBuiltInClientWithClientRouting_deprecated as PageContextBuiltInClientWithClientRouting };
+export { PageContextBuiltInClientWithServerRouting_deprecated as PageContextBuiltInClientWithServerRouting };
 import type { PageContextUrlComputedPropsInternal, PageContextUrlComputedPropsClient, PageContextUrlComputedPropsServer } from './addUrlComputedProps.js';
 import type { ConfigEntries, ExportsAll } from './getPageFiles/getExports.js';
 import type { Config } from './page-configs/Config.js';
 import type { PageContextConfig } from './page-configs/Config/PageContextConfig.js';
 import type { AbortStatusCode } from './route/abort.js';
-type PageContextServer = PageContextBuiltInServer & Vike.PageContext;
-type PageContext = PageContextClient | PageContextServer;
-type PageContextClient = PageContextBuiltInClientWithClientRouting & Vike.PageContext;
-type PageContextWithServerRouting = PageContextClientWithServerRouting | PageContextServer;
-type PageContextClientWithServerRouting = PageContextBuiltInClientWithServerRouting & Vike.PageContext;
-/** Built-in `pageContext` properties set by vike.
- *
- * https://vike.dev/pageContext
- */
-type PageContextBuiltInServer<Page = [never]> = PageContextBuiltInCommon<Page> & PageContextUrlComputedPropsServer;
-/** For Vike internal use */
-type PageContextBuiltInServerInternal<Page = [never]> = PageContextBuiltInCommon<Page> & PageContextUrlComputedPropsInternal;
-type PageContextBuiltInCommon<Page = [never]> = {
+type PageContextServer<Data = unknown> = PageContextBuiltInServer<Data> & Vike.PageContext;
+type PageContext<Data = unknown> = PageContextClient<Data> | PageContextServer<Data>;
+type PageContextClient<Data = unknown> = PageContextBuiltInClientWithClientRouting<Data> & Vike.PageContext;
+type PageContextWithServerRouting<Data = unknown> = PageContextClientWithServerRouting<Data> | PageContextServer<Data>;
+type PageContextClientWithServerRouting<Data = unknown> = PageContextBuiltInClientWithServerRouting<Data> & Vike.PageContext;
+type PageContextBuiltInCommon<Data> = {
     /** The `export { Page }` of your `.page.js` file.
      *
      * https://vike.dev/Page
      */
-    Page: Page extends [never] ? Config['Page'] : Page;
+    Page: Config['Page'];
     /** Route Parameters, e.g. `pageContext.routeParams.productId` for a Route String `/product/@productId`.
      *
      * https://vike.dev/route-string
@@ -39,7 +32,7 @@ type PageContextBuiltInCommon<Page = [never]> = {
      *
      * https://vike.dev/data
      */
-    data?: unknown;
+    data: Data;
     /** The page's configuration values.
      *
      * https://vike.dev/config
@@ -100,11 +93,8 @@ type PageContextBuiltInCommon<Page = [never]> = {
     /** @deprecated */
     pageExports: Record<string, unknown>;
 };
-/** Client-side built-in `pageContext` properties set by vike (Client Routing).
- *
- * https://vike.dev/pageContext
- */
-type PageContextBuiltInClientWithClientRouting<Page = unknown> = Partial<PageContextBuiltInCommon<Page>> & Pick<PageContextBuiltInCommon<Page>, 'Page' | 'pageExports' | 'config' | 'configEntries' | 'exports' | 'exportsAll' | 'abortReason'> & {
+type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextUrlComputedPropsServer;
+type PageContextBuiltInClientWithClientRouting<Data> = Partial<PageContextBuiltInCommon<Data>> & Pick<PageContextBuiltInCommon<Data>, 'Page' | 'pageExports' | 'config' | 'configEntries' | 'exports' | 'exportsAll' | 'abortReason' | 'data'> & {
     /** Whether the current page is already rendered to HTML */
     isHydration: boolean;
     /**
@@ -114,11 +104,7 @@ type PageContextBuiltInClientWithClientRouting<Page = unknown> = Partial<PageCon
      */
     isBackwardNavigation: boolean | null;
 } & PageContextUrlComputedPropsClient;
-/** Client-side built-in `pageContext` properties set by vike (Server Routing).
- *
- * https://vike.dev/pageContext
- */
-type PageContextBuiltInClientWithServerRouting<Page = unknown> = Partial<PageContextBuiltInCommon<Page>> & Pick<PageContextBuiltInCommon<Page>, 'Page' | 'pageExports' | 'exports' | 'abortReason'> & {
+type PageContextBuiltInClientWithServerRouting<Data> = Partial<PageContextBuiltInCommon<Data>> & Pick<PageContextBuiltInCommon<Data>, 'Page' | 'pageExports' | 'exports' | 'abortReason' | 'data'> & {
     /**
      * Whether the current page is already rendered to HTML.
      *
@@ -132,3 +118,44 @@ type PageContextBuiltInClientWithServerRouting<Page = unknown> = Partial<PageCon
      */
     isBackwardNavigation: null;
 };
+/** For Vike internal use */
+type PageContextBuiltInServerInternal = Omit<PageContextBuiltInCommon<unknown> & PageContextUrlComputedPropsInternal, 'data'>;
+/** @deprecated
+ * Replace:
+ *   ```
+ *   import type { PageContextBuiltInServer } from 'vike/types'
+ *   ```
+ * With:
+ *   ```
+ *   import { PageContextServer } from 'vike/types'
+ *   ```
+ *
+ * See https://vike.dev/pageContext#typescript
+ */
+type PageContextBuiltInServer_deprecated<Page = never> = PageContextBuiltInServer<unknown>;
+/** @deprecated
+ * Replace:
+ *   ```
+ *   import type { PageContextBuiltInClientWithClientRouting } from 'vike/types'
+ *   ```
+ * With:
+ *   ```
+ *   import { PageContextClient } from 'vike/types'
+ *   ```
+ *
+ * See https://vike.dev/pageContext#typescript
+ */
+type PageContextBuiltInClientWithClientRouting_deprecated<Page = never> = PageContextBuiltInClientWithClientRouting<unknown>;
+/** @deprecated
+ * Replace:
+ *   ```
+ *   import type { PageContextBuiltInClientWithServerRouting } from 'vike/types'
+ *   ```
+ * With:
+ *   ```
+ *   import { PageContextClientWithServerRouting as PageContextClient } from 'vike/types'
+ *   ```
+ *
+ * See https://vike.dev/pageContext#typescript
+ */
+type PageContextBuiltInClientWithServerRouting_deprecated<Page = never> = PageContextBuiltInClientWithServerRouting<unknown>;

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

@@ -1,13 +1,13 @@
 export { projectInfo };
 export type { ProjectTag };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.158";
+declare const PROJECT_VERSION: "0.4.159";
 type PackageName = typeof projectInfo.npmPackageName;
 type ProjectVersion = typeof projectInfo.projectVersion;
 type ProjectTag = `[${PackageName}]` | `[${PackageName}@${ProjectVersion}]`;
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.158";
+    projectVersion: "0.4.159";
     npmPackageName: "vike";
     githubRepository: "https://github.com/vikejs/vike";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
 import { onProjectInfo } from './assertSingleInstance.js';
-const PROJECT_VERSION = '0.4.158';
+const PROJECT_VERSION = '0.4.159';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.158",
+  "version": "0.4.159",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",