Skip to content

Commit cb80567

Browse files
author
bapelin
committed
feat: support csp nonce
1 parent fe99682 commit cb80567

File tree

9 files changed

+23
-24
lines changed

9 files changed

+23
-24
lines changed

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.2.3",
2+
"version": "1.2.5",
33
"useWorkspaces": true,
44
"npmClient": "yarn"
55
}

packages/configs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"name": "next-redux-wrapper-future-configs",
33
"private": true,
4-
"version": "1.2.3"
4+
"version": "1.2.5"
55
}

packages/demo-page/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "demo-page",
33
"private": true,
4-
"version": "1.2.3",
4+
"version": "1.2.5",
55
"description": "Demo of redux wrapper for Next.js",
66
"scripts": {
77
"clean": "rimraf .next coverage",
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"jsondiffpatch": "0.4.1",
13-
"next-redux-wrapper-future": "^1.2.1",
13+
"next-redux-wrapper-future": "^1.2.5",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0",
1616
"react-redux": "^8.0.7",
@@ -23,7 +23,7 @@
2323
"@types/react-redux": "7.1.20",
2424
"@types/redux-logger": "3.0.9",
2525
"next": "14.0.2",
26-
"next-redux-wrapper-future-configs": "^1.2.3",
26+
"next-redux-wrapper-future-configs": "^1.2.5",
2727
"playwright": "1.17.1",
2828
"rimraf": "3.0.2",
2929
"typescript": "4.5.2"

packages/demo-redux-toolkit/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "demo-redux-toolkit",
3-
"version": "1.2.3",
3+
"version": "1.2.5",
44
"private": true,
55
"scripts": {
66
"clean": "rimraf .next coverage",
@@ -9,7 +9,7 @@
99
},
1010
"dependencies": {
1111
"@reduxjs/toolkit": "1.9.5",
12-
"next-redux-wrapper-future": "^1.2.1",
12+
"next-redux-wrapper-future": "^1.2.5",
1313
"react": "^18.2.0",
1414
"react-dom": "^18.2.0",
1515
"react-redux": "^8.0.7"
@@ -20,7 +20,7 @@
2020
"@types/react-dom": "^18.2.15",
2121
"@types/react-redux": "7.1.30",
2222
"next": "14.0.2",
23-
"next-redux-wrapper-future-configs": "^1.2.3",
23+
"next-redux-wrapper-future-configs": "^1.2.5",
2424
"playwright": "1.17.1"
2525
},
2626
"license": "MIT"

packages/demo-saga-page/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "demo-saga-page",
33
"private": true,
4-
"version": "1.2.3",
4+
"version": "1.2.5",
55
"description": "Demo of redux wrapper for Next.js",
66
"scripts": {
77
"clean": "rimraf .next coverage",
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"jsondiffpatch": "0.4.1",
13-
"next-redux-wrapper-future": "^1.2.1",
13+
"next-redux-wrapper-future": "^1.2.5",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0",
1616
"react-redux": "^8.0.7",
@@ -24,7 +24,7 @@
2424
"@types/react-redux": "7.1.30",
2525
"@types/redux-logger": "3.0.9",
2626
"next": "14.0.2",
27-
"next-redux-wrapper-future-configs": "^1.2.3",
27+
"next-redux-wrapper-future-configs": "^1.2.5",
2828
"playwright": "1.17.1",
2929
"rimraf": "3.0.2",
3030
"typescript": "4.5.2"

packages/demo-saga/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "demo-saga",
33
"private": true,
4-
"version": "1.2.3",
4+
"version": "1.2.5",
55
"description": "Demo of redux wrapper for Next.js",
66
"scripts": {
77
"clean": "rimraf .next coverage",
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"jsondiffpatch": "0.4.1",
13-
"next-redux-wrapper-future": "^1.2.1",
13+
"next-redux-wrapper-future": "^1.2.5",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0",
1616
"react-redux": "^8.0.7",
@@ -24,7 +24,7 @@
2424
"@types/react-redux": "7.1.30",
2525
"@types/redux-logger": "3.0.9",
2626
"next": "14.0.2",
27-
"next-redux-wrapper-future-configs": "^1.2.3",
27+
"next-redux-wrapper-future-configs": "^1.2.5",
2828
"playwright": "1.17.1",
2929
"rimraf": "3.0.2",
3030
"typescript": "4.5.2"

packages/demo/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "demo",
33
"private": true,
4-
"version": "1.2.3",
4+
"version": "1.2.5",
55
"description": "Demo of redux wrapper for Next.js",
66
"scripts": {
77
"clean": "rimraf .next coverage",
88
"test": "playwright test",
99
"start": "next"
1010
},
1111
"dependencies": {
12-
"next-redux-wrapper-future": "^1.2.1",
12+
"next-redux-wrapper-future": "^1.2.5",
1313
"react": "^18.2.0",
1414
"react-dom": "^18.2.0",
1515
"react-redux": "^8.0.7",
@@ -23,7 +23,7 @@
2323
"@types/react-redux": "7.1.30",
2424
"@types/redux-logger": "3.0.9",
2525
"next": "14.0.2",
26-
"next-redux-wrapper-future-configs": "^1.2.3",
26+
"next-redux-wrapper-future-configs": "^1.2.5",
2727
"playwright": "1.17.1",
2828
"rimraf": "3.0.2",
2929
"typescript": "4.5.2"

packages/wrapper/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "next-redux-wrapper-future",
3-
"version": "1.2.3",
3+
"version": "1.2.5",
44
"description": "Redux wrapper for Next.js",
55
"main": "lib/index.js",
66
"module": "es6/index.js",
@@ -30,7 +30,7 @@
3030
"concurrently": "6.4.0",
3131
"jest": "27.4.3",
3232
"next": "^14.0.2",
33-
"next-redux-wrapper-future-configs": "^1.2.3",
33+
"next-redux-wrapper-future-configs": "^1.2.5",
3434
"react": "^18.2.0",
3535
"react-dom": "^18.2.0",
3636
"react-redux": "^8.0.7",
@@ -56,5 +56,5 @@
5656
},
5757
"homepage": "https://github.com/LLLLLamHo/next-redux-wrapper-future",
5858
"license": "MIT",
59-
"gitHead": "b9c111031886c114d7dbf8e828826cc40d9ceff9"
59+
"gitHead": "fe9968239cac45d1ff45c4e5f1b4a581a29e7ce0"
6060
}

packages/wrapper/src/index.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ export const createWrapper = <S extends Store>(makeStore: MakeStore<S>, config:
112112
const nextDataScript = document.getElementById(NEXT_DATA_SCRIPT_ID);
113113
const ssrData = JSON.parse(nextDataScript?.innerHTML || '{}');
114114
const ssrDataInitialState = ssrData?.props?.initialState || {};
115-
116-
if (config.nonce) {
117-
nextDataScript?.setAttribute('nonce', config.nonce);
115+
const nonce = context?.req?.headers['x-nonce'];
116+
if (nonce) {
117+
nextDataScript?.setAttribute('nonce', nonce);
118118
}
119119

120120
if (config.debug) {
@@ -331,7 +331,6 @@ export interface Config<S extends Store> {
331331
serializeState?: (state: ReturnType<S['getState']>) => any;
332332
deserializeState?: (state: any) => ReturnType<S['getState']>;
333333
debug?: boolean;
334-
nonce?: string;
335334
}
336335

337336
export interface WrapperProps {

0 commit comments

Comments
 (0)