vike-react 0.4.10 → 0.4.12
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 +9 -1
- package/dist/+config.js +9 -2
- package/dist/hooks/usePageContext.d.ts +5 -1
- package/dist/hooks/usePageContext.js +5 -7
- package/dist/renderer/onRenderHtml.js +13 -7
- package/dist/types/Config.d.ts +8 -2
- package/package.json +7 -7
- package/dist/utils/assert.d.ts +0 -1
- package/dist/utils/assert.js +0 -5
package/dist/+config.d.ts
CHANGED
@@ -2,6 +2,9 @@ import { ssrEffect } from './renderer/ssrEffect.js';
|
|
2
2
|
import './types/index.js';
|
3
3
|
declare const _default: {
|
4
4
|
name: string;
|
5
|
+
require: {
|
6
|
+
vike: string;
|
7
|
+
};
|
5
8
|
onRenderHtml: "import:vike-react/renderer/onRenderHtml:onRenderHtml";
|
6
9
|
onRenderClient: "import:vike-react/renderer/onRenderClient:onRenderClient";
|
7
10
|
passToClient: string[];
|
@@ -48,7 +51,7 @@ declare const _default: {
|
|
48
51
|
server: true;
|
49
52
|
};
|
50
53
|
};
|
51
|
-
|
54
|
+
streamIsRequired: {
|
52
55
|
env: {
|
53
56
|
server: true;
|
54
57
|
};
|
@@ -80,6 +83,11 @@ declare const _default: {
|
|
80
83
|
config: true;
|
81
84
|
};
|
82
85
|
};
|
86
|
+
require: {
|
87
|
+
env: {
|
88
|
+
config: true;
|
89
|
+
};
|
90
|
+
};
|
83
91
|
reactStrictMode: {
|
84
92
|
env: {
|
85
93
|
client: true;
|
package/dist/+config.js
CHANGED
@@ -4,6 +4,9 @@ import { ssrEffect } from './renderer/ssrEffect.js';
|
|
4
4
|
import './types/index.js';
|
5
5
|
export default {
|
6
6
|
name: 'vike-react',
|
7
|
+
require: {
|
8
|
+
vike: '>=0.4.173'
|
9
|
+
},
|
7
10
|
// https://vike.dev/onRenderHtml
|
8
11
|
onRenderHtml: 'import:vike-react/renderer/onRenderHtml:onRenderHtml',
|
9
12
|
// https://vike.dev/onRenderClient
|
@@ -39,7 +42,7 @@ export default {
|
|
39
42
|
stream: {
|
40
43
|
env: { server: true }
|
41
44
|
},
|
42
|
-
|
45
|
+
streamIsRequired: {
|
43
46
|
env: { server: true }
|
44
47
|
},
|
45
48
|
onBeforeRenderClient: {
|
@@ -54,10 +57,14 @@ export default {
|
|
54
57
|
Wrapper: {
|
55
58
|
env: { client: true, server: true }
|
56
59
|
},
|
57
|
-
// 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).
|
60
|
+
// 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`).
|
58
61
|
name: {
|
59
62
|
env: { config: true }
|
60
63
|
},
|
64
|
+
// Vike already defines the setting 'require', but we redundantly define it here for older Vike versions (otherwise older Vike versions will complain that 'require` 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`).
|
65
|
+
require: {
|
66
|
+
env: { config: true }
|
67
|
+
},
|
61
68
|
reactStrictMode: {
|
62
69
|
env: { client: true, server: true }
|
63
70
|
}
|
@@ -6,5 +6,9 @@ declare function PageContextProvider({ pageContext, children }: {
|
|
6
6
|
pageContext: PageContext;
|
7
7
|
children: React.ReactNode;
|
8
8
|
}): React.JSX.Element;
|
9
|
-
/**
|
9
|
+
/**
|
10
|
+
* Access `pageContext` from any React component.
|
11
|
+
*
|
12
|
+
* https://vike.dev/usePageContext
|
13
|
+
*/
|
10
14
|
declare function usePageContext(): PageContext;
|
@@ -2,22 +2,20 @@ export { usePageContext };
|
|
2
2
|
export { PageContextProvider };
|
3
3
|
import React, { useContext } from 'react';
|
4
4
|
import { getGlobalObject } from '../utils/getGlobalObject.js';
|
5
|
-
import { assert } from '../utils/assert.js';
|
6
5
|
const globalObject = getGlobalObject('PageContextProvider.ts', {
|
7
6
|
reactContext: React.createContext(undefined)
|
8
7
|
});
|
9
8
|
function PageContextProvider({ pageContext, children }) {
|
10
|
-
assert(pageContext);
|
11
9
|
const { reactContext } = globalObject;
|
12
10
|
return React.createElement(reactContext.Provider, { value: pageContext }, children);
|
13
11
|
}
|
14
|
-
/**
|
12
|
+
/**
|
13
|
+
* Access `pageContext` from any React component.
|
14
|
+
*
|
15
|
+
* https://vike.dev/usePageContext
|
16
|
+
*/
|
15
17
|
function usePageContext() {
|
16
18
|
const { reactContext } = globalObject;
|
17
19
|
const pageContext = useContext(reactContext);
|
18
|
-
/* React throws an error upon wrong hook usage, so I guess a nice error message isn't needed? And I guess we can therefore assume and assert pageContext to have been provided? Let's see if users report back an assert() failure.
|
19
|
-
if (!pageContext) throw new Error('<PageContextProvider> is needed for being able to use usePageContext()')
|
20
|
-
*/
|
21
|
-
assert(pageContext);
|
22
20
|
return pageContext;
|
23
21
|
}
|
@@ -28,15 +28,18 @@ const onRenderHtml = async (pageContext) => {
|
|
28
28
|
}
|
29
29
|
else {
|
30
30
|
const page = getPageElement(pageContext);
|
31
|
-
const { stream,
|
32
|
-
|
33
|
-
_streamIsRequied } = pageContext.config;
|
34
|
-
if (!stream && !_streamIsRequied) {
|
31
|
+
const { stream, streamIsRequired } = pageContext.config;
|
32
|
+
if (!stream && !streamIsRequired) {
|
35
33
|
pageView = dangerouslySkipEscape(renderToString(page));
|
36
34
|
}
|
37
35
|
else {
|
38
36
|
const disable = stream === false ? true : undefined;
|
39
|
-
pageView = await renderToStream(page, {
|
37
|
+
pageView = await renderToStream(page, {
|
38
|
+
userAgent: pageContext.headers?.['user-agent'] ||
|
39
|
+
// Deprecated way of acccessing User Agent header. Eventually remove it.
|
40
|
+
pageContext.userAgent,
|
41
|
+
disable
|
42
|
+
});
|
40
43
|
}
|
41
44
|
}
|
42
45
|
const documentHtml = escapeInject `<!DOCTYPE html>
|
@@ -53,6 +56,8 @@ const onRenderHtml = async (pageContext) => {
|
|
53
56
|
</html>`;
|
54
57
|
return documentHtml;
|
55
58
|
};
|
59
|
+
// We don't need this anymore starting from vike@0.4.173 which added the `require` setting.
|
60
|
+
// TODO/eventually: remove this once <=0.4.172 versions become rare.
|
56
61
|
function checkVikeVersion() {
|
57
62
|
if (version) {
|
58
63
|
const versionParts = version.split('.').map((s) => parseInt(s, 10));
|
@@ -60,10 +65,11 @@ function checkVikeVersion() {
|
|
60
65
|
return;
|
61
66
|
if (versionParts[1] > 4)
|
62
67
|
return;
|
63
|
-
if (versionParts[2] >=
|
68
|
+
if (versionParts[2] >= 173)
|
64
69
|
return;
|
65
70
|
}
|
66
|
-
|
71
|
+
// We can leave it 0.4.173 until we entirely remove checkVikeVersion() (because starting vike@0.4.173 we use the new `require` setting).
|
72
|
+
throw new Error('Update Vike to 0.4.173 or above');
|
67
73
|
}
|
68
74
|
// Used by:
|
69
75
|
// - react-streaming (to improve error messages, see https://github.com/brillout/react-streaming/blob/70c168de1e97b9c4385a4c3002b5013f1e406341/src/utils/isVikeReactApp.ts#L4)
|
package/dist/types/Config.d.ts
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
import type { PageContextClient } from 'vike/types';
|
2
2
|
declare global {
|
3
|
-
namespace
|
4
|
-
interface
|
3
|
+
namespace Vike {
|
4
|
+
interface Config {
|
5
5
|
/** The page's root React component */
|
6
6
|
Page?: () => React.ReactNode;
|
7
7
|
/** React element rendered and appended into <head></head> */
|
@@ -54,6 +54,12 @@ declare global {
|
|
54
54
|
*
|
55
55
|
*/
|
56
56
|
stream?: boolean;
|
57
|
+
/**
|
58
|
+
* Whether the existence of the React SSR stream is required (some integrations require it).
|
59
|
+
*
|
60
|
+
* HTML Streaming can still be disabled: the SSR stream is awaited and converted to a string.
|
61
|
+
*/
|
62
|
+
streamIsRequired?: boolean;
|
57
63
|
/**
|
58
64
|
* Whether to use `<StrictMode>`.
|
59
65
|
*
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "vike-react",
|
3
|
-
"version": "0.4.
|
3
|
+
"version": "0.4.12",
|
4
4
|
"type": "module",
|
5
5
|
"main": "./dist/index.js",
|
6
6
|
"types": "./dist/index.d.ts",
|
@@ -21,14 +21,14 @@
|
|
21
21
|
"release:commit": "release-me commit"
|
22
22
|
},
|
23
23
|
"peerDependencies": {
|
24
|
-
"react": "18.
|
25
|
-
"react-dom": "18.
|
26
|
-
"vike": "
|
27
|
-
"vite": "
|
24
|
+
"react": ">=18.0.0",
|
25
|
+
"react-dom": ">=18.0.0",
|
26
|
+
"vike": ">=0.4.173",
|
27
|
+
"vite": ">=4.3.8"
|
28
28
|
},
|
29
29
|
"devDependencies": {
|
30
30
|
"@biomejs/biome": "^1.6.4",
|
31
|
-
"@brillout/release-me": "^0.3.
|
31
|
+
"@brillout/release-me": "^0.3.8",
|
32
32
|
"@types/node": "^20.11.17",
|
33
33
|
"@types/react": "^18.2.55",
|
34
34
|
"@types/react-dom": "^18.2.19",
|
@@ -36,7 +36,7 @@
|
|
36
36
|
"react-dom": "^18.2.0",
|
37
37
|
"rimraf": "^5.0.5",
|
38
38
|
"typescript": "^5.3.3",
|
39
|
-
"vike": "^0.4.
|
39
|
+
"vike": "^0.4.173"
|
40
40
|
},
|
41
41
|
"dependencies": {
|
42
42
|
"react-streaming": "^0.3.27"
|
package/dist/utils/assert.d.ts
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
export declare function assert(condition: unknown): asserts condition;
|
package/dist/utils/assert.js
DELETED