From 8e271c007f9caa68201319186be97ff45d941b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Vasconcellos?= Date: Thu, 29 Feb 2024 22:57:27 -0300 Subject: [PATCH] Lock version of patched dependencies (#2151) Fix eslint warning - Fix some subdependencies requiring an older @typescript-eslint/parser version that is incompatible with the current version of typescript - Add react-router and react-router-dom version lock to ensure pnpm doesn't download a version incompatible with our patched @remix/router - Add version lock to @remix-run/router to avoid incompatibilities with our patched version --- apps/desktop/package.json | 4 ++-- apps/landing/package.json | 6 +++--- apps/mobile/package.json | 2 +- apps/storybook/package.json | 2 +- apps/web/package.json | 4 ++-- interface/package.json | 6 +++--- package.json | 8 ++++++-- packages/client/package.json | 2 +- packages/ui/package.json | 4 ++-- pnpm-lock.yaml | Bin 914933 -> 911136 bytes 10 files changed, 21 insertions(+), 17 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 677d8b697..7c5fe567a 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -25,14 +25,14 @@ "immer": "^10.0.3", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-router-dom": "6.20.1", + "react-router-dom": "^6.20.1", "sonner": "^1.0.3" }, "devDependencies": { "@sd/config": "workspace:*", "@sentry/vite-plugin": "^2.14.2", "@tauri-apps/cli": "^1.5.10", - "@types/react": "^18.2.60", + "@types/react": "^18.2.61", "@types/react-dom": "^18.2.19", "sass": "^1.71.1", "typescript": "^5.3.3", diff --git a/apps/landing/package.json b/apps/landing/package.json index 4dc673bd9..5f6421534 100644 --- a/apps/landing/package.json +++ b/apps/landing/package.json @@ -19,6 +19,7 @@ "@sd/assets": "workspace:*", "@sd/ui": "workspace:*", "@t3-oss/env-nextjs": "^0.7.1", + "@tsparticles/react": "^3.0.0", "clsx": "^2.0.0", "contentlayer": "^0.3.4", "dayjs": "^1.11.10", @@ -47,7 +48,6 @@ "tailwind-merge": "^1.14.0", "three": "^0.161.0", "tsparticles": "^3.3.0", - "@tsparticles/react": "^3.0.0", "unist-util-visit": "^5.0.0", "zod": "~3.22.4" }, @@ -57,10 +57,10 @@ "@sd/config": "workspace:*", "@svgr/webpack": "^8.1.0", "@types/node": "~18.17.19", - "@types/react": "^18.2.60", + "@types/react": "^18.2.61", "@types/react-burger-menu": "^2.8.7", "@types/react-dom": "^18.2.19", - "@types/three": "^0.161.2", + "@types/three": "^0.162.0", "autoprefixer": "^10.4.17", "postcss": "^8.4.35", "sharp": "^0.33.2", diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 0a5a356b7..fdc6e1a5f 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -76,7 +76,7 @@ "@babel/core": "^7.23.9", "@rnx-kit/metro-config": "^1.3.14", "@sd/config": "workspace:*", - "@types/react": "^18.2.60", + "@types/react": "^18.2.61", "babel-plugin-module-resolver": "^5.0.0", "eslint-plugin-react-native": "^4.1.0", "react-native-svg-transformer": "^1.3.0", diff --git a/apps/storybook/package.json b/apps/storybook/package.json index e2d350988..aae4748fc 100644 --- a/apps/storybook/package.json +++ b/apps/storybook/package.json @@ -20,7 +20,7 @@ "devDependencies": { "@sd/config": "workspace:*", "@sd/ui": "workspace:*", - "@types/react": "^18.2.60", + "@types/react": "^18.2.61", "@types/react-dom": "^18.2.19", "autoprefixer": "^10.4.17", "postcss": "^8.4.35", diff --git a/apps/web/package.json b/apps/web/package.json index 2ea61068c..6fb9ed388 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -19,13 +19,13 @@ "html2canvas": "^1.4.1", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-router-dom": "6.20.1" + "react-router-dom": "^6.20.1" }, "devDependencies": { "@playwright/test": "^1.42.0", "@sd/config": "workspace:*", "@sd/ui": "workspace:*", - "@types/react": "^18.2.60", + "@types/react": "^18.2.61", "@types/react-dom": "^18.2.19", "autoprefixer": "^10.4.17", "postcss": "^8.4.35", diff --git a/interface/package.json b/interface/package.json index 71f7d4d0b..60c9999b2 100644 --- a/interface/package.json +++ b/interface/package.json @@ -51,8 +51,8 @@ "react-json-view": "^1.21.3", "react-loading-skeleton": "^3.3.1", "react-markdown": "^9.0.0", - "react-router": "6.20.1", - "react-router-dom": "6.20.1", + "react-router": "^6.20.1", + "react-router-dom": "^6.20.1", "react-selecto": "^1.26.0", "react-slidedown": "^2.4.7", "react-sticky-el": "^2.1.0", @@ -71,7 +71,7 @@ "devDependencies": { "@sd/config": "workspace:*", "@types/node": "~18.17.19", - "@types/react": "^18.2.60", + "@types/react": "^18.2.61", "@types/react-dom": "^18.2.19", "@types/uuid": "^9.0.8", "tailwindcss": "^3.4.1", diff --git a/package.json b/package.json index db57d3a1b..d421e81bc 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,12 @@ "@contentlayer/cli@0.3.4": "patches/@contentlayer__cli@0.3.4.patch" }, "overrides": { - "@types/node": "~18.17.19", - "@remix-run/router": "=1.13.1" + "@types/node": "~18.19.21", + "react-router": "=6.20.1", + "react-router-dom": "=6.20.1", + "@remix-run/router": "=1.13.1", + "@contentlayer/cli": "=0.3.4", + "@typescript-eslint/parser": "^7.1.0" } }, "devDependencies": { diff --git a/packages/client/package.json b/packages/client/package.json index fbb46fe28..100ebcf59 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@sd/config": "workspace:*", - "@types/react": "^18.2.60", + "@types/react": "^18.2.61", "typescript": "^5.3.3" }, "peerDependencies": { diff --git a/packages/ui/package.json b/packages/ui/package.json index 9c1ab683a..5873540a4 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -40,7 +40,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-loading-icons": "^1.1.0", - "react-router-dom": "6.20.1", + "react-router-dom": "^6.20.1", "sonner": "^1.0.3", "use-debounce": "^9.0.4", "zod": "~3.22.4" @@ -53,7 +53,7 @@ "@tailwindcss/forms": "^0.5.7", "@tailwindcss/typography": "^0.5.10", "@types/node": "~18.17.19", - "@types/react": "^18.2.60", + "@types/react": "^18.2.61", "@types/react-dom": "^18.2.19", "autoprefixer": "^10.4.17", "postcss": "^8.4.35", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d7597b674895f1c94a2df7033c47ceb9adbc2e91..31b75d67ecc595a21fee9283f684129c8ad6202f 100644 GIT binary patch delta 12753 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