Skip to content

Commit 5ce3856

Browse files
si14si14
authoredJan 18, 2024
Bump Yarn to 4.0.2 and add version constraints (tldraw#2481)
This PR bumps Yarn to 4.0.2, adds version constraints and fixes reported problems. Current constraints (per @ds300): 1. all dependencies (both prod and dev) should have consistent versions across the project 2. only the root `package.json` should have `packageManager` set Removed 54 packages due to deduplication. ### Change Type - [ ] `patch` — Bug fix - [ ] `minor` — New feature - [ ] `major` — Breaking change - [x] `dependencies` — Changes to package dependencies[^1] - [ ] `documentation` — Changes to the documentation only[^2] - [ ] `tests` — Changes to any test code only[^2] - [ ] `internal` — Any other changes that don't affect the published package[^2] - [ ] I don't know [^1]: publishes a `patch` release, for devDependencies use `internal` [^2]: will not publish a new version <details> <summary>An example of a report with a bunch of problems</summary> ``` ❯ yarn constraints ➤ Errors prefixed by '⚙' can be fixed by running yarn constraints --fix ├─ @tldraw/monorepo@workspace:. │ ├─ Conflict detected in constraint targeting devDependencies["@types/react"]; conflicting values are: │ │ ├─ '^18.2.47' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.33' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["@typescript-eslint/eslint-plugin"]; conflicting values are: │ │ ├─ '^5.57.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^5.10.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["@typescript-eslint/parser"]; conflicting values are: │ │ ├─ '^5.57.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^5.10.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["eslint"]; conflicting values are: │ │ ├─ '^8.37.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '8.36.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["eslint-config-prettier"]; conflicting values are: │ │ ├─ '^8.8.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^8.3.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["eslint-plugin-react"]; conflicting values are: │ │ ├─ '^7.32.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '7.28.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["prettier-plugin-organize-imports"]; conflicting values are: │ │ ├─ '^3.2.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^3.2.3' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["tsx"]; conflicting values are: │ │ ├─ '^3.12.7' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^4.0.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ Conflict detected in constraint targeting devDependencies["typescript"]; conflicting values are: │ ├─ '^5.2.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ '^5.0.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ @tldraw/docs@workspace:apps/docs │ ├─ Conflict detected in constraint targeting dependencies["@types/ws"]; conflicting values are: │ │ ├─ '^8.5.9' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^8.5.3' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["@vercel/analytics"]; conflicting values are: │ │ ├─ '^1.1.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^1.0.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["concurrently"]; conflicting values are: │ │ ├─ '^8.2.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ ├─ '^8.2.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '7.0.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["dotenv"]; conflicting values are: │ │ ├─ '^16.3.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^16.0.3' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["eslint"]; conflicting values are: │ │ ├─ '^8.37.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '8.36.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["eslint-config-next"]; conflicting values are: │ │ ├─ '13.2.4' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '12.2.5' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["next"]; conflicting values are: │ │ ├─ '^14.0.4' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^13.2.3' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["prettier-plugin-organize-imports"]; conflicting values are: │ │ ├─ '^3.2.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^3.2.3' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["react"]; conflicting values are: │ │ ├─ '18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["react-dom"]; conflicting values are: │ │ ├─ '18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["tsx"]; conflicting values are: │ │ ├─ '^3.12.7' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^4.0.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["typescript"]; conflicting values are: │ │ ├─ '^5.2.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^5.0.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["ws"]; conflicting values are: │ │ ├─ '^8.14.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ ├─ '^8.13.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^8.16.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ dotcom@workspace:apps/dotcom │ ├─ Conflict detected in constraint targeting dependencies["@radix-ui/react-popover"]; conflicting values are: │ │ ├─ '1.0.6-rc.5' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^1.0.7' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["@vercel/analytics"]; conflicting values are: │ │ ├─ '^1.1.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^1.0.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["react"]; conflicting values are: │ │ ├─ '18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["react-dom"]; conflicting values are: │ │ ├─ '18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["react-router-dom"]; conflicting values are: │ │ ├─ '^6.17.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^6.9.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["@types/react"]; conflicting values are: │ │ ├─ '^18.2.47' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.33' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["dotenv"]; conflicting values are: │ │ ├─ '^16.3.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^16.0.3' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["vite"]; conflicting values are: │ │ ├─ '^5.0.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^4.3.4' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["ws"]; conflicting values are: │ │ ├─ '^8.14.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ ├─ '^8.13.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^8.16.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ dotcom-asset-upload@workspace:apps/dotcom-asset-upload │ ├─ Conflict detected in constraint targeting dependencies["itty-router"]; conflicting values are: │ │ ├─ '^2.6.6' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^4.0.13' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["@types/ws"]; conflicting values are: │ │ ├─ '^8.5.9' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^8.5.3' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ @tldraw/bookmark-extractor@workspace:apps/dotcom-bookmark-extractor │ ├─ Conflict detected in constraint targeting dependencies["tslib"]; conflicting values are: │ │ ├─ '^2.6.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^2.4.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["typescript"]; conflicting values are: │ │ ├─ '^5.2.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^5.0.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ @tldraw/dotcom-worker@workspace:apps/dotcom-worker │ ├─ Conflict detected in constraint targeting dependencies["itty-router"]; conflicting values are: │ │ ├─ '^2.6.6' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^4.0.13' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["concurrently"]; conflicting values are: │ │ ├─ '^8.2.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ ├─ '^8.2.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '7.0.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["typescript"]; conflicting values are: │ │ ├─ '^5.2.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^5.0.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ examples.tldraw.com@workspace:apps/examples │ ├─ Conflict detected in constraint targeting dependencies["@vercel/analytics"]; conflicting values are: │ │ ├─ '^1.1.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^1.0.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["react"]; conflicting values are: │ │ ├─ '18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["react-dom"]; conflicting values are: │ │ ├─ '18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["react-router-dom"]; conflicting values are: │ │ ├─ '^6.17.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^6.9.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["vite"]; conflicting values are: │ │ ├─ '^5.0.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^4.3.4' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["dotenv"]; conflicting values are: │ │ ├─ '^16.3.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^16.0.3' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ huppy@workspace:apps/huppy │ ├─ Conflict detected in constraint targeting dependencies["next"]; conflicting values are: │ │ ├─ '^14.0.4' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^13.2.3' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["react"]; conflicting values are: │ │ ├─ '18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["react-dom"]; conflicting values are: │ │ ├─ '18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["eslint-config-next"]; conflicting values are: │ │ ├─ '13.2.4' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '12.2.5' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ @tldraw/vscode-editor@workspace:apps/vscode/editor │ ├─ Conflict detected in constraint targeting devDependencies["@types/react"]; conflicting values are: │ │ ├─ '^18.2.47' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.33' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["concurrently"]; conflicting values are: │ │ ├─ '^8.2.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ ├─ '^8.2.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '7.0.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["dotenv"]; conflicting values are: │ │ ├─ '^16.3.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^16.0.3' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["react"]; conflicting values are: │ │ ├─ '18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["react-dom"]; conflicting values are: │ │ ├─ '18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["tslib"]; conflicting values are: │ │ ├─ '^2.6.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^2.4.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ tldraw-vscode@workspace:apps/vscode/extension │ ├─ Conflict detected in constraint targeting devDependencies["@typescript-eslint/eslint-plugin"]; conflicting values are: │ │ ├─ '^5.57.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^5.10.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["@typescript-eslint/parser"]; conflicting values are: │ │ ├─ '^5.57.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^5.10.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["tslib"]; conflicting values are: │ │ ├─ '^2.6.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^2.4.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["tsx"]; conflicting values are: │ │ ├─ '^3.12.7' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^4.0.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ config@workspace:config │ ├─ Conflict detected in constraint targeting dependencies["eslint-config-prettier"]; conflicting values are: │ │ ├─ '^8.8.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^8.3.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting dependencies["eslint-plugin-react"]; conflicting values are: │ │ ├─ '^7.32.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '7.28.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Missing field packageManager; expected null │ ├─ @tldraw/assets@workspace:packages/assets │ └─ ⚙ Missing field packageManager; expected null │ ├─ @tldraw/editor@workspace:packages/editor │ ├─ Conflict detected in constraint targeting devDependencies["@testing-library/jest-dom"]; conflicting values are: │ │ ├─ '^5.16.5' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^5.14.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["jest-canvas-mock"]; conflicting values are: │ │ ├─ '^2.5.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^2.5.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["jest-environment-jsdom"]; conflicting values are: │ │ ├─ '^29.4.3' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^28.1.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ @tldraw/state@workspace:packages/state │ ├─ Conflict detected in constraint targeting devDependencies["@types/react"]; conflicting values are: │ │ ├─ '^18.2.47' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^18.2.33' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ @tldraw/store@workspace:packages/store │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ @tldraw/tldraw@workspace:packages/tldraw │ ├─ Conflict detected in constraint targeting dependencies["@radix-ui/react-popover"]; conflicting values are: │ │ ├─ '1.0.6-rc.5' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^1.0.7' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["@testing-library/jest-dom"]; conflicting values are: │ │ ├─ '^5.16.5' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^5.14.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["jest-canvas-mock"]; conflicting values are: │ │ ├─ '^2.5.1' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^2.5.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["jest-environment-jsdom"]; conflicting values are: │ │ ├─ '^29.4.3' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^28.1.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ @tldraw/tlschema@workspace:packages/tlschema │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ @tldraw/tlsync@workspace:packages/tlsync │ ├─ Conflict detected in constraint targeting dependencies["ws"]; conflicting values are: │ │ ├─ '^8.14.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ ├─ '^8.13.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^8.16.0' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ ├─ Conflict detected in constraint targeting devDependencies["typescript"]; conflicting values are: │ │ ├─ '^5.2.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ │ └─ '^5.0.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ @tldraw/utils@workspace:packages/utils │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ ├─ @tldraw/validate@workspace:packages/validate │ └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' │ └─ @tldraw/scripts@workspace:scripts ├─ Conflict detected in constraint targeting devDependencies["typescript"]; conflicting values are: │ ├─ '^5.2.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) │ └─ '^5.0.2' at enforceConsistentDependenciesAcrossTheProject (…/tldraw/yarn.config.cjs:14:15) └─ ⚙ Invalid field packageManager; expected null, found '[email protected]' ``` </details>
1 parent 64b8f2e commit 5ce3856

37 files changed

+7466
-9154
lines changed
 

‎.github/actions/setup/action.yml

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ description: Set up node & yarn
44
runs:
55
using: composite
66
steps:
7+
# see https://github.com/actions/setup-node/issues/899 for one of the reasons why this
8+
# needs to be done before action/setup-node
79
- name: Enable corepack
810
run: corepack enable
911
shell: bash

‎.github/workflows/checks.yml

+3
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ jobs:
3838
- name: Check API declarations and docs work as intended
3939
run: yarn api-check
4040

41+
- name: Check version constraints
42+
run: yarn constraints
43+
4144
- name: Test
4245
run: yarn test
4346

‎.github/workflows/playwright-update-snapshots.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,8 @@ jobs:
5151
token: ${{ secrets.GITHUB_TOKEN }}
5252
ref: ${{ github.event.pull_request.head.ref }}
5353

54-
- name: Setup Node.js environment
55-
uses: actions/setup-node@v3
56-
with:
57-
node-version: 18.18.2
58-
cache: 'yarn'
59-
60-
- name: Enable corepack
61-
run: corepack enable
62-
63-
- name: Install dependencies
64-
run: yarn
54+
- name: Run our setup
55+
uses: ./.github/actions/setup
6556

6657
- name: Install Playwright browsers
6758
run: npx playwright install --with-deps chromium chrome

‎.github/workflows/playwright.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,8 @@ jobs:
2424
- name: Check out code
2525
uses: actions/checkout@v3
2626

27-
- name: Setup Node.js environment
28-
uses: actions/setup-node@v3
29-
with:
30-
node-version: 18.18.2
31-
cache: 'yarn'
32-
33-
- name: Enable corepack
34-
run: corepack enable
35-
36-
- name: Install dependencies
37-
run: yarn
27+
- name: Run our setup
28+
uses: ./.github/actions/setup
3829

3930
- name: Get installed Playwright version
4031
id: playwright-version

‎.github/workflows/publish-canary.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,8 @@ jobs:
1717
with:
1818
fetch-depth: 0
1919

20-
- name: Setup Node.js environment
21-
uses: actions/setup-node@v3
22-
with:
23-
node-version: 18.18.2
24-
cache: 'yarn'
25-
26-
- name: Enable corepack
27-
run: corepack enable
28-
29-
- name: Install dependencies
30-
run: yarn
20+
- name: Run our setup
21+
uses: ./.github/actions/setup
3122

3223
- name: Publish Canary Packages
3324
run: yarn tsx ./scripts/publish-canary.ts

‎.github/workflows/publish-manual.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,8 @@ jobs:
1616
- name: Check out code
1717
uses: actions/checkout@v3
1818

19-
- name: Setup Node.js environment
20-
uses: actions/setup-node@v3
21-
with:
22-
node-version: 18.18.2
23-
cache: 'yarn'
24-
25-
- name: Enable corepack
26-
run: corepack enable
27-
28-
- name: Install dependencies
29-
run: yarn
19+
- name: Run our setup
20+
uses: ./.github/actions/setup
3021

3122
- name: Publish
3223
run: yarn tsx ./scripts/publish-manual.ts

‎.github/workflows/publish-new.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,8 @@ jobs:
2828
# Fetch full git history and tags for auto
2929
run: git fetch --unshallow --tags
3030

31-
- name: Setup Node.js environment
32-
uses: actions/setup-node@v3
33-
with:
34-
node-version: 18.18.2
35-
cache: 'yarn'
36-
37-
- name: Enable corepack
38-
run: corepack enable
39-
40-
- name: Install dependencies
41-
run: yarn
31+
- name: Run our setup
32+
uses: ./.github/actions/setup
4233

4334
- name: Publish
4435
run: |

‎.yarn/releases/yarn-3.5.0.cjs

-873
This file was deleted.

‎.yarnrc.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
compressionLevel: mixed
2+
3+
enableGlobalCache: false
4+
15
enableInlineBuilds: true
2-
nodeLinker: node-modules
3-
yarnPath: .yarn/releases/yarn-3.5.0.cjs
6+
7+
nodeLinker: node-modules

‎apps/docs/package.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"description": "A docs site for tldraw.",
44
"version": "2.0.0-beta.2",
55
"private": true,
6-
"packageManager": "yarn@3.5.0",
76
"author": {
87
"name": "tldraw Inc.",
98
"email": "hello@tldraw.com"
@@ -53,7 +52,7 @@
5352
"broken-link-checker": "^0.7.8",
5453
"concurrently": "^8.2.2",
5554
"dotenv": "^16.3.1",
56-
"eslint": "8.36.0",
55+
"eslint": "^8.37.0",
5756
"eslint-config-next": "13.2.4",
5857
"github-slugger": "^2.0.0",
5958
"gray-matter": "^4.0.3",
@@ -66,8 +65,8 @@
6665
"postinstall-postinstall": "^2.1.0",
6766
"prettier": "^3.0.3",
6867
"prettier-plugin-organize-imports": "^3.2.3",
69-
"react": "18.2.0",
70-
"react-dom": "18.2.0",
68+
"react": "^18.2.0",
69+
"react-dom": "^18.2.0",
7170
"react-hotkeys-hook": "^4.4.1",
7271
"rehype-autolink-headings": "^7.0.0",
7372
"rehype-highlight": "^7.0.0",
@@ -81,6 +80,6 @@
8180
"unist-util-is": "^6.0.0",
8281
"unist-util-visit": "^5.0.0",
8382
"vectra": "^0.4.4",
84-
"ws": "^8.14.2"
83+
"ws": "^8.16.0"
8584
}
8685
}

