vike-react 0.4.12 → 0.4.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/+config.d.ts CHANGED
@@ -66,13 +66,8 @@ declare const _default: {
66
66
  client: true;
67
67
  };
68
68
  };
69
- VikeReactQueryWrapper: {
70
- env: {
71
- client: true;
72
- server: true;
73
- };
74
- };
75
69
  Wrapper: {
70
+ cumulative: true;
76
71
  env: {
77
72
  client: true;
78
73
  server: true;
package/dist/+config.js CHANGED
@@ -51,10 +51,8 @@ export default {
51
51
  onAfterRenderClient: {
52
52
  env: { client: true }
53
53
  },
54
- VikeReactQueryWrapper: {
55
- env: { client: true, server: true }
56
- },
57
54
  Wrapper: {
55
+ cumulative: true,
58
56
  env: { client: true, server: true }
59
57
  },
60
58
  // Vike already defines the setting 'name', but we redundantly define it here for older Vike versions (otherwise older Vike versions will complain that 'name` is an unknown config). TODO/eventually: remove this once <=0.4.172 versions become rare (also because we use the `require` setting starting from `0.4.173`).
@@ -2,14 +2,14 @@ export { getPageElement };
2
2
  import React from 'react';
3
3
  import { PageContextProvider } from '../hooks/usePageContext.js';
4
4
  function getPageElement(pageContext) {
5
+ // Main component
5
6
  const Layout = pageContext.config.Layout ?? PassThrough;
6
- const Wrapper = pageContext.config.Wrapper ?? PassThrough;
7
- const VikeReactQueryWrapper = pageContext.config.VikeReactQueryWrapper ?? PassThrough;
8
7
  const { Page } = pageContext;
9
- let page = (React.createElement(PageContextProvider, { pageContext: pageContext },
10
- React.createElement(VikeReactQueryWrapper, { pageContext: pageContext },
11
- React.createElement(Wrapper, null,
12
- React.createElement(Layout, null, Page ? React.createElement(Page, null) : null)))));
8
+ let page = React.createElement(Layout, null, Page ? React.createElement(Page, null) : null);
9
+ (pageContext.config.Wrapper || []).forEach((Wrapper) => {
10
+ page = React.createElement(Wrapper, null, page);
11
+ });
12
+ page = React.createElement(PageContextProvider, { pageContext: pageContext }, page);
13
13
  if (pageContext.config.reactStrictMode !== false) {
14
14
  page = React.createElement(React.StrictMode, null, page);
15
15
  }
@@ -1,4 +1,4 @@
1
- import type { PageContextClient } from 'vike/types';
1
+ import type { ImportString, PageContextClient } from 'vike/types';
2
2
  declare global {
3
3
  namespace Vike {
4
4
  interface Config {
@@ -21,9 +21,7 @@ declare global {
21
21
  *
22
22
  * https://vike.dev/Wrapper
23
23
  */
24
- Wrapper?: (props: {
25
- children: React.ReactNode;
26
- }) => React.ReactNode;
24
+ Wrapper?: Wrapper | ImportString;
27
25
  /** &lt;title>${title}&lt;/title> */
28
26
  title?: string;
29
27
  /** &lt;link rel="icon" href="${favicon}" /> */
@@ -80,7 +78,13 @@ declare global {
80
78
  * https://vike.dev/onAfterRenderClient
81
79
  */
82
80
  onAfterRenderClient?: (pageContext: PageContextClient) => void;
83
- VikeReactQueryWrapper?: React.ReactNode;
81
+ }
82
+ interface ConfigResolved {
83
+ Wrapper?: Wrapper[];
84
84
  }
85
85
  }
86
86
  }
87
+ type Wrapper = (props: {
88
+ children: React.ReactNode;
89
+ }) => React.ReactNode;
90
+ export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vike-react",
3
- "version": "0.4.12",
3
+ "version": "0.4.13",
4
4
  "type": "module",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",