Merge branch 'main' into feat/jest-ignore-scenario-files

redwoodjs · Jul 22, 2024 · 39a16ff · 39a16ff
2 parents ea420a7 + a82319d
commit 39a16ff
Show file tree

Hide file tree

Showing 138 changed files with 983 additions and 823 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,4 @@ packages/create-redwood-app/create-redwood-app.tgz
 **/meta.*.json
 
 .nx/cache
+.nx/workspace-data
diff --git a/__fixtures__/test-project-rsa/web/src/Routes.tsx b/__fixtures__/test-project-rsa/web/src/Routes.tsx
@@ -7,12 +7,9 @@
 // 'src/pages/HomePage/HomePage.js'         -> HomePage
 // 'src/pages/Admin/BooksPage/BooksPage.js' -> AdminBooksPage
 
-import { Route } from '@redwoodjs/router/dist/Route'
-import { Set } from '@redwoodjs/router/dist/Set'
-
-// @ts-expect-error - ESM issue. RW projects need to be ESM to properly pick up
-// on the types here
-import { Router } from '@redwoodjs/vite/Router'
+import { Route } from '@redwoodjs/router/Route'
+import { Router } from '@redwoodjs/router/RscRouter'
+import { Set } from '@redwoodjs/router/Set'
 
 import NavigationLayout from './layouts/NavigationLayout/NavigationLayout'
 import NotFoundPage from './pages/NotFoundPage/NotFoundPage'

diff --git a/__fixtures__/test-project-rsa/web/src/layouts/NavigationLayout/NavigationLayout.tsx b/__fixtures__/test-project-rsa/web/src/layouts/NavigationLayout/NavigationLayout.tsx
@@ -1,4 +1,4 @@
-import { namedRoutes as routes } from '@redwoodjs/router/dist/namedRoutes'
+import { namedRoutes as routes } from '@redwoodjs/router/namedRoutes'
 
 import './NavigationLayout.css'
 

diff --git a/__fixtures__/test-project-rsc-kitchen-sink/web/src/Routes.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/Routes.tsx
@@ -7,9 +7,9 @@
 // 'src/pages/HomePage/HomePage.js'         -> HomePage
 // 'src/pages/Admin/BooksPage/BooksPage.js' -> AdminBooksPage
 
-import { Route } from '@redwoodjs/router/dist/Route'
-import { Set, PrivateSet } from '@redwoodjs/router/dist/Set'
-import { Router } from '@redwoodjs/vite/Router'
+import { Route } from '@redwoodjs/router/Route'
+import { Router } from '@redwoodjs/router/RscRouter'
+import { Set, PrivateSet } from '@redwoodjs/router/Set'
 
 import { useAuth } from './auth'
 import AuthLayout from './layouts/AuthLayout/AuthLayout'

diff --git a/__fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/AuthLayout/AuthLayout.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/layouts/AuthLayout/AuthLayout.tsx
@@ -1,5 +1,5 @@
-import { namedRoutes as routes } from '@redwoodjs/router/dist/namedRoutes'
-import { NavLink } from '@redwoodjs/router/dist/navLink'
+import { namedRoutes as routes } from '@redwoodjs/router/namedRoutes'
+import { NavLink } from '@redwoodjs/router/NavLink'
 
 import './AuthLayout.css'
 

diff --git a/...res__/test-project-rsc-kitchen-sink/web/src/layouts/NavigationLayout/NavigationLayout.tsx b/...res__/test-project-rsc-kitchen-sink/web/src/layouts/NavigationLayout/NavigationLayout.tsx
@@ -1,6 +1,6 @@
-import { Link } from '@redwoodjs/router/dist/link'
-import { namedRoutes as routes } from '@redwoodjs/router/dist/namedRoutes'
-import { NavLink } from '@redwoodjs/router/dist/navLink'
+import { Link } from '@redwoodjs/router/Link'
+import { namedRoutes as routes } from '@redwoodjs/router/namedRoutes'
+import { NavLink } from '@redwoodjs/router/NavLink'
 import { getAuthState, getLocation } from '@redwoodjs/server-store'
 
 import ReadFileServerCell from 'src/components/ReadFileServerCell'

