diff --git a/__fixtures__/test-project/api/package.json b/__fixtures__/test-project/api/package.json index 2d3fa0850317..d41d76fe79f3 100644 --- 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 index 6c98ff73770b..9604d0242e0f 100644 --- 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 index aaa0ff7816e7..4ec608291ece 100644 --- 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 index 302143fe5add..785f92861ef5 100644 --- 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 index f6a2a3c1ffc1..67b8c1f8de47 100644 --- 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 index 302143fe5add..c2a70ef92596 100644 --- 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 index ab9ed29ad9ce..66eccd9e4611 100644 --- 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 index b60e87dca762..e7c044921843 100644 --- 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 index 1f4826612645..712412c3d101 100644 --- 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 index 68c28d8d4905..87fabacd180c 100644 --- 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 index bfe415f43f4c..9d283532d621 100644 --- 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 index 0c33bc890400..e2c1893c9e05 100644 --- 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 index 25e7cb4f8a45..c09e840107d3 100644 --- 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 index 00bae0cebea6..dac6fb0bac89 100644 --- 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 index f89e4deae25c..88d5efe6b8cc 100644 --- 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 index 341adaa4f254..d8bc979a0184 100644 --- 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 index 4fc50472cf26..503a22168be9 100644 --- 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 index 7ddaf63eb8e0..f3fabec4ba3d 100644 --- 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 index ba62926dd407..005cefe01298 100644 --- 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 index 5819c8ca6f82..6c9f1d38ca38 100644 --- 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 index 8d306b2a1dc0..9460a725cd42 100644 --- 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 index 5f099ee7776e..b96e757407f6 100644 --- 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" }, diff --git a/packages/auth-providers/firebase/api/package.json b/packages/auth-providers/firebase/api/package.json index b93a6b1f8fc5..30731f48d887 100644 --- a/packages/auth-providers/firebase/api/package.json +++ b/packages/auth-providers/firebase/api/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth-firebase-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/firebase/setup/package.json b/packages/auth-providers/firebase/setup/package.json index b84cfc82df1d..e2e4a65b2cc7 100644 --- a/packages/auth-providers/firebase/setup/package.json +++ b/packages/auth-providers/firebase/setup/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth-firebase-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/firebase/web/package.json b/packages/auth-providers/firebase/web/package.json index 2bd8da4e2de0..3e11a377773c 100644 --- a/packages/auth-providers/firebase/web/package.json +++ b/packages/auth-providers/firebase/web/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth-firebase-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/netlify/api/package.json b/packages/auth-providers/netlify/api/package.json index 2eb868c96479..7c09677303c9 100644 --- a/packages/auth-providers/netlify/api/package.json +++ b/packages/auth-providers/netlify/api/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth-netlify-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", "@types/jsonwebtoken": "9.0.2", "jest": "29.6.1", diff --git a/packages/auth-providers/netlify/setup/package.json b/packages/auth-providers/netlify/setup/package.json index b076a20708b9..88606d34cb4a 100644 --- a/packages/auth-providers/netlify/setup/package.json +++ b/packages/auth-providers/netlify/setup/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth-netlify-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/netlify/web/package.json b/packages/auth-providers/netlify/web/package.json index 456d219c7ab5..9b4a5755ce46 100644 --- a/packages/auth-providers/netlify/web/package.json +++ b/packages/auth-providers/netlify/web/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth-netlify-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/supabase/api/package.json b/packages/auth-providers/supabase/api/package.json index 68053509a3d9..f0c9a082ed59 100644 --- a/packages/auth-providers/supabase/api/package.json +++ b/packages/auth-providers/supabase/api/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth-supabase-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", "@types/jsonwebtoken": "9.0.2", "jest": "29.6.1", diff --git a/packages/auth-providers/supabase/setup/package.json b/packages/auth-providers/supabase/setup/package.json index a692c753296e..7e808051b44e 100644 --- a/packages/auth-providers/supabase/setup/package.json +++ b/packages/auth-providers/supabase/setup/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth-supabase-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/supabase/web/package.json b/packages/auth-providers/supabase/web/package.json index 4ce45094e9d9..0d87c9ae8028 100644 --- a/packages/auth-providers/supabase/web/package.json +++ b/packages/auth-providers/supabase/web/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth-supabase-web", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/auth-providers/supertokens/api/package.json b/packages/auth-providers/supertokens/api/package.json index 171c0c04b085..260be596f9e1 100644 --- a/packages/auth-providers/supertokens/api/package.json +++ b/packages/auth-providers/supertokens/api/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth-supertokens-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/supertokens/setup/package.json b/packages/auth-providers/supertokens/setup/package.json index 20c6601a7e93..5b55ea98bf9a 100644 --- a/packages/auth-providers/supertokens/setup/package.json +++ b/packages/auth-providers/supertokens/setup/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth-supertokens-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/supertokens/web/package.json b/packages/auth-providers/supertokens/web/package.json index c96ef9254577..179937064569 100644 --- a/packages/auth-providers/supertokens/web/package.json +++ b/packages/auth-providers/supertokens/web/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth-supertokens-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/package.json b/packages/auth/package.json index 01b36a399135..c511797befbf 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/cli-helpers/package.json b/packages/cli-helpers/package.json index 126980fe7729..d5dd97247e66 100644 --- a/packages/cli-helpers/package.json +++ b/packages/cli-helpers/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/cli-helpers", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -25,8 +25,8 @@ "@babel/core": "7.22.9", "@babel/runtime-corejs3": "7.22.6", "@opentelemetry/api": "1.4.1", - "@redwoodjs/project-config": "6.0.2", - "@redwoodjs/telemetry": "6.0.2", + "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/telemetry": "6.0.3", "chalk": "4.1.2", "core-js": "3.31.1", "execa": "5.1.1", diff --git a/packages/cli-packages/storybook/package.json b/packages/cli-packages/storybook/package.json index 6306ca10be60..272e26e01068 100644 --- a/packages/cli-packages/storybook/package.json +++ b/packages/cli-packages/storybook/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/cli-storybook", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -24,9 +24,9 @@ ] }, "dependencies": { - "@redwoodjs/cli-helpers": "6.0.2", - "@redwoodjs/project-config": "6.0.2", - "@redwoodjs/telemetry": "6.0.2", + "@redwoodjs/cli-helpers": "6.0.3", + "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/telemetry": "6.0.3", "@storybook/addon-a11y": "7.2.0", "@storybook/addon-docs": "7.2.0", "@storybook/addon-essentials": "7.2.0", diff --git a/packages/cli/package.json b/packages/cli/package.json index 068feed9f780..a1b0fcda736c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/cli", - "version": "6.0.2", + "version": "6.0.3", "description": "The Redwood Command Line", "repository": { "type": "git", @@ -37,14 +37,14 @@ "@opentelemetry/sdk-trace-node": "1.15.0", "@opentelemetry/semantic-conventions": "1.15.0", "@prisma/internals": "5.1.0", - "@redwoodjs/api-server": "6.0.2", - "@redwoodjs/cli-helpers": "6.0.2", - "@redwoodjs/fastify": "6.0.2", - "@redwoodjs/internal": "6.0.2", - "@redwoodjs/prerender": "6.0.2", - "@redwoodjs/project-config": "6.0.2", - "@redwoodjs/structure": "6.0.2", - "@redwoodjs/telemetry": "6.0.2", + "@redwoodjs/api-server": "6.0.3", + "@redwoodjs/cli-helpers": "6.0.3", + "@redwoodjs/fastify": "6.0.3", + "@redwoodjs/internal": "6.0.3", + "@redwoodjs/prerender": "6.0.3", + "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/structure": "6.0.3", + "@redwoodjs/telemetry": "6.0.3", "@types/secure-random-password": "0.2.1", "boxen": "5.1.2", "camelcase": "6.3.0", diff --git a/packages/codemods/package.json b/packages/codemods/package.json index ae63e1301d93..7508f2288872 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/codemods", - "version": "6.0.2", + "version": "6.0.3", "description": "Codemods to ease upgrading a RedwoodJS Project", "repository": { "type": "git", @@ -29,7 +29,7 @@ "@babel/runtime-corejs3": "7.22.6", "@babel/traverse": "7.22.8", "@iarna/toml": "2.2.5", - "@redwoodjs/project-config": "6.0.2", + "@redwoodjs/project-config": "6.0.3", "@svgr/core": "8.0.0", "@svgr/plugin-jsx": "8.0.1", "@vscode/ripgrep": "1.15.5", diff --git a/packages/core/package.json b/packages/core/package.json index 486ffe145f2b..08246e4dae08 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/core", - "version": "6.0.2", + "version": "6.0.3", "description": "Foundational packages and config required to build RedwoodJS.", "repository": { "type": "git", @@ -48,12 +48,12 @@ "@babel/preset-typescript": "7.22.5", "@babel/runtime-corejs3": "7.22.6", "@pmmmwh/react-refresh-webpack-plugin": "0.5.10", - "@redwoodjs/cli": "6.0.2", - "@redwoodjs/eslint-config": "6.0.2", - "@redwoodjs/internal": "6.0.2", - "@redwoodjs/project-config": "6.0.2", - "@redwoodjs/testing": "6.0.2", - "@redwoodjs/web-server": "6.0.2", + "@redwoodjs/cli": "6.0.3", + "@redwoodjs/eslint-config": "6.0.3", + "@redwoodjs/internal": "6.0.3", + "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/testing": "6.0.3", + "@redwoodjs/web-server": "6.0.3", "babel-loader": "9.1.3", "babel-plugin-auto-import": "1.1.0", "babel-plugin-graphql-tag": "3.3.0", diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index ceca547a14bf..c918dc58a01d 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -1,6 +1,6 @@ { "name": "create-redwood-app", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -25,7 +25,7 @@ "@opentelemetry/resources": "1.15.0", "@opentelemetry/sdk-trace-node": "1.15.0", "@opentelemetry/semantic-conventions": "1.15.0", - "@redwoodjs/tui": "6.0.2", + "@redwoodjs/tui": "6.0.3", "chalk": "4.1.2", "check-node-version": "4.2.1", "ci-info": "3.8.0", diff --git a/packages/create-redwood-app/templates/js/api/package.json b/packages/create-redwood-app/templates/js/api/package.json index f27c7e52bae1..e4759a5969d4 100644 --- a/packages/create-redwood-app/templates/js/api/package.json +++ b/packages/create-redwood-app/templates/js/api/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "@redwoodjs/api": "6.0.2", - "@redwoodjs/graphql-server": "6.0.2" + "@redwoodjs/api": "6.0.3", + "@redwoodjs/graphql-server": "6.0.3" } } diff --git a/packages/create-redwood-app/templates/js/package.json b/packages/create-redwood-app/templates/js/package.json index 6c98ff73770b..9604d0242e0f 100644 --- a/packages/create-redwood-app/templates/js/package.json +++ b/packages/create-redwood-app/templates/js/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/packages/create-redwood-app/templates/js/web/package.json b/packages/create-redwood-app/templates/js/web/package.json index af82e71f5c30..6b563b2c5552 100644 --- a/packages/create-redwood-app/templates/js/web/package.json +++ b/packages/create-redwood-app/templates/js/web/package.json @@ -11,14 +11,14 @@ ] }, "dependencies": { - "@redwoodjs/forms": "6.0.2", - "@redwoodjs/router": "6.0.2", - "@redwoodjs/web": "6.0.2", + "@redwoodjs/forms": "6.0.3", + "@redwoodjs/router": "6.0.3", + "@redwoodjs/web": "6.0.3", "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" } } diff --git a/packages/create-redwood-app/templates/ts/api/package.json b/packages/create-redwood-app/templates/ts/api/package.json index f27c7e52bae1..e4759a5969d4 100644 --- a/packages/create-redwood-app/templates/ts/api/package.json +++ b/packages/create-redwood-app/templates/ts/api/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "@redwoodjs/api": "6.0.2", - "@redwoodjs/graphql-server": "6.0.2" + "@redwoodjs/api": "6.0.3", + "@redwoodjs/graphql-server": "6.0.3" } } diff --git a/packages/create-redwood-app/templates/ts/package.json b/packages/create-redwood-app/templates/ts/package.json index 6c98ff73770b..9604d0242e0f 100644 --- a/packages/create-redwood-app/templates/ts/package.json +++ b/packages/create-redwood-app/templates/ts/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/packages/create-redwood-app/templates/ts/web/package.json b/packages/create-redwood-app/templates/ts/web/package.json index af82e71f5c30..6b563b2c5552 100644 --- a/packages/create-redwood-app/templates/ts/web/package.json +++ b/packages/create-redwood-app/templates/ts/web/package.json @@ -11,14 +11,14 @@ ] }, "dependencies": { - "@redwoodjs/forms": "6.0.2", - "@redwoodjs/router": "6.0.2", - "@redwoodjs/web": "6.0.2", + "@redwoodjs/forms": "6.0.3", + "@redwoodjs/router": "6.0.3", + "@redwoodjs/web": "6.0.3", "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" } } diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index f23d162c06ee..12e0b8339459 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/eslint-config", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -15,9 +15,9 @@ "@babel/core": "7.22.9", "@babel/eslint-parser": "7.22.9", "@babel/eslint-plugin": "7.22.5", - "@redwoodjs/eslint-plugin": "6.0.2", - "@redwoodjs/internal": "6.0.2", - "@redwoodjs/project-config": "6.0.2", + "@redwoodjs/eslint-plugin": "6.0.3", + "@redwoodjs/internal": "6.0.3", + "@redwoodjs/project-config": "6.0.3", "@typescript-eslint/eslint-plugin": "5.61.0", "@typescript-eslint/parser": "5.61.0", "eslint": "8.45.0", diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index c8959b5cc2ca..08776ee52fb6 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/eslint-plugin", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/fastify/package.json b/packages/fastify/package.json index fec82cfa308e..29cc2e2fde7f 100644 --- a/packages/fastify/package.json +++ b/packages/fastify/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/fastify", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -21,8 +21,8 @@ "@fastify/http-proxy": "9.2.1", "@fastify/static": "6.10.2", "@fastify/url-data": "5.3.1", - "@redwoodjs/graphql-server": "6.0.2", - "@redwoodjs/project-config": "6.0.2", + "@redwoodjs/graphql-server": "6.0.3", + "@redwoodjs/project-config": "6.0.3", "ansi-colors": "4.1.3", "fast-glob": "3.3.1", "fastify": "4.21.0", diff --git a/packages/forms/package.json b/packages/forms/package.json index db0c75ce49bb..56385f77ec19 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/forms", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 644b6f01f94c..2eeb08b235d8 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/graphql-server", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -33,8 +33,8 @@ "@graphql-tools/schema": "10.0.0", "@graphql-tools/utils": "10.0.1", "@opentelemetry/api": "1.4.1", - "@redwoodjs/api": "6.0.2", - "@redwoodjs/project-config": "6.0.2", + "@redwoodjs/api": "6.0.3", + "@redwoodjs/project-config": "6.0.3", "core-js": "3.31.1", "graphql": "16.7.1", "graphql-scalars": "1.22.2", @@ -48,7 +48,7 @@ "@babel/core": "7.22.9", "@envelop/testing": "6.0.0", "@envelop/types": "4.0.0", - "@redwoodjs/realtime": "6.0.2", + "@redwoodjs/realtime": "6.0.3", "@types/jsonwebtoken": "9.0.2", "@types/lodash": "4.14.195", "@types/uuid": "9.0.2", diff --git a/packages/internal/package.json b/packages/internal/package.json index 0f90fe34168d..3abae6aae5fb 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/internal", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -44,9 +44,9 @@ "@graphql-codegen/typescript-operations": "3.0.4", "@graphql-codegen/typescript-react-apollo": "3.3.7", "@graphql-codegen/typescript-resolvers": "3.2.1", - "@redwoodjs/graphql-server": "6.0.2", - "@redwoodjs/project-config": "6.0.2", - "@redwoodjs/router": "6.0.2", + "@redwoodjs/graphql-server": "6.0.3", + "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/router": "6.0.3", "@sdl-codegen/node": "0.0.10", "babel-plugin-graphql-tag": "3.3.0", "babel-plugin-polyfill-corejs3": "0.8.3", diff --git a/packages/prerender/package.json b/packages/prerender/package.json index 8b045492bcd3..5da98fc05955 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/prerender", - "version": "6.0.2", + "version": "6.0.3", "description": "RedwoodJS prerender", "repository": { "type": "git", @@ -25,12 +25,12 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.22.6", - "@redwoodjs/auth": "6.0.2", - "@redwoodjs/internal": "6.0.2", - "@redwoodjs/project-config": "6.0.2", - "@redwoodjs/router": "6.0.2", - "@redwoodjs/structure": "6.0.2", - "@redwoodjs/web": "6.0.2", + "@redwoodjs/auth": "6.0.3", + "@redwoodjs/internal": "6.0.3", + "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/router": "6.0.3", + "@redwoodjs/structure": "6.0.3", + "@redwoodjs/web": "6.0.3", "@whatwg-node/fetch": "0.9.9", "babel-plugin-ignore-html-and-css-imports": "0.1.0", "cheerio": "1.0.0-rc.12", diff --git a/packages/project-config/package.json b/packages/project-config/package.json index 937bf2789126..a580933e2903 100644 --- a/packages/project-config/package.json +++ b/packages/project-config/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/project-config", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/realtime/package.json b/packages/realtime/package.json index 3ad705a66859..903c5b47071f 100644 --- a/packages/realtime/package.json +++ b/packages/realtime/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/realtime", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/record/package.json b/packages/record/package.json index b6644d534a53..c4aefd9a3caf 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/record", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -29,7 +29,7 @@ "dependencies": { "@babel/runtime-corejs3": "7.22.6", "@prisma/client": "5.1.0", - "@redwoodjs/project-config": "6.0.2", + "@redwoodjs/project-config": "6.0.3", "core-js": "3.31.1" }, "devDependencies": { diff --git a/packages/router/package.json b/packages/router/package.json index f5c99d735d09..9495268cc24c 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/router", - "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", "@reach/skip-nav": "0.18.0", - "@redwoodjs/auth": "6.0.2", + "@redwoodjs/auth": "6.0.3", "core-js": "3.31.1" }, "devDependencies": { diff --git a/packages/structure/package.json b/packages/structure/package.json index 037cb39e0992..affebf580075 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/structure", - "version": "6.0.2", + "version": "6.0.3", "description": "noun: the arrangement of and relations between the parts or elements of something complex", "repository": { "type": "git", @@ -33,7 +33,7 @@ "@babel/runtime-corejs3": "7.22.6", "@iarna/toml": "2.2.5", "@prisma/internals": "5.1.0", - "@redwoodjs/project-config": "6.0.2", + "@redwoodjs/project-config": "6.0.3", "@types/line-column": "1.0.0", "camelcase": "6.3.0", "core-js": "3.31.1", diff --git a/packages/studio/package.json b/packages/studio/package.json index ca37abd3521a..25f7ca11cf4a 100644 --- a/packages/studio/package.json +++ b/packages/studio/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/studio", - "version": "6.0.2", + "version": "6.0.3", "description": "Redwood's development studio", "repository": { "type": "git", @@ -29,8 +29,8 @@ "@fastify/http-proxy": "9.2.1", "@fastify/static": "6.10.2", "@fastify/url-data": "5.3.1", - "@redwoodjs/internal": "6.0.2", - "@redwoodjs/project-config": "6.0.2", + "@redwoodjs/internal": "6.0.3", + "@redwoodjs/project-config": "6.0.3", "ansi-colors": "4.1.3", "chokidar": "3.5.3", "core-js": "3.31.1", diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 00eb8088ea17..c540c4188a06 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/telemetry", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -27,8 +27,8 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.22.6", - "@redwoodjs/project-config": "6.0.2", - "@redwoodjs/structure": "6.0.2", + "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/structure": "6.0.3", "@whatwg-node/fetch": "0.9.9", "ci-info": "3.8.0", "core-js": "3.31.1", diff --git a/packages/testing/package.json b/packages/testing/package.json index 5be3f9ab3e81..2ce24320eb3f 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/testing", - "version": "6.0.2", + "version": "6.0.3", "description": "Tools, wrappers and configuration for testing a Redwood project.", "repository": { "type": "git", @@ -28,12 +28,12 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.22.6", - "@redwoodjs/auth": "6.0.2", - "@redwoodjs/graphql-server": "6.0.2", - "@redwoodjs/internal": "6.0.2", - "@redwoodjs/project-config": "6.0.2", - "@redwoodjs/router": "6.0.2", - "@redwoodjs/web": "6.0.2", + "@redwoodjs/auth": "6.0.3", + "@redwoodjs/graphql-server": "6.0.3", + "@redwoodjs/internal": "6.0.3", + "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/router": "6.0.3", + "@redwoodjs/web": "6.0.3", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "14.0.0", "@testing-library/user-event": "14.4.3", diff --git a/packages/tui/package.json b/packages/tui/package.json index aa7ca4ca7d8c..810de8bdda81 100644 --- a/packages/tui/package.json +++ b/packages/tui/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/tui", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/vite/ambient.d.ts b/packages/vite/ambient.d.ts index 9857529d3b60..da81612adf7a 100644 --- a/packages/vite/ambient.d.ts +++ b/packages/vite/ambient.d.ts @@ -3,12 +3,22 @@ import type { HelmetServerState } from 'react-helmet-async' declare global { + // Provided by Vite.config, or Webpack in the user's project + // but "regsitered" in packages/vite/src/streaming/registerGlobals.ts + // for it to be available to framework code var RWJS_ENV: { - RWJS_API_GRAPHQL_URL?: string + RWJS_API_GRAPHQL_URL: string /** URL or absolute path to serverless functions */ - RWJS_API_URL?: string + RWJS_API_URL: string + RWJS_EXP_STREAMING_SSR: boolean + RWJS_EXP_RSC: boolean - __REDWOOD__APP_TITLE?: string + __REDWOOD__APP_TITLE: string + } + + var RWJS_DEBUG_ENV: { + RWJS_SRC_ROOT: string + REDWOOD_ENV_EDITOR: string } var __REDWOOD__PRERENDER_PAGES: any diff --git a/packages/vite/package.json b/packages/vite/package.json index 6c860533eb94..a168e5152db3 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/vite", - "version": "6.0.2", + "version": "6.0.3", "description": "Vite configuration package for Redwood", "repository": { "type": "git", @@ -64,9 +64,9 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.22.6", - "@redwoodjs/internal": "6.0.2", - "@redwoodjs/project-config": "6.0.2", - "@redwoodjs/web": "6.0.2", + "@redwoodjs/internal": "6.0.3", + "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/web": "6.0.3", "@swc/core": "1.3.60", "@vitejs/plugin-react": "4.0.4", "acorn-loose": "8.3.0", diff --git a/packages/vite/src/devFeServer.ts b/packages/vite/src/devFeServer.ts index 1ddbe1ecb414..462ff2a1b9d0 100644 --- a/packages/vite/src/devFeServer.ts +++ b/packages/vite/src/devFeServer.ts @@ -8,19 +8,19 @@ import { getAppRouteHook, getConfig, getPaths } from '@redwoodjs/project-config' import { matchPath } from '@redwoodjs/router' import type { TagDescriptor } from '@redwoodjs/web' -import { reactRenderToStream } from './streamHelpers' -import { loadAndRunRouteHooks } from './triggerRouteHooks' +import { registerFwGlobals } from './streaming/registerGlobals' +import { reactRenderToStream } from './streaming/streamHelpers' +import { loadAndRunRouteHooks } from './streaming/triggerRouteHooks' import { ensureProcessDirWeb, stripQueryStringAndHashFromPath } from './utils' -// These values are defined in the vite.config.ts -globalThis.RWJS_ENV = {} - // TODO (STREAMING) Just so it doesn't error out. Not sure how to handle this. globalThis.__REDWOOD__PRERENDER_PAGES = {} async function createServer() { ensureProcessDirWeb() + registerFwGlobals() + const app = express() const rwPaths = getPaths() @@ -51,8 +51,6 @@ async function createServer() { const currentPathName = stripQueryStringAndHashFromPath(req.originalUrl) globalThis.__REDWOOD__HELMET_CONTEXT = {} - res.setHeader('content-type', 'text/html; charset=utf-8') - try { const routes = getProjectRoutes() @@ -112,6 +110,8 @@ async function createServer() { const pageWithJs = currentRoute?.renderMode !== 'html' + res.setHeader('content-type', 'text/html; charset=utf-8') + reactRenderToStream({ ServerEntry, currentPathName, diff --git a/packages/vite/src/runFeServer.ts b/packages/vite/src/runFeServer.ts index a2e9eff85687..3170de8eb25b 100644 --- a/packages/vite/src/runFeServer.ts +++ b/packages/vite/src/runFeServer.ts @@ -18,12 +18,11 @@ import { getConfig, getPaths } from '@redwoodjs/project-config' import { matchPath } from '@redwoodjs/router' import type { TagDescriptor } from '@redwoodjs/web' -import { loadAndRunRouteHooks } from './triggerRouteHooks' +import { registerFwGlobals } from './streaming/registerGlobals' +import { loadAndRunRouteHooks } from './streaming/triggerRouteHooks' import { RWRouteManifest } from './types' import { stripQueryStringAndHashFromPath } from './utils' -globalThis.RWJS_ENV = {} - /** * TODO (STREAMING) * We have this server in the vite package only temporarily. @@ -50,6 +49,8 @@ export async function runFeServer() { const rwPaths = getPaths() const rwConfig = getConfig() + registerFwGlobals() + // TODO When https://github.com/tc39/proposal-import-attributes and // https://github.com/microsoft/TypeScript/issues/53656 have both landed we // should try to do this instead: diff --git a/packages/vite/src/runRscFeServer.ts b/packages/vite/src/runRscFeServer.ts index 1b62b7533996..af4cde8bb392 100644 --- a/packages/vite/src/runRscFeServer.ts +++ b/packages/vite/src/runRscFeServer.ts @@ -15,10 +15,9 @@ import type { Manifest as ViteBuildManifest } from 'vite' import { getConfig, getPaths } from '@redwoodjs/project-config' +import { registerFwGlobals } from './streaming/registerGlobals' import { renderRSC, setClientEntries } from './waku-lib/rsc-handler-worker' -globalThis.RWJS_ENV = {} - /** * TODO (STREAMING) * We have this server in the vite package only temporarily. @@ -45,6 +44,8 @@ export async function runFeServer() { const rwPaths = getPaths() const rwConfig = getConfig() + registerFwGlobals() + await setClientEntries('load') // TODO When https://github.com/tc39/proposal-import-attributes and diff --git a/packages/vite/src/streaming/registerGlobals.ts b/packages/vite/src/streaming/registerGlobals.ts new file mode 100644 index 000000000000..fd21a2855dc5 --- /dev/null +++ b/packages/vite/src/streaming/registerGlobals.ts @@ -0,0 +1,34 @@ +import path from 'node:path' + +import { getConfig, getPaths } from '@redwoodjs/project-config' + +/** + * Use this function on the web server + * + * Because although this is defined in Vite/index.ts + * They are only available in the user's code (and not in FW code) + * because define STATICALLY replaces it in user's code, not in node_modules + * + * It's still available on the client side though, probably because its processed by Vite + */ +export const registerFwGlobals = () => { + const rwConfig = getConfig() + const rwPaths = getPaths() + + globalThis.RWJS_ENV = { + // @NOTE we're avoiding process.env here, unlike webpack + RWJS_API_GRAPHQL_URL: + rwConfig.web.apiGraphQLUrl ?? rwConfig.web.apiUrl + '/graphql', + RWJS_API_URL: rwConfig.web.apiUrl, + __REDWOOD__APP_TITLE: rwConfig.web.title || path.basename(rwPaths.base), + RWJS_EXP_STREAMING_SSR: + rwConfig.experimental.streamingSsr && + rwConfig.experimental.streamingSsr.enabled, + RWJS_EXP_RSC: rwConfig.experimental?.rsc?.enabled, + } + + globalThis.RWJS_DEBUG_ENV = { + RWJS_SRC_ROOT: rwPaths.web.src, + REDWOOD_ENV_EDITOR: JSON.stringify(process.env.REDWOOD_ENV_EDITOR), + } +} diff --git a/packages/vite/src/streamHelpers.ts b/packages/vite/src/streaming/streamHelpers.ts similarity index 92% rename from packages/vite/src/streamHelpers.ts rename to packages/vite/src/streaming/streamHelpers.ts index 47ec04af8879..bed2ad5bccf0 100644 --- a/packages/vite/src/streamHelpers.ts +++ b/packages/vite/src/streaming/streamHelpers.ts @@ -1,5 +1,5 @@ +import path from 'node:path' import { Writable } from 'node:stream' -import path from 'path' import React from 'react' @@ -33,7 +33,7 @@ export function reactRenderToStream({ const rwPaths = getPaths() const bootstrapModules = [ - path.join(__dirname, '../inject', 'reactRefresh.js'), + path.join(__dirname, '../../inject', 'reactRefresh.js'), ] if (includeJs) { @@ -54,11 +54,6 @@ export function reactRenderToStream({ // This ensures an isolated state for each request const { injectionState, injectToPage } = createInjector() - console.log(`👉 \n ~ file: streamHelpers.ts:57 ~ injectToPage:`, injectToPage) - console.log( - `👉 \n ~ file: streamHelpers.ts:57 ~ injectionState:`, - injectionState - ) // This is effectively a transformer stream const intermediateStream = createServerInjectionStream({ @@ -83,7 +78,7 @@ export function reactRenderToStream({ ), { bootstrapScriptContent: includeJs - ? `window.__assetMap = function() { return ${assetMap} }` + ? `window.__REDWOOD__ASSET_MAP = ${assetMap}` : undefined, bootstrapModules, onShellReady() { diff --git a/packages/vite/src/triggerRouteHooks.ts b/packages/vite/src/streaming/triggerRouteHooks.ts similarity index 98% rename from packages/vite/src/triggerRouteHooks.ts rename to packages/vite/src/streaming/triggerRouteHooks.ts index af383255df44..285bcd0c6cd3 100644 --- a/packages/vite/src/triggerRouteHooks.ts +++ b/packages/vite/src/streaming/triggerRouteHooks.ts @@ -112,6 +112,6 @@ export const loadAndRunRouteHooks = async ({ } } catch (e) { console.error(`Error loading route hooks in ${routeHookPath}}`) - throw new Error(e as any) + throw e } } diff --git a/packages/vite/src/utils.ts b/packages/vite/src/utils.ts index 3430a17a32a1..e721c32177f3 100644 --- a/packages/vite/src/utils.ts +++ b/packages/vite/src/utils.ts @@ -11,7 +11,7 @@ export function ensureProcessDirWeb(webDir: string = getPaths().web.base) { console.error('⚠️ Warning: CWD is ', process.cwd()) console.warn('~'.repeat(50)) console.warn( - 'The cwd must be web/. Please use invoke with yarn rw {command} or run the command from the web/ directory.' + 'The cwd must be web/. Please use `yarn rw ` or run the command from the web/ directory.' ) console.log(`Changing cwd to ${webDir}....`) console.log() diff --git a/packages/web-server/package.json b/packages/web-server/package.json index 4a68e2549f0e..b5d9caa044de 100644 --- a/packages/web-server/package.json +++ b/packages/web-server/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/web-server", - "version": "6.0.2", + "version": "6.0.3", "description": "Redwood's server for the Web side", "repository": { "type": "git", @@ -25,7 +25,7 @@ "test:watch": "echo \"No tests yet\"" }, "dependencies": { - "@redwoodjs/project-config": "6.0.2", + "@redwoodjs/project-config": "6.0.3", "chalk": "4.1.2", "dotenv-defaults": "5.0.2", "fast-glob": "3.3.1", diff --git a/packages/web/ambient.d.ts b/packages/web/ambient.d.ts index e452d2016432..151c7972b58a 100644 --- a/packages/web/ambient.d.ts +++ b/packages/web/ambient.d.ts @@ -8,6 +8,11 @@ declare global { var __REDWOOD__APP_TITLE: string var __REDWOOD__APOLLO_STATE: NormalizedCacheObject + var __REDWOOD__ASSET_MAP: { + css?: string[] + meta?: TagDescriptor[] + } + // Provided by Vite.config, or Webpack in the user's project var RWJS_ENV: { RWJS_API_GRAPHQL_URL: string diff --git a/packages/web/package.json b/packages/web/package.json index 5c7d3d49e577..6f419541cf3d 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/web", - "version": "6.0.2", + "version": "6.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -37,7 +37,7 @@ "dependencies": { "@apollo/client": "rc", "@babel/runtime-corejs3": "7.22.6", - "@redwoodjs/auth": "6.0.2", + "@redwoodjs/auth": "6.0.3", "core-js": "3.31.1", "graphql": "16.7.1", "graphql-tag": "2.12.6", diff --git a/packages/web/src/components/PortalHead.tsx b/packages/web/src/components/PortalHead.tsx index 78e710d54c49..829c1ccc5687 100644 --- a/packages/web/src/components/PortalHead.tsx +++ b/packages/web/src/components/PortalHead.tsx @@ -4,6 +4,8 @@ import { useServerInsertedHTML } from './ServerInject' const PortalHead: React.FC = ({ children }) => { useServerInsertedHTML(() => { + // @TODO this component should be wrapped in: document.head.append() + // because its possible for meta tags to be rendered after is closed return children }) diff --git a/packages/web/src/components/ServerInject.tsx b/packages/web/src/components/ServerInject.tsx index 93c011579deb..1e1819243dfd 100644 --- a/packages/web/src/components/ServerInject.tsx +++ b/packages/web/src/components/ServerInject.tsx @@ -1,4 +1,4 @@ -import React, { Fragment, ReactNode, useContext } from 'react' +import React, { Fragment, ReactNode, useContext, useId } from 'react' /** * @@ -51,8 +51,12 @@ export const ServerInjectedHtml = ({ injectionState.delete(callback) } + const fragmentId = useId() + return serverInsertedHtml.map((html, i) => { - return {html} + return ( + {html} + ) }) } @@ -65,3 +69,14 @@ export function useServerInsertedHTML(callback: () => React.ReactNode): void { addInsertedServerHTMLCallback(callback) } } + +// @TODO use this in streamHelpers final block +export const AppendToHead = ({ tagsToAppend }: { tagsToAppend: string }) => { + return ( +