From 5f243c8d2c0df99d41eee21e78e7ae5403fe1b1c Mon Sep 17 00:00:00 2001 From: facebook-github-bot Date: Mon, 18 Dec 2023 11:56:56 -0800 Subject: [PATCH 1/4] Update Cargo.lock (#4553) Summary: Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action Pull Request resolved: https://github.com/facebook/relay/pull/4553 Reviewed By: tyao1 Differential Revision: D52239786 Pulled By: alunyov fbshipit-source-id: 50de944b6aeed97164db05b9bc4ce0dde6dacf2d --- compiler/Cargo.lock | 50 ++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/compiler/Cargo.lock b/compiler/Cargo.lock index a91c91539ef82..9550c70da4a47 100644 --- a/compiler/Cargo.lock +++ b/compiler/Cargo.lock @@ -221,7 +221,7 @@ dependencies = [ "bitflags 1.3.2", "clap_derive", "clap_lex", - "indexmap", + "indexmap 1.9.2", "once_cell", "regex", "strsim", @@ -269,7 +269,7 @@ name = "common" version = "0.0.0" dependencies = [ "colored", - "indexmap", + "indexmap 2.1.0", "intern", "log", "lsp-types", @@ -415,7 +415,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ "cfg-if 1.0.0", - "hashbrown", + "hashbrown 0.12.3", "lock_api", "once_cell", "parking_lot_core", @@ -494,6 +494,12 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.2.8" @@ -751,7 +757,7 @@ dependencies = [ "fnv", "graphql-cli", "graphql-syntax", - "indexmap", + "indexmap 2.1.0", "intern", "lazy_static", "once_cell", @@ -849,7 +855,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.2", "slab", "tokio", "tokio-util 0.7.8", @@ -866,6 +872,12 @@ dependencies = [ "serde", ] +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + [[package]] name = "heck" version = "0.4.0" @@ -974,9 +986,19 @@ version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ - "arbitrary", "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "arbitrary", + "equivalent", + "hashbrown 0.14.3", "rayon", "serde", ] @@ -987,8 +1009,8 @@ version = "0.1.0" dependencies = [ "bincode", "fnv", - "hashbrown", - "indexmap", + "hashbrown 0.12.3", + "indexmap 2.1.0", "once_cell", "parking_lot", "rand", @@ -1618,7 +1640,7 @@ dependencies = [ "graphql-syntax", "graphql-test-helpers", "hex", - "indexmap", + "indexmap 2.1.0", "intern", "lazy_static", "md-5", @@ -1656,7 +1678,7 @@ dependencies = [ "graphql-text-printer", "graphql-watchman", "hex", - "indexmap", + "indexmap 2.1.0", "intern", "js-config-loader", "lazy_static", @@ -1718,7 +1740,7 @@ version = "0.0.0" dependencies = [ "common", "fnv", - "indexmap", + "indexmap 2.1.0", "intern", "pathdiff", "regex", @@ -1825,7 +1847,7 @@ dependencies = [ "graphql-syntax", "graphql-test-helpers", "graphql-text-printer", - "indexmap", + "indexmap 2.1.0", "intern", "itertools", "lazy_static", @@ -1851,7 +1873,7 @@ dependencies = [ "graphql-ir", "graphql-syntax", "graphql-test-helpers", - "indexmap", + "indexmap 2.1.0", "intern", "itertools", "lazy_static", From e1cefa5c1265896dbc0625344b82378c88c6b0b5 Mon Sep 17 00:00:00 2001 From: Tianyu Yao Date: Tue, 19 Dec 2023 11:57:54 -0800 Subject: [PATCH 2/4] Remove a `==` Reviewed By: captbaritone Differential Revision: D52186795 fbshipit-source-id: 7c4644f50830f8577e01452a7f35660869e4de0d --- packages/relay-runtime/store/RelayStoreUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/relay-runtime/store/RelayStoreUtils.js b/packages/relay-runtime/store/RelayStoreUtils.js index 4f4772c668bda..8338672f25a45 100644 --- a/packages/relay-runtime/store/RelayStoreUtils.js +++ b/packages/relay-runtime/store/RelayStoreUtils.js @@ -80,7 +80,7 @@ function getArgumentValues( FRAGMENT_POINTER_IS_WITHIN_UNMATCHED_TYPE_REFINEMENT?: boolean, [string]: mixed, } = {}; - if (isWithinUnmatchedTypeRefinement == true) { + if (isWithinUnmatchedTypeRefinement) { values[ RelayStoreUtils.FRAGMENT_POINTER_IS_WITHIN_UNMATCHED_TYPE_REFINEMENT ] = true; From e98d2e59382939dbdf01280dc22052c40c88a6f9 Mon Sep 17 00:00:00 2001 From: Pieter Vanderwerff Date: Tue, 19 Dec 2023 14:40:47 -0800 Subject: [PATCH 3/4] Deploy 0.225.0 to xplat Reviewed By: SamChou19815 Differential Revision: D52305312 fbshipit-source-id: b18045c450dc3204b08452ede17b76d1a43cce50 --- .flowconfig | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.flowconfig b/.flowconfig index c1a8c937ef479..520308b77a5d8 100644 --- a/.flowconfig +++ b/.flowconfig @@ -43,4 +43,4 @@ untyped-import untyped-type-import [version] -^0.224.0 +^0.225.0 diff --git a/package.json b/package.json index f0061a168dacb..45ced2e524fb6 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "eslint-plugin-relay": "1.8.3", "eslint-plugin-relay-internal": "link:./packages/eslint-plugin-relay-internal", "fbjs": "^3.0.2", - "flow-bin": "^0.224.0", + "flow-bin": "^0.225.0", "glob": "^7.1.1", "graphql": "15.3.0", "gulp": "4.0.2", diff --git a/yarn.lock b/yarn.lock index dd10e2611a2e8..d21d20f310d50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3352,10 +3352,10 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.6.tgz#022e9218c637f9f3fc9c35ab9c9193f05add60b2" integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ== -flow-bin@^0.224.0: - version "0.224.0" - resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.224.0.tgz#99454c9a37d2c531e831fa1261ad3e38f24edaf1" - integrity sha512-dsfQCDzOzNL/6bSQMGSSjTUNU7jpniZzmHQRt1rjD7AROthtXdqAkWQ00Xoifn42xeMaO/YkjlOvjpDA4F5Igw== +flow-bin@^0.225.0: + version "0.225.0" + resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.225.0.tgz#780d035f48ec306c5e311db3b8979849bac2509c" + integrity sha512-JwdUIuHtIsmbdiXPPYvbei2y0Q3q4hh6Bifwp/RiMFTryKkvs0WYkNO1Nl0A3TfObcsa13XpcwCCkhJ7Dv8B/w== flush-write-stream@^1.0.2: version "1.1.1" From 5c82d16619e88984fc26581363a4daa19ad70e57 Mon Sep 17 00:00:00 2001 From: "Alex Taylor (alta)" Date: Tue, 19 Dec 2023 20:48:44 -0800 Subject: [PATCH 4/4] Update hermes-parser and related packages in fbsource to 0.18.2 Reviewed By: pieterv Differential Revision: D52303145 fbshipit-source-id: 1b2b07c16bf55879ecb3b6611cbd53faa1ecc012 --- package.json | 6 +-- packages/babel-plugin-relay/package.json | 2 +- yarn.lock | 54 ++++++++++++------------ 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 45ced2e524fb6..c580b616dc4a1 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@jest/create-cache-key-function": "^26.6.2", "babel-eslint": "^10.1.0", "babel-plugin-macros": "^2.0.0", - "babel-plugin-syntax-hermes-parser": "0.18.0", + "babel-plugin-syntax-hermes-parser": "0.18.2", "babel-plugin-tester": "^6.0.1", "babel-preset-fbjs": "^3.4.0", "cosmiconfig": "^5.0.5", @@ -67,12 +67,12 @@ "gulp-header": "2.0.9", "gulp-rename": "^2.0.0", "gulp-util": "3.0.8", - "hermes-eslint": "0.18.0", + "hermes-eslint": "0.18.2", "invariant": "^2.2.4", "jest": "^26.6.3", "nullthrows": "^1.1.1", "prettier": "2.8.8", - "prettier-plugin-hermes-parser": "0.18.0", + "prettier-plugin-hermes-parser": "0.18.2", "promise-polyfill": "6.1.0", "react": "17.0.2", "react-refresh": "^0.9.0", diff --git a/packages/babel-plugin-relay/package.json b/packages/babel-plugin-relay/package.json index 46a571cf368ef..34f67a6c9a3b3 100644 --- a/packages/babel-plugin-relay/package.json +++ b/packages/babel-plugin-relay/package.json @@ -24,6 +24,6 @@ "devDependencies": { "@babel/core": "^7.20.0", "prettier": "2.8.8", - "prettier-plugin-hermes-parser": "0.18.0" + "prettier-plugin-hermes-parser": "0.18.2" } } diff --git a/yarn.lock b/yarn.lock index d21d20f310d50..1e99e9a46341a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1778,12 +1778,12 @@ babel-plugin-polyfill-regenerator@^0.3.1: dependencies: "@babel/helper-define-polyfill-provider" "^0.3.1" -babel-plugin-syntax-hermes-parser@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-hermes-parser/-/babel-plugin-syntax-hermes-parser-0.18.0.tgz#d9bb20ccf4a570762161e01c3fcd53ee4270d687" - integrity sha512-6W1oSgLKyZM98dUsiu7uLyOcxv7P0gWcS6DPz2UXfhAF7eiogtrhkEV74jH8sAopPhADXNs9V/2UqS6gRih+Qg== +babel-plugin-syntax-hermes-parser@0.18.2: + version "0.18.2" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-hermes-parser/-/babel-plugin-syntax-hermes-parser-0.18.2.tgz#4980cfcc1bd02daabe0280a05eba58ea2932690a" + integrity sha512-dPSkRrmQFtl5W9qQM/imQ3TBj5ozS9mcYwZ1wUAVW7ysNTcRmupHlmElefi09LTbMxKfV8QtUnBTzOQFvGg8Iw== dependencies: - hermes-parser "0.18.0" + hermes-parser "0.18.2" babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: version "7.0.0-beta.0" @@ -3816,26 +3816,26 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -hermes-eslint@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/hermes-eslint/-/hermes-eslint-0.18.0.tgz#16e7d5c7742f709d814d6a5a5d955803e81b328d" - integrity sha512-NIh8Utqk32+voL1b4ngCRnMQ0XCRzFbon7IG25lhnSYCTezX5besIK+79pUHw1YEDZVGrVrMxeIYxXiamLzcUQ== +hermes-eslint@0.18.2: + version "0.18.2" + resolved "https://registry.yarnpkg.com/hermes-eslint/-/hermes-eslint-0.18.2.tgz#af09ea1700eb32502caf135b181ffed6091ccb72" + integrity sha512-FWKVoHyHaXRjOfjoTgoc4OTkC+KThYdhLFyggoXIYLMDHF9hkg5yHSih3cyK3hT73te6+aaGHePzwaOai69uoA== dependencies: esrecurse "^4.3.0" - hermes-estree "0.18.0" - hermes-parser "0.18.0" + hermes-estree "0.18.2" + hermes-parser "0.18.2" -hermes-estree@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.18.0.tgz#6c202d8c78ddefadf3eb595a584dfa55b51a0508" - integrity sha512-WaIudIVKo5QWFqz1ta53HqSDuVxYST/MUuP9X7dqUpbHse3E2gzJq/7hEtgx84hh2XSNWN1AhYho3ThOA85uCA== +hermes-estree@0.18.2: + version "0.18.2" + resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.18.2.tgz#fd450fa1659cf074ceaa2ddeeb21674f3b2342f3" + integrity sha512-KoLsoWXJ5o81nit1wSyEZnWUGy9cBna9iYMZBR7skKh7okYAYKqQ9/OczwpMHn/cH0hKDyblulGsJ7FknlfVxQ== -hermes-parser@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.18.0.tgz#dd9878f70e9ca2570e7626181ae0465115f7f78d" - integrity sha512-DIIM6vsy30BU5hNkOXh6MR2r4ZAxVhbfyTnmfo/rqUf3KySlNWn9fWiOcpuGAdDN2o5sdPCpu6cep3a23d1Klw== +hermes-parser@0.18.2: + version "0.18.2" + resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.18.2.tgz#50f15e2fcd559a48c68cd7af259d4292298bd14d" + integrity sha512-1eQfvib+VPpgBZ2zYKQhpuOjw1tH+Emuib6QmjkJWJMhyjM8xnXMvA+76o9LhF0zOAJDZgPfQhg43cyXEyl5Ew== dependencies: - hermes-estree "0.18.0" + hermes-estree "0.18.2" homedir-polyfill@^1.0.1: version "1.0.3" @@ -5880,14 +5880,14 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -prettier-plugin-hermes-parser@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/prettier-plugin-hermes-parser/-/prettier-plugin-hermes-parser-0.18.0.tgz#00b6d979f8068c4fab72500c1abb5a8dcc107645" - integrity sha512-gU/K9jjJYDzdn1PLJdjhaHk+27POGrSbxVxBUOVm9qOiIpnwW1IeYA3sHg2PpCJLUQyJM7R6jiesQgPgvUHkmA== +prettier-plugin-hermes-parser@0.18.2: + version "0.18.2" + resolved "https://registry.yarnpkg.com/prettier-plugin-hermes-parser/-/prettier-plugin-hermes-parser-0.18.2.tgz#b9c32c39e1cf095ec551f4a325e4bba1e350cb0b" + integrity sha512-mKAmNrbhl+axP5o4W1xsZJLVPpMbwpnhTPx64e9R6XVGsNXVi7C208xy3FhwDEWUqSPwu4m9puplDey98l5i1g== dependencies: - hermes-estree "0.18.0" - hermes-parser "0.18.0" - prettier-plugin-hermes-parser "0.18.0" + hermes-estree "0.18.2" + hermes-parser "0.18.2" + prettier-plugin-hermes-parser "0.18.2" prettier@2.8.8: version "2.8.8"