Merge branch 'main' of github.com:redwoodjs/redwood into ds-upgrade-p…

…rojects-to-yarn-3

* 'main' of github.com:redwoodjs/redwood: (29 commits)
  Update dependency eslint-config-prettier to v8.5.0 (#4631)
  Update dependency msw to v0.38.2 (#4630)
  Update dependency @clerk/types to v1.27.0 (#4628)
  Update dependency @clerk/clerk-js to v2.16.0 (#4627)
  Update dependency @types/react-dom to v17.0.13 (#4629)
  Update dependency @types/testing-library__jest-dom to v5.14.3 (#4624)
  Update dependency @types/aws-lambda to v8.10.93 (#4620)
  Webhook verifiers: Make them all support timestamp diff check (#4608)
  Add custom log payload support to logFormatter (#4619)
  Update dependency @types/react-dom to v17.0.12 (#4621)
  part II of #4623 (#4626)
  Update dependency systeminformation to v5.11.6 (#4611)
  Update dependency @clerk/clerk-js to v2.15.0 (#4606)
  remove Redwood extension from vscode rec (#4613)
  (fixture chore) pin fixture autoprefixer 9.8.8 (#4623)
  update yarn.lock
  v0.47.1
  update yarn.lock
  fixi(prisma): Set default cwd for runCommand task to base (#4604)
  Update actions/checkout action to v3 (#4610)
  ...

.github/workflows/build-eslint-jest.yaml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} | Node ${{ matrix.node-version }} latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup node
         uses: actions/setup-node@v3

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/create-pr-artifact.yaml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout PR
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup node
         uses: actions/setup-node@v3

.github/workflows/e2e.yaml

@@ -16,7 +16,7 @@ jobs:
     name: ${{ matrix.os }} | Node ${{ matrix.node-version }} latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup node
         uses: actions/setup-node@v3

.github/workflows/publish-npm-canary.yaml

@@ -11,7 +11,7 @@ jobs:
     if: github.repository == 'redwoodjs/redwood'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Required because lerna uses tags to determine the version.
       - name: Setup node

.github/workflows/publish-npm-rc.yaml

@@ -11,7 +11,7 @@ jobs:
     if: github.repository == 'redwoodjs/redwood'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Required because lerna uses tags to determine the version.
 

.github/workflows/smoke-test.yaml

@@ -21,7 +21,7 @@ jobs:
       PLAYWRIGHT_BROWSERS_PATH: 0 # this makes sure that playwright dependencies are cached in node_modules
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup node
         uses: actions/setup-node@v3

README.md

@@ -3,34 +3,49 @@
   <h1 align="center">Redwood</h1>
 </p>
 
-_by Tom Preston-Werner, Peter Pistorius, Rob Cameron, David Price, and more than two hundred amazing contributors (see end of file for a full list)._
-
-**Redwood is an opinionated, full-stack, serverless-ready web application framework
-that will allow you to build and deploy with ease.**
-Imagine a React frontend, statically delivered by CDN, that talks via GraphQL to
-your backend running on AWS Lambdas (or containers) around the world, all deployable with just a
-`git push`—that's Redwood. By making a lot of decisions for you, Redwood lets
-you get to work on what makes your application special, instead of wasting
-cycles choosing and re-choosing various technologies and configurations. Plus,
-because Redwood is a proper framework, you benefit from continued performance
-and feature upgrades over time and with minimum effort.
-
-Redwood is the latest open source project initiated by Tom Preston-Werner, cofounder of GitHub (most popular code host on the planet), creator of Jekyll (one of the first and most popular static site generators), creator of Gravatar (the most popular avatar service on the planet), author of the Semantic Versioning specification (powers the Node packaging ecosystem), and inventor of TOML (an obvious, minimal configuration language used by many projects).
-
-> **NOTICE:** RedwoodJS is very close to a stable version 1.0. In the last two years,
-> the project has matured significantly and is already used in production by a number
-> of startups. We intend to have a 1.0 release candidate before the end of 2021 and
-> to release a truly production-ready 1.0 in early 2022.
-
-> **TUTORIAL:** The best way to get to know Redwood is by going through the extensive
-> [Redwood Tutorial](https://redwoodjs.com/tutorial). Have fun!
-
-> **QUICK START:** You can install and run a full-stack Redwood application on your
-> machine with only a couple commands. Check out the [Quick Start](https://redwoodjs.com/docs/quick-start)
-> guide to get started.
-
-**EXAMPLES:** If you'd like to see some examples of what a Redwood application looks
-like, take a look at the following projects:
+_by Tom Preston-Werner, Peter Pistorius, Rob Cameron, David Price, and more than
+250 amazing contributors (see end of file for a full list)._
+
+**Redwood is an opinionated, full-stack, JavaScript/TypeScript web application
+framework designed to keep you moving fast as your app grows from side project
+to startup.**
+
+At the highest level, a Redwood app is a React frontend that talks to a custom
+GraphQL API. The API uses Prisma to operate on a database. Out of the box you
+get tightly integrated testing with Jest, logging with Pino, and a UI component
+catalog with Storybook. Setting up authentication (like Auth0) or CSS frameworks
+(like Tailwind CSS) are a single command line invocation away. And to top it
+off, Redwood's architecture allows you to deploy to either serverless providers
+(e.g. Netlify, Vercel) or traditional server and container providers (e.g. AWS,
+Render) with nearly no code changes between the two!
+
+By making a lot of decisions for you, Redwood lets you get to work on what makes
+your application special, instead of wasting cycles choosing and re-choosing
+various technologies and configurations. Plus, because Redwood is a proper
+framework, you benefit from continued performance and feature upgrades over time
+and with minimum effort.
+
+Redwood is the latest open source project initiated by Tom Preston-Werner,
+cofounder of GitHub (most popular code host on the planet), creator of Jekyll
+(one of the first and most popular static site generators), creator of Gravatar
+(the most popular avatar service on the planet), author of the Semantic
+Versioning specification (powers the Node packaging ecosystem), and inventor of
+TOML (an obvious, minimal configuration language used by many projects).
+
+> **NOTICE:** RedwoodJS is very close to a stable version 1.0. In the last two
+> years, the project has matured significantly and is already used in production
+> by a number of VC-backed startups. We are currently in the release candidate
+> phase and intend to release a final v1.0.0 in March of 2022.
+
+> **TUTORIAL:** The best way to get to know Redwood is by going through the
+> extensive [Redwood Tutorial](https://redwoodjs.com/tutorial). Have fun!
+
+> **QUICK START:** You can install and run a full-stack Redwood application on
+> your machine with only a couple commands. Check out the [Quick
+> Start](https://redwoodjs.com/docs/quick-start) guide to get started.
+
+**EXAMPLES:** If you'd like to see some simple examples of what a Redwood
+application looks like, take a look at the following projects:
 
 - [Todo](https://github.com/redwoodjs/example-todo)
 - [Blog](https://github.com/redwoodjs/example-blog)
@@ -78,52 +93,12 @@ use:
 - API Server using [Fastify](https://www.fastify.io) for Serverful deploys
 - First-class Jamstack-style deployment to both serverless and traditional infrastructure: [Netlify](https://www.netlify.com/), [Vercel](https://vercel.com/), [Serverless](https://www.serverless.com/), [Render](https://render.com/), [Docker container](https://community.redwoodjs.com/t/dockerize-redwoodjs/2291) (for AWS, Google Cloud, Azure, etc.), and many more on the way!
 
-## Roadmap
-
-We intend to have a 1.0 release candidate before the end of 2021 and to release a truly production-ready 1.0 in early 2022.
-To see all the features we plan on including in Redwood's first major release, you can check out our [Roadmap](https://redwoodjs.com/roadmap).
-
-A framework like Redwood has a lot of moving parts; the Roadmap is a great way to get a high-level overview of where the framework is relative to where we want it to be. And since we link to all of our GitHub project boards, it's also a great way to get involved!
-
-## The Redwood philosophy
-
-Redwood believes that [Jamstack](https://jamstack.org/) architecture is a huge leap forward in how we can write web
-applications that are easy to write, deploy, scale, and maintain.
-
-Redwood believes that there is power in standards, and makes decisions for you
-about which technologies to use, how to organize your code into files, and how to
-name things. With a shared understanding of the Redwood conventions, a developer
-should be able to jump into any Redwood application and get up to speed very
-quickly.
-
-Redwood believes that traditional, relational databases like PostgreSQL and
-MySQL are still the workhorses of today's web applications and should be first-class
-citizens. However, Redwood also shines with NoSQL databases like [FaunaDB](https://fauna.com/).
-
-Redwood believes that, as much as possible, you should be able to operate in a
-serverless mindset and deploy to a generic computational grid. This helps unlock
-the next point...
-
-Redwood believes that deployment and scaling should be super easy, whether deploying to serverless or traditional infrastructure. To deploy
-your application, you should only need to commit and push to your Git
-repository. To scale from zero to thousands of users should not require your
-intervention. The principles of JAMstack and serverless make this possible.
-
-Redwood believes that it should be equally useful for writing both simple, toy
-applications and complex, mission-critical applications. In addition, it should
-require very little operational work to grow your app from the former to the
-latter.
-
-Redwood believes that you can use JavaScript as your primary language on both
-the frontend and backend. Using a single language simplifies everything
-from code reuse to hiring developers.
-
 ## How it works
 
 A Redwood application is split into two parts: a frontend and a backend. This is
-represented as two node projects within a single monorepo. We use [Yarn](https://yarnpkg.com/) to make
-it easy to operate across both projects while keeping them in a single
-Git repository.
+represented as two JS/TS projects within a single monorepo. We use
+[Yarn](https://yarnpkg.com/) to make it easy to operate across both projects
+while keeping them in a single Git repository.
 
 The frontend project is called `web` and the backend project is called `api`.
 For clarity, we will refer to these in prose as "sides", i.e. the "web side" and
@@ -156,32 +131,16 @@ because Redwood conceives of a world where you may have other sides like
 "mobile", "desktop", "cli", etc., all consuming the same GraphQL API and living
 in the same monorepo.
 
-## How can it be serverless if it involves a GraphQL API and database?
-
-I'm glad you asked! Currently, Redwood can deploy your GraphQL API to a Lambda
-function. This is not appropriate for all use cases, but on hosting providers
-like Netlify, it makes deployment a breeze. As time goes on, "functions" will
-continue to enjoy performance improvements which will further increase the
-number of use cases that can take advantage of this technology.
-
-Databases are a little trickier, especially the traditional relational ones
-like PostgreSQL and MySQL. Right now, you still need to set these up manually,
-but we are working hard with Netlify and other providers to fulfill the
-serverless dream here too.
-
-Redwood is intentionally pushing the boundaries of what's possible with
-JAMstack. In fact, the whole reason I (Tom) started working on Redwood is
-because of a tweet I posted some time ago:
-
-> Prediction: within 5 years, you’ll build your next large scale, fully featured
-> web app with #JAMstack and deploy on @Netlify.
-> [—@mojombo • 9 July 2018](https://twitter.com/mojombo/status/1016506622477135872)
+## Roadmap
 
-I kept waiting for a high quality full-stack framework to arrive, but it didn't,
-so I decided to take matters into my own hands. And that's why Redwood exists.
+We intend to release a truly production-ready 1.0 in early 2022. To see all the
+features we plan on including in Redwood's first major release, you can check
+out our [Roadmap](https://redwoodjs.com/roadmap).
 
-If you are like minded, then I hope you'll join me in helping build Redwood and
-hasten the arrival of the future I predicted!
+A framework like Redwood has a lot of moving parts; the Roadmap is a great way
+to get a high-level overview of where the framework is relative to where we want
+it to be. And since we link to all of our GitHub project boards, it's also a
+great way to get involved!
 
 ## Why is it called Redwood?
 

__fixtures__/test-project/api/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "0.47.0",
-    "@redwoodjs/graphql-server": "0.47.0"
+    "@redwoodjs/api": "0.47.1",
+    "@redwoodjs/graphql-server": "0.47.1"
   }
 }

__fixtures__/test-project/package.json

@@ -8,7 +8,11 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "0.47.0"
+    "@redwoodjs/core": "0.47.1",
+    "autoprefixer": "10.4.2",
+    "postcss": "8.4.7",
+    "postcss-loader": "6.2.1",
+    "tailwindcss": "3.0.23"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config",

__fixtures__/test-project/web/package.json

@@ -13,18 +13,12 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/auth": "0.47.0",
-    "@redwoodjs/forms": "0.47.0",
-    "@redwoodjs/router": "0.47.0",
-    "@redwoodjs/web": "0.47.0",
+    "@redwoodjs/auth": "0.47.1",
+    "@redwoodjs/forms": "0.47.1",
+    "@redwoodjs/router": "0.47.1",
+    "@redwoodjs/web": "0.47.1",
     "prop-types": "15.8.1",
     "react": "17.0.2",
     "react-dom": "17.0.2"
-  },
-  "devDependencies": {
-    "autoprefixer": "^10.4.2",
-    "postcss": "^8.4.7",
-    "postcss-loader": "^6.2.1",
-    "tailwindcss": "^3.0.23"
   }
 }

__fixtures__/test-project/web/src/index.css

@@ -5,9 +5,9 @@
  * to inject Tailwind's styles into your CSS.
  * For more information, see: https://tailwindcss.com/docs/installation#include-tailwind-in-your-css
  */
-@import "tailwindcss/base";
-@import "tailwindcss/components";
-@import "tailwindcss/utilities";
+@import 'tailwindcss/base';
+@import 'tailwindcss/components';
+@import 'tailwindcss/utilities';
 /**
  * END --- SETUP TAILWINDCSS EDIT
  */

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.47.0",
+  "version": "0.47.1",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

package.json

@@ -34,7 +34,7 @@
     "prop-types": "15.8.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "typescript": "4.5.5",
+    "typescript": "4.6.2",
     "vscode-languageserver": "6.1.1",
     "vscode-languageserver-protocol": "3.15.3",
     "vscode-languageserver-textdocument": "1.0.4",
@@ -70,7 +70,7 @@
     "babel-plugin-remove-code": "0.0.6",
     "boxen": "5.1.2",
     "core-js": "3.21.1",
-    "cypress": "9.5.0",
+    "cypress": "9.5.1",
     "cypress-wait-until": "1.7.2",
     "eslint": "8.10.0",
     "fast-glob": "3.2.11",
@@ -81,7 +81,7 @@
     "lerna": "4.0.0",
     "lodash.template": "4.5.0",
     "make-dir-cli": "3.0.0",
-    "msw": "0.38.1",
+    "msw": "0.38.2",
     "ncp": "2.0.0",
     "node-notifier": "10.0.1",
     "nodemon": "2.0.15",
@@ -91,7 +91,7 @@
     "prompts": "2.4.2",
     "rimraf": "3.0.2",
     "terminal-link": "2.1.1",
-    "typescript": "4.5.5",
+    "typescript": "4.6.2",
     "typescript-transform-paths": "3.3.1",
     "zx": "5.2.0"
   },

packages/api-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/api-server",
-  "version": "0.47.0",
+  "version": "0.47.1",
   "description": "Redwood's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -23,7 +23,9 @@
     "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\"",
     "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build && yarn fix:permissions\"",
     "fix:permissions": "chmod +x dist/index.js; chmod +x dist/watch.js",
-    "prepublishOnly": "NODE_ENV=production yarn build"
+    "prepublishOnly": "NODE_ENV=production yarn build",
+    "test": "jest src",
+    "test:watch": "yarn test --watch"
   },
   "dependencies": {
     "@babel/plugin-transform-runtime": "7.16.7",
@@ -46,14 +48,14 @@
   "devDependencies": {
     "@babel/cli": "7.16.7",
     "@babel/core": "7.16.7",
-    "@types/aws-lambda": "8.10.92",
+    "@types/aws-lambda": "8.10.93",
     "@types/lodash.escape": "4.0.6",
     "@types/qs": "6.9.7",
     "@types/split2": "3.2.1",
     "@types/yargs": "16.0.4",
     "aws-lambda": "1.0.7",
     "jest": "27.5.1",
-    "typescript": "4.5.5"
+    "typescript": "4.6.2"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }