Merge branch 'fix/more-streaming-fixes' of github.com:dac09/redwood i…

…nto try/apollo-ssr-stream * 'fix/more-streaming-fixes' of github.com:dac09/redwood: Whoops Update packages/vite/src/utils.ts More suggestions, fix wrong path on reactRefresh script Use node path for consistency Fix portal head not rendering on the server docs(fonts): Update @font-face recommendation (redwoodjs#8986) Docs: remove useless code in code snippet (redwoodjs#8990) v6.0.3 fix(router): Prevent rerendering authenticated routes on hash change (redwoodjs#9007) Remove the indexed type reference on AvailableRoutes (redwoodjs#8918) Remove debug logs Update packages/vite/src/streamHelpers.ts
dac09 · Aug 7, 2023 · 2808497 · 2808497
2 parents 3cc921a + 37a20a8
commit 2808497
Show file tree

Hide file tree

Showing 79 changed files with 393 additions and 306 deletions.
diff --git a/__fixtures__/test-project/api/package.json b/__fixtures__/test-project/api/package.json
@@ -3,8 +3,8 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "6.0.2",
-    "@redwoodjs/auth-dbauth-api": "6.0.2",
-    "@redwoodjs/graphql-server": "6.0.2"
+    "@redwoodjs/api": "6.0.3",
+    "@redwoodjs/auth-dbauth-api": "6.0.3",
+    "@redwoodjs/graphql-server": "6.0.3"
   }
 }
diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json
@@ -7,7 +7,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "6.0.2"
+    "@redwoodjs/core": "6.0.3"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config",

diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json
@@ -11,17 +11,17 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/auth-dbauth-web": "6.0.2",
-    "@redwoodjs/forms": "6.0.2",
-    "@redwoodjs/router": "6.0.2",
-    "@redwoodjs/web": "6.0.2",
+    "@redwoodjs/auth-dbauth-web": "6.0.3",
+    "@redwoodjs/forms": "6.0.3",
+    "@redwoodjs/router": "6.0.3",
+    "@redwoodjs/web": "6.0.3",
     "humanize-string": "2.1.0",
     "prop-types": "15.8.1",
     "react": "18.3.0-canary-035a41c4e-20230704",
     "react-dom": "18.3.0-canary-035a41c4e-20230704"
   },
   "devDependencies": {
-    "@redwoodjs/vite": "6.0.2",
+    "@redwoodjs/vite": "6.0.3",
     "autoprefixer": "^10.4.14",
     "postcss": "^8.4.25",
     "postcss-loader": "^7.3.3",

diff --git a/docs/docs/assets-and-files.md b/docs/docs/assets-and-files.md
@@ -145,24 +145,36 @@ export const CarIcon = (props: SVGProps) => {
 If you needed to convert a whole library of SVGs into stylable (or animatable!) components, one easy way would be to use the [SVGR cli](https://react-svgr.com/docs/cli/)
 
 
-
 ## Custom fonts
 There are many different ways to peel this potato – it's all a search away – but if you're using the CSS `@font-face` rule, we have a quick tip for you:
 
 1. Place your fonts in the public folder, so it gets carried across
-2. In your CSS, use relative paths to point to the font file, for example:
+2. In your CSS, use absolute paths - the public folder being your root - to point to the font file (same as the [Vite docs](https://vitejs.dev/guide/assets.html#the-public-directory)), for example:
+
+```shell
+web/
+├── src
+  ├── App.tsx
+  ├── entry.client.tsx
+  ├── index.css
+  ├── ...
+├── public
+│   ├── favicon.png
+│   ├── fonts
+// highlight-next-line
+│   │   └── RedwoodNeue.woff2
+```
 
 ```css
-/* in some CSS file you are loading in your project */
+/* in e.g. index.css */
 @font-face {
   font-family: 'Redwood Neue';
   /* 👇 it's a relative path */
   // highlight-next-line
-  src: url('../../public/fonts/RedwoodNeue.woff2')
+  src: url('/fonts/RedwoodNeue.woff2')
     format('woff2');
   font-weight: 300;
   font-style: italic;
   ascent-override: 97%;
 }
 ```
-This will make sure that the fonts are being loaded correctly across your dev server and storybook – where there are subtle differences in how paths are processed.
diff --git a/docs/docs/tutorial/chapter3/saving-data.md b/docs/docs/tutorial/chapter3/saving-data.md
@@ -239,12 +239,6 @@ export const schema = gql`
     message: String!
   }
 
-  input UpdateContactInput {
-    name: String
-    email: String
-    message: String
-  }
-
   // highlight-start
   type Mutation {
     createContact(input: CreateContactInput!): Contact! @skipAuth

diff --git a/docs/versioned_docs/version-6.0/assets-and-files.md b/docs/versioned_docs/version-6.0/assets-and-files.md
@@ -150,19 +150,33 @@ If you needed to convert a whole library of SVGs into stylable (or animatable!)
 There are many different ways to peel this potato – it's all a search away – but if you're using the CSS `@font-face` rule, we have a quick tip for you:
 
 1. Place your fonts in the public folder, so it gets carried across
-2. In your CSS, use relative paths to point to the font file, for example:
+2. In your CSS, use absolute paths - the public folder being your root - to point to the font file (same as the [Vite docs](https://vitejs.dev/guide/assets.html#the-public-directory)), for example:
+
+
+```shell
+web/
+├── src
+  ├── App.tsx
+  ├── entry.client.tsx
+  ├── index.css
+  ├── ...
+├── public
+│   ├── favicon.png
+│   ├── fonts
+// highlight-next-line
+│   │   └── RedwoodNeue.woff2
+```
 
 ```css
-/* in some CSS file you are loading in your project */
+/* in e.g. index.css */
 @font-face {
   font-family: 'Redwood Neue';
   /* 👇 it's a relative path */
   // highlight-next-line
-  src: url('../../public/fonts/RedwoodNeue.woff2')
+  src: url('/fonts/RedwoodNeue.woff2')
     format('woff2');
   font-weight: 300;
   font-style: italic;
   ascent-override: 97%;
 }
 ```
-This will make sure that the fonts are being loaded correctly across your dev server and storybook – where there are subtle differences in how paths are processed.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "6.0.2",
+  "version": "6.0.3",
   "npmClient": "yarn",
   "command": {
     "publish": {

diff --git a/packages/api-server/package.json b/packages/api-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/api-server",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Redwood's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "@fastify/http-proxy": "9.2.1",
     "@fastify/static": "6.10.2",
     "@fastify/url-data": "5.3.1",
-    "@redwoodjs/project-config": "6.0.2",
+    "@redwoodjs/project-config": "6.0.3",
     "ansi-colors": "4.1.3",
     "chalk": "4.1.2",
     "chokidar": "3.5.3",

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",

diff --git a/packages/auth-providers/auth0/api/package.json b/packages/auth-providers/auth0/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-auth0-api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.9",
     "@babel/core": "7.22.9",
-    "@redwoodjs/api": "6.0.2",
+    "@redwoodjs/api": "6.0.3",
     "@types/jsonwebtoken": "9.0.2",
     "jest": "29.6.1",
     "typescript": "5.1.6"

diff --git a/packages/auth-providers/auth0/setup/package.json b/packages/auth-providers/auth0/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-auth0-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {

diff --git a/packages/auth-providers/auth0/web/package.json b/packages/auth-providers/auth0/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-auth0-web",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {

diff --git a/packages/auth-providers/azureActiveDirectory/api/package.json b/packages/auth-providers/azureActiveDirectory/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-azure-active-directory-api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.9",
     "@babel/core": "7.22.9",
-    "@redwoodjs/api": "6.0.2",
+    "@redwoodjs/api": "6.0.3",
     "@types/aws-lambda": "8.10.119",
     "@types/jsonwebtoken": "9.0.2",
     "jest": "29.6.1",

diff --git a/packages/auth-providers/azureActiveDirectory/setup/package.json b/packages/auth-providers/azureActiveDirectory/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-azure-active-directory-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {

diff --git a/packages/auth-providers/azureActiveDirectory/web/package.json b/packages/auth-providers/azureActiveDirectory/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-azure-active-directory-web",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {

diff --git a/packages/auth-providers/clerk/api/package.json b/packages/auth-providers/clerk/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-clerk-api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.9",
     "@babel/core": "7.22.9",
-    "@redwoodjs/api": "6.0.2",
+    "@redwoodjs/api": "6.0.3",
     "@types/aws-lambda": "8.10.119",
     "jest": "29.6.1",
     "typescript": "5.1.6"

diff --git a/packages/auth-providers/clerk/setup/package.json b/packages/auth-providers/clerk/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-clerk-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {

diff --git a/packages/auth-providers/clerk/web/package.json b/packages/auth-providers/clerk/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-clerk-web",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {

diff --git a/packages/auth-providers/custom/setup/package.json b/packages/auth-providers/custom/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-custom-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "core-js": "3.31.1"
   },
   "devDependencies": {

diff --git a/packages/auth-providers/dbAuth/api/package.json b/packages/auth-providers/dbAuth/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-dbauth-api",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.9",
     "@babel/core": "7.22.9",
-    "@redwoodjs/api": "6.0.2",
+    "@redwoodjs/api": "6.0.3",
     "@simplewebauthn/server": "7.3.1",
     "@types/crypto-js": "4.1.1",
     "@types/md5": "2.3.2",

diff --git a/packages/auth-providers/dbAuth/setup/package.json b/packages/auth-providers/dbAuth/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-dbauth-setup",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/cli-helpers": "6.0.2",
+    "@redwoodjs/cli-helpers": "6.0.3",
     "@simplewebauthn/browser": "7.2.0",
     "core-js": "3.31.1",
     "prompts": "2.4.2",

diff --git a/packages/auth-providers/dbAuth/web/package.json b/packages/auth-providers/dbAuth/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redwoodjs/auth-dbauth-web",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.22.6",
-    "@redwoodjs/auth": "6.0.2",
+    "@redwoodjs/auth": "6.0.3",
     "@simplewebauthn/browser": "7.2.0",
     "core-js": "3.31.1"
   },