Skip to content

Commit d40e7f6

Browse files
authored
Merge pull request #1 from facebook/main
[flow] upgrade to 0.209.0 (#26958)
2 parents fc929cf + 613e6f5 commit d40e7f6

File tree

6 files changed

+34
-24
lines changed

6 files changed

+34
-24
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
"eslint-plugin-react-internal": "link:./scripts/eslint-rules",
6666
"fbjs-scripts": "^3.0.1",
6767
"filesize": "^6.0.1",
68-
"flow-bin": "^0.206.0",
69-
"flow-remove-types": "^2.206.0",
68+
"flow-bin": "^0.209.0",
69+
"flow-remove-types": "^2.209.0",
7070
"glob": "^7.1.6",
7171
"glob-stream": "^6.1.0",
7272
"google-closure-compiler": "^20230206.0.0",

packages/react-reconciler/src/ReactFiberCacheComponent.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ const AbortControllerLocal: typeof AbortController = enableCache
2222
? typeof AbortController !== 'undefined'
2323
? AbortController
2424
: // $FlowFixMe[missing-this-annot]
25-
(function AbortControllerShim() {
25+
// $FlowFixMe[prop-missing]
26+
function AbortControllerShim() {
2627
const listeners = [];
2728
const signal = (this.signal = {
2829
aborted: false,
@@ -35,8 +36,9 @@ const AbortControllerLocal: typeof AbortController = enableCache
3536
signal.aborted = true;
3637
listeners.forEach(listener => listener());
3738
};
38-
}: AbortController)
39-
: (null: any);
39+
}
40+
: // $FlowFixMe[incompatible-type]
41+
null;
4042

4143
export type Cache = {
4244
controller: AbortController,

packages/react-server-dom-esm/src/ReactFlightDOMServerNode.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,11 @@ function decodeReplyFromBusboy<T>(
131131
close(response);
132132
});
133133
busboyStream.on('error', err => {
134-
reportGlobalError(response, err);
134+
reportGlobalError(
135+
response,
136+
// $FlowFixMe[incompatible-call] types Error and mixed are incompatible
137+
err,
138+
);
135139
});
136140
return getRoot(response);
137141
}

packages/react-server-dom-webpack/src/ReactFlightDOMServerNode.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,11 @@ function decodeReplyFromBusboy<T>(
131131
close(response);
132132
});
133133
busboyStream.on('error', err => {
134-
reportGlobalError(response, err);
134+
reportGlobalError(
135+
response,
136+
// $FlowFixMe[incompatible-call] types Error and mixed are incompatible
137+
err,
138+
);
135139
});
136140
return getRoot(response);
137141
}

scripts/flow/config/flowconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ munge_underscores=false
3636
%REACT_RENDERER_FLOW_OPTIONS%
3737

3838
[version]
39-
^0.206.0
39+
^0.209.0

yarn.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8245,22 +8245,22 @@ flatted@^3.1.0:
82458245
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
82468246
integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
82478247

8248-
flow-bin@^0.206.0:
8249-
version "0.206.0"
8250-
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.206.0.tgz#a593304be5440a965ae773efcef55071b6d33178"
8251-
integrity sha512-cZTEs/OEWcbxfvb8BP+Fw0Cep5wrEyEzQHGpXyjVpQXrAraRA5wZUXvTf1C5YHufQaAYY9YkKY5WAr461JvmOA==
8252-
8253-
flow-parser@^0.206.0:
8254-
version "0.206.0"
8255-
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.206.0.tgz#f4f794f8026535278393308e01ea72f31000bfef"
8256-
integrity sha512-HVzoK3r6Vsg+lKvlIZzaWNBVai+FXTX1wdYhz/wVlH13tb/gOdLXmlTqy6odmTBhT5UoWUbq0k8263Qhr9d88w==
8257-
8258-
flow-remove-types@^2.206.0:
8259-
version "2.206.0"
8260-
resolved "https://registry.yarnpkg.com/flow-remove-types/-/flow-remove-types-2.206.0.tgz#d65389bea555e91c2273e441a70d5916cf1feab7"
8261-
integrity sha512-ARHcZ4NFYI+TOnLDW+yO70t4F+5mlZ4Gj0RWZfFq7FUPeDpGvQKxQh8UPXvKOkIfqghmvGOfcz9Y2mVzfjGtiA==
8262-
dependencies:
8263-
flow-parser "^0.206.0"
8248+
flow-bin@^0.209.0:
8249+
version "0.209.0"
8250+
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.209.0.tgz#616a002b94ef35e1b083add9a6d27dbe387bf4f0"
8251+
integrity sha512-HRc6+bKE8AN23SnuKaxdUjcQcjaIp6pksrGJ6pltFO5tIEvZmPrbT99P7Yb3ybqwcKU/Ry8yfJbuW92Ed2V3nw==
8252+
8253+
flow-parser@^0.209.0:
8254+
version "0.209.0"
8255+
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.209.0.tgz#adf4fa1245b2dd9073bbffbdca5c005e83194430"
8256+
integrity sha512-uD7Du+9xC/gGnOyk3kANQmtgWWKANWcKGJ84Wu0NSjTaVING3GqUAsywUPAl3fEYKLVVIcDWiaQ8+R6qzghwmA==
8257+
8258+
flow-remove-types@^2.209.0:
8259+
version "2.209.0"
8260+
resolved "https://registry.yarnpkg.com/flow-remove-types/-/flow-remove-types-2.209.0.tgz#32dbb65515f417067ade9f76260e8badd1baa541"
8261+
integrity sha512-p8Tvy95IunOvO0PVSb/rqxUqVXRS+G9aLSkDU56eGNTJ4lEdPbnXd+LCUUb3Ntl5t0L0Llndja6cQqjovC1qaQ==
8262+
dependencies:
8263+
flow-parser "^0.209.0"
82648264
pirates "^3.0.2"
82658265
vlq "^0.2.1"
82668266

0 commit comments

Comments
 (0)