Skip to content

Commit 60c5717

Browse files
committed
chore(v7): Revert RSC and SSR changes
This commit reverts all the RSC and SSR PRs to date so that v7.0.0 can go out with clean changes. Revert "chore(deps): update dependency @apollo/experimental-nextjs-app-support to v0.5.2 (#9716)" This reverts commit 9d9d373. Revert "fix(apollo): Enhance error differently for Suspense Cells (#9640)" This reverts commit 7870ce4. Revert "SSR smoke-test: Use <Metadata /> (#9763)" This reverts commit 3d1179a. Revert "Use TS 5.3 import attributes (#9591)" This reverts commit cb4aba6. Revert "chore(RSC): update RSC test projects to latest canary (#9717)" This reverts commit 209add6. Revert "RSC: Fix the RSA test project fixture (#9704)" This reverts commit f7c7613. Revert "chore(CI): add RSC fixtures to detect changes list (#9703)" This reverts commit b7115dd. Revert "RSC: Update rsc test project fixtures (#9666)" This reverts commit cc69243. Revert "RSC: Use `pages` directory (#9660)" This reverts commit 809e3ff. Revert "RSC: Default entry.server and more standard App.tsx (#9655)" This reverts commit 33a3b0b. Revert "RSC: Use the default entry.client file (#9654)" This reverts commit 3f6e7c1. Revert "RSC: No need to patch Vite anymore (#9636)" This reverts commit 2fdb496. Revert "RSC: Remove unused code. Improve code organization (#9631)" This reverts commit 4937929. Revert "chore: Linting and disable some console logs (#9635)" This reverts commit b1adcc7. Revert "RSC: Use Routes.tsx for (client-side) routing (#9630)" This reverts commit e9f5f01. Revert "RSC: Add RW env var definitions to Vite config and include FatalErrorBoundary (#9622)" This reverts commit 69a1770. Revert "RSC: Refactor to share buildRouteManifest function with SSR process (#9618)" This reverts commit 00462e5. Revert "RSC: Fake server-side routing (#9593)" This reverts commit 2c638c3. Revert "RSC: Include routing in initial RSC example app (#9611)" This reverts commit a7ea8cd. Revert "fix(deps): update dependency @whatwg-node/server to v0.9.18 (#9602)" This reverts commit 1e1c8d1. Revert "RSC: Generate a route manifest (#9592)" This reverts commit 99685ee. Revert "RSC: Refactor build process (#9588)" This reverts commit 1f66831. Revert "fix(streaming-ssr): Fixes running the streaming server using rw serve (#9558)" This reverts commit 6459562. Revert "fix(streaming): Fix css loading on dev server on Windows (#9557)" This reverts commit 205e0f4. Revert "RSC: Combine RSC server with StreamingSSR server (#9553)" This reverts commit 4afccbc. Revert "Prerender smoke-test: await helper function (#9546)" This reverts commit fe70a36. Revert "fix(deps): update dependency isbot to v3.7.1 (#9506)" This reverts commit e330be7. Revert "fix(deps): update dependency @whatwg-node/server to v0.9.16 (#9475)" This reverts commit 886e28a. Revert "chore(deps): update dependency rollup to v3.29.4 (#9464)" This reverts commit c5eca98. Revert "RSC: Support client-only package and include @tobbe.dev/rsc-test in smoke test (#9367)" This reverts commit e04e48e. Revert "RSC: Check for rw-rsc header (#9410)" This reverts commit cb0b035. Revert "RSC GH action: Move build to after copy (#9413)" This reverts commit 114a2b0. Revert "RSC: Move loaders to worker thread (#9412)" This reverts commit df88574. Revert "RSC: smoke tests: install and build after project:copy (#9411)" This reverts commit e2a90f8. Revert "feat(ssr-streaming): Allow building without index.html during streaming-ssr (#9387)" This reverts commit 76e1672. Revert "chore(ssr): Move LocationProvider inside framework for SSR (#9383)" This reverts commit c4dedc6. Revert "feat(ssr): Collect CSS links during dev (#9382)" This reverts commit 1e42b43. Revert "fix(stream-ssr): Move wait for all ready to fix bot rendering (#9389)" This reverts commit bdf885a. Revert "chore(e2e): Setup e2e test for streaming SSR (#9349)" This reverts commit 656a2c8. Revert "RSC: vite externalConditions (#9333)" This reverts commit c8c8a3b. Revert "RSC: test-project-rsa: Fix TS type error in onSend (#9332)" This reverts commit 45065da. Revert "RSC: Implement RSC worker (#9331)" This reverts commit 18c5d96. Revert "RSC: createRscRequestHandler (#9330)" This reverts commit 433d8ef. Revert "fix(stream-ssr): Cancel the timeout when the react stream has finished (#9317)" This reverts commit daaa199. Revert "fix(ssr-build): Generate document in ssr build too! (#9310)" This reverts commit e2cf25d. Revert "feat(streaming-ssr): Various bug fixes and migrate to FetchAPI/Web streams (#9295)" This reverts commit 1ed2b5b. Revert "RSC: Smoke test (#9194)" This reverts commit 18555d0. Revert "RSC: Handle Windows paths in clientEntries (#9233)" This reverts commit 27d33d3. Revert "RSC: Check if index.html has already been updated during setup (#9197)" This reverts commit 83d180f. Revert "RSC: Use react/experimental types (#9196)" This reverts commit e2c14eb. Revert "RSC: Patch vite when running setup command (#9192)" This reverts commit a7bab85. Revert "RSC: Support 'use client' in 3pp packages (#9191)" This reverts commit a436b1c. Revert "RSC: react-18.3.0-canary-bbc8530ed-20230912 (#9164)" This reverts commit 9d63d08. Revert "RSC: Decode RSF args from request (#9157)" This reverts commit 9257e39. Revert "RSC: RSF aka Server Actions (#9155)" This reverts commit c46bb67. Revert "RSC: Make code and execution easier to follow. Improve error handling. (#9154)" This reverts commit d3475cd. Revert "RSC: Work around an issue in Rollup (#9153)" This reverts commit ee334bc. Revert "Streaming: meta charSet=utf-8 (#9142)" This reverts commit 050a169. Revert "Streaming SSR: Fix RWJS_EXP_SSR_GRAPHQL_ENDPOINT logic (#9134)" This reverts commit ae11f69. Revert "RSC: Don't set the react-server condition for client builds (#9132)" This reverts commit 7ee6153. Revert "Streaming fe server: bind to 0.0.0.0 in prod (#9115)" This reverts commit 0c23f67. Revert "fix(meta): Remove duplicated title and meta attributes (possible edge cases) (#9113)" This reverts commit 8d0ab16. Revert "chore(deps): update dependency @apollo/experimental-nextjs-app-support to v0.4.2 (#9021)" This reverts commit d7560ec. Revert "feat(Cell Suspense): Allow Cells to not Suspend (#9106)" This reverts commit 2b8a555. Revert "feat(streaming): Make Cells render on the server with useBackgroundQuery and useReadQuery (#9074)" This reverts commit 069101b. Revert "feat(streaming): Cleanup/Unify streaming dev and prod server (#9047)" This reverts commit c5ba488. Revert "exp(streaming): Allow SSR with experimental apollo client (#9038)" This reverts commit c89e136. Revert "feat(streaming-ssr): Fix build and server html injection (#8978)" This reverts commit 58a2421. Revert "RSC: Use experimental node loader (#8979)" This reverts commit 2add568. Revert "RSC: Fix noExternal rule for server build (#8961)" This reverts commit 9ac5ab2. Revert "Refactor cli serve command (#8958)" This reverts commit f24016a. Revert "@rwjs/vite: Pin acorn-loose version (#8944)" This reverts commit 6f33914. Revert "RSC: react-server condition. Poisoned imports (#8948)" This reverts commit e941365. Revert "RSC fix typo in example code (#8949)" This reverts commit 3588ec0. Revert "fix(ssr): Get experimental ssr setup working properly (#8922)" This reverts commit abf229b. Revert "RSC fix: setup description (#8906)" This reverts commit b11bd72. Revert "RSC: Add css files to the example (#8905)" This reverts commit fcd7c39. Revert "RSC build without user config (#8896)" This reverts commit 37692a4. Revert "RSC: Use rw serve (#8897)" This reverts commit 921c9cb. Revert "RSC: Build using rw build (#8893)" This reverts commit f1d0dcb. Revert "RSC: Fix experimental setup (#8894)" This reverts commit c44a260. Revert "RSC: Include entries.ts in paths (#8888)" This reverts commit db271db. Revert "RSC: Initial css support (#8887)" This reverts commit 8610d58. Revert "RSC: Use exported defineEntries() (#8886)" This reverts commit f5fc2e2. Revert "Include standard vite config in RSC build (#8882)" This reverts commit c1e62c2. Revert "Update entry.client and disable vite legacy mode (#8851)" This reverts commit 8917ad6. Revert "experimental feature flag for rsc (#8837)" This reverts commit c7a5b13. Revert "React Server Components (RSC) (#8451)" This reverts commit f22dfbe. Revert "Use "import type" for all types (#8827)" This reverts commit 7a6aea7. Revert "React 18.3.0-canary-035a41c4e-20230704 (#8826)" This reverts commit d261819. Revert "ViteBuildManifest and note about import-attributes (#8818)" This reverts commit 8b85ad6. Revert "Streaming SSR: Fix build, serve and dev (#8811)" This reverts commit 4c51cae. Revert "Add files needed for React Streaming SSR (#8810)" This reverts commit 6da5aae. Revert "entry.server and entry.client (#8808)" This reverts commit 7cc5564. Revert "Use existing rw-vite-build bin for SSR as well (#8806)" This reverts commit 8b2a566. Revert "Disable prerender when streamingSsr is enabled (#8775)" This reverts commit e7d5361. Revert "vite utils.ts: fix source format (#8796)" This reverts commit e191071. Revert "Server Rendering & Streaming (#8561)" This reverts commit 2557bf8. Revert "React Streaming and SSR feature flag (#8764)" This reverts commit 565f620.
1 parent e26395f commit 60c5717

File tree

297 files changed

+1725
-11275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

297 files changed

+1725
-11275
lines changed

.github/actions/actionsLib.mjs

Lines changed: 4 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* eslint-env node */
22
// @ts-check
33

4-
import fs from 'node:fs'
54
import path from 'node:path'
65
import { fileURLToPath } from 'node:url'
76

@@ -62,9 +61,9 @@ export function projectCopy(redwoodProjectCwd) {
6261
}
6362

6463
/**
65-
* @param {{ baseKeyPrefix: string, distKeyPrefix: string, canary: boolean }} options
64+
* @param {{ baseKeyPrefix: string, distKeyPrefix: string }} options
6665
*/
67-
export async function createCacheKeys({ baseKeyPrefix, distKeyPrefix, canary }) {
66+
export async function createCacheKeys({ baseKeyPrefix, distKeyPrefix }) {
6867
const baseKey = [
6968
baseKeyPrefix,
7069
process.env.RUNNER_OS,
@@ -76,7 +75,7 @@ export async function createCacheKeys({ baseKeyPrefix, distKeyPrefix, canary })
7675
baseKey,
7776
'dependencies',
7877
await hashFiles(['yarn.lock', '.yarnrc.yml'].join('\n')),
79-
].join('-') + (canary ? '-canary' : '')
78+
].join('-')
8079

8180
const distKey = [
8281
dependenciesKey,
@@ -91,73 +90,11 @@ export async function createCacheKeys({ baseKeyPrefix, distKeyPrefix, canary })
9190
'lerna.json',
9291
'packages',
9392
].join('\n'))
94-
].join('-') + (canary ? '-canary' : '')
93+
].join('-')
9594

