From 3d3b7e6d80ea172a2c28339f4e45fd50c1691ef4 Mon Sep 17 00:00:00 2001 From: Bogdan Chadkin Date: Fri, 16 Dec 2022 17:38:27 +0300 Subject: [PATCH] Install missing deps and restrict ranges (#646) Pnpm helped to find a few dependencies were missing in projects. Some root deps with "*" versions restricted to simplify upgrade and prevent unwanted upgrade while migrating to pnpm. --- apps/designer/package.json | 12 ++++++++++++ package.json | 6 +++--- packages/asset-uploader/package.json | 2 ++ packages/design-system/package.json | 6 ++++++ packages/icons/package.json | 3 ++- packages/image/package.json | 5 ++++- packages/project/package.json | 2 ++ yarn.lock | 24 ++++++++++++------------ 8 files changed, 43 insertions(+), 17 deletions(-) diff --git a/apps/designer/package.json b/apps/designer/package.json index f82bd447fc..077fcabb9e 100644 --- a/apps/designer/package.json +++ b/apps/designer/package.json @@ -18,7 +18,12 @@ }, "dependencies": { "@floating-ui/dom": "^1.0.6", + "@lexical/link": "^0.6.0", "@lexical/react": "^0.6.0", + "@lexical/selection": "^0.6.0", + "@lexical/utils": "^0.6.0", + "@radix-ui/react-select": "^1.0.0", + "@radix-ui/react-tooltip": "^1.0.0", "@remix-run/node": "^1.6.4", "@remix-run/react": "^1.6.4", "@remix-run/serve": "^1.6.4", @@ -26,9 +31,12 @@ "@sentry/remix": "^7.5.0", "@vercel/node": "^2.4.1", "@webstudio-is/asset-uploader": "*", + "@webstudio-is/css-data": "*", "@webstudio-is/css-engine": "*", "@webstudio-is/css-vars": "*", "@webstudio-is/design-system": "*", + "@webstudio-is/design-tokens": "*", + "@webstudio-is/fonts": "*", "@webstudio-is/icons": "*", "@webstudio-is/prisma-client": "*", "@webstudio-is/project": "*", @@ -41,10 +49,12 @@ "detect-font": "^0.1.5", "djb2a": "^2.0.0", "downshift": "^6.1.7", + "fast-deep-equal": "3.1.3", "hyphenate-style-name": "^1.0.4", "immer": "^9.0.12", "immerhin": "^0.1.2", "lexical": "^0.6.0", + "lodash": "4.17.21", "lodash.capitalize": "^4.2.1", "lodash.debounce": "^4.0.8", "lodash.memoize": "^4.1.2", @@ -69,7 +79,9 @@ "remix-auth-google": "^1.1.0", "remix-utils": "^4.1.0", "slugify": "^1.6.5", + "uuid": "^9.0.0", "warn-once": "^0.1.1", + "zod": "^3.19.1", "zod-form-data": "^1.2.1" }, "devDependencies": { diff --git a/package.json b/package.json index f3f07238dc..7287345cad 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,10 @@ "@webstudio-is/eslint-config-custom": "*", "chromatic": "^6.11.4", "golden-fleece": "^1.0.9", - "husky": ">=6", + "husky": "8.0.1", "lint-staged": "^13.0.2", - "prettier": "latest", - "turbo": "latest", + "prettier": "2.7.1", + "turbo": "1.3.1", "typescript": "4.7.4" }, "engines": { diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json index e1496ae45a..0a16afded1 100644 --- a/packages/asset-uploader/package.json +++ b/packages/asset-uploader/package.json @@ -17,9 +17,11 @@ "dependencies": { "@aws-sdk/client-s3": "^3.131.0", "@aws-sdk/lib-storage": "^3.131.0", + "@remix-run/node": "^1.6.4", "@webstudio-is/fonts": "*", "@webstudio-is/prisma-client": "*", "app-root-path": "^3.0.0", + "bson-objectid": "^2.0.2", "sharp": "^0.30.7" }, "devDependencies": { diff --git a/packages/design-system/package.json b/packages/design-system/package.json index afe2bbfeec..3ea58cf73c 100644 --- a/packages/design-system/package.json +++ b/packages/design-system/package.json @@ -31,6 +31,8 @@ "@webstudio-is/scripts": "*", "@webstudio-is/tsconfig": "*", "jest": "^29.3.1", + "react": "^17.0.2", + "react-dom": "^17.0.2", "typescript": "4.7.4" }, "peerDependencies": { @@ -70,6 +72,10 @@ "@react-aria/utils": "^3.13.3", "@stitches/react": "^1.2.8", "@webstudio-is/icons": "*", + "@webstudio-is/css-vars": "*", + "downshift": "^6.1.7", + "lodash.merge": "^4.6.2", + "match-sorter": "^6.3.1", "react-hot-toast": "^2.3.0" }, "exports": "./lib/index.js", diff --git a/packages/icons/package.json b/packages/icons/package.json index aeb7f2db25..3818500db2 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -38,7 +38,8 @@ }, "dependencies": { "@radix-ui/react-icons": "^1.1.0", - "@webstudio-is/css-vars": "*" + "@webstudio-is/css-vars": "*", + "react": "^17.0.2" }, "module": "./lib/index.js", "exports": { diff --git a/packages/image/package.json b/packages/image/package.json index f79888769c..310b6bd3a3 100644 --- a/packages/image/package.json +++ b/packages/image/package.json @@ -18,7 +18,10 @@ "generate-types": "generate-arg-types", "publish-to-npm": "bash ../../bin/publish-to-npm.sh" }, - "dependencies": {}, + "dependencies": { + "react": "^17.0.2", + "warn-once": "^0.1.1" + }, "devDependencies": { "@jest/globals": "^29.3.1", "@storybook/addon-actions": "^6.5.6", diff --git a/packages/project/package.json b/packages/project/package.json index eb39284674..aa93facc71 100644 --- a/packages/project/package.json +++ b/packages/project/package.json @@ -15,6 +15,7 @@ "publish-to-npm": "bash ../../bin/publish-to-npm.sh" }, "dependencies": { + "@webstudio-is/design-tokens": "*", "@webstudio-is/fonts": "*", "@webstudio-is/css-engine": "*", "@webstudio-is/asset-uploader": "*", @@ -24,6 +25,7 @@ "bson-objectid": "^2.0.2", "immer": "^9.0.12", "nanoid": "^3.2.0", + "react": "^17.0.2", "slugify": "^1.6.5", "uuid": "^9.0.0", "warn-once": "^0.1.1", diff --git a/yarn.lock b/yarn.lock index f1358683f2..5c2adc93b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2650,7 +2650,7 @@ dependencies: "@lexical/selection" "0.6.0" -"@lexical/link@0.6.0": +"@lexical/link@0.6.0", "@lexical/link@^0.6.0": version "0.6.0" resolved "https://registry.yarnpkg.com/@lexical/link/-/link-0.6.0.tgz#2f72fcc999182728670b90f9c3fbe8b219aab795" integrity sha512-VnHQk6lDcwbm+xiIrFVGlAclzn/n2cM8WX6aM3lwiq9vk3WDFcO+ZgDRs/UGgw4NHXoTn2LBs1ovveYEWdOhdw== @@ -2727,7 +2727,7 @@ resolved "https://registry.yarnpkg.com/@lexical/rich-text/-/rich-text-0.6.0.tgz#b4c2391bdd2d062cd3e0faa11d1ded82a1096224" integrity sha512-shGN15bjjXG1FRcxuKdlM1/eSq/s91yGbI1T9y7ezMihbDyUa+Ytf0xP51QPYTLEmXtqZrUOFoFZm+tqGNugYQ== -"@lexical/selection@0.6.0": +"@lexical/selection@0.6.0", "@lexical/selection@^0.6.0": version "0.6.0" resolved "https://registry.yarnpkg.com/@lexical/selection/-/selection-0.6.0.tgz#e36acb49983ab78168eb070898f193b0417dbab7" integrity sha512-IP9QNAH0em0cavS1M+d6rzTWWo0zdxyhPiYnxpj0mzhtbObfEV7L1fEn9PFH8CMDWGC+zXh810l+0Nz9SEPyKA== @@ -2744,7 +2744,7 @@ resolved "https://registry.yarnpkg.com/@lexical/text/-/text-0.6.0.tgz#9b8728beabf2e1c437d0aafc98450628c2972d73" integrity sha512-jY29kKa5t1elEtSOWpzVak1vDQdQBHzGdaNDkces0KYntzlJ9AFoEU6lVNJWRoKXWDwh5pEvhYLKUzz6luaniQ== -"@lexical/utils@0.6.0": +"@lexical/utils@0.6.0", "@lexical/utils@^0.6.0": version "0.6.0" resolved "https://registry.yarnpkg.com/@lexical/utils/-/utils-0.6.0.tgz#992a1052d833e407ee797dfbd66a455c07659125" integrity sha512-qIhIkRSbgGLOq/sOOpvHkEnDDvMxljV3D8y/feNyYJv8e/qbY0lHT5E+hDauAAbDDwnGTtQ3GTNVnmOtqG2cbw== @@ -9663,7 +9663,7 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: +fast-deep-equal@3.1.3, fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== @@ -10885,7 +10885,7 @@ human-signals@^3.0.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-3.0.1.tgz#c740920859dafa50e5a3222da9d3bf4bb0e5eef5" integrity sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ== -husky@>=6: +husky@8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.1.tgz#511cb3e57de3e3190514ae49ed50f6bc3f50b3e9" integrity sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw== @@ -12531,7 +12531,7 @@ lodash.uniq@4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== -lodash@^4.0.1, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: +lodash@4.17.21, lodash@^4.0.1, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -14594,16 +14594,16 @@ prettier@2.6.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.1.tgz#d472797e0d7461605c1609808e27b80c0f9cfe17" integrity sha512-8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A== +prettier@2.7.1, prettier@^2.6.2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" + integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== + "prettier@>=2.2.1 <=2.3.0": version "2.3.0" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18" integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w== -prettier@^2.6.2, prettier@latest: - version "2.7.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" - integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== - pretty-bytes@5.6.0: version "5.6.0" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" @@ -17327,7 +17327,7 @@ turbo-windows-arm64@1.3.1: resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.3.1.tgz#5abe1743b93e272641018cef213b21ac6c984f04" integrity sha512-0MWcHLvYgs/qdcoTFZ55nu8HhrpeiwXEMw9cbNfgqTlzy3OsrAsovYEJFyQ8KSxeploiD+QJlCdvhxx+5C0tlA== -turbo@latest: +turbo@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.3.1.tgz#8091f3c8b654addaac84f9452476204a879b32ea" integrity sha512-DXckoGKlZgvTn/PrHpBI/57aeXR7tfyPf2dK+4LmBczt24ELA3o6eYHeA7KzfpSYhB2LE9qveYFQ6mJ1OzGjjg==