From a933c0d72c01eb1e0824086db9aea6e275fa3c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Horv=C3=A1th?= Date: Fri, 28 Jun 2024 02:07:17 +0200 Subject: [PATCH] fix rebase --- packages/vike-react/src/+config.ts | 3 - pnpm-lock.yaml | 133 +++++++++++++++++++++++------ 2 files changed, 108 insertions(+), 28 deletions(-) diff --git a/packages/vike-react/src/+config.ts b/packages/vike-react/src/+config.ts index 81619a0c..697a311d 100644 --- a/packages/vike-react/src/+config.ts +++ b/packages/vike-react/src/+config.ts @@ -59,9 +59,6 @@ export default { onAfterRenderClient: { env: { client: true } }, - VikeReactZustandWrapper:{ - env: { client: true, server: true } - }, Wrapper: { cumulative: true, env: { client: true, server: true } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6775a76a..91055ec5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -121,6 +121,45 @@ importers: specifier: ^5.1.1 version: 5.1.1(@types/node@20.11.17) + examples/zustand: + dependencies: + '@types/react': + specifier: ^18.2.45 + version: 18.2.55 + '@types/react-dom': + specifier: ^18.2.18 + version: 18.2.19 + '@vitejs/plugin-react': + specifier: ^4.2.1 + version: 4.2.1(vite@5.1.1(@types/node@20.11.17)) + immer: + specifier: ^10.0.3 + version: 10.1.1 + react: + specifier: 18.2.0 + version: 18.2.0 + react-dom: + specifier: 18.2.0 + version: 18.2.0(react@18.2.0) + typescript: + specifier: ^5.3.3 + version: 5.3.3 + vike: + specifier: ^0.4.168 + version: 0.4.173(react-streaming@0.3.27(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(vite@5.1.1(@types/node@20.11.17)) + vike-react: + specifier: link:../../packages/vike-react + version: link:../../packages/vike-react + vike-react-zustand: + specifier: workspace:* + version: link:../../packages/vike-react-zustand + vite: + specifier: ^5.0.10 + version: 5.1.1(@types/node@20.11.17) + zustand: + specifier: ^4.4.7 + version: 4.5.4(@types/react@18.2.55)(immer@10.1.1)(react@18.2.0) + packages/vike-react: dependencies: react-streaming: @@ -221,7 +260,7 @@ importers: devDependencies: '@brillout/release-me': specifier: ^0.3.4 - version: 0.3.4 + version: 0.3.8 '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 @@ -250,8 +289,8 @@ importers: specifier: ^5.3.3 version: 5.3.3 vike: - specifier: ^0.4.151 - version: 0.4.161(react-streaming@0.3.22)(vite@5.1.1) + specifier: ^0.4.160 + version: 0.4.173(react-streaming@0.3.27(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(vite@5.1.1(@types/node@20.11.17)) vike-react: specifier: link:../vike-react version: link:../vike-react @@ -260,7 +299,7 @@ importers: version: 5.1.1(@types/node@20.11.17) zustand: specifier: ^4.4.7 - version: 4.4.7(@types/react@18.2.55)(immer@10.0.3)(react@18.2.0) + version: 4.5.4(@types/react@18.2.55)(immer@10.1.1)(react@18.2.0) packages: @@ -909,6 +948,12 @@ packages: '@types/estree@1.0.5': resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} + '@types/lodash-es@4.17.12': + resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==} + + '@types/lodash@4.17.6': + resolution: {integrity: sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA==} + '@types/node@20.11.17': resolution: {integrity: sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==} @@ -1423,6 +1468,9 @@ packages: resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} engines: {node: '>=0.10.0'} + immer@10.1.1: + resolution: {integrity: sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==} + internal-slot@1.0.6: resolution: {integrity: sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==} engines: {node: '>= 0.4'} @@ -1587,6 +1635,9 @@ packages: resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + lodash-es@4.17.21: + resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} + loose-envify@1.4.0: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} hasBin: true @@ -2112,6 +2163,11 @@ packages: url-parse@1.5.10: resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} + use-sync-external-store@1.2.0: + resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + validate-npm-package-license@3.0.4: resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} @@ -2274,6 +2330,21 @@ packages: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} + zustand@4.5.4: + resolution: {integrity: sha512-/BPMyLKJPtFEvVL0E9E9BTUM63MNyhPGlvxk1XjrfWTUlV+BR8jufjsovHzrtR6YNcBEcL7cMHovL1n9xHawEg==} + engines: {node: '>=12.7.0'} + peerDependencies: + '@types/react': '>=16.8' + immer: '>=9.0.6' + react: '>=16.8' + peerDependenciesMeta: + '@types/react': + optional: true + immer: + optional: true + react: + optional: true + snapshots: '@ampproject/remapping@2.2.1': @@ -2798,6 +2869,12 @@ snapshots: '@types/estree@1.0.5': {} + '@types/lodash-es@4.17.12': + dependencies: + '@types/lodash': 4.17.6 + + '@types/lodash@4.17.6': {} + '@types/node@20.11.17': dependencies: undici-types: 5.26.5 @@ -3405,6 +3482,8 @@ snapshots: dependencies: safer-buffer: 2.1.2 + immer@10.1.1: {} + internal-slot@1.0.6: dependencies: get-intrinsic: 1.2.2 @@ -3566,6 +3645,8 @@ snapshots: dependencies: p-locate: 6.0.0 + lodash-es@4.17.21: {} + loose-envify@1.4.0: dependencies: js-tokens: 4.0.0 @@ -4049,6 +4130,10 @@ snapshots: querystringify: 2.2.0 requires-port: 1.0.0 + use-sync-external-store@1.2.0(react@18.2.0): + dependencies: + react: 18.2.0 + validate-npm-package-license@3.0.4: dependencies: spdx-correct: 3.2.0 @@ -4105,19 +4190,19 @@ snapshots: '@vitest/snapshot': 1.2.2 '@vitest/spy': 1.2.2 '@vitest/utils': 1.2.2 - acorn-walk: 8.3.3 + acorn-walk: 8.3.2 cac: 6.7.14 - chai: 4.4.1 - debug: 4.3.5 + chai: 4.3.10 + debug: 4.3.4 execa: 8.0.1 local-pkg: 0.5.0 - magic-string: 0.30.10 - pathe: 1.1.2 - picocolors: 1.0.1 - std-env: 3.7.0 + magic-string: 0.30.5 + pathe: 1.1.1 + picocolors: 1.0.0 + std-env: 3.5.0 strip-literal: 1.3.0 - tinybench: 2.8.0 - tinypool: 0.8.4 + tinybench: 2.5.1 + tinypool: 0.8.2 vite: 5.1.1(@types/node@20.11.17) vite-node: 1.2.2(@types/node@20.11.17) why-is-node-running: 2.2.2 @@ -4176,18 +4261,8 @@ snapshots: which-typed-array@1.1.13: dependencies: - is-map: 2.0.3 - is-set: 2.0.3 - is-weakmap: 2.0.2 - is-weakset: 2.0.3 - dev: true - - /which-typed-array@1.1.15: - resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==} - engines: {node: '>= 0.4'} - dependencies: - available-typed-arrays: 1.0.7 - call-bind: 1.0.7 + available-typed-arrays: 1.0.5 + call-bind: 1.0.5 for-each: 0.3.3 gopd: 1.0.1 has-tostringtag: 1.0.0 @@ -4226,3 +4301,11 @@ snapshots: yallist@4.0.0: {} yocto-queue@1.0.0: {} + + zustand@4.5.4(@types/react@18.2.55)(immer@10.1.1)(react@18.2.0): + dependencies: + use-sync-external-store: 1.2.0(react@18.2.0) + optionalDependencies: + '@types/react': 18.2.55 + immer: 10.1.1 + react: 18.2.0