Merge branch 'main' of github.com:redwoodjs/redwood into feat/dc-kc-e…

…xperimental-vite-optin

* 'main' of github.com:redwoodjs/redwood: (26 commits)
  Compress v1 (1.0-1.5) docs to v1.x (#7025)
  Ch4: Deployment - Updating Environment variable section (#6970)
  fix(deps): update dependency systeminformation to v5.16.0 (#7011)
  fix(deps): update graphqlcodegenerator monorepo (#7005)
  fix(deps): update dependency concurrently to v7.6.0 (#7006)
  fix(deps): update dependency mini-css-extract-plugin to v2.7.1 (#7007)
  fix(deps): update dependency eslint to v8.28.0 (#7008)
  fix(deps): update dependency prettier to v2.8.0 (#7009)
  fix(deps): update dependency react-hook-form to v7.40.0 (#7010)
  chore(deps): update dependency lerna to v6.1.0 (#6993)
  fix(deps): update dependency @fastify/http-proxy to v8.4.0 (#6995)
  fix(deps): update prisma monorepo to v4.7.0 (#6999)
  fix(deps): update dependency jest-watch-typeahead to v2.2.1 (#6991)
  fix(deps): update dependency listr2 to v5.0.6 (#6989)
  chore(deps): update dependency cypress to v11.2.0 (#6992)
  chore(deps): update dependency nx to v15.2.4 (#6994)
  fix(deps): update dependency msw to v0.49.1 (#6996)
  auth-firebase-* (#6987)
  fix(cli): Handle importing optional setup auth commands (#6997)
  fix(deps): update dependency eslint-plugin-react to v7.31.11 (#6990)
  ...

docs/docs/tutorial/chapter4/deployment.md

@@ -104,11 +104,11 @@ Therefore, **please follow the instructions below** to sync your GitHub (or othe
 
 Now just authorize Netlify to connect to your git hosting provider and find your repo. When the deploy settings come up you can leave everything as the defaults and click **Deploy site**.
 
-Netlify will start building your app and it will eventually say "Site is live", but nothing will work. Why? We haven't told it where to find our database yet!
+Netlify will start building your app and it will eventually say the deployment failed. Why? We haven't told it where to find our database yet!
 
 #### Environment Variables
 
-Go back to the main site page and then to **Site settings** at the top, and then **Build & Deploy** > **Environment**. Click **Edit Variables** and this is where we'll paste the database connection URI we got from Railway (note the **Key** is "DATABASE_URL"). After pasting the value, append `?connection_limit=1` to the end. The URI will have the following format: `postgresql://<user>:<pass>@<url>/<db>?connection_limit=1`.
+Go back to the main site page and then to **Site settings** at the top, and then **Environment variables**. Click **Add a Variable** and this is where we'll paste the database connection URI we got from Railway (note the **Key** is "DATABASE_URL"). After pasting the value, append `?connection_limit=1` to the end. The URI will have the following format: `postgresql://<user>:<pass>@<url>/<db>?connection_limit=1`. The default values for Scopes and Values can be left as is. Click **Create variable** to proceed.
 
 :::tip
 
@@ -123,9 +123,7 @@ yarn rw g secret
 
 Copy that over to Netlify along with `DATABASE_URL`:
 
-![Adding ENV var](https://user-images.githubusercontent.com/300/154520225-76dfa960-1d09-4544-92a4-2c7e58dc4e3f.png)
-
-Make sure to click the **Save** button.
+![Adding ENV var](https://user-images.githubusercontent.com/2931245/204148740-f8aaa276-e9b1-4ffc-a842-7602a1e0111a.png)
 
 #### IT'S ALIVE
 

docs/i18n/en/code.json

@@ -0,0 +1,6 @@
+{
+  "theme.common.editThisPage": {
+    "message": "Edit the latest version of this page",
+    "description": "The link label to edit the latest version of this page"
+  }
+}

docs/netlify.toml

@@ -213,3 +213,35 @@
   from = "/dbauth"
   to = "/docs/authentication#self-hosted-auth-installation-and-setup"
   status = 301
+
+# v1.0-v1.5 redirects (to v1.x)
+
+[[redirects]]
+  from = "/docs/1.0/*"
+  to = "/docs/1.x/:splat"
+  status = 301
+
+[[redirects]]
+  from = "/docs/1.1/*"
+  to = "/docs/1.x/:splat"
+  status = 301
+
+[[redirects]]
+  from = "/docs/1.2/*"
+  to = "/docs/1.x/:splat"
+  status = 301
+
+[[redirects]]
+  from = "/docs/1.3/*"
+  to = "/docs/1.x/:splat"
+  status = 301
+
+[[redirects]]
+  from = "/docs/1.4/*"
+  to = "/docs/1.x/:splat"
+  status = 301
+
+[[redirects]]
+  from = "/docs/1.5/*"
+  to = "/docs/1.x/:splat"
+  status = 301