9695
return {
9796
baseKey,
9897
dependenciesKey,
9998
distKey
10099
}
101100
}
102-
103-
/**
104-
* @callback ExecInProject
105-
* @param {string} commandLine command to execute (can include additional args). Must be correctly escaped.
106-
* @param {Omit<ExecOptions, "cwd">=} options exec options. See ExecOptions
107-
* @returns {Promise<unknown>} exit code
108-
*/
109-
110-
/**
111-
* @param {string} testProjectPath
112-
* @param {string} fixtureName
113-
* @param {Object} core
114-
* @param {(key: string, value: string) => void} core.setOutput
115-
* @param {ExecInProject} execInProject
116-
* @returns {Promise<void>}
117-
*/
118-
export async function setUpRscTestProject(
119-
testProjectPath,
120-
fixtureName,
121-
core,
122-
execInProject
123-
) {
124-
core.setOutput('test-project-path', testProjectPath)
125-
126-
console.log('rwPath', REDWOOD_FRAMEWORK_PATH)
127-
console.log('testProjectPath', testProjectPath)
128-
129-
const fixturePath = path.join(
130-
REDWOOD_FRAMEWORK_PATH,
131-
'__fixtures__',
132-
fixtureName
133-
)
134-
const rwBinPath = path.join(
135-
REDWOOD_FRAMEWORK_PATH,
136-
'packages/cli/dist/index.js'
137-
)
138-
const rwfwBinPath = path.join(
139-
REDWOOD_FRAMEWORK_PATH,
140-
'packages/cli/dist/rwfw.js'
141-
)
142-
143-
console.log(`Creating project at ${testProjectPath}`)
144-
console.log()
145-
fs.cpSync(fixturePath, testProjectPath, { recursive: true })
146-
147-
console.log(`Adding framework dependencies to ${testProjectPath}`)
148-
await projectDeps(testProjectPath)
149-
console.log()
150-
151-
console.log(`Installing node_modules in ${testProjectPath}`)
152-
await execInProject('yarn install')
153-
154-
console.log(`Copying over framework files to ${testProjectPath}`)
155-
await execInProject(`node ${rwfwBinPath} project:copy`, {
156-
env: { RWFW_PATH: REDWOOD_FRAMEWORK_PATH },
157-
})
158-
console.log()
159-
160-
console.log(`Building project in ${testProjectPath}`)
161-
await execInProject(`node ${rwBinPath} build -v`)
162-
console.log()
163-
}

.github/actions/detect-changes/cases/rsc.mjs

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/actions/detect-changes/cases/ssr.mjs

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/actions/set-up-rsa-project/README.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/actions/set-up-rsa-project/action.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/actions/set-up-rsa-project/jsconfig.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/actions/set-up-rsa-project/package.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/actions/set-up-rsa-project/setUpRsaProjectGitHub.mjs

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/actions/set-up-rsa-project/setUpRsaProjectLocally.mjs

Lines changed: 0 additions & 111 deletions
This file was deleted.

.github/actions/set-up-rsc-external-packages-project/README.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)