Merge branch 'main' into fix/vite-entrypoint-windows

.github/actions/check_test_project_fixture/package.json

@@ -5,5 +5,5 @@
     "@actions/core": "1.10.0",
     "@actions/exec": "1.1.1"
   },
-  "packageManager": "yarn@3.3.1"
+  "packageManager": "yarn@3.4.1"
 }

.github/actions/only_doc_changes/package.json

@@ -5,5 +5,5 @@
     "@actions/core": "1.10.0",
     "@actions/exec": "1.1.1"
   },
-  "packageManager": "yarn@3.3.1"
+  "packageManager": "yarn@3.4.1"
 }

.yarnrc.yml

@@ -16,4 +16,4 @@ plugins:
 
 preferInteractive: true
 
-yarnPath: .yarn/releases/yarn-3.3.1.cjs
+yarnPath: .yarn/releases/yarn-3.4.1.cjs

__fixtures__/test-project/.yarnrc.yml

@@ -14,4 +14,4 @@ nmMode: hardlinks-local
 # Heads up: right now, Redwood expects this to be `node-modules`.
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.3.0.cjs
+yarnPath: .yarn/releases/yarn-3.4.1.cjs

docs/docs/auth/clerk.md

@@ -28,23 +28,20 @@ How you get your API keys to production depends on your deploy provider.
 :::
 
 We're looking for three API keys.
-Head over to the "Developers" section in the nav on the left and click "API Keys".
-You'll need all three of the ones on this page: the Frontend API key, the default Backend API key, and the JWT verification key.
-Copy them into your project's `.env` file:
+Head over to the "Developers" section in the nav on the left and click "API Keys". Finally select RedwoodJS in the Framework dropdown in the Quick Copy section.
+Do as it says and copy the two keys into your project's `.env` file:
 
 ```bash title=".env"
-CLERK_FRONTEND_API_URL="..."
-# This one is the default Backend API Key.
-CLERK_API_KEY="..."
-CLERK_JWT_KEY="..."
+CLERK_PUBLISHABLE_KEY="..."
+CLERK_SECRET_KEY="..."
 ```
 
-Lastly, in your project's `redwood.toml` file, include `CLERK_FRONTEND_API_URL` in the list of env vars that should be available to the web side:
+Lastly, in your project's `redwood.toml` file, include `CLERK_PUBLISHABLE_KEY` in the list of env vars that should be available to the web side:
 
 ```toml title="redwood.toml"
 [web]
   # ...
-  includeEnvironmentVariables = ["CLERK_FRONTEND_API_URL"]
+  includeEnvironmentVariables = ["CLERK_PUBLISHABLE_KEY"]
 ```
 
 That should be enough; now, things should just work.

docs/docs/cli-commands.md

@@ -139,7 +139,7 @@ Launch an interactive Redwood shell (experimental):
 yarn redwood console
 ```
 
-Right now, you can only use the Redwood console to interact with your database:
+Right now, you can only use the Redwood console to interact with your database (always with `await`):
 
 **Example**
 

docs/docs/tutorial/chapter3/saving-data.md

@@ -1560,7 +1560,7 @@ We get that error message at the top saying something went wrong in plain Englis
 
 This just scratches the surface of what Service Validations can do. You can perform more complex validations, including combining multiple directives in a single call. What if we had a model representing a `Car`, and users could submit them to us for sale on our exclusive car shopping site. How do we make sure we only get the cream of the crop of motorized vehicles? Service validations would allow us to be very particular about the values someone would be allowed to submit, all without any custom checks, just built-in `validate()` calls:
 
-<Tabs>
+<Tabs groupId="js-ts">
 <TabItem value="js" label="JavaScript">
 
 ```js

docs/docs/tutorial/chapter6/comments-schema.md

@@ -567,7 +567,7 @@ That being said, if you really wanted to you could use Jest's [mocking utilities
 
 Where does that data come from? Take a look at the `comments.scenarios.{js,ts}` file which is next door:
 
-<Tabs>
+<Tabs groupId="js-ts">
 <TabItem value="js" label="JavaScript">
 
 ```javascript title="api/src/services/comments.scenarios.js"

docs/versioned_docs/version-4.0/tutorial/chapter3/saving-data.md

@@ -1560,7 +1560,7 @@ We get that error message at the top saying something went wrong in plain Englis
 
 This just scratches the surface of what Service Validations can do. You can perform more complex validations, including combining multiple directives in a single call. What if we had a model representing a `Car`, and users could submit them to us for sale on our exclusive car shopping site. How do we make sure we only get the cream of the crop of motorized vehicles? Service validations would allow us to be very particular about the values someone would be allowed to submit, all without any custom checks, just built-in `validate()` calls:
 
-<Tabs>
+<Tabs groupId="js-ts">
 <TabItem value="js" label="JavaScript">
 
 ```js

docs/versioned_docs/version-4.0/tutorial/chapter6/comments-schema.md

@@ -567,7 +567,7 @@ That being said, if you really wanted to you could use Jest's [mocking utilities
 
 Where does that data come from? Take a look at the `comments.scenarios.{js,ts}` file which is next door:
 
-<Tabs>
+<Tabs groupId="js-ts">
 <TabItem value="js" label="JavaScript">
 
 ```javascript title="api/src/services/comments.scenarios.js"

docs/yarn.lock

@@ -5884,9 +5884,9 @@ __metadata:
   linkType: hard
 
 "http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "http-cache-semantics@npm:4.1.0"
-  checksum: abe115ddd9f24914a49842f2745ecc8380837bbe30b59b154648c76ebc1bd3d5f8bd05c1789aaa2ae6b79624c591d13c8aa79104ff21078e117140a65ac20654
+  version: 4.1.1
+  resolution: "http-cache-semantics@npm:4.1.1"
+  checksum: ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc
   languageName: node
   linkType: hard
 
@@ -9915,11 +9915,11 @@ __metadata:
 
 "typescript@patch:[email protected]#~builtin<compat/typescript>":
   version: 4.9.5
-  resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=ad5954"
+  resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=23ec76"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 5db0510cc74ad3f2d0300b695dc9de58e3652f286cac595ae34788c6fc0f85af85b637c93b803d4af8003c5ceb695a4be13cd5c5240768ec932be167e7161a76
+  checksum: 10d31da0caa997927eab0167b7ddacb9ac8d3fd87e6584185b14da32b7f033e727309682fc0395021f4ac110860a3be6054e9b039a996a24d282a20bafc599f4
   languageName: node
   linkType: hard
 

package.json

@@ -49,10 +49,10 @@
     "@babel/preset-react": "7.18.6",
     "@babel/preset-typescript": "7.18.6",
     "@babel/runtime-corejs3": "7.20.13",
-    "@npmcli/arborist": "6.2.0",
+    "@npmcli/arborist": "6.2.1",
     "@nrwl/nx-cloud": "15.0.3",
     "@playwright/test": "1.30.0",
-    "@replayio/playwright": "0.3.16",
+    "@replayio/playwright": "0.3.17",
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "13.4.0",
     "@testing-library/user-event": "14.4.3",
@@ -71,7 +71,7 @@
     "babel-plugin-remove-code": "0.0.6",
     "boxen": "5.1.2",
     "core-js": "3.27.2",
-    "cypress": "12.5.0",
+    "cypress": "12.5.1",
     "cypress-wait-until": "1.7.2",
     "eslint": "8.33.0",
     "fast-glob": "3.2.12",
@@ -98,6 +98,6 @@
     "typescript": "4.9.5",
     "zx": "7.1.1"
   },
-  "packageManager": "yarn@3.3.1",
+  "packageManager": "yarn@3.4.1",
   "npmClient": "yarn"
 }

packages/codemods/src/codemods/v0.48.x/upgradeYarn/__testfixtures__/default/output/.yarnrc.yml

@@ -6,4 +6,4 @@ nmMode: hardlinks-local
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.2.0.cjs
+yarnPath: .yarn/releases/yarn-3.4.1.cjs

packages/codemods/src/codemods/v0.48.x/upgradeYarn/__testfixtures__/default/output/package.json

@@ -21,5 +21,5 @@
   "prisma": {
     "seed": "yarn rw exec seed"
   },
-  "packageManager": "yarn@3.3.1"
+  "packageManager": "yarn@3.4.1"
 }

packages/create-redwood-app/template/.yarnrc.yml

@@ -14,4 +14,4 @@ nmMode: hardlinks-local
 # Heads up: right now, Redwood expects this to be `node-modules`.
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.3.1.cjs
+yarnPath: .yarn/releases/yarn-3.4.1.cjs

packages/create-redwood-app/template/package.json

@@ -20,5 +20,5 @@
   "prisma": {
     "seed": "yarn rw exec seed"
   },
-  "packageManager": "yarn@3.3.1"
+  "packageManager": "yarn@3.4.1"
 }

packages/internal/package.json

@@ -28,7 +28,7 @@
     "test:watch": "yarn test --watch"
   },
   "dependencies": {
-    "@babel/parser": "7.20.13",
+    "@babel/parser": "7.20.15",
     "@babel/plugin-transform-typescript": "7.20.13",
     "@babel/register": "7.18.9",
     "@babel/runtime-corejs3": "7.20.13",

packages/structure/package.json

@@ -61,7 +61,7 @@
     "@types/lodash": "4.14.191",
     "@types/lru-cache": "5.1.1",
     "@types/node": "16.18.11",
-    "@types/vscode": "1.74.0",
+    "@types/vscode": "1.74.1",
     "jest": "29.4.1",
     "typescript": "4.9.5"
   },

packages/telemetry/src/sendTelemetry.ts

@@ -8,6 +8,8 @@ import envinfo from 'envinfo'
 import system from 'systeminformation'
 import { v4 as uuidv4 } from 'uuid'
 
+import { getConfig } from '@redwoodjs/internal/dist/config'
+
 // circular dependency when trying to import @redwoodjs/structure so lets do it
 // the old fashioned way
 const { DefaultHost } = require('@redwoodjs/structure/dist/hosts')
@@ -97,6 +99,7 @@ const getInfo = async (presets: Args = {}) => {
     redwoodVersion:
       presets.redwoodVersion || info.npmPackages['@redwoodjs/core']?.installed,
     system: `${cpu.physicalCores}.${Math.round(mem.total / 1073741824)}`,
+    webBundler: getConfig().web.bundler,
   }
 }
 

packages/vite/package.json

@@ -24,10 +24,10 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.20.13",
     "@redwoodjs/internal": "4.0.0",
-    "@vitejs/plugin-react": "3.0.1",
+    "@vitejs/plugin-react": "3.1.0",
     "buffer": "6.0.3",
     "core-js": "3.27.2",
-    "vite": "4.0.4",
+    "vite": "4.1.1",
     "vite-plugin-commonjs": "0.6.1",
     "vite-plugin-environment": "1.1.3",
     "vite-plugin-html": "3.2.0"