‎apps/dotcom-asset-upload/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"description": "A Cloudflare Worker to upload and serve images",
44
"version": "2.0.0-alpha.8",
55
"private": true,
6-
"packageManager": "yarn@3.5.0",
76
"author": {
87
"name": "tldraw GB Ltd.",
98
"email": "hello@tldraw.com"
@@ -17,11 +16,11 @@
1716
},
1817
"dependencies": {
1918
"itty-cors": "^0.3.4",
20-
"itty-router": "^2.6.6"
19+
"itty-router": "^4.0.13"
2120
},
2221
"devDependencies": {
2322
"@cloudflare/workers-types": "^4.20230821.0",
24-
"@types/ws": "^8.5.3",
23+
"@types/ws": "^8.5.9",
2524
"lazyrepo": "0.0.0-alpha.27",
2625
"wrangler": "3.16.0"
2726
},

‎apps/dotcom-bookmark-extractor/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"description": "A tiny little drawing app (merge server).",
44
"version": "2.0.0-alpha.11",
55
"private": true,
6-
"packageManager": "yarn@3.5.0",
76
"author": {
87
"name": "tldraw GB Ltd.",
98
"email": "hello@tldraw.com"
@@ -19,6 +18,6 @@
1918
},
2019
"devDependencies": {
2120
"lazyrepo": "0.0.0-alpha.27",
22-
"typescript": "^5.0.2"
21+
"typescript": "^5.2.2"
2322
}
2423
}

