Merge branch 'main' of github.com:redwoodjs/redwood into feat/ts-stri…

…ctmode-gen

* 'main' of github.com:redwoodjs/redwood: (22 commits)
  Remove "node:os" import from telemetry (redwoodjs#5914)
  fix: temporarily disable telemetry on windows (redwoodjs#5899)
  fix(deps): update dependency dotenv-webpack to v7.1.1 (redwoodjs#5909)
  fix(deps): update dependency dotenv-defaults to v5.0.2 (redwoodjs#5908)
  fix(deps): update dependency webpack-dev-server to v4.9.3 (redwoodjs#5906)
  fix(deps): update dependency core-js to v3.23.4 (redwoodjs#5905)
  Fix single-character typo (redwoodjs#5904)
  chore(deps): update dependency esbuild to v0.14.49 (redwoodjs#5898)
  Gitpod hot reload fix (redwoodjs#5888)
  fix(deps): update dependency @types/aws-lambda to v8.10.101 (redwoodjs#5894)
  fix(deps): update dependency @testing-library/user-event to v14.2.1 (redwoodjs#5893)
  fix(deps): update dependency @testing-library/react-hooks to v8.0.1 (redwoodjs#5892)
  chore(deps): update dependency typescript to v4.7.4 (redwoodjs#5886)
  feat: add noire-munich to core team (redwoodjs#5891)
  Fix file structure display (redwoodjs#5889)
  Make Form generic for better TS support (redwoodjs#5867)
  chore(deps): update dependency npm-packlist to v5.1.1 (redwoodjs#5885)
  Bump framer motion version to 6.* as recommended (redwoodjs#5870)
  chore(deps): update dependency nodemon to v2.0.19 (redwoodjs#5884)
  chore(deps): update dependency firebase to v9.8.4 (redwoodjs#5879)
  ...

.gitpod.yml

@@ -27,7 +27,7 @@ tasks:
       yarn run build:test-project ../rw-test-app --typescript --link --verbose
     command: |
       cd /workspace/rw-test-app
-      yarn rw dev
+      yarn rw dev --fwd="--client-web-socket-url=ws$(gp url 8910 | cut -c 5-)/ws"
 
 
 ports:

docs/docs/deploy/serverless.md

@@ -8,7 +8,7 @@ description: Deploy to AWS with Serverless Framework
 
 Yes, the name is confusing, but Serverless provides a very interesting option—deploy to your own cloud service account and skip the middleman entirely! By default, Serverless just orchestrates starting up services in your cloud provider of choice and pushing your code up to them. Any bill you receive is from your hosting provider (although many offer a generous free tier). You can optionally use the [Serverless Dashboard](https://www.serverless.com/dashboard/) to monitor your deploys and setup CI/CD to automatically deploy when pushing to your repo of choice. If you don't setup CI/CD you actually deploy from your development machine (or another designated machine you've setup to do the deployment).
 
-Currently we default to deploying to AWS. We'd like to add more providers in the future but need help from the community in figuring our what services are equivalent to the ones we're using in AWS (Lambda for the api-side and S3/CloudFront for the web-side).
+Currently we default to deploying to AWS. We'd like to add more providers in the future but need help from the community in figuring out what services are equivalent to the ones we're using in AWS (Lambda for the api-side and S3/CloudFront for the web-side).
 
 We'll handle most of the deployment commands for you, you just need an [AWS account](https://www.serverless.com/framework/docs/providers/aws/guide/credentials#sign-up-for-an-aws-account) and your [access/secret keys](https://www.serverless.com/framework/docs/providers/aws/guide/credentials#create-an-iam-user-and-access-key) before we begin.
 

docs/docs/testing.md

@@ -1239,9 +1239,27 @@ To simplify Service testing, rather than mess with your development database, Re
 
 If you're using Postgres or MySQL locally you'll want to set that env var to your connection string for a test database in those services.
 
-> Does anyone else find it confusing that the software itself is called a "database", but the container that actually holds your data is also called a "database," and you can have multiple databases (containers) within one instance of a database (software)?
+:::info
+
+Does anyone else find it confusing that the software itself is called a "database", but the container that actually holds your data is also called a "database," and you can have multiple databases (containers) within one instance of a database (software)?
+
+:::
+
+When you start your test suite you may notice some output from Prisma talking about migrating the database. Redwood will automatically run `yarn rw prisma db push` against your test database to make sure it's up-to-date.
+
+:::caution What if I have custom migration SQL?
 
-When you start your test suite you may notice some output from Prisma talking about migrating the database. Redwood will automatically run `yarn rw prisma migrate dev` against your test database to make sure it's up-to-date.
+The `prisma db push` command only restores a snapshot of the current database schema (so that it runs as fast as possible). **It does not actually run migrations in sequence.** This can cause a [problem](https://github.com/redwoodjs/redwood/issues/5818) if you have certain database configuration that *must* occur as a result of the SQL statements inside the migration files.
+
+In order to preserve those statements in your test database, you can set an additional ENV var which will use the command `yarn rw prisma migrate reset` instead. This will run each migration in sequence against your test database. The tradeoff is that starting your test suite will take a little longer depending on how many migrations you have:
+
+```.env title=/.env
+TEST_DATABASE_STRATEGY=reset
+```
+
+Set the variable to `push`, or remove it completely, and it will use the default behavior of running `yarn rw prisma db push`.
+
+:::
 
 ### Writing Service Tests
 

docs/docs/tutorial/chapter1/file-structure.md

@@ -58,7 +58,7 @@ Don't worry about trying to memorize this directory structure right now, it's ju
 ```
 ├── api
 │   ├── db
-│   │   ├── schema.prisma
+│   │   └── schema.prisma
 │   ├── dist
 │   ├── src
 │   │   ├── directives

docs/package.json

@@ -36,6 +36,6 @@
   "devDependencies": {
     "@docusaurus/module-type-aliases": "2.0.0-beta.21",
     "@tsconfig/docusaurus": "1.0.6",
-    "typescript": "4.7.3"
+    "typescript": "4.7.4"
   }
 }

docs/yarn.lock

@@ -4637,7 +4637,7 @@ __metadata:
     react: 17.0.2
     react-dom: 17.0.2
     react-player: 2.10.1
-    typescript: 4.7.3
+    typescript: 4.7.4
   languageName: unknown
   linkType: soft
 
@@ -10138,23 +10138,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:4.7.3":
-  version: 4.7.3
-  resolution: "typescript@npm:4.7.3"
+"typescript@npm:4.7.4":
+  version: 4.7.4
+  resolution: "typescript@npm:4.7.4"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 4f2597ac203e792881e02db85cd01bcba0ff0edfdb467e16af5a35808d35c424fe4fbc99ce8cea3745b206e66dbbe67e9ca0a0b03117672d7d95cad7055bd2b6
+  checksum: 8c1c4007b6ce5b24c49f0e89173ab9e82687cc6ae54418d1140bb63b82d6598d085ac0f993fe3d3d1fbf87a2c76f1f81d394dc76315bc72c7a9f8561c5d8d205
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@4.7.3#~builtin<compat/typescript>":
-  version: 4.7.3
-  resolution: "typescript@patch:typescript@npm%3A4.7.3#~builtin<compat/typescript>::version=4.7.3&hash=7ad353"
+"typescript@patch:typescript@4.7.4#~builtin<compat/typescript>":
+  version: 4.7.4
+  resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=7ad353"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: fd3972aed0089d64c03235f4352a232eb62e5810e7b37e28ff804d1dbb728cda4c81b7e2d1e9b0e72d9fc8a7ccb1c211e044078b6b3774d4a18a6fcb9f16f86f
+  checksum: 2eb6e31b04fabec84a4d07b5d567deb5ef0a2971d89d9adb16895f148f7d8508adfb12074abc2efc6966805d3664e68ab67925060e5b0ebd8da616db4b151906
   languageName: node
   linkType: hard
 

package.json

@@ -33,7 +33,7 @@
     "prop-types": "15.8.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "typescript": "4.7.3",
+    "typescript": "4.7.4",
     "vscode-languageserver": "6.1.1",
     "vscode-languageserver-protocol": "3.15.3",
     "vscode-languageserver-textdocument": "1.0.5",
@@ -58,8 +58,8 @@
     "@playwright/test": "1.22.2",
     "@testing-library/jest-dom": "5.16.4",
     "@testing-library/react": "12.1.5",
-    "@testing-library/react-hooks": "8.0.0",
-    "@testing-library/user-event": "14.2.0",
+    "@testing-library/react-hooks": "8.0.1",
+    "@testing-library/user-event": "14.2.1",
     "@types/fs-extra": "9.0.13",
     "@types/jest": "27.5.2",
     "@types/jscodeshift": "0.11.5",
@@ -72,7 +72,7 @@
     "babel-plugin-auto-import": "1.1.0",
     "babel-plugin-remove-code": "0.0.6",
     "boxen": "5.1.2",
-    "core-js": "3.23.3",
+    "core-js": "3.23.4",
     "cypress": "9.7.0",
     "cypress-wait-until": "1.7.2",
     "eslint": "8.18.0",
@@ -87,14 +87,14 @@
     "msw": "0.40.2",
     "ncp": "2.0.0",
     "node-notifier": "10.0.1",
-    "nodemon": "2.0.16",
-    "npm-packlist": "5.1.0",
+    "nodemon": "2.0.19",
+    "npm-packlist": "5.1.1",
     "octokit": "1.7.2",
     "ora": "5.4.1",
     "prompts": "2.4.2",
     "rimraf": "3.0.2",
     "terminal-link": "2.1.1",
-    "typescript": "4.7.3",
+    "typescript": "4.7.4",
     "typescript-transform-paths": "3.3.1",
     "zx": "6.1.0"
   },

packages/api-server/package.json

@@ -35,7 +35,7 @@
     "ansi-colors": "4.1.3",
     "chalk": "4.1.2",
     "chokidar": "3.5.3",
-    "core-js": "3.23.3",
+    "core-js": "3.23.4",
     "fast-json-parse": "1.0.3",
     "fastify": "3.29.0",
     "fastify-raw-body": "3.2.0",
@@ -49,14 +49,14 @@
   "devDependencies": {
     "@babel/cli": "7.16.7",
     "@babel/core": "7.16.7",
-    "@types/aws-lambda": "8.10.97",
+    "@types/aws-lambda": "8.10.101",
     "@types/lodash.escape": "4.0.7",
     "@types/qs": "6.9.7",
     "@types/split2": "3.2.1",
     "@types/yargs": "17.0.10",
     "aws-lambda": "1.0.7",
     "jest": "27.5.1",
-    "typescript": "4.7.3"
+    "typescript": "4.7.4"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }

packages/api/package.json

@@ -32,7 +32,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.16.7",
     "@prisma/client": "3.15.2",
-    "core-js": "3.23.3",
+    "core-js": "3.23.4",
     "cross-undici-fetch": "0.4.11",
     "crypto-js": "4.1.1",
     "humanize-string": "2.1.0",
@@ -49,7 +49,7 @@
     "@babel/core": "7.16.7",
     "@clerk/clerk-sdk-node": "3.6.1",
     "@redwoodjs/auth": "2.0.0",
-    "@types/aws-lambda": "8.10.97",
+    "@types/aws-lambda": "8.10.101",
     "@types/crypto-js": "4.1.1",
     "@types/jsonwebtoken": "8.5.8",
     "@types/md5": "2.3.2",
@@ -59,7 +59,7 @@
     "aws-lambda": "1.0.7",
     "jest": "27.5.1",
     "split2": "4.1.0",
-    "typescript": "4.7.3"
+    "typescript": "4.7.4"
   },
   "peerDependencies": {
     "@clerk/clerk-sdk-node": "3.6.1",

packages/auth/package.json

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.16.7",
-    "core-js": "3.23.3"
+    "core-js": "3.23.4"
   },
   "devDependencies": {
     "@auth0/auth0-spa-js": "1.22.1",
@@ -38,15 +38,15 @@
     "@supabase/supabase-js": "1.35.4",
     "@types/netlify-identity-widget": "1.9.3",
     "@types/react": "17.0.47",
-    "firebase": "9.8.3",
+    "firebase": "9.8.4",
     "firebase-admin": "10.2.0",
     "gotrue-js": "0.9.29",
     "jest": "27.5.1",
     "magic-sdk": "8.1.1",
     "netlify-identity-widget": "1.9.2",
     "react": "17.0.2",
     "supertokens-auth-react": "0.21.3",
-    "typescript": "4.7.3"
+    "typescript": "4.7.4"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }

packages/cli/package.json

@@ -40,10 +40,10 @@
     "chalk": "4.1.2",
     "concurrently": "7.2.2",
     "configstore": "3.1.5",
-    "core-js": "3.23.3",
+    "core-js": "3.23.4",
     "cross-env": "7.0.3",
     "decamelize": "5.0.0",
-    "dotenv-defaults": "5.0.0",
+    "dotenv-defaults": "5.0.2",
     "envinfo": "7.8.1",
     "execa": "5.1.1",
     "fast-glob": "3.2.11",
@@ -70,7 +70,7 @@
     "@babel/core": "7.16.7",
     "@types/listr": "0.14.4",
     "jest": "27.5.1",
-    "typescript": "4.7.3"
+    "typescript": "4.7.4"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }

packages/cli/src/commands/setup/ui/libraries/chakra-ui.js

@@ -31,7 +31,7 @@ export async function handler({ force, install }) {
     '@chakra-ui/react@^1',
     '@emotion/react@^11',
     '@emotion/styled@^11',
-    'framer-motion@^4',
+    'framer-motion@^6',
   ]
 
   const tasks = new Listr([

packages/codemods/package.json

@@ -27,7 +27,7 @@
     "@babel/plugin-transform-typescript": "7.16.7",
     "@babel/runtime-corejs3": "7.16.7",
     "@vscode/ripgrep": "1.14.2",
-    "core-js": "3.23.3",
+    "core-js": "3.23.4",
     "cross-undici-fetch": "0.4.11",
     "deepmerge": "4.2.2",
     "execa": "5.1.1",

packages/core/package.json

@@ -59,11 +59,11 @@
     "babel-plugin-module-resolver": "4.1.0",
     "babel-timing": "0.9.1",
     "copy-webpack-plugin": "11.0.0",
-    "core-js": "3.23.3",
+    "core-js": "3.23.4",
     "css-loader": "6.7.1",
     "css-minimizer-webpack-plugin": "4.0.0",
-    "dotenv-webpack": "7.1.0",
-    "esbuild": "0.14.48",
+    "dotenv-webpack": "7.1.1",
+    "esbuild": "0.14.49",
     "esbuild-loader": "2.19.0",
     "fast-glob": "3.2.11",
     "file-loader": "6.2.0",
@@ -72,18 +72,18 @@
     "html-webpack-plugin": "5.5.0",
     "lodash.escaperegexp": "4.1.2",
     "mini-css-extract-plugin": "2.6.0",
-    "nodemon": "2.0.16",
+    "nodemon": "2.0.19",
     "null-loader": "4.0.1",
     "react-refresh": "0.13.0",
     "rimraf": "3.0.2",
     "style-loader": "3.3.1",
     "svg-react-loader": "0.4.6",
-    "typescript": "4.7.3",
+    "typescript": "4.7.4",
     "url-loader": "4.1.1",
     "webpack": "5.73.0",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-cli": "4.10.0",
-    "webpack-dev-server": "4.9.2",
+    "webpack-dev-server": "4.9.3",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-merge": "5.8.0",
     "webpack-retry-chunk-load-plugin": "3.1.1"

packages/create-redwood-app/package.json

@@ -28,7 +28,7 @@
     "@redwoodjs/telemetry": "2.0.0",
     "chalk": "4.1.2",
     "check-node-version": "4.2.1",
-    "core-js": "3.23.3",
+    "core-js": "3.23.4",
     "execa": "5.1.1",
     "fs-extra": "10.1.0",
     "listr": "0.14.3",
@@ -37,7 +37,7 @@
   "devDependencies": {
     "@babel/cli": "7.16.7",
     "jest": "27.5.1",
-    "typescript": "4.7.3"
+    "typescript": "4.7.4"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }

packages/eslint-config/package.json

@@ -33,7 +33,7 @@
   "devDependencies": {
     "@babel/cli": "7.16.7",
     "jest": "27.5.1",
-    "typescript": "4.7.3"
+    "typescript": "4.7.4"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }

packages/forms/package.json

@@ -22,27 +22,27 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.16.7",
-    "core-js": "3.23.3",
+    "core-js": "3.23.4",
     "pascalcase": "1.0.0",
-    "react-hook-form": "7.33.0"
+    "react-hook-form": "7.33.1"
   },
   "devDependencies": {
     "@babel/cli": "7.16.7",
     "@babel/core": "7.16.7",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.4",
     "@testing-library/react": "12.1.5",
-    "@testing-library/user-event": "14.2.0",
+    "@testing-library/user-event": "14.2.1",
     "@types/pascalcase": "1.0.1",
     "@types/react": "17.0.47",
     "@types/react-dom": "17.0.17",
     "@types/testing-library__jest-dom": "5.14.5",
     "graphql": "16.5.0",
     "jest": "27.5.1",
-    "nodemon": "2.0.16",
+    "nodemon": "2.0.19",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "typescript": "4.7.3"
+    "typescript": "4.7.4"
   },
   "peerDependencies": {
     "graphql": "16.5.0",

packages/forms/src/FormError.tsx

@@ -12,7 +12,7 @@ export interface ServerError extends Error {
   result: Record<string, any>
 }
 
-export interface RwGqlError {
+export interface RWGqlError {
   message: string
   graphQLErrors: ReadonlyArray<GraphQLError>
   networkError: Error | ServerParseError | ServerError | null
@@ -21,7 +21,7 @@ export interface RwGqlError {
 export type RwGqlErrorProperties = Record<string, Record<string, string[]>>
 
 interface FormErrorProps {
-  error?: RwGqlError
+  error?: RWGqlError
   wrapperClassName?: string
   wrapperStyle?: React.CSSProperties
   titleClassName?: string