From 3162b911949d48e9dace3196100157da01269944 Mon Sep 17 00:00:00 2001
From: Matt Murphy <63432827+mattmurph9@users.noreply.github.com>
Date: Wed, 13 Apr 2022 14:45:01 +0300
Subject: [PATCH 01/20] Fix type lets => let's (#5146)
---
docs/docs/tutorial/chapter2/routing-params.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/docs/tutorial/chapter2/routing-params.md b/docs/docs/tutorial/chapter2/routing-params.md
index bf4551555a41..7b8af3280252 100644
--- a/docs/docs/tutorial/chapter2/routing-params.md
+++ b/docs/docs/tutorial/chapter2/routing-params.md
@@ -44,7 +44,7 @@ But what we really need is to specify _which_ post we want to view on this page.
```
-Notice the `{id}`. Redwood calls these _route parameters_. They say "whatever value is in this position in the path, let me reference it by the name inside the curly braces". And while we're in the routes file, lets move the route inside the `Set` with the `BlogLayout`.
+Notice the `{id}`. Redwood calls these _route parameters_. They say "whatever value is in this position in the path, let me reference it by the name inside the curly braces". And while we're in the routes file, let's move the route inside the `Set` with the `BlogLayout`.
```jsx title="web/src/Routes.js"
import { Router, Route, Set } from '@redwoodjs/router'
From 7940c446a99788c096f93480698e6acac21e0d93 Mon Sep 17 00:00:00 2001
From: Pete McCarthy
Date: Wed, 13 Apr 2022 05:48:34 -0600
Subject: [PATCH 02/20] Incorrect Copy, changed "Comment" to "Post" (#5138)
The section is discussing creating Comment sdl but references the previous example of creating Post but mistakenly calls it Comment.
---
docs/docs/tutorial/chapter6/comments-schema.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/docs/tutorial/chapter6/comments-schema.md b/docs/docs/tutorial/chapter6/comments-schema.md
index 49431cf11340..c1b6513e656a 100644
--- a/docs/docs/tutorial/chapter6/comments-schema.md
+++ b/docs/docs/tutorial/chapter6/comments-schema.md
@@ -115,7 +115,7 @@ Next we'll create the SDL (that defines the GraphQL interface) and a service (to
yarn rw g sdl Comment --no-crud
```
-Note the `--no-crud` flag here. This gives us bare-bones functionality to start with (read-only access to our model) that we can build on. We got all the CRUD endpoints for free when we created the Comment section of our site, so let's do the opposite here and see how to add functionality from scratch.
+Note the `--no-crud` flag here. This gives us bare-bones functionality to start with (read-only access to our model) that we can build on. We got all the CRUD endpoints for free when we created the Post section of our site, so let's do the opposite here and see how to add functionality from scratch.
That command will create both the SDL and the service. One change we'll need to make to the generated code is to allow access to anonymous users to view all comments. Change the `@requireAuth` directive to `@skipAuth` instead:
From 907b250ff9c4b1990ba536320cf4a3de523944ab Mon Sep 17 00:00:00 2001
From: m3t
Date: Wed, 13 Apr 2022 11:49:20 +0000
Subject: [PATCH 03/20] Fix deprecated API (#5124)
Co-authored-by: Tobbe Lundberg
Co-authored-by: Dominic Saadi <32992335+jtoar@users.noreply.github.com>
---
docs/docs/how-to/role-based-access-control.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/docs/how-to/role-based-access-control.md b/docs/docs/how-to/role-based-access-control.md
index 36219ab719b3..b471772cae2d 100644
--- a/docs/docs/how-to/role-based-access-control.md
+++ b/docs/docs/how-to/role-based-access-control.md
@@ -280,7 +280,7 @@ import { Router, Route, Private } from '@redwoodjs/router'
const Routes = () => {
return (
-
+
From cef884669545928adfba89b3733e9f8c3dd54b36 Mon Sep 17 00:00:00 2001
From: Dominic Saadi <32992335+jtoar@users.noreply.github.com>
Date: Wed, 13 Apr 2022 21:26:56 +0900
Subject: [PATCH 04/20] Set to false and overwrite if there (#5144)
---
packages/testing/config/storybook/main.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/packages/testing/config/storybook/main.js b/packages/testing/config/storybook/main.js
index a7a79256e553..3d0fb0902387 100644
--- a/packages/testing/config/storybook/main.js
+++ b/packages/testing/config/storybook/main.js
@@ -78,6 +78,10 @@ const baseConfig = {
sbConfig.resolve.alias['~__REDWOOD__USER_WEB_SRC'] = rwjsPaths.web.src
// Determine the default storybook style file to use.
+ // If one isn't provided, set the alias to `false` to tell webpack to ignore it.
+ // See https://webpack.js.org/configuration/resolve/#resolvealias.
+ sbConfig.resolve.alias['~__REDWOOD__USER_WEB_DEFAULT_CSS'] = false
+
const supportedStyleIndexFiles = ['index.scss', 'index.sass', 'index.css']
for (let file of supportedStyleIndexFiles) {
const filePath = path.join(rwjsPaths.web.src, file)
From 39d46da47c971416f4023b4236641dfe5815a5cf Mon Sep 17 00:00:00 2001
From: Matt Murphy <63432827+mattmurph9@users.noreply.github.com>
Date: Wed, 13 Apr 2022 16:55:40 +0300
Subject: [PATCH 05/20] Fix typo, grammar (#5148)
---
docs/docs/tutorial/chapter3/forms.md | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/docs/docs/tutorial/chapter3/forms.md b/docs/docs/tutorial/chapter3/forms.md
index 1c0b8595ac0a..3b9912076c39 100644
--- a/docs/docs/tutorial/chapter3/forms.md
+++ b/docs/docs/tutorial/chapter3/forms.md
@@ -4,7 +4,7 @@
-Wait, don't close your browser! You had to know this was coming eventually, didn't you? And you've probably realized by now we wouldn't even have this section in the tutorial unless Redwood had figured out a way to make forms less soul-sucking than usual. In fact Redwood might even make you _love_ building forms.
+Wait, don't close your browser! You had to know this was coming eventually, didn't you? And you've probably realized by now we wouldn't even have this section in the tutorial unless Redwood had figured out a way to make forms less soul-sucking than usual. In fact, Redwood might even make you _love_ building forms.
Well, love is a strong word. _Like_ building forms?
@@ -56,7 +56,7 @@ const BlogLayout = ({ children }) => {
export default BlogLayout
```
-And then use the `BlogLayout` for the `ContactPage` by making sure its wrapped by the same `` as the other pages in the routes file:
+And then use the `BlogLayout` for the `ContactPage` by making sure it's wrapped by the same `` as the other pages in the routes file:
```jsx title="web/src/Routes.js"
import { Router, Route, Set } from '@redwoodjs/router'
@@ -175,7 +175,6 @@ Similar to a plain HTML form we'll give `