diff --git a/common/changes/@boostercloud/framework-core/fix_graphql_dependency_2023-06-29-13-39.json b/common/changes/@boostercloud/framework-core/fix_graphql_dependency_2023-06-29-13-39.json new file mode 100644 index 000000000..98075935b --- /dev/null +++ b/common/changes/@boostercloud/framework-core/fix_graphql_dependency_2023-06-29-13-39.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@boostercloud/framework-core", + "comment": "Fix GraphQL dependency", + "type": "minor" + } + ], + "packageName": "@boostercloud/framework-core" +} \ No newline at end of file diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 448bef355..dfb4c95d2 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -8,8 +8,8 @@ importers: ../../packages/application-tester: specifiers: '@apollo/client': 3.7.13 - '@boostercloud/eslint-config': workspace:^1.14.1 - '@boostercloud/framework-types': workspace:^1.14.1 + '@boostercloud/eslint-config': workspace:^1.17.0 + '@boostercloud/framework-types': workspace:^1.17.0 '@effect-ts/core': ^0.60.4 '@types/jsonwebtoken': ^8.5.8 '@types/node': 16.11.7 @@ -26,7 +26,7 @@ importers: eslint-plugin-prettier: 3.4.0 eslint-plugin-unicorn: ~44.0.2 fast-check: 2.17.0 - graphql: 16.6.0 + graphql: ^16.6.0 jsonwebtoken: 8.5.1 prettier: 2.3.0 rimraf: 5.0.0 @@ -70,10 +70,10 @@ importers: ../../packages/cli: specifiers: - '@boostercloud/application-tester': workspace:^1.14.1 - '@boostercloud/eslint-config': workspace:^1.14.1 - '@boostercloud/framework-core': workspace:^1.14.1 - '@boostercloud/framework-types': workspace:^1.14.1 + '@boostercloud/application-tester': workspace:^1.17.0 + '@boostercloud/eslint-config': workspace:^1.17.0 + '@boostercloud/framework-core': workspace:^1.17.0 + '@boostercloud/framework-types': workspace:^1.17.0 '@effect-ts/core': ^0.60.4 '@oclif/command': ^1.8 '@oclif/config': ^1.18 @@ -189,8 +189,8 @@ importers: ../../packages/framework-common-helpers: specifiers: - '@boostercloud/eslint-config': workspace:^1.14.1 - '@boostercloud/framework-types': workspace:^1.14.1 + '@boostercloud/eslint-config': workspace:^1.17.0 + '@boostercloud/framework-types': workspace:^1.17.0 '@effect-ts/core': ^0.60.4 '@types/chai': 4.2.18 '@types/chai-as-promised': 7.1.4 @@ -258,10 +258,10 @@ importers: ../../packages/framework-core: specifiers: - '@boostercloud/eslint-config': workspace:^1.14.1 - '@boostercloud/framework-common-helpers': workspace:^1.14.1 - '@boostercloud/framework-types': workspace:^1.14.1 - '@boostercloud/metadata-booster': workspace:^1.14.1 + '@boostercloud/eslint-config': workspace:^1.17.0 + '@boostercloud/framework-common-helpers': workspace:^1.17.0 + '@boostercloud/framework-types': workspace:^1.17.0 + '@boostercloud/metadata-booster': workspace:^1.17.0 '@effect-ts/core': ^0.60.4 '@types/chai': 4.2.18 '@types/chai-as-promised': 7.1.4 @@ -285,7 +285,7 @@ importers: eslint-plugin-unicorn: ~44.0.2 faker: 5.1.0 fp-ts: ^2.11.0 - graphql: 16.6.0 + graphql: ^16.6.0 graphql-scalars: ^1.17.0 graphql-subscriptions: 2.0.0 inflected: 2.1.0 @@ -310,7 +310,6 @@ importers: '@boostercloud/framework-types': link:../framework-types '@effect-ts/core': 0.60.5 fp-ts: 2.14.0 - graphql: 16.6.0 graphql-scalars: 1.21.3_graphql@16.6.0 graphql-subscriptions: 2.0.0_graphql@16.6.0 inflected: 2.1.0 @@ -344,6 +343,7 @@ importers: eslint-plugin-prettier: 3.4.0_uyy4h6aa7bacputuojct3xmumq eslint-plugin-unicorn: 44.0.2_eslint@8.39.0 faker: 5.1.0 + graphql: 16.6.0 mocha: 8.4.0 mock-jwks: 1.0.3_nock@11.8.2 nock: 11.8.2 @@ -358,19 +358,19 @@ importers: ../../packages/framework-integration-tests: specifiers: '@apollo/client': 3.7.13 - '@boostercloud/application-tester': workspace:^1.14.1 - '@boostercloud/cli': workspace:^1.14.1 - '@boostercloud/eslint-config': workspace:^1.14.1 - '@boostercloud/framework-common-helpers': workspace:^1.14.1 - '@boostercloud/framework-core': workspace:^1.14.1 - '@boostercloud/framework-provider-aws': workspace:^1.14.1 - '@boostercloud/framework-provider-aws-infrastructure': workspace:^1.14.1 - '@boostercloud/framework-provider-azure': workspace:^1.14.1 - '@boostercloud/framework-provider-azure-infrastructure': workspace:^1.14.1 - '@boostercloud/framework-provider-local': workspace:^1.14.1 - '@boostercloud/framework-provider-local-infrastructure': workspace:^1.14.1 - '@boostercloud/framework-types': workspace:^1.14.1 - '@boostercloud/metadata-booster': workspace:^1.14.1 + '@boostercloud/application-tester': workspace:^1.17.0 + '@boostercloud/cli': workspace:^1.17.0 + '@boostercloud/eslint-config': workspace:^1.17.0 + '@boostercloud/framework-common-helpers': workspace:^1.17.0 + '@boostercloud/framework-core': workspace:^1.17.0 + '@boostercloud/framework-provider-aws': workspace:^1.17.0 + '@boostercloud/framework-provider-aws-infrastructure': workspace:^1.17.0 + '@boostercloud/framework-provider-azure': workspace:^1.17.0 + '@boostercloud/framework-provider-azure-infrastructure': workspace:^1.17.0 + '@boostercloud/framework-provider-local': workspace:^1.17.0 + '@boostercloud/framework-provider-local-infrastructure': workspace:^1.17.0 + '@boostercloud/framework-types': workspace:^1.17.0 + '@boostercloud/metadata-booster': workspace:^1.17.0 '@effect-ts/core': ^0.60.4 '@kubernetes/client-node': ^0.17.0 '@types/aws-lambda': 8.10.48 @@ -403,7 +403,7 @@ importers: express-unless: 2.1.3 faker: 5.1.0 graphology-types: ^0.24.0 - graphql: 16.6.0 + graphql: ^16.6.0 ink: ^3.0.5 jsonwebtoken: 8.5.1 jwks-rsa: 2.0.3 @@ -494,9 +494,9 @@ importers: ../../packages/framework-provider-aws: specifiers: - '@boostercloud/eslint-config': workspace:^1.14.1 - '@boostercloud/framework-common-helpers': workspace:^1.14.1 - '@boostercloud/framework-types': workspace:^1.14.1 + '@boostercloud/eslint-config': workspace:^1.17.0 + '@boostercloud/framework-common-helpers': workspace:^1.17.0 + '@boostercloud/framework-types': workspace:^1.17.0 '@effect-ts/core': ^0.60.4 '@types/aws-lambda': 8.10.48 '@types/chai': 4.2.18 @@ -590,10 +590,10 @@ importers: '@aws-cdk/core': ^1.170.0 '@aws-cdk/custom-resources': ^1.170.0 '@aws-cdk/cx-api': ^1.170.0 - '@boostercloud/eslint-config': workspace:^1.14.1 - '@boostercloud/framework-common-helpers': workspace:^1.14.1 - '@boostercloud/framework-provider-aws': workspace:^1.14.1 - '@boostercloud/framework-types': workspace:^1.14.1 + '@boostercloud/eslint-config': workspace:^1.17.0 + '@boostercloud/framework-common-helpers': workspace:^1.17.0 + '@boostercloud/framework-provider-aws': workspace:^1.17.0 + '@boostercloud/framework-types': workspace:^1.17.0 '@effect-ts/core': ^0.60.4 '@types/archiver': 5.1.0 '@types/aws-lambda': 8.10.48 @@ -706,9 +706,9 @@ importers: '@azure/functions': ^1.2.2 '@azure/identity': ~2.1.0 '@azure/web-pubsub': ~1.1.0 - '@boostercloud/eslint-config': workspace:^1.14.1 - '@boostercloud/framework-common-helpers': workspace:^1.14.1 - '@boostercloud/framework-types': workspace:^1.14.1 + '@boostercloud/eslint-config': workspace:^1.17.0 + '@boostercloud/framework-common-helpers': workspace:^1.17.0 + '@boostercloud/framework-types': workspace:^1.17.0 '@effect-ts/core': ^0.60.4 '@types/chai': 4.2.18 '@types/chai-as-promised': 7.1.4 @@ -779,11 +779,11 @@ importers: '@azure/arm-resources': ^5.0.1 '@azure/cosmos': ^3.17.0 '@azure/identity': ~2.1.0 - '@boostercloud/eslint-config': workspace:^1.14.1 - '@boostercloud/framework-common-helpers': workspace:^1.14.1 - '@boostercloud/framework-core': workspace:^1.14.1 - '@boostercloud/framework-provider-azure': workspace:^1.14.1 - '@boostercloud/framework-types': workspace:^1.14.1 + '@boostercloud/eslint-config': workspace:^1.17.0 + '@boostercloud/framework-common-helpers': workspace:^1.17.0 + '@boostercloud/framework-core': workspace:^1.17.0 + '@boostercloud/framework-provider-azure': workspace:^1.17.0 + '@boostercloud/framework-types': workspace:^1.17.0 '@cdktf/provider-azurerm': 5.0.13 '@cdktf/provider-time': 5.0.0 '@effect-ts/core': ^0.60.4 @@ -890,9 +890,9 @@ importers: ../../packages/framework-provider-local: specifiers: - '@boostercloud/eslint-config': workspace:^1.14.1 - '@boostercloud/framework-common-helpers': workspace:^1.14.1 - '@boostercloud/framework-types': workspace:^1.14.1 + '@boostercloud/eslint-config': workspace:^1.17.0 + '@boostercloud/framework-common-helpers': workspace:^1.17.0 + '@boostercloud/framework-types': workspace:^1.17.0 '@effect-ts/core': ^0.60.4 '@types/chai': 4.2.18 '@types/chai-as-promised': 7.1.4 @@ -971,10 +971,10 @@ importers: ../../packages/framework-provider-local-infrastructure: specifiers: - '@boostercloud/eslint-config': workspace:^1.14.1 - '@boostercloud/framework-common-helpers': workspace:^1.14.1 - '@boostercloud/framework-provider-local': workspace:^1.14.1 - '@boostercloud/framework-types': workspace:^1.14.1 + '@boostercloud/eslint-config': workspace:^1.17.0 + '@boostercloud/framework-common-helpers': workspace:^1.17.0 + '@boostercloud/framework-provider-local': workspace:^1.17.0 + '@boostercloud/framework-types': workspace:^1.17.0 '@effect-ts/core': ^0.60.4 '@types/chai': 4.2.18 '@types/chai-as-promised': 7.1.4 @@ -1054,12 +1054,13 @@ importers: ../../packages/framework-types: specifiers: - '@boostercloud/eslint-config': workspace:^1.14.1 - '@boostercloud/metadata-booster': workspace:^1.14.1 + '@boostercloud/eslint-config': workspace:^1.17.0 + '@boostercloud/metadata-booster': workspace:^1.17.0 '@effect-ts/core': ^0.60.4 '@effect-ts/node': ~0.39.0 '@types/chai': 4.2.18 '@types/chai-as-promised': 7.1.4 + '@types/graphql': ^14.5.0 '@types/mocha': 8.2.2 '@types/node': 16.11.7 '@types/sinon': 10.0.0 @@ -1075,7 +1076,7 @@ importers: eslint-plugin-prettier: 3.4.0 eslint-plugin-unicorn: ~44.0.2 fast-check: 2.17.0 - graphql: 16.6.0 + graphql: ^16.6.0 mocha: 8.4.0 nyc: ^15.1.0 prettier: 2.3.0 @@ -1087,7 +1088,6 @@ importers: dependencies: '@effect-ts/core': 0.60.5 '@effect-ts/node': 0.39.0_@effect-ts+core@0.60.5 - graphql: 16.6.0 tslib: 2.5.0 uuid: 8.3.2 devDependencies: @@ -1095,6 +1095,7 @@ importers: '@boostercloud/metadata-booster': link:../metadata-booster '@types/chai': 4.2.18 '@types/chai-as-promised': 7.1.4 + '@types/graphql': 14.5.0 '@types/mocha': 8.2.2 '@types/node': 16.11.7 '@types/sinon': 10.0.0 @@ -1110,6 +1111,7 @@ importers: eslint-plugin-prettier: 3.4.0_uyy4h6aa7bacputuojct3xmumq eslint-plugin-unicorn: 44.0.2_eslint@8.39.0 fast-check: 2.17.0 + graphql: 16.6.0 mocha: 8.4.0 nyc: 15.1.0 prettier: 2.3.0 @@ -1119,7 +1121,7 @@ importers: ../../packages/metadata-booster: specifiers: - '@boostercloud/eslint-config': workspace:^1.14.1 + '@boostercloud/eslint-config': workspace:^1.17.0 '@effect-ts/core': ^0.60.4 '@types/node': 16.11.7 '@typescript-eslint/eslint-plugin': ^5.0.0 @@ -1539,7 +1541,7 @@ packages: '@aws-cdk/aws-logs': 1.199.0_tqi77pcvvujtgay5663ykqn7wy '@aws-cdk/aws-s3': 1.199.0_wim6pvar6pmwiq3fs3ksmix5ru '@aws-cdk/aws-s3-assets': 1.199.0_tqi77pcvvujtgay5663ykqn7wy - '@aws-cdk/aws-secretsmanager': 1.199.0_maqnqwhn36fygp3z4rdnivbxii + '@aws-cdk/aws-secretsmanager': 1.199.0_uxypjio4ejtfqgxognd5fibs2q '@aws-cdk/core': 1.199.0_kscyon7amn7dglog7cugnqvkwm '@aws-cdk/region-info': 1.199.0 constructs: 3.4.293 @@ -1761,7 +1763,7 @@ packages: '@aws-cdk/aws-route53-targets': 1.199.0_6qn3q4quwxpkjgl3z2r2rmaqqi '@aws-cdk/aws-s3': 1.199.0_wim6pvar6pmwiq3fs3ksmix5ru '@aws-cdk/aws-s3-assets': 1.199.0_tqi77pcvvujtgay5663ykqn7wy - '@aws-cdk/aws-secretsmanager': 1.199.0_maqnqwhn36fygp3z4rdnivbxii + '@aws-cdk/aws-secretsmanager': 1.199.0_uxypjio4ejtfqgxognd5fibs2q '@aws-cdk/aws-servicediscovery': 1.199.0_4axszbdsnc7kzhsa3r5g56z4bu '@aws-cdk/aws-sns': 1.199.0_wim6pvar6pmwiq3fs3ksmix5ru '@aws-cdk/aws-sqs': 1.199.0_iumdymv27iwprkm3rzoqxlpuia @@ -2007,7 +2009,7 @@ packages: '@aws-cdk/aws-lambda': 1.199.0_5pbncl2no5vqinyo3n2ekkob5q '@aws-cdk/aws-s3': 1.199.0_wim6pvar6pmwiq3fs3ksmix5ru '@aws-cdk/aws-s3-notifications': 1.199.0_fufarp47blk4okwshjegj2wjg4 - '@aws-cdk/aws-secretsmanager': 1.199.0_maqnqwhn36fygp3z4rdnivbxii + '@aws-cdk/aws-secretsmanager': 1.199.0_uxypjio4ejtfqgxognd5fibs2q '@aws-cdk/aws-sns': 1.199.0_wim6pvar6pmwiq3fs3ksmix5ru '@aws-cdk/aws-sns-subscriptions': 1.199.0_x7skkdpav5hf4ncc76dwztyszi '@aws-cdk/aws-sqs': 1.199.0_iumdymv27iwprkm3rzoqxlpuia @@ -2232,7 +2234,7 @@ packages: constructs: 3.4.293 dev: false - /@aws-cdk/aws-secretsmanager/1.199.0_maqnqwhn36fygp3z4rdnivbxii: + /@aws-cdk/aws-secretsmanager/1.199.0_uxypjio4ejtfqgxognd5fibs2q: resolution: {integrity: sha512-Dj0+q7I9xRwg1hHowrHb9rxmicDGZVmQixFaFuBdsS5zNfBNdC6WJGWhDddJDZIPclip06fXBm/by4+l4XUpNw==} engines: {node: '>= 14.15.0'} peerDependencies: @@ -2242,18 +2244,12 @@ packages: '@aws-cdk/cx-api': 1.199.0 constructs: ^3.3.69 dependencies: - '@aws-cdk/aws-ec2': 1.199.0_ylylsu27pdmlfxyxktlluxtkr4 '@aws-cdk/aws-iam': 1.199.0_xwfh4icwyvj4zfjhzlqde6qllu - '@aws-cdk/aws-kms': 1.199.0_iumdymv27iwprkm3rzoqxlpuia '@aws-cdk/aws-lambda': 1.199.0_5pbncl2no5vqinyo3n2ekkob5q '@aws-cdk/aws-sam': 1.199.0_xwfh4icwyvj4zfjhzlqde6qllu '@aws-cdk/core': 1.199.0_kscyon7amn7dglog7cugnqvkwm '@aws-cdk/cx-api': 1.199.0 constructs: 3.4.293 - transitivePeerDependencies: - - '@aws-cdk/assets' - - '@aws-cdk/aws-logs' - - '@aws-cdk/aws-s3' dev: false /@aws-cdk/aws-servicediscovery/1.199.0_4axszbdsnc7kzhsa3r5g56z4bu: @@ -3876,6 +3872,13 @@ packages: '@types/minimatch': 5.1.2 '@types/node': 16.11.7 + /@types/graphql/14.5.0: + resolution: {integrity: sha512-MOkzsEp1Jk5bXuAsHsUi6BVv0zCO+7/2PTiZMXWDSsMXvNU6w/PLMQT2vHn8hy2i0JqojPz1Sz6rsFjHtsU0lA==} + deprecated: This is a stub types definition. graphql provides its own type definitions, so you do not need this installed. + dependencies: + graphql: 16.6.0 + dev: true + /@types/http-cache-semantics/4.0.1: resolution: {integrity: sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==} dev: true diff --git a/packages/application-tester/package.json b/packages/application-tester/package.json index b6d3d5369..1a26ea97c 100644 --- a/packages/application-tester/package.json +++ b/packages/application-tester/package.json @@ -35,7 +35,7 @@ "@apollo/client": "3.7.13", "@boostercloud/framework-types": "workspace:^1.17.0", "cross-fetch": "3.1.5", - "graphql": "16.6.0", + "graphql": "^16.6.0", "jsonwebtoken": "8.5.1", "subscriptions-transport-ws": "0.11.0", "tslib": "^2.4.0", diff --git a/packages/cli/src/templates/project/package-json.ts b/packages/cli/src/templates/project/package-json.ts index 6640c4410..e6b4e6fc8 100644 --- a/packages/cli/src/templates/project/package-json.ts +++ b/packages/cli/src/templates/project/package-json.ts @@ -32,7 +32,8 @@ export const template = `{ "typescript": "4.7.4", "ts-node": "9.1.1", "@types/node": "16.11.7", - "ttypescript": "1.5.13" + "ttypescript": "1.5.13", + "graphql": "^16.6.0" }, "engines": { "node": ">=14.0.0" diff --git a/packages/framework-core/package.json b/packages/framework-core/package.json index b832d9782..2fb83cd80 100644 --- a/packages/framework-core/package.json +++ b/packages/framework-core/package.json @@ -29,11 +29,13 @@ "bugs": { "url": "https://github.com/boostercloud/booster/issues" }, + "peerDependencies": { + "graphql": "^16.6.0" + }, "dependencies": { "@boostercloud/framework-common-helpers": "workspace:^1.17.0", "@boostercloud/framework-types": "workspace:^1.17.0", "fp-ts": "^2.11.0", - "graphql": "16.6.0", "graphql-scalars": "^1.17.0", "graphql-subscriptions": "2.0.0", "inflected": "2.1.0", @@ -78,7 +80,8 @@ "sinon-chai": "3.5.0", "ts-node": "^10.9.1", "typescript": "4.7.4", - "eslint-plugin-unicorn": "~44.0.2" + "eslint-plugin-unicorn": "~44.0.2", + "graphql": "^16.6.0" }, "pnpm": { "overrides": { diff --git a/packages/framework-integration-tests/integration/fixtures/cart-demo/package.json b/packages/framework-integration-tests/integration/fixtures/cart-demo/package.json index 5ed5b7b43..7dcaeff49 100644 --- a/packages/framework-integration-tests/integration/fixtures/cart-demo/package.json +++ b/packages/framework-integration-tests/integration/fixtures/cart-demo/package.json @@ -24,7 +24,8 @@ "@types/node": "whatever", "@boostercloud/framework-provider-aws-infrastructure": "whatever", "ttypescript": "whatever", - "@boostercloud/metadata-booster": "whatever" + "@boostercloud/metadata-booster": "whatever", + "graphql": "^16.6.0" }, "engines": { "node": ">=14.0.0" diff --git a/packages/framework-integration-tests/package.json b/packages/framework-integration-tests/package.json index b8934c68d..ad079cb6a 100644 --- a/packages/framework-integration-tests/package.json +++ b/packages/framework-integration-tests/package.json @@ -16,7 +16,7 @@ "@boostercloud/framework-provider-local": "workspace:^1.17.0", "@boostercloud/framework-types": "workspace:^1.17.0", "aws-sdk": "2.853.0", - "graphql": "16.6.0", + "graphql": "^16.6.0", "tslib": "^2.4.0", "@effect-ts/core": "^0.60.4", "express-unless": "2.1.3" diff --git a/packages/framework-types/package.json b/packages/framework-types/package.json index 94cb73e6b..d06f61e48 100644 --- a/packages/framework-types/package.json +++ b/packages/framework-types/package.json @@ -32,8 +32,10 @@ "bugs": { "url": "https://github.com/boostercloud/booster/issues" }, + "peerDependencies": { + "graphql": "^16.6.0" + }, "dependencies": { - "graphql": "16.6.0", "tslib": "^2.4.0", "uuid": "8.3.2", "@effect-ts/core": "^0.60.4", @@ -51,6 +53,7 @@ "@types/uuid": "8.3.0", "@typescript-eslint/eslint-plugin": "^5.0.0", "@typescript-eslint/parser": "^5.0.0", + "@types/graphql": "^14.5.0", "eslint": "^8.23.1", "eslint-config-prettier": "8.3.0", "eslint-plugin-import": "^2.26.0", @@ -64,7 +67,8 @@ "sinon-chai": "3.5.0", "typescript": "4.7.4", "prettier": "2.3.0", - "eslint-plugin-unicorn": "~44.0.2" + "eslint-plugin-unicorn": "~44.0.2", + "graphql": "^16.6.0" }, "pnpm": { "overrides": {