Skip to content

Commit

Permalink
Merge branch 'main' into fix/windows-paths
Browse files Browse the repository at this point in the history
  • Loading branch information
@artola
artola authored Dec 20, 2023
2 parents 55b9fd9 + 5c82d16 commit cac003f
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 52 deletions.
2 changes: 1 addition & 1 deletion .flowconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ untyped-import
untyped-type-import

[version]
^0.224.0
^0.225.0
50 changes: 36 additions & 14 deletions compiler/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin-relay/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/relay-runtime/store/RelayStoreUtils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
62 changes: 31 additions & 31 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit cac003f

Please # to comment.