diff --git a/.github/actions/detect-changes/cases/rsc.mjs b/.github/actions/detect-changes/cases/rsc.mjs index e2e31da48e8a..34fbf3e763c2 100644 --- a/.github/actions/detect-changes/cases/rsc.mjs +++ b/.github/actions/detect-changes/cases/rsc.mjs @@ -15,14 +15,14 @@ export function rscChanged(changedFiles){ changedFile.startsWith('tasks/smoke-tests/rsa/') || changedFile.startsWith('tasks/smoke-tests/basePlaywright.config.ts') || changedFile.startsWith('.github/actions/set-up-rsa-project/') || - changedFile.startsWith('.github/actions/set-up-rsc-external-packages-project/') || + changedFile.startsWith('.github/actions/set-up-rsc-kitchen-sink-project/') || changedFile.startsWith('.github/actions/set-up-rsc-project/') || changedFile.startsWith('packages/internal/') || changedFile.startsWith('packages/project-config/') || changedFile.startsWith('packages/web/') || changedFile.startsWith('packages/vite/') || changedFile.startsWith('__fixtures__/test-project-rsa') || - changedFile.startsWith('__fixtures__/test-project-rsc-external-packages') + changedFile.startsWith('__fixtures__/test-project-rsc-kitchen-sink') ) { console.log('RSC change detected:', changedFile) return true diff --git a/.github/actions/set-up-rsc-external-packages-and-cells-project/action.yaml b/.github/actions/set-up-rsc-external-packages-and-cells-project/action.yaml deleted file mode 100644 index cdac1d7c9fbc..000000000000 --- a/.github/actions/set-up-rsc-external-packages-and-cells-project/action.yaml +++ /dev/null @@ -1,10 +0,0 @@ -name: Set up RSC test project with external packages from fixture -description: Sets up an RSC project that imports external packages for smoke-tests - -runs: - using: node20 - main: 'setUpRscExternalPackagesProjectGitHub.mjs' - -outputs: - test-project-path: - description: Path to the test project diff --git a/.github/actions/set-up-rsc-external-packages-and-cells-project/README.md b/.github/actions/set-up-rsc-kitchen-sink-project/README.md similarity index 72% rename from .github/actions/set-up-rsc-external-packages-and-cells-project/README.md rename to .github/actions/set-up-rsc-kitchen-sink-project/README.md index abe811ee0a99..8cdd0b0a7ad8 100644 --- a/.github/actions/set-up-rsc-external-packages-and-cells-project/README.md +++ b/.github/actions/set-up-rsc-kitchen-sink-project/README.md @@ -3,24 +3,24 @@ This action copies a RW project with Streaming SSR and RSC support already set up. It's used for RSC smoke tests. -It copies the `__fixtures__/test-project-rsc-external-packages-and-cells` +It copies the `__fixtures__/test-project-rsc-kitchen-sink` project, runs `yarn install` and `project:copy`. Finally it builds the rw app. ## Testing/running locally Go into the github actions folder -`cd .github/actions/set-up-rsc-external-packages-and-cells-project` +`cd .github/actions/set-up-rsc-kitchen-sink-project` Then run the following command to execute the action -`node setUpRscExternalPackagesProjectLocally.mjs` +`node setUpRscKitchenSinkProjectLocally.mjs` ## Design The main logic of the action is in the `../actionsLib.mjs` file. To be able to run that code both on GitHub and locally it uses dependency injection. The -injection is done by `setupRscExternalPackagesProjectLocally.mjs` for when you +injection is done by `setupRscKitchenSinkProjectLocally.mjs` for when you want to run the action on your own machine and by -`setupRscExternalPackagesProjectGitHib.mjs` when it's triggered by GitHub CI. +`setupRscKitchenSinkProjectGitHib.mjs` when it's triggered by GitHub CI. When doing further changes to the code here it's very important to keep the DI scripts as light on logic as possible. Ideally all logic is kept to diff --git a/.github/actions/set-up-rsc-kitchen-sink-project/action.yaml b/.github/actions/set-up-rsc-kitchen-sink-project/action.yaml new file mode 100644 index 000000000000..eb9d0109badf --- /dev/null +++ b/.github/actions/set-up-rsc-kitchen-sink-project/action.yaml @@ -0,0 +1,10 @@ +name: Set up RSC kitchen sink test project from fixture +description: Sets up an RSC project that tests all-the-things + +runs: + using: node20 + main: 'setUpRscKitchenSinkProjectGitHub.mjs' + +outputs: + test-project-path: + description: Path to the test project diff --git a/.github/actions/set-up-rsc-external-packages-and-cells-project/jsconfig.json b/.github/actions/set-up-rsc-kitchen-sink-project/jsconfig.json similarity index 100% rename from .github/actions/set-up-rsc-external-packages-and-cells-project/jsconfig.json rename to .github/actions/set-up-rsc-kitchen-sink-project/jsconfig.json diff --git a/.github/actions/set-up-rsc-external-packages-and-cells-project/package.json b/.github/actions/set-up-rsc-kitchen-sink-project/package.json similarity index 51% rename from .github/actions/set-up-rsc-external-packages-and-cells-project/package.json rename to .github/actions/set-up-rsc-kitchen-sink-project/package.json index cd61e78c360e..0a151aaa807a 100644 --- a/.github/actions/set-up-rsc-external-packages-and-cells-project/package.json +++ b/.github/actions/set-up-rsc-kitchen-sink-project/package.json @@ -1,5 +1,5 @@ { - "name": "set-up-rsc-external-packages-and-cells-project", + "name": "set-up-rsc-kitchen-sink-project", "version": "0.0.0", "private": true, "type": "module" diff --git a/.github/actions/set-up-rsc-external-packages-and-cells-project/setUpRscExternalPackagesProjectGitHub.mjs b/.github/actions/set-up-rsc-kitchen-sink-project/setUpRscKitchenSinkProjectGitHub.mjs similarity index 84% rename from .github/actions/set-up-rsc-external-packages-and-cells-project/setUpRscExternalPackagesProjectGitHub.mjs rename to .github/actions/set-up-rsc-kitchen-sink-project/setUpRscKitchenSinkProjectGitHub.mjs index 969027bacaa4..27490e9f6cf3 100644 --- a/.github/actions/set-up-rsc-external-packages-and-cells-project/setUpRscExternalPackagesProjectGitHub.mjs +++ b/.github/actions/set-up-rsc-kitchen-sink-project/setUpRscKitchenSinkProjectGitHub.mjs @@ -7,7 +7,7 @@ import core from '@actions/core' import { createExecWithEnvInCwd, setUpRscTestProject } from '../actionsLib.mjs' -const testProjectAndFixtureName = 'test-project-rsc-external-packages-and-cells' +const testProjectAndFixtureName = 'test-project-rsc-kitchen-sink' const testProjectPath = path.join( path.dirname(process.cwd()), testProjectAndFixtureName diff --git a/.github/actions/set-up-rsc-external-packages-and-cells-project/setUpRscExternalPackagesProjectLocally.mjs b/.github/actions/set-up-rsc-kitchen-sink-project/setUpRscKitchenSinkProjectLocally.mjs similarity index 96% rename from .github/actions/set-up-rsc-external-packages-and-cells-project/setUpRscExternalPackagesProjectLocally.mjs rename to .github/actions/set-up-rsc-kitchen-sink-project/setUpRscKitchenSinkProjectLocally.mjs index 30fcc27cf8a0..41a966452833 100644 --- a/.github/actions/set-up-rsc-external-packages-and-cells-project/setUpRscExternalPackagesProjectLocally.mjs +++ b/.github/actions/set-up-rsc-kitchen-sink-project/setUpRscKitchenSinkProjectLocally.mjs @@ -71,7 +71,7 @@ function getExecaOptions(cwd, env = {}) { } } -const testProjectAndFixtureName = 'test-project-rsc-external-packages-and-cells' +const testProjectAndFixtureName = 'test-project-rsc-kitchen-sink' const testProjectPath = path.join( os.tmpdir(), diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8436d7c63c55..717a55dc010a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -496,18 +496,18 @@ jobs: REDWOOD_TEST_PROJECT_PATH: ${{ steps.set-up-rsa-project.outputs.test-project-path }} REDWOOD_DISABLE_TELEMETRY: 1 - - name: 🌲 Set up RSC external packages and Cells smoke test - id: set-up-rsc-external-packages-and-cells-project - uses: ./.github/actions/set-up-rsc-external-packages-and-cells-project + - name: 🌲 Set up RSC Kitchen Sink smoke test + id: set-up-rsc-kitchen-sink-project + uses: ./.github/actions/set-up-rsc-kitchen-sink-project env: REDWOOD_DISABLE_TELEMETRY: 1 YARN_ENABLE_IMMUTABLE_INSTALLS: false - - name: 🐘 Run RSC external packages and cells smoke tests - working-directory: tasks/smoke-tests/rsc-external-packages-and-cells + - name: 🐘 Run RSC Kitchen Sink smoke tests + working-directory: tasks/smoke-tests/rsc-kitchen-sink run: npx playwright test env: - REDWOOD_TEST_PROJECT_PATH: ${{ steps.set-up-rsc-external-packages-and-cells-project.outputs.test-project-path }} + REDWOOD_TEST_PROJECT_PATH: ${{ steps.set-up-rsc-kitchen-sink-project.outputs.test-project-path }} REDWOOD_DISABLE_TELEMETRY: 1 rsc-smoke-tests-skip: diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/.editorconfig b/__fixtures__/test-project-rsc-kitchen-sink/.editorconfig similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/.editorconfig rename to __fixtures__/test-project-rsc-kitchen-sink/.editorconfig diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/.env.defaults b/__fixtures__/test-project-rsc-kitchen-sink/.env.defaults similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/.env.defaults rename to __fixtures__/test-project-rsc-kitchen-sink/.env.defaults diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/.env.example b/__fixtures__/test-project-rsc-kitchen-sink/.env.example similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/.env.example rename to __fixtures__/test-project-rsc-kitchen-sink/.env.example diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/.gitignore b/__fixtures__/test-project-rsc-kitchen-sink/.gitignore similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/.gitignore rename to __fixtures__/test-project-rsc-kitchen-sink/.gitignore diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/.gitpod.yml b/__fixtures__/test-project-rsc-kitchen-sink/.gitpod.yml similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/.gitpod.yml rename to __fixtures__/test-project-rsc-kitchen-sink/.gitpod.yml diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/.redwood/README.md b/__fixtures__/test-project-rsc-kitchen-sink/.redwood/README.md similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/.redwood/README.md rename to __fixtures__/test-project-rsc-kitchen-sink/.redwood/README.md diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/.vscode/extensions.json b/__fixtures__/test-project-rsc-kitchen-sink/.vscode/extensions.json similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/.vscode/extensions.json rename to __fixtures__/test-project-rsc-kitchen-sink/.vscode/extensions.json diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/.vscode/launch.json b/__fixtures__/test-project-rsc-kitchen-sink/.vscode/launch.json similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/.vscode/launch.json rename to __fixtures__/test-project-rsc-kitchen-sink/.vscode/launch.json diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/.vscode/settings.json b/__fixtures__/test-project-rsc-kitchen-sink/.vscode/settings.json similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/.vscode/settings.json rename to __fixtures__/test-project-rsc-kitchen-sink/.vscode/settings.json diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/.vscode/tasks.json b/__fixtures__/test-project-rsc-kitchen-sink/.vscode/tasks.json similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/.vscode/tasks.json rename to __fixtures__/test-project-rsc-kitchen-sink/.vscode/tasks.json diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/.yarnrc.yml b/__fixtures__/test-project-rsc-kitchen-sink/.yarnrc.yml similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/.yarnrc.yml rename to __fixtures__/test-project-rsc-kitchen-sink/.yarnrc.yml diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/README.md b/__fixtures__/test-project-rsc-kitchen-sink/README.md similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/README.md rename to __fixtures__/test-project-rsc-kitchen-sink/README.md diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/db/dev.db b/__fixtures__/test-project-rsc-kitchen-sink/api/db/dev.db similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/db/dev.db rename to __fixtures__/test-project-rsc-kitchen-sink/api/db/dev.db diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/db/migrations/20240207134237_init/migration.sql b/__fixtures__/test-project-rsc-kitchen-sink/api/db/migrations/20240207134237_init/migration.sql similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/db/migrations/20240207134237_init/migration.sql rename to __fixtures__/test-project-rsc-kitchen-sink/api/db/migrations/20240207134237_init/migration.sql diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/db/migrations/20240212134007_empty_user/migration.sql b/__fixtures__/test-project-rsc-kitchen-sink/api/db/migrations/20240212134007_empty_user/migration.sql similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/db/migrations/20240212134007_empty_user/migration.sql rename to __fixtures__/test-project-rsc-kitchen-sink/api/db/migrations/20240212134007_empty_user/migration.sql diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/db/migrations/migration_lock.toml b/__fixtures__/test-project-rsc-kitchen-sink/api/db/migrations/migration_lock.toml similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/db/migrations/migration_lock.toml rename to __fixtures__/test-project-rsc-kitchen-sink/api/db/migrations/migration_lock.toml diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/db/schema.prisma b/__fixtures__/test-project-rsc-kitchen-sink/api/db/schema.prisma similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/db/schema.prisma rename to __fixtures__/test-project-rsc-kitchen-sink/api/db/schema.prisma diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/jest.config.js b/__fixtures__/test-project-rsc-kitchen-sink/api/jest.config.js similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/jest.config.js rename to __fixtures__/test-project-rsc-kitchen-sink/api/jest.config.js diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/package.json b/__fixtures__/test-project-rsc-kitchen-sink/api/package.json similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/package.json rename to __fixtures__/test-project-rsc-kitchen-sink/api/package.json diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/directives/requireAuth/requireAuth.test.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/directives/requireAuth/requireAuth.test.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/directives/requireAuth/requireAuth.test.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/directives/requireAuth/requireAuth.test.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/directives/requireAuth/requireAuth.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/directives/requireAuth/requireAuth.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/directives/requireAuth/requireAuth.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/directives/requireAuth/requireAuth.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/directives/skipAuth/skipAuth.test.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/directives/skipAuth/skipAuth.test.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/directives/skipAuth/skipAuth.test.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/directives/skipAuth/skipAuth.test.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/directives/skipAuth/skipAuth.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/directives/skipAuth/skipAuth.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/directives/skipAuth/skipAuth.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/directives/skipAuth/skipAuth.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/functions/graphql.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/functions/graphql.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/functions/graphql.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/functions/graphql.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/graphql/.keep b/__fixtures__/test-project-rsc-kitchen-sink/api/src/graphql/.keep similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/graphql/.keep rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/graphql/.keep diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/graphql/emptyUsers.sdl.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/graphql/emptyUsers.sdl.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/graphql/emptyUsers.sdl.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/graphql/emptyUsers.sdl.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/graphql/userExamples.sdl.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/graphql/userExamples.sdl.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/graphql/userExamples.sdl.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/graphql/userExamples.sdl.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/lib/auth.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/lib/auth.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/lib/auth.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/lib/auth.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/lib/db.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/lib/db.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/lib/db.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/lib/db.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/lib/logger.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/lib/logger.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/lib/logger.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/lib/logger.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/services/.keep b/__fixtures__/test-project-rsc-kitchen-sink/api/src/services/.keep similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/services/.keep rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/services/.keep diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/services/emptyUsers/emptyUsers.scenarios.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/services/emptyUsers/emptyUsers.scenarios.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/services/emptyUsers/emptyUsers.scenarios.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/services/emptyUsers/emptyUsers.scenarios.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/services/emptyUsers/emptyUsers.test.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/services/emptyUsers/emptyUsers.test.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/services/emptyUsers/emptyUsers.test.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/services/emptyUsers/emptyUsers.test.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/services/emptyUsers/emptyUsers.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/services/emptyUsers/emptyUsers.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/services/emptyUsers/emptyUsers.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/services/emptyUsers/emptyUsers.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/src/services/userExamples/userExamples.ts b/__fixtures__/test-project-rsc-kitchen-sink/api/src/services/userExamples/userExamples.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/src/services/userExamples/userExamples.ts rename to __fixtures__/test-project-rsc-kitchen-sink/api/src/services/userExamples/userExamples.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/api/tsconfig.json b/__fixtures__/test-project-rsc-kitchen-sink/api/tsconfig.json similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/api/tsconfig.json rename to __fixtures__/test-project-rsc-kitchen-sink/api/tsconfig.json diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/graphql.config.js b/__fixtures__/test-project-rsc-kitchen-sink/graphql.config.js similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/graphql.config.js rename to __fixtures__/test-project-rsc-kitchen-sink/graphql.config.js diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/jest.config.js b/__fixtures__/test-project-rsc-kitchen-sink/jest.config.js similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/jest.config.js rename to __fixtures__/test-project-rsc-kitchen-sink/jest.config.js diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/package.json b/__fixtures__/test-project-rsc-kitchen-sink/package.json similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/package.json rename to __fixtures__/test-project-rsc-kitchen-sink/package.json diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/prettier.config.js b/__fixtures__/test-project-rsc-kitchen-sink/prettier.config.js similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/prettier.config.js rename to __fixtures__/test-project-rsc-kitchen-sink/prettier.config.js diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/redwood.toml b/__fixtures__/test-project-rsc-kitchen-sink/redwood.toml similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/redwood.toml rename to __fixtures__/test-project-rsc-kitchen-sink/redwood.toml diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/scripts/.keep b/__fixtures__/test-project-rsc-kitchen-sink/scripts/.keep similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/scripts/.keep rename to __fixtures__/test-project-rsc-kitchen-sink/scripts/.keep diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/scripts/seed.ts b/__fixtures__/test-project-rsc-kitchen-sink/scripts/seed.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/scripts/seed.ts rename to __fixtures__/test-project-rsc-kitchen-sink/scripts/seed.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/scripts/tsconfig.json b/__fixtures__/test-project-rsc-kitchen-sink/scripts/tsconfig.json similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/scripts/tsconfig.json rename to __fixtures__/test-project-rsc-kitchen-sink/scripts/tsconfig.json diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/jest.config.js b/__fixtures__/test-project-rsc-kitchen-sink/web/jest.config.js similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/jest.config.js rename to __fixtures__/test-project-rsc-kitchen-sink/web/jest.config.js diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/package.json b/__fixtures__/test-project-rsc-kitchen-sink/web/package.json similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/package.json rename to __fixtures__/test-project-rsc-kitchen-sink/web/package.json diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/public/README.md b/__fixtures__/test-project-rsc-kitchen-sink/web/public/README.md similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/public/README.md rename to __fixtures__/test-project-rsc-kitchen-sink/web/public/README.md diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/public/favicon.png b/__fixtures__/test-project-rsc-kitchen-sink/web/public/favicon.png similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/public/favicon.png rename to __fixtures__/test-project-rsc-kitchen-sink/web/public/favicon.png diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/public/robots.txt b/__fixtures__/test-project-rsc-kitchen-sink/web/public/robots.txt similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/public/robots.txt rename to __fixtures__/test-project-rsc-kitchen-sink/web/public/robots.txt diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/App.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/App.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/App.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/App.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/Document.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/Document.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/Document.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/Document.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/Routes.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/Routes.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/Routes.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/Routes.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/ServerRoutes.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/ServerRoutes.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/ServerRoutes.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/ServerRoutes.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/.keep b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/.keep similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/.keep rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/.keep diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/Counter/AboutCounter.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/Counter/AboutCounter.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/Counter/AboutCounter.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/Counter/AboutCounter.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/Counter/Counter.css b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/Counter/Counter.css similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/Counter/Counter.css rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/Counter/Counter.css diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/Counter/Counter.module.css b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/Counter/Counter.module.css similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/Counter/Counter.module.css rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/Counter/Counter.module.css diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/Counter/Counter.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/Counter/Counter.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/Counter/Counter.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/Counter/Counter.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/EditEmptyUserCell/EditEmptyUserCell.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/EditEmptyUserCell/EditEmptyUserCell.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/EditEmptyUserCell/EditEmptyUserCell.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/EditEmptyUserCell/EditEmptyUserCell.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/EmptyUser/EmptyUser.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/EmptyUser/EmptyUser.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/EmptyUser/EmptyUser.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/EmptyUser/EmptyUser.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/EmptyUserCell/EmptyUserCell.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/EmptyUserCell/EmptyUserCell.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/EmptyUserCell/EmptyUserCell.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/EmptyUserCell/EmptyUserCell.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/EmptyUserForm/EmptyUserForm.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/EmptyUserForm/EmptyUserForm.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/EmptyUserForm/EmptyUserForm.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/EmptyUserForm/EmptyUserForm.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/EmptyUsers/EmptyUsers.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/EmptyUsers/EmptyUsers.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/EmptyUsers/EmptyUsers.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/EmptyUsers/EmptyUsers.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/EmptyUsersCell/EmptyUsersCell.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/EmptyUsersCell/EmptyUsersCell.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/EmptyUsersCell/EmptyUsersCell.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/EmptyUsersCell/EmptyUsersCell.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/NewEmptyUser/NewEmptyUser.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/NewEmptyUser/NewEmptyUser.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/EmptyUser/NewEmptyUser/NewEmptyUser.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/EmptyUser/NewEmptyUser/NewEmptyUser.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/RandomNumberServerCell/RandomNumberServerCell.css b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/RandomNumberServerCell/RandomNumberServerCell.css similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/RandomNumberServerCell/RandomNumberServerCell.css rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/RandomNumberServerCell/RandomNumberServerCell.css diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/RandomNumberServerCell/RandomNumberServerCell.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/RandomNumberServerCell/RandomNumberServerCell.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/RandomNumberServerCell/RandomNumberServerCell.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/RandomNumberServerCell/RandomNumberServerCell.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/RandomNumberServerCell/UpdateRandomButton.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/RandomNumberServerCell/UpdateRandomButton.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/RandomNumberServerCell/UpdateRandomButton.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/RandomNumberServerCell/UpdateRandomButton.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/RandomNumberServerCell/actions.ts b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/RandomNumberServerCell/actions.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/RandomNumberServerCell/actions.ts rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/RandomNumberServerCell/actions.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/EditUserExampleCell/EditUserExampleCell.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/EditUserExampleCell/EditUserExampleCell.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/EditUserExampleCell/EditUserExampleCell.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/EditUserExampleCell/EditUserExampleCell.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/NewUserExample/NewUserExample.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/NewUserExample/NewUserExample.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/NewUserExample/NewUserExample.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/NewUserExample/NewUserExample.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/UserExample/UserExample.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/UserExample/UserExample.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/UserExample/UserExample.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/UserExample/UserExample.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/UserExampleCell/UserExampleCell.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/UserExampleCell/UserExampleCell.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/UserExampleCell/UserExampleCell.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/UserExampleCell/UserExampleCell.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/UserExampleForm/UserExampleForm.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/UserExampleForm/UserExampleForm.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/UserExampleForm/UserExampleForm.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/UserExampleForm/UserExampleForm.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/UserExampleServerCell/UserExampleServerCell.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/UserExampleServerCell/UserExampleServerCell.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/UserExampleServerCell/UserExampleServerCell.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/UserExampleServerCell/UserExampleServerCell.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/UserExamples/UserExamples.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/UserExamples/UserExamples.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/UserExamples/UserExamples.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/UserExamples/UserExamples.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/UserExamplesCell/UserExamplesCell.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/UserExamplesCell/UserExamplesCell.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/UserExamplesCell/UserExamplesCell.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/components/UserExample/UserExamplesCell/UserExamplesCell.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/entries.ts b/__fixtures__/test-project-rsc-kitchen-sink/web/src/entries.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/entries.ts rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/entries.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/entry.client.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/entry.client.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/entry.client.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/entry.client.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/entry.server.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/entry.server.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/entry.server.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/entry.server.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/index.css b/__fixtures__/test-project-rsc-kitchen-sink/web/src/index.css similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/index.css rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/index.css diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/layouts/.keep b/__fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/.keep similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/layouts/.keep rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/.keep diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/layouts/NavigationLayout/NavigationLayout.css b/__fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/NavigationLayout/NavigationLayout.css similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/layouts/NavigationLayout/NavigationLayout.css rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/NavigationLayout/NavigationLayout.css diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/layouts/NavigationLayout/NavigationLayout.stories.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/NavigationLayout/NavigationLayout.stories.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/layouts/NavigationLayout/NavigationLayout.stories.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/NavigationLayout/NavigationLayout.stories.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/layouts/NavigationLayout/NavigationLayout.test.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/NavigationLayout/NavigationLayout.test.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/layouts/NavigationLayout/NavigationLayout.test.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/NavigationLayout/NavigationLayout.test.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/layouts/NavigationLayout/NavigationLayout.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/NavigationLayout/NavigationLayout.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/layouts/NavigationLayout/NavigationLayout.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/NavigationLayout/NavigationLayout.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/layouts/ScaffoldLayout/ScaffoldLayout.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/ScaffoldLayout/ScaffoldLayout.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/layouts/ScaffoldLayout/ScaffoldLayout.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/ScaffoldLayout/ScaffoldLayout.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/lib/formatters.test.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/lib/formatters.test.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/lib/formatters.test.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/lib/formatters.test.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/lib/formatters.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/lib/formatters.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/lib/formatters.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/lib/formatters.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/AboutPage/AboutPage.css b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/AboutPage/AboutPage.css similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/AboutPage/AboutPage.css rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/AboutPage/AboutPage.css diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/AboutPage/AboutPage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/AboutPage/AboutPage.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/AboutPage/AboutPage.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/AboutPage/AboutPage.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/EmptyUser/EditEmptyUserPage/EditEmptyUserPage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/EmptyUser/EditEmptyUserPage/EditEmptyUserPage.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/EmptyUser/EditEmptyUserPage/EditEmptyUserPage.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/EmptyUser/EditEmptyUserPage/EditEmptyUserPage.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/EmptyUser/EmptyUserPage/EmptyUserPage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/EmptyUser/EmptyUserPage/EmptyUserPage.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/EmptyUser/EmptyUserPage/EmptyUserPage.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/EmptyUser/EmptyUserPage/EmptyUserPage.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/EmptyUser/EmptyUsersPage/EmptyUsersPage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/EmptyUser/EmptyUsersPage/EmptyUsersPage.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/EmptyUser/EmptyUsersPage/EmptyUsersPage.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/EmptyUser/EmptyUsersPage/EmptyUsersPage.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/EmptyUser/NewEmptyUserPage/NewEmptyUserPage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/EmptyUser/NewEmptyUserPage/NewEmptyUserPage.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/EmptyUser/NewEmptyUserPage/NewEmptyUserPage.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/EmptyUser/NewEmptyUserPage/NewEmptyUserPage.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/FatalErrorPage/FatalErrorPage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/FatalErrorPage/FatalErrorPage.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/FatalErrorPage/FatalErrorPage.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/FatalErrorPage/FatalErrorPage.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/HomePage/HomePage.css b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/HomePage/HomePage.css similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/HomePage/HomePage.css rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/HomePage/HomePage.css diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/HomePage/HomePage.module.css b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/HomePage/HomePage.module.css similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/HomePage/HomePage.module.css rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/HomePage/HomePage.module.css diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/HomePage/HomePage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/HomePage/HomePage.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/HomePage/HomePage.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/HomePage/HomePage.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/HomePage/actions.ts b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/HomePage/actions.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/HomePage/actions.ts rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/HomePage/actions.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/HomePage/words.ts b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/HomePage/words.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/HomePage/words.ts rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/HomePage/words.ts diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/MultiCellPage/MultiCellPage.css b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/MultiCellPage/MultiCellPage.css similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/MultiCellPage/MultiCellPage.css rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/MultiCellPage/MultiCellPage.css diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/MultiCellPage/MultiCellPage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/MultiCellPage/MultiCellPage.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/MultiCellPage/MultiCellPage.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/MultiCellPage/MultiCellPage.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/NotFoundPage/NotFoundPage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/NotFoundPage/NotFoundPage.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/NotFoundPage/NotFoundPage.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/NotFoundPage/NotFoundPage.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/UserExample/EditUserExamplePage/EditUserExamplePage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/UserExample/EditUserExamplePage/EditUserExamplePage.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/UserExample/EditUserExamplePage/EditUserExamplePage.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/UserExample/EditUserExamplePage/EditUserExamplePage.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/UserExample/NewUserExamplePage/NewUserExamplePage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/UserExample/NewUserExamplePage/NewUserExamplePage.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/UserExample/NewUserExamplePage/NewUserExamplePage.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/UserExample/NewUserExamplePage/NewUserExamplePage.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/UserExample/UserExamplePage/UserExamplePage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/UserExample/UserExamplePage/UserExamplePage.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/UserExample/UserExamplePage/UserExamplePage.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/UserExample/UserExamplePage/UserExamplePage.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/UserExample/UserExamplesPage/UserExamplesPage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/UserExample/UserExamplesPage/UserExamplesPage.tsx similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/pages/UserExample/UserExamplesPage/UserExamplesPage.tsx rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/pages/UserExample/UserExamplesPage/UserExamplesPage.tsx diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/src/scaffold.css b/__fixtures__/test-project-rsc-kitchen-sink/web/src/scaffold.css similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/src/scaffold.css rename to __fixtures__/test-project-rsc-kitchen-sink/web/src/scaffold.css diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/tsconfig.json b/__fixtures__/test-project-rsc-kitchen-sink/web/tsconfig.json similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/tsconfig.json rename to __fixtures__/test-project-rsc-kitchen-sink/web/tsconfig.json diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/vite.config.ts b/__fixtures__/test-project-rsc-kitchen-sink/web/vite.config.ts similarity index 100% rename from __fixtures__/test-project-rsc-external-packages-and-cells/web/vite.config.ts rename to __fixtures__/test-project-rsc-kitchen-sink/web/vite.config.ts diff --git a/packages/vite/src/clientSsr.ts b/packages/vite/src/clientSsr.ts index 4fce7a4473a3..490a40109d6b 100644 --- a/packages/vite/src/clientSsr.ts +++ b/packages/vite/src/clientSsr.ts @@ -119,13 +119,13 @@ export function renderFromDist>( get(_target, encodedId: string) { console.log('Proxy get encodedId', encodedId) const [filePath, name] = encodedId.split('#') as [string, string] - // filePath /Users/tobbe/tmp/test-project-rsc-external-packages-and-cells/web/dist/rsc/assets/rsc-AboutCounter.tsx-1.mjs + // filePath /Users/tobbe/tmp/test-project-rsc-kitchen-sink/web/dist/rsc/assets/rsc-AboutCounter.tsx-1.mjs // name AboutCounter const id = resolveClientEntryForProd(filePath, clientEntries) console.log('clientSsr.ts::Proxy id', id) - // id /Users/tobbe/tmp/test-project-rsc-external-packages-and-cells/web/dist/client/assets/rsc-AboutCounter.tsx-1-4kTKU8GC.mjs + // id /Users/tobbe/tmp/test-project-rsc-kitchen-sink/web/dist/client/assets/rsc-AboutCounter.tsx-1-4kTKU8GC.mjs return { id, chunks: [id], name, async: true } }, }, diff --git a/tasks/smoke-tests/rsc-external-packages-and-cells/playwright.config.ts b/tasks/smoke-tests/rsc-kitchen-sink/playwright.config.ts similarity index 100% rename from tasks/smoke-tests/rsc-external-packages-and-cells/playwright.config.ts rename to tasks/smoke-tests/rsc-kitchen-sink/playwright.config.ts diff --git a/tasks/smoke-tests/rsc-external-packages-and-cells/tests/rsc-external-packages-and-cells.spec.ts b/tasks/smoke-tests/rsc-kitchen-sink/tests/rsc-kitchen-sink.spec.ts similarity index 100% rename from tasks/smoke-tests/rsc-external-packages-and-cells/tests/rsc-external-packages-and-cells.spec.ts rename to tasks/smoke-tests/rsc-kitchen-sink/tests/rsc-kitchen-sink.spec.ts diff --git a/tasks/smoke-tests/rsc-external-packages-and-cells/tests/rsc-ssr.spec.ts b/tasks/smoke-tests/rsc-kitchen-sink/tests/rsc-ssr.spec.ts similarity index 100% rename from tasks/smoke-tests/rsc-external-packages-and-cells/tests/rsc-ssr.spec.ts rename to tasks/smoke-tests/rsc-kitchen-sink/tests/rsc-ssr.spec.ts