From 46d40f306ad5fb5c868d9022ce848f49fc5c1ac0 Mon Sep 17 00:00:00 2001 From: Jan Kassens Date: Tue, 4 Oct 2022 13:25:16 -0400 Subject: [PATCH] Flow upgrade to 0.175 ghstack-source-id: 99008118ef76d850eb1c460e07b1db1392c55806 Pull Request resolved: https://github.com/facebook/react/pull/25417 --- package.json | 2 +- .../src/ReactFlightWebpackNodeRegister.js | 3 +++ scripts/flow/config/flowconfig | 3 ++- yarn.lock | 8 ++++---- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ceeeb1ade3a02..902912b3389bc 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "eslint-plugin-react-internal": "link:./scripts/eslint-rules", "fbjs-scripts": "1.2.0", "filesize": "^6.0.1", - "flow-bin": "^0.155.0", + "flow-bin": "^0.175.0", "glob": "^7.1.6", "glob-stream": "^6.1.0", "google-closure-compiler": "^20200517.0.0", diff --git a/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeRegister.js b/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeRegister.js index 009c003eee517..0adff81020373 100644 --- a/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeRegister.js +++ b/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeRegister.js @@ -92,6 +92,7 @@ module.exports = function register() { }, }; + // $FlowFixMe[prop-missing] found when upgrading Flow Module._extensions['.client.js'] = function(module, path) { const moduleId = url.pathToFileURL(path).href; const moduleReference: {[string]: any, ...} = { @@ -103,8 +104,10 @@ module.exports = function register() { module.exports = new Proxy(moduleReference, proxyHandlers); }; + // $FlowFixMe[prop-missing] found when upgrading Flow const originalResolveFilename = Module._resolveFilename; + // $FlowFixMe[prop-missing] found when upgrading Flow Module._resolveFilename = function(request, parent, isMain, options) { const resolved = originalResolveFilename.apply(this, arguments); if (resolved.endsWith('.server.js')) { diff --git a/scripts/flow/config/flowconfig b/scripts/flow/config/flowconfig index a8611db12c348..28bacfe8c32a9 100644 --- a/scripts/flow/config/flowconfig +++ b/scripts/flow/config/flowconfig @@ -14,6 +14,7 @@ .*/node_modules/devtools-timeline-model/.* .*/node_modules/create-react-class/.* .*/node_modules/react-native-web/.* +.*/node_modules/fbjs/lib/keyMirrorRecursive.js.flow .*/__mocks__/.* .*/__tests__/.* @@ -47,4 +48,4 @@ munge_underscores=false %REACT_RENDERER_FLOW_OPTIONS% [version] -^0.155.0 +^0.175.0 diff --git a/yarn.lock b/yarn.lock index 1dfbb00609bba..4d8272b10801f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7912,10 +7912,10 @@ flatted@^2.0.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== -flow-bin@^0.155.0: - version "0.155.1" - resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.155.1.tgz#1263ee3e0f42d11cb13ba56c3851a096213ce5f7" - integrity sha512-qy2eXkgngR6u+MYA1ydzPnclhos21BZlpkJ50Y9YOZ4eTMq6txswB3X+gUsg8XUyCteLoMeo7n30k7aY2no2Yw== +flow-bin@^0.175.0: + version "0.175.1" + resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.175.1.tgz#72237070ba4f293f9e04113481e18929c1de50df" + integrity sha512-zMCP0BPa9BrfBSR7QTcyT/XBwzUbyLdNG0eXvBuNxfHCbMRkUzSceRoOaEZIw+R+GH0UHjVfUvPJ30hXxz1Nfw== fluent-syntax@0.13.0: version "0.13.0"