Skip to content

Commit 655ae40

Browse files
authored
Remove old resolutions & update lock file (#10407)
* Remove unnecessary resolutions
1 parent d6c2669 commit 655ae40

File tree

3 files changed

+12
-361
lines changed

3 files changed

+12
-361
lines changed

package.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,8 @@
8585
]
8686
},
8787
"resolutions": {
88-
"prettier": "2.8.8",
8988
"babel-jest": "29.7.0",
9089
"jest-runner": "28.1.3",
91-
"graphql": "16.9.0",
92-
"graphql-language-service-interface": "2.10.2",
93-
"**/apollo-language-server/graphql": "^16.0.0",
94-
"**/@types/graphql-upload/graphql": "^16.0.0",
95-
"ts-node": "10.9.2",
9690
"typescript": "5.5.4",
9791
"eslint-plugin-promise": "7.1.0"
9892
}

scripts/match-graphql.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ const pkg = require(pkgPath);
88

99
const version = argv[2];
1010

11-
// eslint-disable-next-line logical-assignment-operators -- can be removed after drop support of Node.js 12
12-
pkg.resolutions = pkg.resolutions || {};
13-
if (pkg.resolutions.graphql.startsWith(version)) {
11+
pkg.resolutions ||= {};
12+
if (pkg.devDependencies.graphql?.startsWith(version)) {
1413
// eslint-disable-next-line no-console
1514
console.info(`GraphQL v${version} is match! Skipping.`);
1615
return;
@@ -19,7 +18,5 @@ if (pkg.resolutions.graphql.startsWith(version)) {
1918
const npmVersion = version.includes('-') ? version : `^${version}`;
2019
pkg.devDependencies.graphql = npmVersion;
2120
pkg.resolutions.graphql = npmVersion;
22-
pkg.resolutions['**/apollo-language-server/graphql'] = npmVersion;
23-
pkg.resolutions['**/@types/graphql-upload/graphql'] = npmVersion;
2421

2522
writeFileSync(pkgPath, JSON.stringify(pkg, null, 2), 'utf8');

0 commit comments

Comments
 (0)