diff --git a/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/LoginPage/LoginPage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/LoginPage/LoginPage.tsx
@@ -1,5 +1,5 @@
-import { Link } from '@redwoodjs/router/dist/link'
-import { namedRoutes as routes } from '@redwoodjs/router/dist/namedRoutes'
+import { Link } from '@redwoodjs/router/Link'
+import { namedRoutes as routes } from '@redwoodjs/router/namedRoutes'
 import { Metadata } from '@redwoodjs/web/dist/components/Metadata'
 // import { Toaster } from '@redwoodjs/web/toast'
 

diff --git a/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/SignupPage/SignupPage.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/pages/SignupPage/SignupPage.tsx
@@ -1,5 +1,5 @@
-import { Link } from '@redwoodjs/router/dist/link'
-import { namedRoutes as routes } from '@redwoodjs/router/dist/namedRoutes'
+import { Link } from '@redwoodjs/router/Link'
+import { namedRoutes as routes } from '@redwoodjs/router/namedRoutes'
 import { Metadata } from '@redwoodjs/web/dist/components/Metadata'
 // import { Toaster } from '@redwoodjs/web/toast'
 

diff --git a/docs/docs/tutorial/chapter3/saving-data.md b/docs/docs/tutorial/chapter3/saving-data.md
@@ -1305,7 +1305,7 @@ Right now we won't even be able to test our validation on the server because we'
 <Tabs groupId="js-ts">
 <TabItem value="js" label="JavaScript">
 
-```diff title="web/src/pages/ContactPage/ContactPage.js"
+```diff title="web/src/pages/ContactPage/ContactPage.jsx"
  <TextField
    name="email"
    validation={{

diff --git a/docs/package.json b/docs/package.json
@@ -38,7 +38,7 @@
   "devDependencies": {
     "@docusaurus/module-type-aliases": "3.4.0",
     "@docusaurus/tsconfig": "3.4.0",
-    "typescript": "5.4.5"
+    "typescript": "5.5.3"
   },
   "packageManager": "[email protected]"
 }
diff --git a/docs/yarn.lock b/docs/yarn.lock
@@ -4958,7 +4958,7 @@ __metadata:
     react: "npm:18.2.0"
     react-dom: "npm:18.2.0"
     react-player: "npm:2.16.0"
-    typescript: "npm:5.4.5"
+    typescript: "npm:5.5.3"
   languageName: unknown
   linkType: soft
 
@@ -11030,23 +11030,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:5.4.5":
-  version: 5.4.5
-  resolution: "typescript@npm:5.4.5"
+"typescript@npm:5.5.3":
+  version: 5.5.3
+  resolution: "typescript@npm:5.5.3"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/2954022ada340fd3d6a9e2b8e534f65d57c92d5f3989a263754a78aba549f7e6529acc1921913560a4b816c46dce7df4a4d29f9f11a3dc0d4213bb76d043251e
+  checksum: 10c0/f52c71ccbc7080b034b9d3b72051d563601a4815bf3e39ded188e6ce60813f75dbedf11ad15dd4d32a12996a9ed8c7155b46c93a9b9c9bad1049766fe614bbdd
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>":
-  version: 5.4.5
-  resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=5adc0c"
+"typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>":
+  version: 5.5.3
+  resolution: "typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=379a07"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9
+  checksum: 10c0/911c7811d61f57f07df79c4a35f56a0f426a65426a020e5fcd792f66559f399017205f5f10255329ab5a3d8c2d1f1d19530aeceffda70758a521fae1d469432e
   languageName: node
   linkType: hard
 

diff --git a/package.json b/package.json
@@ -82,10 +82,10 @@
     "babel-plugin-remove-code": "0.0.6",
     "boxen": "5.1.2",
     "core-js": "3.37.1",
-    "cypress": "13.9.0",
+    "cypress": "13.13.1",
     "cypress-fail-fast": "7.1.0",
-    "cypress-wait-until": "3.0.1",
-    "dependency-cruiser": "16.3.2",
+    "cypress-wait-until": "3.0.2",
+    "dependency-cruiser": "16.3.9",
     "dotenv": "16.4.5",
     "eslint": "8.57.0",
     "execa": "5.1.1",
@@ -94,23 +94,23 @@
     "human-id": "^4.1.1",
     "jest": "29.7.0",
     "jscodeshift": "0.15.0",
-    "lerna": "8.1.6",
+    "lerna": "8.1.7",
     "listr2": "6.6.1",
     "make-dir-cli": "4.0.0",
     "msw": "1.3.3",
     "ncp": "2.0.0",
     "nodemon": "3.1.4",
     "npm-packlist": "8.0.2",
-    "nx": "19.0.4",
+    "nx": "19.5.1",
     "ora": "8.0.1",
     "prompts": "2.4.2",
     "rimraf": "6.0.1",
     "tstyche": "2.1.0",
     "tsx": "4.16.2",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3",
     "yargs": "17.7.2",
-    "zx": "8.1.0"
+    "zx": "8.1.4"
   },
   "packageManager": "[email protected]",
   "npmClient": "yarn"

