Unverified Commit a9cd6d7e authored by Luke Sandberg's avatar Luke Sandberg Committed by GitHub

Revert "Adopt pnpm catalogs for devDependencies" (#93226)

Reverts vercel/next.js#93071

This breaks our use of lerna, lerna uses npm-package-arg to parse
package.json files and cannot resolve `catalog` references
parent 8bb30f2d
......@@ -35,11 +35,10 @@
"@types/react": "^18",
"@types/react-dom": "^18",
"cross-env": "10.1.0",
"eslint": "catalog:",
"inliner": "1.13.1",
"postcss": "^8.5",
"tailwindcss": "^4.1.9",
"tw-animate-css": "1.3.3",
"typescript": "catalog:"
"typescript": "6.0.2"
}
}
......@@ -190,7 +190,7 @@
"dd-trace": "4.12.0",
"es5-ext": "0.10.53",
"escape-string-regexp": "2.0.0",
"eslint": "catalog:",
"eslint": "9.37.0",
"eslint-config-next": "workspace:*",
"eslint-formatter-codeframe": "7.32.1",
"eslint-plugin-eslint-plugin": "5.2.1",
......@@ -222,7 +222,7 @@
"image-size": "1.2.1",
"is-animated": "2.0.2",
"isomorphic-unfetch": "3.0.0",
"jest": "catalog:",
"jest": "29.7.0",
"jest-diff": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-extended": "4.0.2",
......@@ -254,7 +254,7 @@
"postcss-pseudoelements": "5.0.0",
"postcss-short-size": "4.0.0",
"postcss-trolling": "0.1.7",
"prettier": "catalog:",
"prettier": "3.6.2",
"pretty-bytes": "5.3.0",
"pretty-ms": "7.0.0",
"random-seed": "0.3.0",
......@@ -294,7 +294,7 @@
"tsec": "0.2.1",
"tsx": "4.19.2",
"turbo": "2.9.4",
"typescript": "catalog:",
"typescript": "6.0.2",
"typescript-eslint": "8.46.0",
"unfetch": "4.2.0",
"wait-port": "0.2.2",
......
......@@ -41,7 +41,6 @@
"cross-spawn": "7.0.3",
"fast-glob": "3.3.1",
"picocolors": "1.1.1",
"prettier": "catalog:",
"prettier-plugin-tailwindcss": "0.6.2",
"prompts": "2.4.2",
"tar": "7.5.7",
......
......@@ -17,8 +17,7 @@
},
"devDependencies": {
"@types/eslint": "9.6.1",
"eslint": "9.37.0",
"typescript": "catalog:"
"eslint": "9.37.0"
},
"scripts": {
"dev": "pnpm build",
......
......@@ -40,7 +40,6 @@
"@types/jscodeshift": "0.11.0",
"@types/prompts": "2.4.2",
"@types/semver": "7.3.1",
"jest": "catalog:",
"typescript": "catalog:"
"typescript": "6.0.2"
}
}
......@@ -32,7 +32,6 @@
"devDependencies": {
"@vercel/ncc": "0.34.0",
"dotenv": "16.3.1",
"dotenv-expand": "10.0.0",
"typescript": "catalog:"
"dotenv-expand": "10.0.0"
}
}
......@@ -34,7 +34,6 @@
"@types/jest": "^29.5.0",
"@vercel/ncc": "0.34.0",
"jest": "^29.5.0",
"ts-jest": "^29.1.0",
"typescript": "catalog:"
"ts-jest": "^29.1.0"
}
}
......@@ -7,7 +7,7 @@
"resolveJsonModule": true,
"esModuleInterop": true,
"skipLibCheck": false,
"lib": ["es2022", "dom", "dom.iterable"],
"lib": ["es2022", "dom"],
"rootDir": "src",
"types": ["jest"]
},
......
......@@ -27,7 +27,6 @@
},
"devDependencies": {
"react-refresh": "0.12.0",
"typescript": "catalog:",
"webpack": "^4 || ^5"
}
}
......@@ -4,21 +4,6 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
catalogs:
default:
eslint:
specifier: 9.37.0
version: 9.37.0
jest:
specifier: 29.7.0
version: 29.7.0
prettier:
specifier: 3.6.2
version: 3.6.2
typescript:
specifier: 6.0.2
version: 6.0.2
overrides:
webpack: 5.98.0
browserslist: 4.28.1
......@@ -322,7 +307,7 @@ importers:
specifier: 2.0.0
version: 2.0.0
eslint:
specifier: 'catalog:'
specifier: 9.37.0
version: 9.37.0(jiti@2.6.1)
eslint-config-next:
specifier: workspace:*
......@@ -418,7 +403,7 @@ importers:
specifier: 3.0.0
version: 3.0.0(encoding@0.1.13)
jest:
specifier: 'catalog:'
specifier: 29.7.0
version: 29.7.0(@types/node@20.17.6(patch_hash=9c31d25336aea4076b3cb942c35e59fd160c540947f01ea455a060367153f9fd))(babel-plugin-macros@3.1.0)
jest-diff:
specifier: 29.7.0
......@@ -514,7 +499,7 @@ importers:
specifier: 0.1.7
version: 0.1.7
prettier:
specifier: 'catalog:'
specifier: 3.6.2
version: 3.6.2
pretty-bytes:
specifier: 5.3.0
......@@ -634,7 +619,7 @@ importers:
specifier: 2.9.4
version: 2.9.4
typescript:
specifier: 'catalog:'
specifier: 6.0.2
version: 6.0.2
typescript-eslint:
specifier: 8.46.0
......@@ -739,9 +724,6 @@ importers:
cross-env:
specifier: 10.1.0
version: 10.1.0
eslint:
specifier: 'catalog:'
version: 9.37.0(jiti@2.6.1)
inliner:
specifier: 1.13.1
version: 1.13.1
......@@ -755,7 +737,7 @@ importers:
specifier: 1.3.3
version: 1.3.3
typescript:
specifier: 'catalog:'
specifier: 6.0.2
version: 6.0.2
bench/app-router-server:
......@@ -982,9 +964,6 @@ importers:
picocolors:
specifier: 1.1.1
version: 1.1.1
prettier:
specifier: 'catalog:'
version: 3.6.2
prettier-plugin-tailwindcss:
specifier: 0.6.2
version: 0.6.2(prettier@3.6.2)
......@@ -1062,9 +1041,6 @@ importers:
eslint:
specifier: 9.37.0
version: 9.37.0(jiti@2.6.1)
typescript:
specifier: 'catalog:'
version: 6.0.2
packages/font:
devDependencies:
......@@ -1839,11 +1815,8 @@ importers:
'@types/semver':
specifier: 7.3.1
version: 7.3.1
jest:
specifier: 'catalog:'
version: 29.7.0(@types/node@20.17.6(patch_hash=9c31d25336aea4076b3cb942c35e59fd160c540947f01ea455a060367153f9fd))(babel-plugin-macros@3.1.0)
typescript:
specifier: 'catalog:'
specifier: 6.0.2
version: 6.0.2
packages/next-env:
......@@ -1857,9 +1830,6 @@ importers:
dotenv-expand:
specifier: 10.0.0
version: 10.0.0
typescript:
specifier: 'catalog:'
version: 6.0.2
packages/next-mdx:
dependencies:
......@@ -1919,9 +1889,6 @@ importers:
ts-jest:
specifier: ^29.1.0
version: 29.4.5(@babel/core@7.26.10)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.10))(jest-util@29.7.0)(jest@29.7.0(@types/node@20.17.6(patch_hash=9c31d25336aea4076b3cb942c35e59fd160c540947f01ea455a060367153f9fd))(babel-plugin-macros@3.1.0))(typescript@6.0.2)
typescript:
specifier: 'catalog:'
version: 6.0.2
packages/next-rspack:
dependencies:
......@@ -1946,9 +1913,6 @@ importers:
react-refresh:
specifier: 0.12.0
version: 0.12.0
typescript:
specifier: 'catalog:'
version: 6.0.2
webpack:
specifier: 5.98.0
version: 5.98.0(@swc/core@1.11.24(@swc/helpers@0.5.15))
......@@ -11342,6 +11306,11 @@ packages:
resolution: {integrity: sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==}
engines: {node: '>=4'}
import-local@3.0.2:
resolution: {integrity: sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==}
engines: {node: '>=8'}
hasBin: true
import-local@3.1.0:
resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
engines: {node: '>=8'}
......@@ -11936,6 +11905,10 @@ packages:
resolution: {integrity: sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==}
engines: {node: '>=8'}
istanbul-lib-instrument@6.0.1:
resolution: {integrity: sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==}
engines: {node: '>=10'}
istanbul-lib-instrument@6.0.3:
resolution: {integrity: sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==}
engines: {node: '>=10'}
......@@ -20038,7 +20011,7 @@ snapshots:
'@eslint/config-array@0.21.0':
dependencies:
'@eslint/object-schema': 2.1.6
debug: 4.4.3
debug: 4.4.0
minimatch: 3.1.2
transitivePeerDependencies:
- supports-color
......@@ -20775,7 +20748,7 @@ snapshots:
glob: 7.1.7
graceful-fs: 4.2.11
istanbul-lib-coverage: 3.2.0
istanbul-lib-instrument: 6.0.3
istanbul-lib-instrument: 6.0.1
istanbul-lib-report: 3.0.0
istanbul-lib-source-maps: 4.0.0
istanbul-reports: 3.1.6
......@@ -23803,7 +23776,7 @@ snapshots:
dependencies:
'@typescript-eslint/tsconfig-utils': 8.46.0(typescript@6.0.2)
'@typescript-eslint/types': 8.46.0
debug: 4.4.3
debug: 4.4.0
typescript: 6.0.2
transitivePeerDependencies:
- supports-color
......@@ -23827,7 +23800,7 @@ snapshots:
'@typescript-eslint/types': 8.46.0
'@typescript-eslint/typescript-estree': 8.46.0(typescript@6.0.2)
'@typescript-eslint/utils': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@6.0.2)
debug: 4.4.3
debug: 4.4.0
eslint: 9.37.0(jiti@2.6.1)
ts-api-utils: 2.1.0(typescript@6.0.2)
typescript: 6.0.2
......@@ -23842,7 +23815,7 @@ snapshots:
dependencies:
'@typescript-eslint/types': 5.62.0
'@typescript-eslint/visitor-keys': 5.62.0
debug: 4.4.3
debug: 4.4.0
globby: 11.1.0
is-glob: 4.0.3
semver: 7.6.3
......@@ -24996,7 +24969,7 @@ snapshots:
dependencies:
bytes: 3.1.2
content-type: 1.0.5
debug: 4.4.3
debug: 4.4.0
http-errors: 2.0.0
iconv-lite: 0.6.3
on-finished: 2.4.1
......@@ -27368,7 +27341,7 @@ snapshots:
esbuild-register@3.6.0(esbuild@0.25.9):
dependencies:
debug: 4.4.3
debug: 4.4.0
esbuild: 0.25.9
transitivePeerDependencies:
- supports-color
......@@ -27829,7 +27802,7 @@ snapshots:
ajv: 6.12.6
chalk: 4.1.2
cross-spawn: 7.0.6
debug: 4.4.3
debug: 4.4.0
escape-string-regexp: 4.0.0
eslint-scope: 8.4.0
eslint-visitor-keys: 4.2.1
......@@ -28354,7 +28327,7 @@ snapshots:
finalhandler@2.1.0:
dependencies:
debug: 4.4.3
debug: 4.4.0
encodeurl: 2.0.0
escape-html: 1.0.3
on-finished: 2.4.1
......@@ -29526,6 +29499,11 @@ snapshots:
import-lazy@2.1.0: {}
import-local@3.0.2:
dependencies:
pkg-dir: 4.2.0
resolve-cwd: 3.0.0
import-local@3.1.0:
dependencies:
pkg-dir: 4.2.0
......@@ -30104,6 +30082,16 @@ snapshots:
transitivePeerDependencies:
- supports-color
istanbul-lib-instrument@6.0.1:
dependencies:
'@babel/core': 7.26.10
'@babel/parser': 7.27.0
'@istanbuljs/schema': 0.1.3
istanbul-lib-coverage: 3.2.0
semver: 7.6.3
transitivePeerDependencies:
- supports-color
istanbul-lib-instrument@6.0.3:
dependencies:
'@babel/core': 7.26.10
......@@ -30238,7 +30226,7 @@ snapshots:
chalk: 4.1.2
create-jest: 29.7.0(@types/node@20.17.6(patch_hash=9c31d25336aea4076b3cb942c35e59fd160c540947f01ea455a060367153f9fd))(babel-plugin-macros@3.1.0)
exit: 0.1.2
import-local: 3.1.0
import-local: 3.0.2
jest-config: 29.7.0(@types/node@20.17.6(patch_hash=9c31d25336aea4076b3cb942c35e59fd160c540947f01ea455a060367153f9fd))(babel-plugin-macros@3.1.0)
jest-util: 29.7.0
jest-validate: 29.7.0
......@@ -30695,7 +30683,7 @@ snapshots:
dependencies:
'@jest/core': 29.7.0(babel-plugin-macros@3.1.0)
'@jest/types': 29.6.3
import-local: 3.1.0
import-local: 3.0.2
jest-cli: 29.7.0(@types/node@20.17.6(patch_hash=9c31d25336aea4076b3cb942c35e59fd160c540947f01ea455a060367153f9fd))(babel-plugin-macros@3.1.0)
transitivePeerDependencies:
- '@types/node'
......@@ -35630,7 +35618,7 @@ snapshots:
router@2.2.0:
dependencies:
debug: 4.4.3
debug: 4.4.0
depd: 2.0.0
is-promise: 4.0.0
parseurl: 1.3.3
......@@ -35873,7 +35861,7 @@ snapshots:
send@1.2.0:
dependencies:
debug: 4.4.3
debug: 4.4.0
encodeurl: 2.0.0
escape-html: 1.0.3
etag: 1.8.1
......@@ -6,11 +6,6 @@ packages:
- 'turbopack/crates/*/js'
- 'turbopack/crates/turbopack-tests/tests/execution'
- 'turbopack/packages/*'
catalog:
eslint: 9.37.0
jest: 29.7.0
prettier: 3.6.2
typescript: 6.0.2
updateNotifier: false
publicHoistPattern:
- '*eslint*'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment