Skip to content

Commit 2808497

Browse files
committed
Merge branch 'fix/more-streaming-fixes' of github.com:dac09/redwood into 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
2 parents 3cc921a + 37a20a8 commit 2808497

File tree

79 files changed

+393
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+393
-306
lines changed

__fixtures__/test-project/api/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"@redwoodjs/api": "6.0.2",
7-
"@redwoodjs/auth-dbauth-api": "6.0.2",
8-
"@redwoodjs/graphql-server": "6.0.2"
6+
"@redwoodjs/api": "6.0.3",
7+
"@redwoodjs/auth-dbauth-api": "6.0.3",
8+
"@redwoodjs/graphql-server": "6.0.3"
99
}
1010
}

__fixtures__/test-project/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
]
88
},
99
"devDependencies": {
10-
"@redwoodjs/core": "6.0.2"
10+
"@redwoodjs/core": "6.0.3"
1111
},
1212
"eslintConfig": {
1313
"extends": "@redwoodjs/eslint-config",

__fixtures__/test-project/web/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
]
1212
},
1313
"dependencies": {
14-
"@redwoodjs/auth-dbauth-web": "6.0.2",
15-
"@redwoodjs/forms": "6.0.2",
16-
"@redwoodjs/router": "6.0.2",
17-
"@redwoodjs/web": "6.0.2",
14+
"@redwoodjs/auth-dbauth-web": "6.0.3",
15+
"@redwoodjs/forms": "6.0.3",
16+
"@redwoodjs/router": "6.0.3",
17+
"@redwoodjs/web": "6.0.3",
1818
"humanize-string": "2.1.0",
1919
"prop-types": "15.8.1",
2020
"react": "18.3.0-canary-035a41c4e-20230704",
2121
"react-dom": "18.3.0-canary-035a41c4e-20230704"
2222
},
2323
"devDependencies": {
24-
"@redwoodjs/vite": "6.0.2",
24+
"@redwoodjs/vite": "6.0.3",
2525
"autoprefixer": "^10.4.14",
2626
"postcss": "^8.4.25",
2727
"postcss-loader": "^7.3.3",

docs/docs/assets-and-files.md

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,24 +145,36 @@ export const CarIcon = (props: SVGProps) => {
145145
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/)
146146

147147

148-
149148
## Custom fonts
150149
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:
151150

152151
1. Place your fonts in the public folder, so it gets carried across
153-
2. In your CSS, use relative paths to point to the font file, for example:
152+
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:
153+
154+
```shell
155+
web/
156+
├── src
157+
├── App.tsx
158+
├── entry.client.tsx
159+
├── index.css
160+
├── ...
161+
├── public
162+
├── favicon.png
163+
├── fonts
164+
// highlight-next-line
165+
└── RedwoodNeue.woff2
166+
```
154167

155168
```css
156-
/* in some CSS file you are loading in your project */
169+
/* in e.g. index.css */
157170
@font-face {
158171
font-family: 'Redwood Neue';
159172
/* 👇 it's a relative path */
160173
// highlight-next-line
161-
src: url('../../public/fonts/RedwoodNeue.woff2')
174+
src: url('/fonts/RedwoodNeue.woff2')
162175
format('woff2');
163176
font-weight: 300;
164177
font-style: italic;
165178
ascent-override: 97%;
166179
}
167180
```
168-
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.

docs/docs/tutorial/chapter3/saving-data.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,6 @@ export const schema = gql`
239239
message: String!
240240
}
241241

242-
input UpdateContactInput {
243-
name: String
244-
email: String
245-
message: String
246-
}
247-
248242
// highlight-start
249243
type Mutation {
250244
createContact(input: CreateContactInput!): Contact! @skipAuth

docs/versioned_docs/version-6.0/assets-and-files.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,19 +150,33 @@ If you needed to convert a whole library of SVGs into stylable (or animatable!)
150150
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:
151151

152152
1. Place your fonts in the public folder, so it gets carried across
153-
2. In your CSS, use relative paths to point to the font file, for example:
153+
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:
154+
155+
156+
```shell
157+
web/
158+
├── src
159+
├── App.tsx
160+
├── entry.client.tsx
161+
├── index.css
162+
├── ...
163+
├── public
164+
├── favicon.png
165+
├── fonts
166+
// highlight-next-line
167+
└── RedwoodNeue.woff2
168+
```
154169

155170
```css
156-
/* in some CSS file you are loading in your project */
171+
/* in e.g. index.css */
157172
@font-face {
158173
font-family: 'Redwood Neue';
159174
/* 👇 it's a relative path */
160175
// highlight-next-line
161-
src: url('../../public/fonts/RedwoodNeue.woff2')
176+
src: url('/fonts/RedwoodNeue.woff2')
162177
format('woff2');
163178
font-weight: 300;
164179
font-style: italic;
165180
ascent-override: 97%;
166181
}
167182
```
168-
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.

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "6.0.2",
2+
"version": "6.0.3",
33
"npmClient": "yarn",
44
"command": {
55
"publish": {

packages/api-server/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@redwoodjs/api-server",
3-
"version": "6.0.2",
3+
"version": "6.0.3",
44
"description": "Redwood's HTTP server for Serverless Functions",
55
"repository": {
66
"type": "git",
@@ -33,7 +33,7 @@
3333
"@fastify/http-proxy": "9.2.1",
3434
"@fastify/static": "6.10.2",
3535
"@fastify/url-data": "5.3.1",
36-
"@redwoodjs/project-config": "6.0.2",
36+
"@redwoodjs/project-config": "6.0.3",
3737
"ansi-colors": "4.1.3",
3838
"chalk": "4.1.2",
3939
"chokidar": "3.5.3",

packages/api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@redwoodjs/api",
3-
"version": "6.0.2",
3+
"version": "6.0.3",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/redwoodjs/redwood.git",

packages/auth-providers/auth0/api/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@redwoodjs/auth-auth0-api",
3-
"version": "6.0.2",
3+
"version": "6.0.3",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/redwoodjs/redwood.git",
@@ -30,7 +30,7 @@
3030
"devDependencies": {
3131
"@babel/cli": "7.22.9",
3232
"@babel/core": "7.22.9",
33-
"@redwoodjs/api": "6.0.2",
33+
"@redwoodjs/api": "6.0.3",
3434
"@types/jsonwebtoken": "9.0.2",
3535
"jest": "29.6.1",
3636
"typescript": "5.1.6"

0 commit comments

Comments
 (0)