diff --git a/packages/adapters/fastify/web/package.json b/packages/adapters/fastify/web/package.json
@@ -31,7 +31,7 @@
     "@redwoodjs/framework-tools": "workspace:*",
     "fastify": "4.28.1",
     "tsx": "4.16.2",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/api-server/package.json b/packages/api-server/package.json
@@ -57,7 +57,7 @@
     "@types/yargs": "17.0.32",
     "pino-abstract-transport": "1.2.0",
     "tsx": "4.16.2",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "peerDependencies": {

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -55,7 +55,7 @@
     "redis": "4.6.15",
     "split2": "4.2.0",
     "ts-toolbelt": "9.6.0",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "peerDependencies": {

diff --git a/packages/auth-providers/auth0/api/package.json b/packages/auth-providers/auth0/api/package.json
@@ -33,7 +33,7 @@
     "@babel/core": "^7.22.20",
     "@redwoodjs/api": "workspace:*",
     "@types/jsonwebtoken": "9.0.6",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/auth-providers/auth0/setup/package.json b/packages/auth-providers/auth0/setup/package.json
@@ -31,7 +31,7 @@
     "@babel/cli": "7.24.8",
     "@babel/core": "^7.22.20",
     "@types/yargs": "17.0.32",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/auth-providers/auth0/web/package.json b/packages/auth-providers/auth0/web/package.json
@@ -33,7 +33,7 @@
     "@babel/core": "^7.22.20",
     "@types/react": "^18.2.55",
     "react": "19.0.0-beta-04b058868c-20240508",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "peerDependencies": {

diff --git a/packages/auth-providers/azureActiveDirectory/api/package.json b/packages/auth-providers/azureActiveDirectory/api/package.json
@@ -34,7 +34,7 @@
     "@redwoodjs/api": "workspace:*",
     "@types/aws-lambda": "8.10.141",
     "@types/jsonwebtoken": "9.0.6",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/auth-providers/azureActiveDirectory/setup/package.json b/packages/auth-providers/azureActiveDirectory/setup/package.json
@@ -31,7 +31,7 @@
     "@babel/cli": "7.24.8",
     "@babel/core": "^7.22.20",
     "@types/yargs": "17.0.32",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/auth-providers/azureActiveDirectory/web/package.json b/packages/auth-providers/azureActiveDirectory/web/package.json
@@ -34,7 +34,7 @@
     "@types/netlify-identity-widget": "1.9.6",
     "@types/react": "^18.2.55",
     "react": "19.0.0-beta-04b058868c-20240508",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "peerDependencies": {

diff --git a/packages/auth-providers/clerk/api/package.json b/packages/auth-providers/clerk/api/package.json
@@ -32,7 +32,7 @@
     "@babel/core": "^7.22.20",
     "@redwoodjs/api": "workspace:*",
     "@types/aws-lambda": "8.10.141",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/auth-providers/clerk/setup/package.json b/packages/auth-providers/clerk/setup/package.json
@@ -29,7 +29,7 @@
     "@babel/cli": "7.24.8",
     "@babel/core": "^7.22.20",
     "@types/yargs": "17.0.32",
-    "typescript": "5.4.5"
+    "typescript": "5.5.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/auth-providers/clerk/web/package.json b/packages/auth-providers/clerk/web/package.json
@@ -34,7 +34,7 @@
     "@clerk/types": "3.65.2",
     "@types/react": "^18.2.55",
     "react": "19.0.0-beta-04b058868c-20240508",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "peerDependencies": {

diff --git a/packages/auth-providers/custom/setup/package.json b/packages/auth-providers/custom/setup/package.json
@@ -31,7 +31,7 @@
     "@babel/cli": "7.24.8",
     "@babel/core": "^7.22.20",
     "@types/yargs": "17.0.32",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/auth-providers/dbAuth/api/package.json b/packages/auth-providers/dbAuth/api/package.json
@@ -37,7 +37,7 @@
     "@simplewebauthn/server": "7.4.0",
     "@types/md5": "2.3.5",
     "@types/uuid": "10.0.0",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/auth-providers/dbAuth/middleware/package.json b/packages/auth-providers/dbAuth/middleware/package.json
@@ -50,7 +50,7 @@
     "publint": "0.2.9",
     "ts-toolbelt": "9.6.0",
     "tsx": "4.16.2",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/auth-providers/dbAuth/setup/package.json b/packages/auth-providers/dbAuth/setup/package.json
@@ -38,7 +38,7 @@
     "@types/yargs": "17.0.32",
     "jest": "29.7.0",
     "jest-environment-node": "29.7.0",
-    "typescript": "5.4.5"
+    "typescript": "5.5.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/auth-providers/dbAuth/web/package.json b/packages/auth-providers/dbAuth/web/package.json
@@ -37,7 +37,7 @@
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "react": "19.0.0-beta-04b058868c-20240508",
-    "typescript": "5.4.5"
+    "typescript": "5.5.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }
diff --git a/packages/auth-providers/firebase/api/package.json b/packages/auth-providers/firebase/api/package.json
@@ -32,7 +32,7 @@
     "@babel/core": "^7.22.20",
     "@redwoodjs/api": "workspace:*",
     "@types/aws-lambda": "8.10.141",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/auth-providers/firebase/setup/package.json b/packages/auth-providers/firebase/setup/package.json
@@ -31,7 +31,7 @@
     "@babel/cli": "7.24.8",
     "@babel/core": "^7.22.20",
     "@types/yargs": "17.0.32",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/auth-providers/firebase/web/package.json b/packages/auth-providers/firebase/web/package.json
@@ -35,7 +35,7 @@
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "react": "19.0.0-beta-04b058868c-20240508",
-    "typescript": "5.4.5"
+    "typescript": "5.5.3"
   },
   "peerDependencies": {
     "firebase": "10.12.4"

diff --git a/packages/auth-providers/netlify/api/package.json b/packages/auth-providers/netlify/api/package.json
@@ -33,7 +33,7 @@
     "@redwoodjs/api": "workspace:*",
     "@types/aws-lambda": "8.10.141",
     "@types/jsonwebtoken": "9.0.6",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/auth-providers/netlify/setup/package.json b/packages/auth-providers/netlify/setup/package.json
@@ -31,7 +31,7 @@
     "@babel/cli": "7.24.8",
     "@babel/core": "^7.22.20",
     "@types/yargs": "17.0.32",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/auth-providers/netlify/web/package.json b/packages/auth-providers/netlify/web/package.json
@@ -33,7 +33,7 @@
     "@types/netlify-identity-widget": "1.9.6",
     "@types/react": "^18.2.55",
     "react": "19.0.0-beta-04b058868c-20240508",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "peerDependencies": {

diff --git a/packages/auth-providers/supabase/api/package.json b/packages/auth-providers/supabase/api/package.json
@@ -34,7 +34,7 @@
     "@babel/core": "^7.22.20",
     "@types/aws-lambda": "8.10.141",
     "@types/jsonwebtoken": "9.0.6",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/auth-providers/supabase/middleware/package.json b/packages/auth-providers/supabase/middleware/package.json
@@ -53,7 +53,7 @@
     "publint": "0.2.9",
     "ts-toolbelt": "9.6.0",
     "tsx": "4.16.2",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "vitest": "2.0.3"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"