‎apps/dotcom-worker/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"description": "A tiny little drawing app (merge server).",
44
"version": "2.0.0-alpha.11",
55
"private": true,
6-
"packageManager": "yarn@3.5.0",
76
"author": {
87
"name": "tldraw GB Ltd.",
98
"email": "hello@tldraw.com"
@@ -35,10 +34,10 @@
3534
},
3635
"devDependencies": {
3736
"@cloudflare/workers-types": "^4.20230821.0",
38-
"concurrently": "^8.2.1",
37+
"concurrently": "^8.2.2",
3938
"lazyrepo": "0.0.0-alpha.27",
4039
"picocolors": "^1.0.0",
41-
"typescript": "^5.0.2",
40+
"typescript": "^5.2.2",
4241
"wrangler": "3.16.0"
4342
},
4443
"jest": {

‎apps/dotcom/package.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"description": "The production app for tldraw.",
44
"version": "2.0.0-alpha.11",
55
"private": true,
6-
"packageManager": "yarn@3.5.0",
76
"author": {
87
"name": "tldraw GB Ltd.",
98
"email": "hello@tldraw.com"
@@ -19,13 +18,13 @@
1918
"test": "lazy inherit"
2019
},
2120
"dependencies": {
22-
"@radix-ui/react-popover": "1.0.6-rc.5",
21+
"@radix-ui/react-popover": "^1.0.7",
2322
"@sentry/integrations": "^7.34.0",
2423
"@sentry/react": "^7.77.0",
2524
"@tldraw/assets": "workspace:*",
2625
"@tldraw/tldraw": "workspace:*",
2726
"@tldraw/tlsync": "workspace:*",
28-
"@vercel/analytics": "^1.0.1",
27+
"@vercel/analytics": "^1.1.1",
2928
"browser-fs-access": "^0.33.0",
3029
"idb": "^7.1.1",
3130
"nanoid": "4.0.2",
@@ -38,15 +37,15 @@
3837
"devDependencies": {
3938
"@sentry/cli": "^2.25.0",
4039
"@types/qrcode": "^1.5.0",
41-
"@types/react": "^18.2.33",
40+
"@types/react": "^18.2.47",
4241
"@typescript-eslint/utils": "^5.59.0",
4342
"@vitejs/plugin-react-swc": "^3.5.0",
4443
"dotenv": "^16.3.1",
4544
"fast-glob": "^3.3.1",
4645
"lazyrepo": "0.0.0-alpha.27",
4746
"vite": "^5.0.0",
4847
"vite-plugin-pwa": "^0.17.0",
49-
"ws": "^8.13.0"
48+
"ws": "^8.16.0"
5049
},
5150
"jest": {
5251
"preset": "config/jest/node",

‎apps/dotcom/src/components/ExportMenu.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const ExportMenu = React.memo(function ExportMenu() {
3939
icon={showIcon ? 'collab' : undefined}
4040
/>
4141
</Popover.Trigger>
42-
<Popover.Portal dir="ltr" container={container}>
42+
<Popover.Portal container={container}>
4343
<Popover.Content
4444
dir="ltr"
4545
className="tlui-menu tlui-share-zone__popover"

‎apps/dotcom/src/components/PeopleMenu/PeopleMenu.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export const PeopleMenu = track(function PeopleMenu({
5151
</div>
5252
</button>
5353
</Popover.Trigger>
54-
<Popover.Portal dir="ltr" container={container}>
54+
<Popover.Portal container={container}>
5555
<Popover.Content dir="ltr" className="tlui-menu" align="end" side="bottom" sideOffset={6}>
5656
<div className="tlui-people-menu__wrapper">
5757
<div className="tlui-people-menu__section">

‎apps/dotcom/src/components/PeopleMenu/UserPresenceColorPicker.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export const UserPresenceColorPicker = track(function UserPresenceColorPicker()
9696
title={msg('people-menu.change-color')}
9797
/>
9898
</Popover.Trigger>
99-
<Popover.Portal dir="ltr" container={container}>
99+
<Popover.Portal container={container}>
100100
<Popover.Content
101101
dir="ltr"
102102
className="tlui-menu tlui-people-menu__user__color-picker"

‎apps/dotcom/src/components/ShareMenu.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export const ShareMenu = React.memo(function ShareMenu() {
100100
label={'share-menu.title'}
101101
/>
102102
</Popover.Trigger>
103-
<Popover.Portal dir="ltr" container={container}>
103+
<Popover.Portal container={container}>
104104
<Popover.Content
105105
dir="ltr"
106106
className="tlui-menu tlui-share-zone__popover"

‎apps/examples/package.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"description": "A tiny little drawing app (examples).",
44
"version": "2.0.0-beta.2",
55
"private": true,
6-
"packageManager": "yarn@3.5.0",
76
"author": {
87
"name": "tldraw Inc.",
98
"email": "hello@tldraw.com"
@@ -38,17 +37,17 @@
3837
"@playwright/test": "^1.38.1",
3938
"@tldraw/assets": "workspace:*",
4039
"@tldraw/tldraw": "workspace:*",
41-
"@vercel/analytics": "^1.0.1",
40+
"@vercel/analytics": "^1.1.1",
4241
"classnames": "^2.3.2",
4342
"lazyrepo": "0.0.0-alpha.27",
4443
"react": "^18.2.0",
4544
"react-dom": "^18.2.0",
46-
"react-router-dom": "^6.9.0",
47-
"vite": "^4.3.4"
45+
"react-router-dom": "^6.17.0",
46+
"vite": "^5.0.0"
4847
},
4948
"devDependencies": {
5049
"@vitejs/plugin-react": "^4.2.0",
51-
"dotenv": "^16.0.3",
50+
"dotenv": "^16.3.1",
5251
"remark": "^15.0.1",
5352
"remark-frontmatter": "^5.0.0",
5453
"remark-html": "^16.0.1",

‎apps/huppy/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"description": "Tools for managing our public and private repos",
44
"version": "2.0.0-alpha.10",
55
"private": true,
6-
"packageManager": "yarn@3.5.0",
76
"author": {
87
"name": "tldraw GB Ltd.",
98
"email": "hello@tldraw.com"
@@ -27,13 +26,13 @@
2726
"@types/jsonwebtoken": "^9.0.1",
2827
"json5": "^2.2.3",
2928
"jsonwebtoken": "^9.0.0",
30-
"next": "^13.2.3",
29+
"next": "^14.0.4",
3130
"octokit": "^3.1.1",
3231
"react": "^18.2.0",
3332
"react-dom": "^18.2.0"
3433
},
3534
"devDependencies": {
36-
"eslint-config-next": "12.2.5",
35+
"eslint-config-next": "13.2.4",
3736
"lazyrepo": "0.0.0-alpha.27"
3837
}
3938
}

‎apps/vscode/editor/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"description": "An an editor for the tldraw vscode extension.",
44
"version": "2.0.0-alpha.0",
55
"private": true,
6-
"packageManager": "yarn@3.5.0",
76
"author": {
87
"name": "tldraw Inc.",
98
"email": "hello@tldraw.com"
@@ -40,15 +39,15 @@
4039
"@types/react": "^18.2.47",
4140
"@types/react-dom": "^18.2.18",
4241
"@types/react-router-dom": "^5.1.8",
43-
"concurrently": "7.0.0",
42+
"concurrently": "^8.2.2",
4443
"create-serve": "1.0.1",
45-
"dotenv": "^16.0.3",
44+
"dotenv": "^16.3.1",
4645
"esbuild": "^0.18.4",
4746
"fs-extra": "^11.1.0",
4847
"lazyrepo": "0.0.0-alpha.27",
4948
"react": "^18.2.0",
5049
"react-dom": "^18.2.0",
51-
"tslib": "^2.4.0"
50+
"tslib": "^2.6.2"
5251
},
5352
"gitHead": "a7dac0f83ad998e205c2aab58182cb4ba4e099a6"
5453
}

0 commit comments

Comments
 (0)
Please sign in to comment.