Skip to content

Commit

Permalink
Merge branch 'main' into bugfix-suspenselist-fallback
Browse files Browse the repository at this point in the history
  • Loading branch information
kassens authored Mar 22, 2023
2 parents fcc9e0a + b93b4f0 commit d04b2ca
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
"eslint-plugin-react-internal": "link:./scripts/eslint-rules",
"fbjs-scripts": "^3.0.1",
"filesize": "^6.0.1",
"flow-bin": "^0.201.0",
"flow-remove-types": "^2.201.0",
"flow-bin": "^0.202.0",
"flow-remove-types": "^2.202.0",
"glob": "^7.1.6",
"glob-stream": "^6.1.0",
"google-closure-compiler": "^20230206.0.0",
Expand Down
5 changes: 3 additions & 2 deletions packages/react-dom-bindings/src/client/ReactDOMComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -595,8 +595,6 @@ export function setInitialProperties(
listenToNonDelegatedEvent('close', domElement);
props = rawProps;
break;
case 'iframe':
case 'object':
case 'embed':
if (
rawProps.children != null ||
Expand All @@ -608,6 +606,9 @@ export function setInitialProperties(
'use `dangerouslySetInnerHTML`.',
);
}
// eslint-disable-next-line no-fallthrough
case 'iframe':
case 'object':
// We listen to this event in case to ensure emulated bubble
// listeners still fire for the load event.
listenToNonDelegatedEvent('load', domElement);
Expand Down
6 changes: 3 additions & 3 deletions packages/react-dom/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ function handleRequest(res) {

### `react-dom`

See https://reactjs.org/docs/react-dom.html
See https://react.dev/reference/react-dom

### `react-dom/client`

See https://reactjs.org/docs/react-dom-client.html
See https://react.dev/reference/react-dom/client

### `react-dom/server`

See https://reactjs.org/docs/react-dom-server.html
See https://react.dev/reference/react-dom/server
4 changes: 2 additions & 2 deletions packages/react/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ root.render(<Counter />);

## Documentation

See https://reactjs.org/
See https://react.dev/

## API

See https://reactjs.org/docs/react-api.html
See https://react.dev/reference/react
5 changes: 2 additions & 3 deletions scripts/flow/config/flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,11 @@ untyped-type-import=error

[options]
%CI_MAX_WORKERS%
exact_by_default=true
munge_underscores=false
inference_mode=experimental.lti
inference_mode=lti

# Substituted by createFlowConfig.js:
%REACT_RENDERER_FLOW_OPTIONS%

[version]
^0.201.0
^0.202.0
32 changes: 16 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8157,22 +8157,22 @@ flatted@^3.1.0:
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==

flow-bin@^0.201.0:
version "0.201.0"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.201.0.tgz#bc8d7c3687526313d7a24dd920873a0273148d81"
integrity sha512-fqx6CMOhX9Xm4mN+tq/c7sqcm8aHFV1ipbLz2ZCzoNcPuUNZPoSVYm4p0qZqH0HyzMMEP1OWlU7dIkuSJ02cpg==

flow-parser@^0.201.0:
version "0.201.0"
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.201.0.tgz#d2005d4dae6fddf60d30f9ae0fb49a13c9c51cfe"
integrity sha512-G4oeDNpNGyIrweF9EnoHatncAihMT0tQgV6NMdyM5I7fhrz9Pr13PJ2KLQ673O4wj9KooTdBpeeYHdDNAQoyyw==

flow-remove-types@^2.201.0:
version "2.201.0"
resolved "https://registry.yarnpkg.com/flow-remove-types/-/flow-remove-types-2.201.0.tgz#d02d8a3ff3cb17d23da35c9786b02cdccc0ef9b8"
integrity sha512-EaS6Q0ApEjFdwD/JtBC1Hm+0j6mMsHeV5FR6MP+UI1RdTeNMdadMITt0Vb3XPBANLXZufaNzs6EMwpGNPzwwoA==
dependencies:
flow-parser "^0.201.0"
flow-bin@^0.202.0:
version "0.202.0"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.202.0.tgz#1e2eb221252c2ab55c997e5eb921902f3181cc4e"
integrity sha512-Yz+yNapJMWWV6Z6pZnBR+naMhFbFJbmMS8ZBQCFUHRqN1TTw7uwitYxRj8DyzLyTpcPReSAjWbWawWPsXJot3w==

flow-parser@^0.202.0:
version "0.202.0"
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.202.0.tgz#534178266d3ceec5368415e59990db97eece5bd0"
integrity sha512-ZiXxSIXK3zPmY3zrzCofFonM2T+/3Jz5QZKJyPVtUERQEJUnYkXBQ+0H3FzyqiyJs+VXqb/UNU6/K6sziVYdxw==

flow-remove-types@^2.202.0:
version "2.202.0"
resolved "https://registry.yarnpkg.com/flow-remove-types/-/flow-remove-types-2.202.0.tgz#0718ce34169148b5e61d25658f531e4236d00a62"
integrity sha512-G6shwCpTpZWSU0HtRLmE+S6zyD1otzKXo5D0jZ92OpfNHgSYIohfUSM+njYK8d2O841AIhq8H0mMYWgc/j5ySw==
dependencies:
flow-parser "^0.202.0"
pirates "^3.0.2"
vlq "^0.2.1"

Expand Down

0 comments on commit d04b2ca

Please sign in to comment.