chore(test): Make the rsc fixture look more like a real/regular RW pr…

…oject

__fixtures__/test-project-rsc-external-packages-and-cells/.vscode/settings.json

@@ -3,7 +3,7 @@
   "files.trimTrailingWhitespace": true,
   "editor.formatOnSave": false,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "[prisma]": {
     "editor.formatOnSave": true

__fixtures__/test-project-rsc-external-packages-and-cells/README.md

@@ -1,10 +1,14 @@
-RW smoke-test fixture project for an app that uses RSC and imports external npm
-packages
+RW smoke-test fixture project for an app that tests two RSC related features
+  1. imports external npm packages
+  2. Uses client cells to do client-side gql data fetching
 
 Mainly these things are tested:
   * Importing a package with company scope (@ and / in its name)
   * Importing a package that uses the 'use client' directive
   * Using the 'client-only' package
   * Using the 'server-only' package
+  * Imports a traditional RW Cell into a page (that's, like all pages, a server
+    component) to verify that we can still do client side GQL data fetching
+    like we've always been able to do
 
 Used by `.github/actions/set-up-rsc-from-fixture`

__fixtures__/test-project-rsc-external-packages-and-cells/api/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "7.0.0-canary.966",
-    "@redwoodjs/graphql-server": "7.0.0-canary.966"
+    "@redwoodjs/api": "7.0.0-canary.981",
+    "@redwoodjs/graphql-server": "7.0.0-canary.981"
   }
 }

__fixtures__/test-project-rsc-external-packages-and-cells/package.json

@@ -7,7 +7,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "7.0.0-canary.966"
+    "@redwoodjs/core": "7.0.0-canary.981"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config",

__fixtures__/test-project-rsc-external-packages-and-cells/web/package.json

@@ -11,17 +11,17 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/forms": "7.0.0-canary.966",
-    "@redwoodjs/router": "7.0.0-canary.966",
-    "@redwoodjs/web": "7.0.0-canary.966",
+    "@redwoodjs/forms": "7.0.0-canary.981",
+    "@redwoodjs/router": "7.0.0-canary.981",
+    "@redwoodjs/web": "7.0.0-canary.981",
     "@tobbe.dev/rsc-test": "0.0.3",
     "client-only": "0.0.1",
     "react": "0.0.0-experimental-e5205658f-20230913",
     "react-dom": "0.0.0-experimental-e5205658f-20230913",
     "server-only": "0.0.1"
   },
   "devDependencies": {
-    "@redwoodjs/vite": "7.0.0-canary.966",
+    "@redwoodjs/vite": "7.0.0-canary.981",
     "@types/react": "^18.2.55",
     "@types/react-dom": "^18.2.19"
   }

__fixtures__/test-project-rsc-external-packages-and-cells/web/src/Routes.tsx

@@ -17,13 +17,14 @@ import NotFoundPage from './pages/NotFoundPage/NotFoundPage'
 const AboutPage = serve('AboutPage')
 const HomePage = serve('HomePage')
 const UserExampleUserExamplesPage = serve('UserExampleUserExamplesPage')
+const UserExampleNewUserExamplePage = serve('UserExampleNewUserExamplePage')
 
 const Routes = () => {
   return (
     <Router>
       <Set wrap={ScaffoldLayout} title="UserExamples" titleTo="userExamples" buttonLabel="New UserExample" buttonTo="newUserExample">
-        {/* <Route path="/user-examples/new" page={UserExampleNewUserExamplePage} name="newUserExample" />
-        <Route path="/user-examples/{id:Int}/edit" page={UserExampleEditUserExamplePage} name="editUserExample" />
+        <Route path="/user-examples/new" page={UserExampleNewUserExamplePage} name="newUserExample" />
+        {/* <Route path="/user-examples/{id:Int}/edit" page={UserExampleEditUserExamplePage} name="editUserExample" />
         <Route path="/user-examples/{id:Int}" page={UserExampleUserExamplePage} name="userExample" /> */}
         <Route path="/user-examples" page={UserExampleUserExamplesPage} name="userExamples" />
       </Set>

__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/NewUserExample/NewUserExample.tsx

@@ -1,3 +1,5 @@
+'use client'
+
 import { navigate, routes } from '@redwoodjs/router'
 import { useMutation } from '@redwoodjs/web'
 import { toast } from '@redwoodjs/web/toast'

__fixtures__/test-project-rsc-external-packages-and-cells/web/src/components/UserExample/UserExamplesCell/UserExamplesCell.tsx

@@ -1,8 +1,8 @@
-"use client"
+'use client'
 
 import type { FindUserExamples } from 'types/graphql'
 
-// import { Link, routes } from '@redwoodjs/router'
+import { Link, routes } from '@redwoodjs/router'
 import type { CellSuccessProps, CellFailureProps } from '@redwoodjs/web'
 
 import UserExamples from '../UserExamples/UserExamples'
@@ -22,10 +22,10 @@ export const Loading = () => <div>Loading...</div>
 export const Empty = () => {
   return (
     <div className="rw-text-center">
-      {'No userExamples yet. '}
-      {/* <Link to={routes.newUserExample()} className="rw-link"> */}
-      {'Create one?'}
-      {/* </Link> */}
+      No userExamples yet.{' '}
+      <Link to={routes.newUserExample()} className="rw-link">
+        Create one?
+      </Link>
     </div>
   )
 }

__fixtures__/test-project-rsc-external-packages-and-cells/web/src/entries.ts

@@ -2,14 +2,18 @@ import { defineEntries } from '@redwoodjs/vite/entries'
 
 export default defineEntries(
   // getEntry
-  async (id) => {
+  async (id: string) => {
     switch (id) {
       case 'AboutPage':
         return import('./pages/AboutPage/AboutPage')
       case 'HomePage':
         return import('./pages/HomePage/HomePage')
       case 'UserExampleUserExamplesPage':
         return import('./pages/UserExample/UserExamplesPage/UserExamplesPage')
+      case 'UserExampleNewUserExamplePage':
+        return import(
+          './pages/UserExample/NewUserExamplePage/NewUserExamplePage'
+        )
       default:
         return null
     }