Skip to content

[pull] main from facebook:main #103

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

Merged
merged 4 commits into from
Feb 5, 2025
Merged

[pull] main from facebook:main #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f82c662
[Flight Parcel] Implement findSourceMapURL (#32294)
devongovett Feb 4, 2025
8bda715
[Fiber] support hydration when rendering Suspense anywhere (#32224)
gnoff Feb 4, 2025
0605cd9
[Fiber] Disable comments as containers in OSS (#32250)
gnoff Feb 4, 2025
32b4114
Set enableViewTransition to dynamic for www (#32306)
jackpope Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions fixtures/flight-parcel/.parcelrc
View file
Open in desktop

This file was deleted.

23 changes: 4 additions & 19 deletions fixtures/flight-parcel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
{
"name": "flight-parcel",
"private": true,
"workspaces": [
"examples/*"
],
"source": "src/server.tsx",
"server": "dist/server.js",
"targets": {
"server": {
"source": "src/server.tsx",
"context": "react-server",
"outputFormat": "commonjs",
"includeNodeModules": {
"express": false
}
Expand All @@ -18,34 +14,23 @@
"scripts": {
"predev": "cp -r ../../build/oss-experimental/* ./node_modules/",
"prebuild": "cp -r ../../build/oss-experimental/* ./node_modules/",
"dev": "concurrently \"npm run dev:watch\" \"sleep 2 && npm run dev:start\"",
"dev:watch": "NODE_ENV=development parcel watch",
"dev:start": "NODE_ENV=development node dist/server.js",
"dev": "parcel",
"build": "parcel build",
"start": "node dist/server.js"
},
"@parcel/resolver-default": {
"packageExports": true
},
"dependencies": {
"@parcel/config-default": "2.0.0-dev.1795",
"@parcel/runtime-rsc": "2.13.3-dev.3418",
"@types/parcel-env": "^0.0.6",
"@types/express": "*",
"@types/node": "^22.10.1",
"@types/react": "^19",
"@types/react-dom": "^19",
"concurrently": "^7.3.0",
"express": "^4.18.2",
"parcel": "2.0.0-dev.1793",
"parcel": "canary",
"process": "^0.11.10",
"react": "experimental",
"react-dom": "experimental",
"react-server-dom-parcel": "experimental",
"rsc-html-stream": "^0.0.4",
"ws": "^8.8.1"
},
"@parcel/bundler-default": {
"minBundleSize": 0
"rsc-html-stream": "^0.0.4"
}
}
2 changes: 0 additions & 2 deletions fixtures/flight-parcel/src/Todos.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import './client';
import './Todos.css';
import {Resources} from '@parcel/runtime-rsc';
import {Dialog} from './Dialog';
import {TodoDetail} from './TodoDetail';
import {TodoCreate} from './TodoCreate';
Expand All @@ -13,7 +12,6 @@ export async function Todos({id}: {id?: number}) {
<html style={{colorScheme: 'dark light'}}>
<head>
<title>Todos</title>
<Resources />
</head>
<body>
<header>
Expand Down
4 changes: 3 additions & 1 deletion fixtures/flight-parcel/src/server.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ async function render(
return ReactClient.use(data);
}

let htmlStream = await renderHTMLToReadableStream(<Content />);
let htmlStream = await renderHTMLToReadableStream(<Content />, {
bootstrapScriptContent: (Todos as any).bootstrapScript,
});
let response = htmlStream.pipeThrough(injectRSCPayload(s2));
Readable.fromWeb(response as NodeReadableStream).pipe(res);
} else {
Expand Down
1,204 changes: 613 additions & 591 deletions fixtures/flight-parcel/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions packages/react-dom-bindings/src/client/ReactDOMContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,3 @@ export function isValidContainer(node: any): boolean {
(node: any).nodeValue === ' react-mount-point-unstable '))
);
}

// TODO: Remove this function which also includes comment nodes.
// We only use it in places that are currently more relaxed.
export function isValidContainerLegacy(node: any): boolean {
return !!(
node &&
(node.nodeType === ELEMENT_NODE ||
node.nodeType === DOCUMENT_NODE ||
node.nodeType === DOCUMENT_FRAGMENT_NODE ||
(node.nodeType === COMMENT_NODE &&
(node: any).nodeValue === ' react-mount-point-unstable '))
);
}
Loading
Loading