Skip to content

Commit

Permalink
node 16 upgrade (#9449)
Browse files Browse the repository at this point in the history
* chore(deps): update graphql-tools monorepo

* chore(dependencies): updated changesets for modified dependencies

* fix(deps): update dependency graphql-config to v5

* fix: use global AggregateError

* chore(dependencies): updated changesets for modified dependencies

* chore: drop node 14 references

* chore(dependencies): updated changesets for modified dependencies

* chore: remove duplicated changesets

* ensure only single version of cosmiconfig is installed

* bump graphql-config

* just log errors

* chore(dependencies): updated changesets for modified dependencies

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
3 people committed May 23, 2023
1 parent 9e8bd9d commit 4d9ea1a
Show file tree
Hide file tree
Showing 30 changed files with 400 additions and 119 deletions.
7 changes: 0 additions & 7 deletions .changeset/@graphql-codegen_cli-9281-dependencies.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/@graphql-codegen_cli-9448-dependencies.md
@@ -0,0 +1,5 @@
---
"@graphql-codegen/cli": patch
---
dependencies updates:
- Updated dependency [`graphql-config@^5.0.0` ↗︎](https://www.npmjs.com/package/graphql-config/v/5.0.0) (from `^4.5.0`, in `dependencies`)
16 changes: 16 additions & 0 deletions .changeset/@graphql-codegen_cli-9449-dependencies.md
@@ -0,0 +1,16 @@
---
"@graphql-codegen/cli": patch
---
dependencies updates:
- Updated dependency [`@graphql-tools/apollo-engine-loader@^8.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/apollo-engine-loader/v/8.0.0) (from `^7.3.6`, in `dependencies`)
- Updated dependency [`@graphql-tools/code-file-loader@^8.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/code-file-loader/v/8.0.0) (from `^7.3.17`, in `dependencies`)
- Updated dependency [`@graphql-tools/git-loader@^8.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/git-loader/v/8.0.0) (from `^7.2.13`, in `dependencies`)
- Updated dependency [`@graphql-tools/github-loader@^8.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/github-loader/v/8.0.0) (from `^7.3.28`, in `dependencies`)
- Updated dependency [`@graphql-tools/graphql-file-loader@^8.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/graphql-file-loader/v/8.0.0) (from `^7.5.0`, in `dependencies`)
- Updated dependency [`@graphql-tools/json-file-loader@^8.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/json-file-loader/v/8.0.0) (from `^7.4.1`, in `dependencies`)
- Updated dependency [`@graphql-tools/load@^8.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/load/v/8.0.0) (from `^7.8.0`, in `dependencies`)
- Updated dependency [`@graphql-tools/prisma-loader@^8.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/prisma-loader/v/8.0.0) (from `^7.2.69`, in `dependencies`)
- Updated dependency [`@graphql-tools/url-loader@^8.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/url-loader/v/8.0.0) (from `^7.17.17`, in `dependencies`)
- Updated dependency [`@graphql-tools/utils@^10.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.0) (from `^9.0.0`, in `dependencies`)
- Updated dependency [`cosmiconfig@^8.1.3` ↗︎](https://www.npmjs.com/package/cosmiconfig/v/8.1.3) (from `^7.0.0`, in `dependencies`)
- Updated dependency [`graphql-config@^5.0.1` ↗︎](https://www.npmjs.com/package/graphql-config/v/5.0.1) (from `^4.5.0`, in `dependencies`)
@@ -0,0 +1,6 @@
---
"@graphql-codegen/client-preset": patch
---
dependencies updates:
- Updated dependency [`@graphql-tools/documents@^1.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/documents/v/1.0.0) (from `^0.1.0`, in `dependencies`)
- Updated dependency [`@graphql-tools/utils@^10.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.0) (from `^9.0.0`, in `dependencies`)
6 changes: 6 additions & 0 deletions .changeset/@graphql-codegen_core-9449-dependencies.md
@@ -0,0 +1,6 @@
---
"@graphql-codegen/core": patch
---
dependencies updates:
- Updated dependency [`@graphql-tools/schema@^10.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/schema/v/10.0.0) (from `^9.0.0`, in `dependencies`)
- Updated dependency [`@graphql-tools/utils@^10.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.0) (from `^9.1.1`, in `dependencies`)
@@ -0,0 +1,5 @@
---
"@graphql-codegen/gql-tag-operations": patch
---
dependencies updates:
- Updated dependency [`@graphql-tools/utils@^10.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.0) (from `^9.0.0`, in `dependencies`)
@@ -0,0 +1,5 @@
---
"@graphql-codegen/graphql-modules-preset": patch
---
dependencies updates:
- Updated dependency [`@graphql-tools/utils@^10.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.0) (from `^9.0.0`, in `dependencies`)
@@ -0,0 +1,5 @@
---
"@graphql-codegen/plugin-helpers": patch
---
dependencies updates:
- Updated dependency [`@graphql-tools/utils@^10.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.0) (from `^9.0.0`, in `dependencies`)
5 changes: 5 additions & 0 deletions .changeset/@graphql-codegen_schema-ast-9449-dependencies.md
@@ -0,0 +1,5 @@
---
"@graphql-codegen/schema-ast": patch
---
dependencies updates:
- Updated dependency [`@graphql-tools/utils@^10.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.0) (from `^9.0.0`, in `dependencies`)
@@ -0,0 +1,5 @@
---
"@graphql-codegen/typescript-resolvers": patch
---
dependencies updates:
- Updated dependency [`@graphql-tools/utils@^10.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.0) (from `^9.0.0`, in `dependencies`)
@@ -0,0 +1,7 @@
---
"@graphql-codegen/visitor-plugin-common": patch
---
dependencies updates:
- Updated dependency [`@graphql-tools/optimize@^2.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/optimize/v/2.0.0) (from `^1.3.0`, in `dependencies`)
- Updated dependency [`@graphql-tools/relay-operation-optimizer@^7.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/relay-operation-optimizer/v/7.0.0) (from `^6.5.0`, in `dependencies`)
- Updated dependency [`@graphql-tools/utils@^10.0.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/10.0.0) (from `^9.0.0`, in `dependencies`)
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Expand Up @@ -115,7 +115,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest] # remove windows to speed up the tests
node_version: [14, 16, 18]
node_version: [16, 18, 20]
graphql_version: [15, 16]
include:
- node-version: 14
Expand Down
2 changes: 1 addition & 1 deletion dev-test/codegen.ts
@@ -1,4 +1,4 @@
import { CodegenConfig } from '@graphql-codegen/cli';
import type { CodegenConfig } from '@graphql-codegen/cli';

const config: CodegenConfig = {
hooks: { afterAllFileWrite: ['prettier --write'] },
Expand Down
6 changes: 3 additions & 3 deletions examples/programmatic-typescript/package.json
Expand Up @@ -16,9 +16,9 @@
"@graphql-codegen/typescript": "3.0.4",
"@graphql-codegen/typescript-operations": "3.0.4",
"@graphql-codegen/typescript-resolvers": "3.2.1",
"@graphql-tools/graphql-file-loader": "7.5.17",
"@graphql-tools/load": "7.8.14",
"@graphql-tools/schema": "9.0.19",
"@graphql-tools/graphql-file-loader": "8.0.0",
"@graphql-tools/load": "8.0.0",
"@graphql-tools/schema": "10.0.0",
"graphql": "16.6.0",
"graphql-tag": "2.12.6",
"prettier": "2.8.8"
Expand Down
2 changes: 1 addition & 1 deletion examples/react/http-executor/package.json
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@graphql-tools/executor-http": "^0.1.8",
"@graphql-tools/executor-http": "^1.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/react/nextjs-swr/package.json
Expand Up @@ -12,7 +12,7 @@
"test:end2end": "start-server-and-test start http://127.0.0.1:3000 test"
},
"dependencies": {
"@graphql-tools/executor-http": "^0.1.8",
"@graphql-tools/executor-http": "^1.0.0",
"next": "^13.3.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
7 changes: 6 additions & 1 deletion package.json
@@ -1,6 +1,10 @@
{
"name": "graphql-code-generator",
"private": true,
"engines": {
"node": ">= 16.0.0"
},
"packageManager": "yarn@1.22.19",
"scripts": {
"postinstall": "patch-package && husky install",
"fix-bins": "node scripts/fix-bin.js",
Expand Down Expand Up @@ -86,6 +90,7 @@
"**/apollo-language-server/graphql": "^16.0.0",
"**/@types/graphql-upload/graphql": "^16.0.0",
"ts-node": "10.9.1",
"typescript": "5.0.4"
"typescript": "5.0.4",
"cosmiconfig": "8.1.3"
}
}
26 changes: 13 additions & 13 deletions packages/graphql-codegen-cli/package.json
Expand Up @@ -45,23 +45,23 @@
"@babel/types": "^7.18.13",
"@graphql-codegen/core": "^3.1.0",
"@graphql-codegen/plugin-helpers": "^4.2.0",
"@graphql-tools/apollo-engine-loader": "^7.3.6",
"@graphql-tools/code-file-loader": "^7.3.17",
"@graphql-tools/git-loader": "^7.2.13",
"@graphql-tools/github-loader": "^7.3.28",
"@graphql-tools/graphql-file-loader": "^7.5.0",
"@graphql-tools/json-file-loader": "^7.4.1",
"@graphql-tools/load": "^7.8.0",
"@graphql-tools/prisma-loader": "^7.2.69",
"@graphql-tools/url-loader": "^7.17.17",
"@graphql-tools/utils": "^9.0.0",
"@graphql-tools/apollo-engine-loader": "^8.0.0",
"@graphql-tools/code-file-loader": "^8.0.0",
"@graphql-tools/git-loader": "^8.0.0",
"@graphql-tools/github-loader": "^8.0.0",
"@graphql-tools/graphql-file-loader": "^8.0.0",
"@graphql-tools/json-file-loader": "^8.0.0",
"@graphql-tools/load": "^8.0.0",
"@graphql-tools/prisma-loader": "^8.0.0",
"@graphql-tools/url-loader": "^8.0.0",
"@graphql-tools/utils": "^10.0.0",
"@parcel/watcher": "^2.1.0",
"@whatwg-node/fetch": "^0.8.0",
"chalk": "^4.1.0",
"cosmiconfig": "^7.0.0",
"cosmiconfig": "^8.1.3",
"debounce": "^1.2.0",
"detect-indent": "^6.0.0",
"graphql-config": "^4.5.0",
"graphql-config": "^5.0.1",
"inquirer": "^8.0.0",
"is-glob": "^4.0.1",
"jiti": "^1.17.1",
Expand All @@ -77,7 +77,7 @@
"yargs": "^17.0.0"
},
"devDependencies": {
"@graphql-tools/merge": "8.4.2",
"@graphql-tools/merge": "9.0.0",
"@types/debounce": "1.2.1",
"@types/inquirer": "8.2.6",
"@types/is-glob": "4.0.2",
Expand Down
1 change: 0 additions & 1 deletion packages/graphql-codegen-cli/src/codegen.ts
Expand Up @@ -11,7 +11,6 @@ import {
normalizeOutputParam,
Types,
} from '@graphql-codegen/plugin-helpers';
import { AggregateError } from '@graphql-tools/utils';
import { DocumentNode, GraphQLError, GraphQLSchema } from 'graphql';
import { Listr, ListrTask } from 'listr2';
import { CodegenContext, ensureContext, shouldEmitLegacyCommonJSImports } from './config.js';
Expand Down
4 changes: 2 additions & 2 deletions packages/graphql-codegen-cli/src/utils/cli-error.ts
Expand Up @@ -5,10 +5,10 @@ export function isListrError(err: Error & { name?: unknown; errors?: unknown }):
}

export function cliError(err: any, exitOnError = true) {
let msg: string;
let msg: string | Error;

if (err instanceof Error) {
msg = err.message || err.toString();
msg = err;
} else if (typeof err === 'string') {
msg = err;
} else {
Expand Down
4 changes: 2 additions & 2 deletions packages/graphql-codegen-core/package.json
Expand Up @@ -38,8 +38,8 @@
},
"dependencies": {
"@graphql-codegen/plugin-helpers": "^4.1.0",
"@graphql-tools/schema": "^9.0.0",
"@graphql-tools/utils": "^9.1.1",
"@graphql-tools/schema": "^10.0.0",
"@graphql-tools/utils": "^10.0.0",
"tslib": "~2.5.0"
},
"main": "dist/cjs/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/other/schema-ast/package.json
Expand Up @@ -14,7 +14,7 @@
},
"dependencies": {
"@graphql-codegen/plugin-helpers": "^4.1.0",
"@graphql-tools/utils": "^9.0.0",
"@graphql-tools/utils": "^10.0.0",
"tslib": "~2.5.0"
},
"peerDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/plugins/other/visitor-plugin-common/package.json
Expand Up @@ -12,10 +12,10 @@
"test": "jest --no-watchman --config ../../../../jest.config.js"
},
"dependencies": {
"@graphql-tools/optimize": "^1.3.0",
"@graphql-tools/optimize": "^2.0.0",
"@graphql-codegen/plugin-helpers": "^4.2.0",
"@graphql-tools/relay-operation-optimizer": "^6.5.0",
"@graphql-tools/utils": "^9.0.0",
"@graphql-tools/relay-operation-optimizer": "^7.0.0",
"@graphql-tools/utils": "^10.0.0",
"auto-bind": "~4.0.0",
"dependency-graph": "^0.11.0",
"graphql-tag": "^2.11.0",
Expand Down
Expand Up @@ -16,7 +16,7 @@
"graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^9.0.0",
"@graphql-tools/utils": "^10.0.0",
"@graphql-codegen/plugin-helpers": "^4.2.0",
"@graphql-codegen/visitor-plugin-common": "3.1.1",
"auto-bind": "~4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/typescript/resolvers/package.json
Expand Up @@ -16,7 +16,7 @@
"@graphql-codegen/plugin-helpers": "^4.2.0",
"@graphql-codegen/typescript": "^3.0.4",
"@graphql-codegen/visitor-plugin-common": "3.1.1",
"@graphql-tools/utils": "^9.0.0",
"@graphql-tools/utils": "^10.0.0",
"auto-bind": "~4.0.0",
"tslib": "~2.5.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/presets/client/package.json
Expand Up @@ -27,8 +27,8 @@
"@graphql-codegen/plugin-helpers": "^4.2.0",
"@graphql-codegen/visitor-plugin-common": "^3.1.1",
"@graphql-typed-document-node/core": "3.2.0",
"@graphql-tools/documents": "^0.1.0",
"@graphql-tools/utils": "^9.0.0",
"@graphql-tools/documents": "^1.0.0",
"@graphql-tools/utils": "^10.0.0",
"tslib": "~2.5.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/presets/graphql-modules/package.json
Expand Up @@ -17,7 +17,7 @@
"dependencies": {
"@graphql-codegen/plugin-helpers": "^4.2.0",
"@graphql-codegen/visitor-plugin-common": "3.1.1",
"@graphql-tools/utils": "^9.0.0",
"@graphql-tools/utils": "^10.0.0",
"parse-filepath": "^1.0.2",
"change-case-all": "1.0.15",
"tslib": "~2.5.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/utils/plugins-helpers/package.json
Expand Up @@ -16,7 +16,7 @@
"graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^9.0.0",
"@graphql-tools/utils": "^10.0.0",
"change-case-all": "1.0.15",
"common-tags": "1.8.2",
"import-from": "4.0.0",
Expand Down Expand Up @@ -52,6 +52,6 @@
},
"type": "module",
"devDependencies": {
"@graphql-tools/apollo-engine-loader": "7.3.26"
"@graphql-tools/apollo-engine-loader": "8.0.0"
}
}
4 changes: 2 additions & 2 deletions tsconfig.json
Expand Up @@ -9,8 +9,8 @@
"importHelpers": true,
"experimentalDecorators": true,
"module": "esnext",
"target": "es2018",
"lib": ["es6", "esnext", "es2015", "dom"],
"target": "es2021",
"lib": ["es6", "esnext", "es2021", "dom"],
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"sourceMap": true,
Expand Down

0 comments on commit 4d9ea1a

Please sign in to comment.