Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update vendored react #46970

Merged
merged 1 commit into from
Mar 9, 2023
Merged

Update vendored react #46970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,11 @@
"random-seed": "0.3.0",
"react": "18.2.0",
"react-17": "npm:react@17.0.2",
"react-builtin": "npm:react@18.3.0-next-703c67560-20230307",
"react-builtin": "npm:react@18.3.0-next-3706edb81-20230308",
"react-dom": "18.2.0",
"react-dom-17": "npm:react-dom@17.0.2",
"react-dom-builtin": "npm:react-dom@18.3.0-next-703c67560-20230307",
"react-server-dom-webpack": "18.3.0-next-703c67560-20230307",
"react-dom-builtin": "npm:react-dom@18.3.0-next-3706edb81-20230308",
"react-server-dom-webpack": "18.3.0-next-3706edb81-20230308",
"react-ssr-prepass": "1.0.8",
"react-virtualized": "9.22.3",
"relay-compiler": "13.0.2",
Expand Down
43 changes: 23 additions & 20 deletions packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if (process.env.NODE_ENV !== "production") {
var React = require('react');
var ReactDOM = require('react-dom');

var ReactVersion = '18.3.0-next-703c67560-20230307';
var ReactVersion = '18.3.0-next-3706edb81-20230308';

var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;

Expand Down Expand Up @@ -3473,28 +3473,31 @@ function pushScript(target, props, resources, textEmbedded, insertionMode, noscr
var key = getResourceKey('script', src);

if (props.async !== true || props.onLoad || props.onError) {
// We can't resourcify scripts with load listeners. To avoid ambiguity with
// other Resourcified async scripts on the server we omit them from the server
// stream and expect them to be inserted during hydration on the client.
// We can still preload them however so the client can start fetching the script
// as soon as possible
var resource = resources.preloadsMap.get(key);
// we don't want to preload nomodule scripts
if (props.noModule !== true) {
// We can't resourcify scripts with load listeners. To avoid ambiguity with
// other Resourcified async scripts on the server we omit them from the server
// stream and expect them to be inserted during hydration on the client.
// We can still preload them however so the client can start fetching the script
// as soon as possible
var resource = resources.preloadsMap.get(key);

if (!resource) {
resource = {
type: 'preload',
chunks: [],
state: NoState,
props: preloadAsScriptPropsFromProps(props.src, props)
};
resources.preloadsMap.set(key, resource);
if (!resource) {
resource = {
type: 'preload',
chunks: [],
state: NoState,
props: preloadAsScriptPropsFromProps(props.src, props)
};
resources.preloadsMap.set(key, resource);

{
markAsImplicitResourceDEV(resource, props, resource.props);
}
{
markAsImplicitResourceDEV(resource, props, resource.props);
}

resources.usedScripts.add(resource);
pushLinkImpl(resource.chunks, resource.props);
resources.usedScripts.add(resource);
pushLinkImpl(resource.chunks, resource.props);
}
}

if (props.async !== true) {
Expand Down
16 changes: 8 additions & 8 deletions packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.min.js
View file
Open in desktop

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

43 changes: 23 additions & 20 deletions packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var React = require('react');
var ReactDOM = require('react-dom');
var stream = require('stream');

var ReactVersion = '18.3.0-next-703c67560-20230307';
var ReactVersion = '18.3.0-next-3706edb81-20230308';

var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;

Expand Down Expand Up @@ -3480,28 +3480,31 @@ function pushScript(target, props, resources, textEmbedded, insertionMode, noscr
var key = getResourceKey('script', src);

if (props.async !== true || props.onLoad || props.onError) {
// We can't resourcify scripts with load listeners. To avoid ambiguity with
// other Resourcified async scripts on the server we omit them from the server
// stream and expect them to be inserted during hydration on the client.
// We can still preload them however so the client can start fetching the script
// as soon as possible
var resource = resources.preloadsMap.get(key);
// we don't want to preload nomodule scripts
if (props.noModule !== true) {
// We can't resourcify scripts with load listeners. To avoid ambiguity with
// other Resourcified async scripts on the server we omit them from the server
// stream and expect them to be inserted during hydration on the client.
// We can still preload them however so the client can start fetching the script
// as soon as possible
var resource = resources.preloadsMap.get(key);

if (!resource) {
resource = {
type: 'preload',
chunks: [],
state: NoState,
props: preloadAsScriptPropsFromProps(props.src, props)
};
resources.preloadsMap.set(key, resource);
if (!resource) {
resource = {
type: 'preload',
chunks: [],
state: NoState,
props: preloadAsScriptPropsFromProps(props.src, props)
};
resources.preloadsMap.set(key, resource);

{
markAsImplicitResourceDEV(resource, props, resource.props);
}
{
markAsImplicitResourceDEV(resource, props, resource.props);
}

resources.usedScripts.add(resource);
pushLinkImpl(resource.chunks, resource.props);
resources.usedScripts.add(resource);
pushLinkImpl(resource.chunks, resource.props);
}
}

if (props.async !== true) {
Expand Down