diff --git a/examples/demo/package.json b/examples/demo/package.json index 8c7c901aa56..faa1dfdb5f6 100644 --- a/examples/demo/package.json +++ b/examples/demo/package.json @@ -3,7 +3,7 @@ "version": "4.0.0", "private": true, "dependencies": { - "@apollo/client": "^3.3.19", + "@apollo/client": "^3.6.6", "@mui/icons-material": "^5.0.1", "@mui/material": "^5.0.2", "@types/inflection": "^1.5.28", diff --git a/packages/ra-data-graphql-simple/package.json b/packages/ra-data-graphql-simple/package.json index 726108b94a4..bcc5abf3e1c 100644 --- a/packages/ra-data-graphql-simple/package.json +++ b/packages/ra-data-graphql-simple/package.json @@ -31,21 +31,26 @@ "watch": "tsup src/index.ts --silent --clean --format cjs,esm --minify --keep-names --metafile --sourcemap --dts --legacy-output --watch" }, "dependencies": { - "@apollo/client": "^3.3.19", + "@apollo/client": "^3.6.6", "graphql-ast-types-browser": "~1.0.2", - "lodash": "~4.17.5", - "pluralize": "~7.0.0", + "lodash": "^4.17.21", + "pluralize": "~8.0.0", "ra-data-graphql": "^4.1.3" }, "peerDependencies": { - "graphql": "^15.6.0", - "ra-core": "^4.0.0" + "graphql": "^15", + "ra-core": "^4.1.2" }, "devDependencies": { "cross-env": "^5.2.0", "graphql": "^15.6.0", - "npm-dts": "^1.3.10", + "npm-dts": "^1.3.11", "rimraf": "^2.6.3", "tsup": "^6.1.0" + }, + "overrides": { + "graphql-ast-types-browser": { + "graphql": "$graphql" + } } } diff --git a/packages/ra-data-graphql/package.json b/packages/ra-data-graphql/package.json index 59ea8bbc00a..5c038a44888 100644 --- a/packages/ra-data-graphql/package.json +++ b/packages/ra-data-graphql/package.json @@ -31,18 +31,18 @@ "watch": "tsup src/index.ts --silent --clean --format cjs,esm --minify --keep-names --metafile --sourcemap --dts --legacy-output --watch" }, "dependencies": { - "@apollo/client": "^3.3.19", - "lodash": "~4.17.5", - "pluralize": "~7.0.0" + "@apollo/client": "^3.6.6", + "lodash": "^4.17.21", + "pluralize": "~8.0.0" }, "peerDependencies": { - "graphql": "^15.6.0", - "ra-core": "^4.0.0" + "graphql": "^15", + "ra-core": "^4.1.2" }, "devDependencies": { "cross-env": "^5.2.0", "graphql": "^15.6.0", - "npm-dts": "^1.3.10", + "npm-dts": "^1.3.11", "rimraf": "^2.6.3", "tsup": "^6.1.0" } diff --git a/yarn.lock b/yarn.lock index 03785b7bc38..d5017bdb84d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25,7 +25,7 @@ __metadata: languageName: node linkType: hard -"@apollo/client@npm:^3.3.19, @apollo/client@npm:^3.4.13": +"@apollo/client@npm:^3.4.13": version: 3.5.7 resolution: "@apollo/client@npm:3.5.7" dependencies: @@ -54,6 +54,38 @@ __metadata: languageName: node linkType: hard +"@apollo/client@npm:^3.6.6": + version: 3.6.6 + resolution: "@apollo/client@npm:3.6.6" + dependencies: + "@graphql-typed-document-node/core": ^3.1.1 + "@wry/context": ^0.6.0 + "@wry/equality": ^0.5.0 + "@wry/trie": ^0.3.0 + graphql-tag: ^2.12.6 + hoist-non-react-statics: ^3.3.2 + optimism: ^0.16.1 + prop-types: ^15.7.2 + symbol-observable: ^4.0.0 + ts-invariant: ^0.10.3 + tslib: ^2.3.0 + zen-observable-ts: ^1.2.5 + peerDependencies: + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 + graphql-ws: ^5.5.5 + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + subscriptions-transport-ws: ^0.9.0 || ^0.11.0 + peerDependenciesMeta: + graphql-ws: + optional: true + react: + optional: true + subscriptions-transport-ws: + optional: true + checksum: aeef464741353cc247560e07c1d6991cdd7a97072399c2888267ede80eda97c9bba39f5f641290354d1c1343986ccbf9eb511533866c5f212ea37f0b8dfdd553 + languageName: node + linkType: hard + "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.5.5, @babel/code-frame@npm:^7.8.3": version: 7.16.7 resolution: "@babel/code-frame@npm:7.16.7" @@ -2084,7 +2116,7 @@ __metadata: languageName: node linkType: hard -"@graphql-typed-document-node/core@npm:^3.0.0": +"@graphql-typed-document-node/core@npm:^3.0.0, @graphql-typed-document-node/core@npm:^3.1.1": version: 3.1.1 resolution: "@graphql-typed-document-node/core@npm:3.1.1" peerDependencies: @@ -7877,7 +7909,7 @@ __metadata: languageName: node linkType: hard -"async@npm:^3.1.0, async@npm:^3.2.0": +"async@npm:^3.1.0, async@npm:^3.2.0, async@npm:^3.2.3": version: 3.2.3 resolution: "async@npm:3.2.3" checksum: 109780c846f05109dde14412d916ae4ed6daf6f9aad0c4aa1dcf0d4da775a3a9e35e0e06e4e06ad9fed66f99ca15549da16f2f243c56103b346e9d3bcd9c943f @@ -10810,7 +10842,7 @@ __metadata: version: 0.0.0-use.local resolution: "demo@workspace:examples/demo" dependencies: - "@apollo/client": ^3.3.19 + "@apollo/client": ^3.6.6 "@mui/icons-material": ^5.0.1 "@mui/material": ^5.0.2 "@types/fetch-mock": ^7.3.2 @@ -18897,6 +18929,23 @@ __metadata: languageName: node linkType: hard +"npm-dts@npm:^1.3.11": + version: 1.3.11 + resolution: "npm-dts@npm:1.3.11" + dependencies: + args: 5.0.1 + find-node-modules: 2.1.2 + mkdirp: 1.0.4 + npm-run: 5.0.1 + rimraf: 3.0.2 + tmp: 0.2.1 + winston: 3.5.0 + bin: + npm-dts: cli.js + checksum: c8d84f77baad18f7de3272a958511fb7069d2d9b8dc8c21b26bb297a8c5c5bdf1af365be0b3eff88837cc4c90030ac1551e14392a39ddf29f0947ad2dd1752a1 + languageName: node + linkType: hard + "npm-install-checks@npm:^4.0.0": version: 4.0.0 resolution: "npm-install-checks@npm:4.0.0" @@ -20051,10 +20100,10 @@ __metadata: languageName: node linkType: hard -"pluralize@npm:~7.0.0": - version: 7.0.0 - resolution: "pluralize@npm:7.0.0" - checksum: b44fd8e4bc487534b804bb8490bc9982bd229997af6e9cc0f51c8205e11c1f31013e8eba3f9b0864fa9f3c0534e06935db46f71f612d1a9633253a14add948e6 +"pluralize@npm:~8.0.0": + version: 8.0.0 + resolution: "pluralize@npm:8.0.0" + checksum: 2044cfc34b2e8c88b73379ea4a36fc577db04f651c2909041b054c981cd863dd5373ebd030123ab058d194ae615d3a97cfdac653991e499d10caf592e8b3dc33 languageName: node linkType: hard @@ -21486,19 +21535,19 @@ __metadata: version: 0.0.0-use.local resolution: "ra-data-graphql-simple@workspace:packages/ra-data-graphql-simple" dependencies: - "@apollo/client": ^3.3.19 + "@apollo/client": ^3.6.6 cross-env: ^5.2.0 graphql: ^15.6.0 graphql-ast-types-browser: ~1.0.2 - lodash: ~4.17.5 - npm-dts: ^1.3.10 - pluralize: ~7.0.0 + lodash: ^4.17.21 + npm-dts: ^1.3.11 + pluralize: ~8.0.0 ra-data-graphql: ^4.1.3 rimraf: ^2.6.3 tsup: ^6.1.0 peerDependencies: - graphql: ^15.6.0 - ra-core: ^4.0.0 + graphql: ^15 + ra-core: ^4.1.2 languageName: unknown linkType: soft @@ -21506,17 +21555,17 @@ __metadata: version: 0.0.0-use.local resolution: "ra-data-graphql@workspace:packages/ra-data-graphql" dependencies: - "@apollo/client": ^3.3.19 + "@apollo/client": ^3.6.6 cross-env: ^5.2.0 graphql: ^15.6.0 - lodash: ~4.17.5 - npm-dts: ^1.3.10 - pluralize: ~7.0.0 + lodash: ^4.17.21 + npm-dts: ^1.3.11 + pluralize: ~8.0.0 rimraf: ^2.6.3 tsup: ^6.1.0 peerDependencies: - graphql: ^15.6.0 - ra-core: ^4.0.0 + graphql: ^15 + ra-core: ^4.1.2 languageName: unknown linkType: soft @@ -23492,6 +23541,13 @@ __metadata: languageName: node linkType: hard +"safe-stable-stringify@npm:^2.3.1": + version: 2.3.1 + resolution: "safe-stable-stringify@npm:2.3.1" + checksum: 5bdf3bae0a628c767cf0fad95a8245802ef3976d5d29709d5ffbbfecde49ad5f55a1c797cf438f1c4cb7d90ab3e88102cca8148829e3a12fe0dc0c36f6445031 + languageName: node + linkType: hard + "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:~2.1.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" @@ -25562,6 +25618,15 @@ __metadata: languageName: node linkType: hard +"ts-invariant@npm:^0.10.3": + version: 0.10.3 + resolution: "ts-invariant@npm:0.10.3" + dependencies: + tslib: ^2.1.0 + checksum: 2fbc178d5903d325ee0b87fad38827eac11888b6e86979b06754fd4bcdcf44c2a99b8bcd5d59d149c0464ede55ae810b02a2aee6835ad10efe4dd0e22efd68c0 + languageName: node + linkType: hard + "ts-invariant@npm:^0.9.4": version: 0.9.4 resolution: "ts-invariant@npm:0.9.4" @@ -26971,6 +27036,17 @@ __metadata: languageName: node linkType: hard +"winston-transport@npm:^4.4.2": + version: 4.5.0 + resolution: "winston-transport@npm:4.5.0" + dependencies: + logform: ^2.3.2 + readable-stream: ^3.6.0 + triple-beam: ^1.3.0 + checksum: 110a47c5acc87c3aa0f101741c0a992e52a86802272838c18aede8178d2b5e80254d2433dcac3439cefbc2777d9e22e65f84e9cee3130681c58e4ae5d58f50c3 + languageName: node + linkType: hard + "winston@npm:3.3.3": version: 3.3.3 resolution: "winston@npm:3.3.3" @@ -26988,6 +27064,24 @@ __metadata: languageName: node linkType: hard +"winston@npm:3.5.0": + version: 3.5.0 + resolution: "winston@npm:3.5.0" + dependencies: + "@dabh/diagnostics": ^2.0.2 + async: ^3.2.3 + is-stream: ^2.0.0 + logform: ^2.3.2 + one-time: ^1.0.0 + readable-stream: ^3.4.0 + safe-stable-stringify: ^2.3.1 + stack-trace: 0.0.x + triple-beam: ^1.3.0 + winston-transport: ^4.4.2 + checksum: 1693b46be21c65fce915d0ed6303f7832a71602b81b6aad37cb878a18c308f543459eb92dfc22bb0e6cc1ac9ff103d2d10d03b5190450f5bdb274e6835409889 + languageName: node + linkType: hard + "word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3": version: 1.2.3 resolution: "word-wrap@npm:1.2.3" @@ -27591,6 +27685,15 @@ __metadata: languageName: node linkType: hard +"zen-observable-ts@npm:^1.2.5": + version: 1.2.5 + resolution: "zen-observable-ts@npm:1.2.5" + dependencies: + zen-observable: 0.8.15 + checksum: 21d586f3d0543e1d6f05d9333a137b407dbf337907c1ee1c2fa7a7da044f7e1262e4baf4ef8902f230c6f5acb561047659eb7df73df33307233cc451efe46db1 + languageName: node + linkType: hard + "zen-observable@npm:0.8.15": version: 0.8.15 resolution: "zen-observable@npm:0.8.15"