diff --git a/apps/web/package.json b/apps/web/package.json index 1997334add..474f9c86f4 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -41,7 +41,7 @@ "y-indexeddb": "^9.0.9", "y-protocols": "^1.0.5", "yjs": "^13.5.48", - "zod": "^3.20.6" + "zod": "^3.21.0" }, "devDependencies": { "@perfsee/webpack": "^1.3.0", diff --git a/package.json b/package.json index 3bc2796ff7..f40512ab00 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,10 @@ "pnpm": { "patchedDependencies": { "@tauri-apps/api@1.2.0": "patches/@tauri-apps__api@1.2.0.patch" + }, + "overrides": { + "@emotion/unitless": "0.8.0", + "react-is": "18.2.0" } }, "packageManager": "pnpm@7.28.0" diff --git a/packages/env/package.json b/packages/env/package.json index 930a93af40..baaa7875b1 100644 --- a/packages/env/package.json +++ b/packages/env/package.json @@ -6,9 +6,10 @@ "next": "^13.2.3", "react": "^18.2.0", "react-dom": "^18.2.0", - "zod": "^3.20.6" + "zod": "^3.21.0" }, "dependencies": { - "@blocksuite/global": "0.5.0-20230304192152-02cfe2b" + "@blocksuite/global": "0.5.0-20230304192152-02cfe2b", + "lit": "^2.6.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2c3d2df26c..031b2f79cc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: 5.4 +overrides: + '@emotion/unitless': 0.8.0 + react-is: 18.2.0 + patchedDependencies: '@tauri-apps/api@1.2.0': hash: nb4isgkwd3sres4g7j7rgtldsu @@ -176,7 +180,7 @@ importers: react: ^18.2.0 react-dom: ^18.2.0 react-helmet-async: ^1.3.0 - react-is: ^18.2.0 + react-is: 18.2.0 redux: ^4.2.1 styled-components: ^5.3.8 swr: ^2.0.4 @@ -185,7 +189,7 @@ importers: y-indexeddb: ^9.0.9 y-protocols: ^1.0.5 yjs: ^13.5.48 - zod: ^3.20.6 + zod: ^3.21.0 dependencies: '@affine/component': link:../../packages/component '@affine/datacenter': link:../../packages/data-center @@ -219,7 +223,7 @@ importers: y-indexeddb: 9.0.9_yjs@13.5.48 y-protocols: 1.0.5 yjs: 13.5.48 - zod: 3.20.6 + zod: 3.21.0 devDependencies: '@perfsee/webpack': 1.3.0_webpack@5.75.0 '@redux-devtools/extension': 3.2.5_redux@4.2.1 @@ -269,7 +273,7 @@ importers: lit: ^2.6.1 react: ^18.2.0 react-dom: ^18.2.0 - react-is: ^18.2.0 + react-is: 18.2.0 storybook: 7.0.0-beta.60 storybook-dark-mode-v7: 3.0.0-alpha.0 styled-components: ^5.3.8 @@ -365,17 +369,19 @@ importers: packages/env: specifiers: '@blocksuite/global': 0.5.0-20230304192152-02cfe2b + lit: ^2.6.1 next: ^13.2.3 react: ^18.2.0 react-dom: ^18.2.0 - zod: ^3.20.6 + zod: ^3.21.0 dependencies: - '@blocksuite/global': 0.5.0-20230304192152-02cfe2b + '@blocksuite/global': 0.5.0-20230304192152-02cfe2b_lit@2.6.1 + lit: 2.6.1 devDependencies: next: 13.2.3_biqbaboplfbrettd7655fr4n2y react: 18.2.0 react-dom: 18.2.0_react@18.2.0 - zod: 3.20.6 + zod: 3.21.0 packages/i18n: specifiers: @@ -1814,18 +1820,6 @@ packages: turndown: 7.1.1 dev: false - /@blocksuite/global/0.5.0-20230304192152-02cfe2b: - resolution: {integrity: sha512-dtj0GE8I0VcmFllh6oMBpLrFnIhisLjUyBaJY/xDVeIK7bizcKvohMfIJIGfKqTsIL9eHTfSqMpq6vAiKBo0BQ==} - peerDependencies: - lit: ^2.6 - peerDependenciesMeta: - lit: - optional: true - dependencies: - ansi-colors: 4.1.3 - zod: 3.21.0 - dev: false - /@blocksuite/global/0.5.0-20230304192152-02cfe2b_lit@2.6.1: resolution: {integrity: sha512-dtj0GE8I0VcmFllh6oMBpLrFnIhisLjUyBaJY/xDVeIK7bizcKvohMfIJIGfKqTsIL9eHTfSqMpq6vAiKBo0BQ==} peerDependencies: @@ -2055,10 +2049,6 @@ packages: resolution: {integrity: sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==} dev: false - /@emotion/unitless/0.7.5: - resolution: {integrity: sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==} - dev: false - /@emotion/unitless/0.8.0: resolution: {integrity: sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==} dev: false @@ -8782,7 +8772,7 @@ packages: /hoist-non-react-statics/3.3.2: resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==} dependencies: - react-is: 16.13.1 + react-is: 18.2.0 dev: false /hosted-git-info/2.8.9: @@ -10922,7 +10912,7 @@ packages: dependencies: ansi-regex: 5.0.1 ansi-styles: 5.2.0 - react-is: 17.0.2 + react-is: 18.2.0 dev: true /pretty-hrtime/1.0.3: @@ -10963,7 +10953,7 @@ packages: dependencies: loose-envify: 1.4.0 object-assign: 4.1.1 - react-is: 16.13.1 + react-is: 18.2.0 /protobufjs/6.11.3: resolution: {integrity: sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==} @@ -11207,7 +11197,7 @@ packages: is-plain-object: 5.0.0 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 - react-is: 18.1.0 + react-is: 18.2.0 dev: true /react-fast-compare/3.2.0: @@ -11257,20 +11247,8 @@ packages: react: 18.2.0 dev: true - /react-is/16.13.1: - resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} - - /react-is/17.0.2: - resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} - dev: true - - /react-is/18.1.0: - resolution: {integrity: sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==} - dev: true - /react-is/18.2.0: resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} - dev: false /react-refresh/0.14.0: resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==} @@ -12183,7 +12161,7 @@ packages: '@babel/traverse': 7.21.2_supports-color@5.5.0 '@emotion/is-prop-valid': 1.2.0 '@emotion/stylis': 0.8.5 - '@emotion/unitless': 0.7.5 + '@emotion/unitless': 0.8.0 babel-plugin-styled-components: 2.0.7_styled-components@5.3.8 css-to-react-native: 3.2.0 hoist-non-react-statics: 3.3.2 @@ -13525,12 +13503,8 @@ packages: engines: {node: '>=12.20'} dev: true - /zod/3.20.6: - resolution: {integrity: sha512-oyu0m54SGCtzh6EClBVqDDlAYRz4jrVtKwQ7ZnsEmMI9HnzuZFj8QFwAY1M5uniIYACdGvv0PBWPF2kO0aNofA==} - /zod/3.21.0: resolution: {integrity: sha512-UYdykTcVxB6lfdyLzAqLyyYAlOcpoluECvjsdoaqfQmz9p+3LRaIqYcNiL/J2kFYp66fBM8wwBvIGVEjq7KtZw==} - dev: false /zustand/4.3.5_react@18.2.0: resolution: {integrity: sha512-2iPUzfwx+g3f0PagOMz2vDO9mZzEp2puFpNe7vrAymVPOEIEUjCPkC4/zy84eAscxIWmTU4j9g6upXYkJdzEFQ==}