diff --git a/__fixtures__/test-project/README.md b/__fixtures__/test-project/README.md index 0b8e17b79a45..08f58865b056 100644 --- a/__fixtures__/test-project/README.md +++ b/__fixtures__/test-project/README.md @@ -4,7 +4,7 @@ Welcome to [RedwoodJS](https://redwoodjs.com)! > **Prerequisites** > -> - Redwood requires [Node.js](https://nodejs.org/en/) (>=18.x) and [Yarn](https://yarnpkg.com/) (>=1.15) +> - Redwood requires [Node.js](https://nodejs.org/en/) (=18.x) and [Yarn](https://yarnpkg.com/) (>=1.15) > - Are you on Windows? For best results, follow our [Windows development setup](https://redwoodjs.com/docs/how-to/windows-development-setup) guide Start by installing dependencies: @@ -13,30 +13,29 @@ Start by installing dependencies: yarn install ``` -Then change into that directory and start the development server: +Then start the development server: ``` -cd my-redwood-project yarn redwood dev ``` -Your browser should automatically open to http://localhost:8910 where you'll see the Welcome Page, which links to many great resources. +Your browser should automatically open to [http://localhost:8910](http://localhost:8910) where you'll see the Welcome Page, which links out to many great resources. > **The Redwood CLI** > -> Congratulations on running your first Redwood CLI command! -> From dev to deploy, the CLI is with you the whole way. -> And there's quite a few commands at your disposal: +> Congratulations on running your first Redwood CLI command! From dev to deploy, the CLI is with you the whole way. And there's quite a few commands at your disposal: +> > ``` > yarn redwood --help > ``` +> > For all the details, see the [CLI reference](https://redwoodjs.com/docs/cli-commands). ## Prisma and the database Redwood wouldn't be a full-stack framework without a database. It all starts with the schema. Open the [`schema.prisma`](api/db/schema.prisma) file in `api/db` and replace the `UserExample` model with the following `Post` model: -``` +```prisma model Post { id Int @id @default(autoincrement()) title String @@ -62,24 +61,28 @@ You'll be prompted for the name of your migration. `create posts` will do. Now let's generate everything we need to perform all the CRUD (Create, Retrieve, Update, Delete) actions on our `Post` model: ``` -yarn redwood g scaffold post +yarn redwood generate scaffold post ``` -Navigate to http://localhost:8910/posts/new, fill in the title and body, and click "Save": +Navigate to [http://localhost:8910/posts/new](http://localhost:8910/posts/new), fill in the title and body, and click "Save". -Did we just create a post in the database? Yup! With `yarn rw g scaffold `, Redwood created all the pages, components, and services necessary to perform all CRUD actions on our posts table. +Did we just create a post in the database? Yup! With `yarn rw generate scaffold `, Redwood created all the pages, components, and services necessary to perform all CRUD actions on our posts table. ## Frontend first with Storybook -Don't know what your data models look like? -That's more than ok—Redwood integrates Storybook so that you can work on design without worrying about data. -Mockup, build, and verify your React components, even in complete isolation from the backend: +Don't know what your data models look like? That's more than ok—Redwood integrates Storybook so that you can work on design without worrying about data. Mockup, build, and verify your React components, even in complete isolation from the backend: ``` yarn rw storybook ``` -Before you start, see if the CLI's `setup ui` command has your favorite styling library: +Seeing "Couldn't find any stories"? That's because you need a `*.stories.{tsx,jsx}` file. The Redwood CLI makes getting one easy enough—try generating a [Cell](https://redwoodjs.com/docs/cells), Redwood's data-fetching abstraction: + +``` +yarn rw generate cell examplePosts +``` + +The Storybook server should hot reload and now you'll have four stories to work with. They'll probably look a little bland since there's no styling. See if the Redwood CLI's `setup ui` command has your favorite styling library: ``` yarn rw setup ui --help @@ -87,14 +90,13 @@ yarn rw setup ui --help ## Testing with Jest -It'd be hard to scale from side project to startup without a few tests. -Redwood fully integrates Jest with the front and the backends and makes it easy to keep your whole app covered by generating test files with all your components and services: +It'd be hard to scale from side project to startup without a few tests. Redwood fully integrates Jest with both the front- and back-ends, and makes it easy to keep your whole app covered by generating test files with all your components and services: ``` yarn rw test ``` -To make the integration even more seamless, Redwood augments Jest with database [scenarios](https://redwoodjs.com/docs/testing.md#scenarios) and [GraphQL mocking](https://redwoodjs.com/docs/testing.md#mocking-graphql-calls). +To make the integration even more seamless, Redwood augments Jest with database [scenarios](https://redwoodjs.com/docs/testing#scenarios) and [GraphQL mocking](https://redwoodjs.com/docs/testing#mocking-graphql-calls). ## Ship it @@ -104,8 +106,7 @@ Redwood is designed for both serverless deploy targets like Netlify and Vercel a yarn rw setup deploy --help ``` -Don't go live without auth! -Lock down your front and backends with Redwood's built-in, database-backed authentication system ([dbAuth](https://redwoodjs.com/docs/authentication#self-hosted-auth-installation-and-setup)), or integrate with nearly a dozen third party auth providers: +Don't go live without auth! Lock down your app with Redwood's built-in, database-backed authentication system ([dbAuth](https://redwoodjs.com/docs/authentication#self-hosted-auth-installation-and-setup)), or integrate with nearly a dozen third-party auth providers: ``` yarn rw setup auth --help diff --git a/__fixtures__/test-project/api/package.json b/__fixtures__/test-project/api/package.json index d41d76fe79f3..0348883de84a 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.3", - "@redwoodjs/auth-dbauth-api": "6.0.3", - "@redwoodjs/graphql-server": "6.0.3" + "@redwoodjs/api": "6.0.4", + "@redwoodjs/auth-dbauth-api": "6.0.4", + "@redwoodjs/graphql-server": "6.0.4" } } diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json index 9604d0242e0f..9046764971fb 100644 --- a/__fixtures__/test-project/package.json +++ b/__fixtures__/test-project/package.json @@ -7,7 +7,7 @@ ] }, "devDependencies": { - "@redwoodjs/core": "6.0.3" + "@redwoodjs/core": "6.0.4" }, "eslintConfig": { "extends": "@redwoodjs/eslint-config", diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json index 4ec608291ece..e21b14fed39f 100644 --- a/__fixtures__/test-project/web/package.json +++ b/__fixtures__/test-project/web/package.json @@ -11,22 +11,21 @@ ] }, "dependencies": { - "@redwoodjs/auth-dbauth-web": "6.0.3", - "@redwoodjs/forms": "6.0.3", - "@redwoodjs/router": "6.0.3", - "@redwoodjs/web": "6.0.3", + "@redwoodjs/auth-dbauth-web": "6.0.4", + "@redwoodjs/forms": "6.0.4", + "@redwoodjs/router": "6.0.4", + "@redwoodjs/web": "6.0.4", "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.3", + "@redwoodjs/vite": "6.0.4", "autoprefixer": "^10.4.14", - "postcss": "^8.4.25", + "postcss": "^8.4.27", "postcss-loader": "^7.3.3", - "prettier-plugin-tailwindcss": "^0.3.0", - "storybook": "^7.0.26", - "tailwindcss": "^3.3.2" + "prettier-plugin-tailwindcss": "^0.4.1", + "tailwindcss": "^3.3.3" } } diff --git a/__fixtures__/test-project/web/src/components/AuthorCell/AuthorCell.stories.tsx b/__fixtures__/test-project/web/src/components/AuthorCell/AuthorCell.stories.tsx index 3a5b334f6e03..8d535ed2fb9b 100644 --- a/__fixtures__/test-project/web/src/components/AuthorCell/AuthorCell.stories.tsx +++ b/__fixtures__/test-project/web/src/components/AuthorCell/AuthorCell.stories.tsx @@ -11,24 +11,24 @@ export default meta export const loading: StoryObj = { render: () => { - return Loading ? : <>; + return Loading ? : <> }, } export const empty: StoryObj = { render: () => { - return Empty ? : <>; + return Empty ? : <> }, } export const failure: StoryObj = { render: (args) => { - return Failure ? : <>; + return Failure ? : <> }, } export const success: StoryObj = { render: (args) => { - return Success ? : <>; + return Success ? : <> }, } diff --git a/__fixtures__/test-project/web/src/components/BlogPostCell/BlogPostCell.stories.tsx b/__fixtures__/test-project/web/src/components/BlogPostCell/BlogPostCell.stories.tsx index 962c48fe5246..797fb9c7c1dc 100644 --- a/__fixtures__/test-project/web/src/components/BlogPostCell/BlogPostCell.stories.tsx +++ b/__fixtures__/test-project/web/src/components/BlogPostCell/BlogPostCell.stories.tsx @@ -11,24 +11,24 @@ export default meta export const loading: StoryObj = { render: () => { - return Loading ? : <>; + return Loading ? : <> }, } export const empty: StoryObj = { render: () => { - return Empty ? : <>; + return Empty ? : <> }, } export const failure: StoryObj = { render: (args) => { - return Failure ? : <>; + return Failure ? : <> }, } export const success: StoryObj = { render: (args) => { - return Success ? : <>; + return Success ? : <> }, } diff --git a/__fixtures__/test-project/web/src/components/BlogPostsCell/BlogPostsCell.stories.tsx b/__fixtures__/test-project/web/src/components/BlogPostsCell/BlogPostsCell.stories.tsx index 7c7a32dda115..75950a785a0e 100644 --- a/__fixtures__/test-project/web/src/components/BlogPostsCell/BlogPostsCell.stories.tsx +++ b/__fixtures__/test-project/web/src/components/BlogPostsCell/BlogPostsCell.stories.tsx @@ -11,24 +11,24 @@ export default meta export const loading: StoryObj = { render: () => { - return Loading ? : <>; + return Loading ? : <> }, } export const empty: StoryObj = { render: () => { - return Empty ? : <>; + return Empty ? : <> }, } export const failure: StoryObj = { render: (args) => { - return Failure ? : <>; + return Failure ? : <> }, } export const success: StoryObj = { render: (args) => { - return Success ? : <>; + return Success ? : <> }, } diff --git a/__fixtures__/test-project/web/src/components/WaterfallBlogPostCell/WaterfallBlogPostCell.stories.tsx b/__fixtures__/test-project/web/src/components/WaterfallBlogPostCell/WaterfallBlogPostCell.stories.tsx index 466e409b805e..e1781c510d54 100644 --- a/__fixtures__/test-project/web/src/components/WaterfallBlogPostCell/WaterfallBlogPostCell.stories.tsx +++ b/__fixtures__/test-project/web/src/components/WaterfallBlogPostCell/WaterfallBlogPostCell.stories.tsx @@ -11,24 +11,24 @@ export default meta export const loading: StoryObj = { render: () => { - return Loading ? : <>; + return Loading ? : <> }, } export const empty: StoryObj = { render: () => { - return Empty ? : <>; + return Empty ? : <> }, } export const failure: StoryObj = { render: (args) => { - return Failure ? : <>; + return Failure ? : <> }, } export const success: StoryObj = { render: (args) => { - return Success ? : <>; + return Success ? : <> }, } diff --git a/__fixtures__/test-project/web/src/index.css b/__fixtures__/test-project/web/src/index.css index 027a7cd88a2a..b31cb3378fae 100644 --- a/__fixtures__/test-project/web/src/index.css +++ b/__fixtures__/test-project/web/src/index.css @@ -1,13 +1,13 @@ /** * START --- SETUP TAILWINDCSS EDIT * - * `yarn rw setup ui tailwindcss` placed these imports here + * `yarn rw setup ui tailwindcss` placed these directives here * to inject Tailwind's styles into your CSS. - * For more information, see: https://tailwindcss.com/docs/installation#include-tailwind-in-your-css + * For more information, see: https://tailwindcss.com/docs/installation */ -@import 'tailwindcss/base'; -@import 'tailwindcss/components'; -@import 'tailwindcss/utilities'; +@tailwind base; +@tailwind components; +@tailwind utilities; /** * END --- SETUP TAILWINDCSS EDIT */ diff --git a/__fixtures__/test-project/web/src/pages/AboutPage/AboutPage.stories.tsx b/__fixtures__/test-project/web/src/pages/AboutPage/AboutPage.stories.tsx index fcf2e0439eaa..b8259100eb85 100644 --- a/__fixtures__/test-project/web/src/pages/AboutPage/AboutPage.stories.tsx +++ b/__fixtures__/test-project/web/src/pages/AboutPage/AboutPage.stories.tsx @@ -4,7 +4,7 @@ import AboutPage from './AboutPage' const meta: Meta = { component: AboutPage, -}; +} export default meta diff --git a/docs/docs/quick-start.md b/docs/docs/quick-start.md index 2dbac26d6ff9..40f35f9134bf 100644 --- a/docs/docs/quick-start.md +++ b/docs/docs/quick-start.md @@ -102,7 +102,17 @@ Mockup, build, and verify your React components, even in complete isolation from yarn rw storybook ``` -Before you start, see if the CLI's `setup ui` command has your favorite styling library: +Seeing "Couldn't find any stories"? +That's because you need a `*.stories.{tsx,jsx}` file. +The Redwood CLI makes getting one easy enough—try generating a [Cell](./cells), Redwood's data-fetching abstraction: + +``` +yarn rw generate cell examplePosts +``` + +The Storybook server should hot reload and now you'll have four stories to work with. +They'll probably look a little bland since there's no styling. +See if the Redwood CLI's `setup ui` command has your favorite styling library: ``` yarn rw setup ui --help diff --git a/docs/docs/tutorial/chapter1/file-structure.md b/docs/docs/tutorial/chapter1/file-structure.md index 199b43dd1261..cbf375035bc8 100644 --- a/docs/docs/tutorial/chapter1/file-structure.md +++ b/docs/docs/tutorial/chapter1/file-structure.md @@ -142,8 +142,9 @@ That's it for the backend. - `NotFoundPage.{jsx,tsx}` will be served when no other route is found (see `Routes.{jsx,tsx}` below). - `FatalErrorPage.{jsx,tsx}` will be rendered when there is an uncaught error that can't be recovered from and would otherwise cause our application to really blow up (normally rendering a blank page). - `App.{jsx,tsx}` the bootstrapping code to get our Redwood app up and running. + - `entry.client.{jsx,tsx}` is the standard React starting point for our app. - `index.css` is a good starting place for custom CSS, but there are many options (we like [TailwindCSS](https://tailwindcss.com/) which, believe it or not, may not require you to write any custom CSS for the life of your app!) - - `index.html` is the standard React starting point for our app. + - `index.html` is what's first sent to a visitor's browser. It fetches `entry.client.{jsx,tsx}`. - `Routes.{jsx,tsx}` the route definitions for our app which map a URL to a _Page_. We'll dip in and out of these directories and files (and create some new ones) as we work through the tutorial. 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 c2a70ef92596..785f92861ef5 100644 --- a/docs/versioned_docs/version-6.0/assets-and-files.md +++ b/docs/versioned_docs/version-6.0/assets-and-files.md @@ -145,14 +145,12 @@ 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 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 diff --git a/docs/versioned_docs/version-6.0/quick-start.md b/docs/versioned_docs/version-6.0/quick-start.md index 2dbac26d6ff9..40f35f9134bf 100644 --- a/docs/versioned_docs/version-6.0/quick-start.md +++ b/docs/versioned_docs/version-6.0/quick-start.md @@ -102,7 +102,17 @@ Mockup, build, and verify your React components, even in complete isolation from yarn rw storybook ``` -Before you start, see if the CLI's `setup ui` command has your favorite styling library: +Seeing "Couldn't find any stories"? +That's because you need a `*.stories.{tsx,jsx}` file. +The Redwood CLI makes getting one easy enough—try generating a [Cell](./cells), Redwood's data-fetching abstraction: + +``` +yarn rw generate cell examplePosts +``` + +The Storybook server should hot reload and now you'll have four stories to work with. +They'll probably look a little bland since there's no styling. +See if the Redwood CLI's `setup ui` command has your favorite styling library: ``` yarn rw setup ui --help diff --git a/docs/versioned_docs/version-6.0/tutorial/chapter1/file-structure.md b/docs/versioned_docs/version-6.0/tutorial/chapter1/file-structure.md index 199b43dd1261..cbf375035bc8 100644 --- a/docs/versioned_docs/version-6.0/tutorial/chapter1/file-structure.md +++ b/docs/versioned_docs/version-6.0/tutorial/chapter1/file-structure.md @@ -142,8 +142,9 @@ That's it for the backend. - `NotFoundPage.{jsx,tsx}` will be served when no other route is found (see `Routes.{jsx,tsx}` below). - `FatalErrorPage.{jsx,tsx}` will be rendered when there is an uncaught error that can't be recovered from and would otherwise cause our application to really blow up (normally rendering a blank page). - `App.{jsx,tsx}` the bootstrapping code to get our Redwood app up and running. + - `entry.client.{jsx,tsx}` is the standard React starting point for our app. - `index.css` is a good starting place for custom CSS, but there are many options (we like [TailwindCSS](https://tailwindcss.com/) which, believe it or not, may not require you to write any custom CSS for the life of your app!) - - `index.html` is the standard React starting point for our app. + - `index.html` is what's first sent to a visitor's browser. It fetches `entry.client.{jsx,tsx}`. - `Routes.{jsx,tsx}` the route definitions for our app which map a URL to a _Page_. We'll dip in and out of these directories and files (and create some new ones) as we work through the tutorial. diff --git a/docs/versioned_docs/version-6.0/tutorial/chapter3/saving-data.md b/docs/versioned_docs/version-6.0/tutorial/chapter3/saving-data.md index f6a2a3c1ffc1..67b8c1f8de47 100644 --- a/docs/versioned_docs/version-6.0/tutorial/chapter3/saving-data.md +++ b/docs/versioned_docs/version-6.0/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/lerna.json b/lerna.json index 66eccd9e4611..8dd01a05f606 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "6.0.3", + "version": "6.0.4", "npmClient": "yarn", "command": { "publish": { diff --git a/package.json b/package.json index 4155714f6c3c..afc6ca75f033 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "cypress": "12.15.0", "cypress-wait-until": "1.7.2", "dependency-cruiser": "13.0.4", - "eslint": "8.45.0", + "eslint": "8.46.0", "fast-glob": "3.3.1", "fs-extra": "11.1.1", "jest": "29.6.1", @@ -89,7 +89,7 @@ "nodemon": "2.0.22", "npm-packlist": "7.0.4", "nx": "16.4.1", - "nx-cloud": "16.0.5", + "nx-cloud": "16.2.0", "octokit": "2.1.0", "ora": "6.3.1", "prompts": "2.4.2", diff --git a/packages/api-server/package.json b/packages/api-server/package.json index e7c044921843..084d7cc7c2b5 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/api-server", - "version": "6.0.3", + "version": "6.0.4", "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.3", + "@redwoodjs/project-config": "6.0.4", "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 712412c3d101..70228dfe0055 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/api", - "version": "6.0.3", + "version": "6.0.4", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -38,7 +38,7 @@ "humanize-string": "2.1.0", "jsonwebtoken": "9.0.0", "pascalcase": "1.0.0", - "pino": "8.14.1", + "pino": "8.15.0", "title-case": "3.0.3" }, "devDependencies": { diff --git a/packages/auth-providers/auth0/api/package.json b/packages/auth-providers/auth0/api/package.json index 87fabacd180c..c3ab46d61c78 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/api": "6.0.4", "@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 9d283532d621..0edb15e9f220 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/cli-helpers": "6.0.4", "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 e2c1893c9e05..a8b7990769a6 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/auth": "6.0.4", "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 c09e840107d3..fc25282d3f00 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/api": "6.0.4", "@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 dac6fb0bac89..e0b3e6feb22a 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/cli-helpers": "6.0.4", "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 88d5efe6b8cc..246e4399c4e4 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/auth": "6.0.4", "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 d8bc979a0184..973c2abac1e8 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/api": "6.0.4", "@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 503a22168be9..fd3902c9af4d 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/cli-helpers": "6.0.4", "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 f3fabec4ba3d..4425844ca36a 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/auth": "6.0.4", "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 005cefe01298..556b48907366 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/cli-helpers": "6.0.4", "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 6c9f1d38ca38..9c390585ac8e 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/api": "6.0.4", "@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 9460a725cd42..d7669cb6326e 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/cli-helpers": "6.0.4", "@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 b96e757407f6..c8ac9968d8e6 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/auth": "6.0.4", "@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 30731f48d887..cac4e42d6468 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/api": "6.0.4", "@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 e2e4a65b2cc7..e8db1df7e084 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/cli-helpers": "6.0.4", "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 3e11a377773c..6be7c9597788 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/auth": "6.0.4", "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 7c09677303c9..4595e7fe1376 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/api": "6.0.4", "@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 88606d34cb4a..c0b5f37a9396 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/cli-helpers": "6.0.4", "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 9b4a5755ce46..473126d19bf9 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/auth": "6.0.4", "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 f0c9a082ed59..a5417de97921 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/api": "6.0.4", "@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 7e808051b44e..f2d35e17f054 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/cli-helpers": "6.0.4", "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 0d87c9ae8028..2a65df62a44a 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.3", + "version": "6.0.4", "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 260be596f9e1..b1c13ae8351e 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/api": "6.0.4", "@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 5b55ea98bf9a..5bba67435a92 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/cli-helpers": "6.0.4", "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 179937064569..30d26d3b0ba3 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/auth": "6.0.4", "core-js": "3.31.1" }, "devDependencies": { diff --git a/packages/auth/package.json b/packages/auth/package.json index c511797befbf..b22d21c4cf2c 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth", - "version": "6.0.3", + "version": "6.0.4", "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 d5dd97247e66..024dfadfc06a 100644 --- a/packages/cli-helpers/package.json +++ b/packages/cli-helpers/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/cli-helpers", - "version": "6.0.3", + "version": "6.0.4", "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.3", - "@redwoodjs/telemetry": "6.0.3", + "@redwoodjs/project-config": "6.0.4", + "@redwoodjs/telemetry": "6.0.4", "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 272e26e01068..44edc1e38210 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.3", + "version": "6.0.4", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -24,9 +24,9 @@ ] }, "dependencies": { - "@redwoodjs/cli-helpers": "6.0.3", - "@redwoodjs/project-config": "6.0.3", - "@redwoodjs/telemetry": "6.0.3", + "@redwoodjs/cli-helpers": "6.0.4", + "@redwoodjs/project-config": "6.0.4", + "@redwoodjs/telemetry": "6.0.4", "@storybook/addon-a11y": "7.2.0", "@storybook/addon-docs": "7.2.0", "@storybook/addon-essentials": "7.2.0", @@ -39,7 +39,7 @@ }, "devDependencies": { "@types/yargs": "17.0.24", - "esbuild": "0.18.16", + "esbuild": "0.18.19", "fast-glob": "3.3.1", "jest": "29.6.1", "typescript": "5.1.6" diff --git a/packages/cli/package.json b/packages/cli/package.json index a1b0fcda736c..d292adf2705a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/cli", - "version": "6.0.3", + "version": "6.0.4", "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.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", + "@redwoodjs/api-server": "6.0.4", + "@redwoodjs/cli-helpers": "6.0.4", + "@redwoodjs/fastify": "6.0.4", + "@redwoodjs/internal": "6.0.4", + "@redwoodjs/prerender": "6.0.4", + "@redwoodjs/project-config": "6.0.4", + "@redwoodjs/structure": "6.0.4", + "@redwoodjs/telemetry": "6.0.4", "@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 7508f2288872..c4ad6a68dde9 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/codemods", - "version": "6.0.3", + "version": "6.0.4", "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.3", + "@redwoodjs/project-config": "6.0.4", "@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 08246e4dae08..743a47b9a498 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/core", - "version": "6.0.3", + "version": "6.0.4", "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.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", + "@redwoodjs/cli": "6.0.4", + "@redwoodjs/eslint-config": "6.0.4", + "@redwoodjs/internal": "6.0.4", + "@redwoodjs/project-config": "6.0.4", + "@redwoodjs/testing": "6.0.4", + "@redwoodjs/web-server": "6.0.4", "babel-loader": "9.1.3", "babel-plugin-auto-import": "1.1.0", "babel-plugin-graphql-tag": "3.3.0", @@ -64,7 +64,7 @@ "css-loader": "6.8.1", "css-minimizer-webpack-plugin": "5.0.1", "dotenv-webpack": "8.0.1", - "esbuild": "0.18.16", + "esbuild": "0.18.19", "fast-glob": "3.3.1", "file-loader": "6.2.0", "graphql": "16.7.1", diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index c918dc58a01d..9fe112c995a6 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.3", + "version": "6.0.4", "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.3", + "@redwoodjs/tui": "6.0.4", "chalk": "4.1.2", "check-node-version": "4.2.1", "ci-info": "3.8.0", @@ -43,7 +43,7 @@ "@babel/core": "7.22.9", "@babel/plugin-transform-typescript": "7.22.9", "@types/babel__core": "7.20.1", - "esbuild": "0.18.16", + "esbuild": "0.18.19", "jest": "29.6.1", "klaw-sync": "6.0.0" }, diff --git a/packages/create-redwood-app/templates/js/README.md b/packages/create-redwood-app/templates/js/README.md index 0b8e17b79a45..08f58865b056 100644 --- a/packages/create-redwood-app/templates/js/README.md +++ b/packages/create-redwood-app/templates/js/README.md @@ -4,7 +4,7 @@ Welcome to [RedwoodJS](https://redwoodjs.com)! > **Prerequisites** > -> - Redwood requires [Node.js](https://nodejs.org/en/) (>=18.x) and [Yarn](https://yarnpkg.com/) (>=1.15) +> - Redwood requires [Node.js](https://nodejs.org/en/) (=18.x) and [Yarn](https://yarnpkg.com/) (>=1.15) > - Are you on Windows? For best results, follow our [Windows development setup](https://redwoodjs.com/docs/how-to/windows-development-setup) guide Start by installing dependencies: @@ -13,30 +13,29 @@ Start by installing dependencies: yarn install ``` -Then change into that directory and start the development server: +Then start the development server: ``` -cd my-redwood-project yarn redwood dev ``` -Your browser should automatically open to http://localhost:8910 where you'll see the Welcome Page, which links to many great resources. +Your browser should automatically open to [http://localhost:8910](http://localhost:8910) where you'll see the Welcome Page, which links out to many great resources. > **The Redwood CLI** > -> Congratulations on running your first Redwood CLI command! -> From dev to deploy, the CLI is with you the whole way. -> And there's quite a few commands at your disposal: +> Congratulations on running your first Redwood CLI command! From dev to deploy, the CLI is with you the whole way. And there's quite a few commands at your disposal: +> > ``` > yarn redwood --help > ``` +> > For all the details, see the [CLI reference](https://redwoodjs.com/docs/cli-commands). ## Prisma and the database Redwood wouldn't be a full-stack framework without a database. It all starts with the schema. Open the [`schema.prisma`](api/db/schema.prisma) file in `api/db` and replace the `UserExample` model with the following `Post` model: -``` +```prisma model Post { id Int @id @default(autoincrement()) title String @@ -62,24 +61,28 @@ You'll be prompted for the name of your migration. `create posts` will do. Now let's generate everything we need to perform all the CRUD (Create, Retrieve, Update, Delete) actions on our `Post` model: ``` -yarn redwood g scaffold post +yarn redwood generate scaffold post ``` -Navigate to http://localhost:8910/posts/new, fill in the title and body, and click "Save": +Navigate to [http://localhost:8910/posts/new](http://localhost:8910/posts/new), fill in the title and body, and click "Save". -Did we just create a post in the database? Yup! With `yarn rw g scaffold `, Redwood created all the pages, components, and services necessary to perform all CRUD actions on our posts table. +Did we just create a post in the database? Yup! With `yarn rw generate scaffold `, Redwood created all the pages, components, and services necessary to perform all CRUD actions on our posts table. ## Frontend first with Storybook -Don't know what your data models look like? -That's more than ok—Redwood integrates Storybook so that you can work on design without worrying about data. -Mockup, build, and verify your React components, even in complete isolation from the backend: +Don't know what your data models look like? That's more than ok—Redwood integrates Storybook so that you can work on design without worrying about data. Mockup, build, and verify your React components, even in complete isolation from the backend: ``` yarn rw storybook ``` -Before you start, see if the CLI's `setup ui` command has your favorite styling library: +Seeing "Couldn't find any stories"? That's because you need a `*.stories.{tsx,jsx}` file. The Redwood CLI makes getting one easy enough—try generating a [Cell](https://redwoodjs.com/docs/cells), Redwood's data-fetching abstraction: + +``` +yarn rw generate cell examplePosts +``` + +The Storybook server should hot reload and now you'll have four stories to work with. They'll probably look a little bland since there's no styling. See if the Redwood CLI's `setup ui` command has your favorite styling library: ``` yarn rw setup ui --help @@ -87,14 +90,13 @@ yarn rw setup ui --help ## Testing with Jest -It'd be hard to scale from side project to startup without a few tests. -Redwood fully integrates Jest with the front and the backends and makes it easy to keep your whole app covered by generating test files with all your components and services: +It'd be hard to scale from side project to startup without a few tests. Redwood fully integrates Jest with both the front- and back-ends, and makes it easy to keep your whole app covered by generating test files with all your components and services: ``` yarn rw test ``` -To make the integration even more seamless, Redwood augments Jest with database [scenarios](https://redwoodjs.com/docs/testing.md#scenarios) and [GraphQL mocking](https://redwoodjs.com/docs/testing.md#mocking-graphql-calls). +To make the integration even more seamless, Redwood augments Jest with database [scenarios](https://redwoodjs.com/docs/testing#scenarios) and [GraphQL mocking](https://redwoodjs.com/docs/testing#mocking-graphql-calls). ## Ship it @@ -104,8 +106,7 @@ Redwood is designed for both serverless deploy targets like Netlify and Vercel a yarn rw setup deploy --help ``` -Don't go live without auth! -Lock down your front and backends with Redwood's built-in, database-backed authentication system ([dbAuth](https://redwoodjs.com/docs/authentication#self-hosted-auth-installation-and-setup)), or integrate with nearly a dozen third party auth providers: +Don't go live without auth! Lock down your app with Redwood's built-in, database-backed authentication system ([dbAuth](https://redwoodjs.com/docs/authentication#self-hosted-auth-installation-and-setup)), or integrate with nearly a dozen third-party auth providers: ``` yarn rw setup auth --help diff --git a/packages/create-redwood-app/templates/js/api/package.json b/packages/create-redwood-app/templates/js/api/package.json index e4759a5969d4..06411ebd2258 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.3", - "@redwoodjs/graphql-server": "6.0.3" + "@redwoodjs/api": "6.0.4", + "@redwoodjs/graphql-server": "6.0.4" } } diff --git a/packages/create-redwood-app/templates/js/package.json b/packages/create-redwood-app/templates/js/package.json index 9604d0242e0f..9046764971fb 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.3" + "@redwoodjs/core": "6.0.4" }, "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 6b563b2c5552..5b6559e56440 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.3", - "@redwoodjs/router": "6.0.3", - "@redwoodjs/web": "6.0.3", + "@redwoodjs/forms": "6.0.4", + "@redwoodjs/router": "6.0.4", + "@redwoodjs/web": "6.0.4", "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.3" + "@redwoodjs/vite": "6.0.4" } } diff --git a/packages/create-redwood-app/templates/ts/README.md b/packages/create-redwood-app/templates/ts/README.md index 0b8e17b79a45..08f58865b056 100644 --- a/packages/create-redwood-app/templates/ts/README.md +++ b/packages/create-redwood-app/templates/ts/README.md @@ -4,7 +4,7 @@ Welcome to [RedwoodJS](https://redwoodjs.com)! > **Prerequisites** > -> - Redwood requires [Node.js](https://nodejs.org/en/) (>=18.x) and [Yarn](https://yarnpkg.com/) (>=1.15) +> - Redwood requires [Node.js](https://nodejs.org/en/) (=18.x) and [Yarn](https://yarnpkg.com/) (>=1.15) > - Are you on Windows? For best results, follow our [Windows development setup](https://redwoodjs.com/docs/how-to/windows-development-setup) guide Start by installing dependencies: @@ -13,30 +13,29 @@ Start by installing dependencies: yarn install ``` -Then change into that directory and start the development server: +Then start the development server: ``` -cd my-redwood-project yarn redwood dev ``` -Your browser should automatically open to http://localhost:8910 where you'll see the Welcome Page, which links to many great resources. +Your browser should automatically open to [http://localhost:8910](http://localhost:8910) where you'll see the Welcome Page, which links out to many great resources. > **The Redwood CLI** > -> Congratulations on running your first Redwood CLI command! -> From dev to deploy, the CLI is with you the whole way. -> And there's quite a few commands at your disposal: +> Congratulations on running your first Redwood CLI command! From dev to deploy, the CLI is with you the whole way. And there's quite a few commands at your disposal: +> > ``` > yarn redwood --help > ``` +> > For all the details, see the [CLI reference](https://redwoodjs.com/docs/cli-commands). ## Prisma and the database Redwood wouldn't be a full-stack framework without a database. It all starts with the schema. Open the [`schema.prisma`](api/db/schema.prisma) file in `api/db` and replace the `UserExample` model with the following `Post` model: -``` +```prisma model Post { id Int @id @default(autoincrement()) title String @@ -62,24 +61,28 @@ You'll be prompted for the name of your migration. `create posts` will do. Now let's generate everything we need to perform all the CRUD (Create, Retrieve, Update, Delete) actions on our `Post` model: ``` -yarn redwood g scaffold post +yarn redwood generate scaffold post ``` -Navigate to http://localhost:8910/posts/new, fill in the title and body, and click "Save": +Navigate to [http://localhost:8910/posts/new](http://localhost:8910/posts/new), fill in the title and body, and click "Save". -Did we just create a post in the database? Yup! With `yarn rw g scaffold `, Redwood created all the pages, components, and services necessary to perform all CRUD actions on our posts table. +Did we just create a post in the database? Yup! With `yarn rw generate scaffold `, Redwood created all the pages, components, and services necessary to perform all CRUD actions on our posts table. ## Frontend first with Storybook -Don't know what your data models look like? -That's more than ok—Redwood integrates Storybook so that you can work on design without worrying about data. -Mockup, build, and verify your React components, even in complete isolation from the backend: +Don't know what your data models look like? That's more than ok—Redwood integrates Storybook so that you can work on design without worrying about data. Mockup, build, and verify your React components, even in complete isolation from the backend: ``` yarn rw storybook ``` -Before you start, see if the CLI's `setup ui` command has your favorite styling library: +Seeing "Couldn't find any stories"? That's because you need a `*.stories.{tsx,jsx}` file. The Redwood CLI makes getting one easy enough—try generating a [Cell](https://redwoodjs.com/docs/cells), Redwood's data-fetching abstraction: + +``` +yarn rw generate cell examplePosts +``` + +The Storybook server should hot reload and now you'll have four stories to work with. They'll probably look a little bland since there's no styling. See if the Redwood CLI's `setup ui` command has your favorite styling library: ``` yarn rw setup ui --help @@ -87,14 +90,13 @@ yarn rw setup ui --help ## Testing with Jest -It'd be hard to scale from side project to startup without a few tests. -Redwood fully integrates Jest with the front and the backends and makes it easy to keep your whole app covered by generating test files with all your components and services: +It'd be hard to scale from side project to startup without a few tests. Redwood fully integrates Jest with both the front- and back-ends, and makes it easy to keep your whole app covered by generating test files with all your components and services: ``` yarn rw test ``` -To make the integration even more seamless, Redwood augments Jest with database [scenarios](https://redwoodjs.com/docs/testing.md#scenarios) and [GraphQL mocking](https://redwoodjs.com/docs/testing.md#mocking-graphql-calls). +To make the integration even more seamless, Redwood augments Jest with database [scenarios](https://redwoodjs.com/docs/testing#scenarios) and [GraphQL mocking](https://redwoodjs.com/docs/testing#mocking-graphql-calls). ## Ship it @@ -104,8 +106,7 @@ Redwood is designed for both serverless deploy targets like Netlify and Vercel a yarn rw setup deploy --help ``` -Don't go live without auth! -Lock down your front and backends with Redwood's built-in, database-backed authentication system ([dbAuth](https://redwoodjs.com/docs/authentication#self-hosted-auth-installation-and-setup)), or integrate with nearly a dozen third party auth providers: +Don't go live without auth! Lock down your app with Redwood's built-in, database-backed authentication system ([dbAuth](https://redwoodjs.com/docs/authentication#self-hosted-auth-installation-and-setup)), or integrate with nearly a dozen third-party auth providers: ``` yarn rw setup auth --help diff --git a/packages/create-redwood-app/templates/ts/api/package.json b/packages/create-redwood-app/templates/ts/api/package.json index e4759a5969d4..06411ebd2258 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.3", - "@redwoodjs/graphql-server": "6.0.3" + "@redwoodjs/api": "6.0.4", + "@redwoodjs/graphql-server": "6.0.4" } } diff --git a/packages/create-redwood-app/templates/ts/package.json b/packages/create-redwood-app/templates/ts/package.json index 9604d0242e0f..9046764971fb 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.3" + "@redwoodjs/core": "6.0.4" }, "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 6b563b2c5552..5b6559e56440 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.3", - "@redwoodjs/router": "6.0.3", - "@redwoodjs/web": "6.0.3", + "@redwoodjs/forms": "6.0.4", + "@redwoodjs/router": "6.0.4", + "@redwoodjs/web": "6.0.4", "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.3" + "@redwoodjs/vite": "6.0.4" } } diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 12e0b8339459..e96a3258fe4e 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/eslint-config", - "version": "6.0.3", + "version": "6.0.4", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -15,12 +15,12 @@ "@babel/core": "7.22.9", "@babel/eslint-parser": "7.22.9", "@babel/eslint-plugin": "7.22.5", - "@redwoodjs/eslint-plugin": "6.0.3", - "@redwoodjs/internal": "6.0.3", - "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/eslint-plugin": "6.0.4", + "@redwoodjs/internal": "6.0.4", + "@redwoodjs/project-config": "6.0.4", "@typescript-eslint/eslint-plugin": "5.61.0", "@typescript-eslint/parser": "5.61.0", - "eslint": "8.45.0", + "eslint": "8.46.0", "eslint-config-prettier": "8.8.0", "eslint-import-resolver-babel-module": "5.3.2", "eslint-plugin-babel": "5.3.1", diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index 08776ee52fb6..6bb1271a2863 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/eslint-plugin", - "version": "6.0.3", + "version": "6.0.4", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -22,13 +22,13 @@ }, "dependencies": { "@typescript-eslint/utils": "5.61.0", - "eslint": "8.45.0" + "eslint": "8.46.0" }, "devDependencies": { "@types/eslint": "8", "@types/estree": "1.0.1", "@typescript-eslint/parser": "5.61.0", - "esbuild": "0.18.16", + "esbuild": "0.18.19", "fast-glob": "3.3.1", "glob": "10.3.1", "typescript": "5.1.6" diff --git a/packages/fastify/package.json b/packages/fastify/package.json index 29cc2e2fde7f..dd0bc988ceaa 100644 --- a/packages/fastify/package.json +++ b/packages/fastify/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/fastify", - "version": "6.0.3", + "version": "6.0.4", "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.3", - "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/graphql-server": "6.0.4", + "@redwoodjs/project-config": "6.0.4", "ansi-colors": "4.1.3", "fast-glob": "3.3.1", "fastify": "4.21.0", @@ -34,7 +34,7 @@ "@types/aws-lambda": "8.10.119", "@types/lodash": "4.14.195", "@types/qs": "6.9.7", - "esbuild": "0.18.16", + "esbuild": "0.18.19", "typescript": "5.1.6" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/forms/package.json b/packages/forms/package.json index 56385f77ec19..13eeb9cd5a41 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/forms", - "version": "6.0.3", + "version": "6.0.4", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -25,7 +25,7 @@ "@babel/runtime-corejs3": "7.22.6", "core-js": "3.31.1", "pascalcase": "1.0.0", - "react-hook-form": "7.45.2" + "react-hook-form": "7.45.4" }, "devDependencies": { "@babel/cli": "7.22.9", diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 2eeb08b235d8..c9af71a4838a 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/graphql-server", - "version": "6.0.3", + "version": "6.0.4", "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.3", - "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/api": "6.0.4", + "@redwoodjs/project-config": "6.0.4", "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.3", + "@redwoodjs/realtime": "6.0.4", "@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 3abae6aae5fb..07471744be0f 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/internal", - "version": "6.0.3", + "version": "6.0.4", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -44,16 +44,16 @@ "@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.3", - "@redwoodjs/project-config": "6.0.3", - "@redwoodjs/router": "6.0.3", + "@redwoodjs/graphql-server": "6.0.4", + "@redwoodjs/project-config": "6.0.4", + "@redwoodjs/router": "6.0.4", "@sdl-codegen/node": "0.0.10", "babel-plugin-graphql-tag": "3.3.0", "babel-plugin-polyfill-corejs3": "0.8.3", "chalk": "4.1.2", "core-js": "3.31.1", "deepmerge": "4.3.1", - "esbuild": "0.18.16", + "esbuild": "0.18.19", "fast-glob": "3.3.1", "fs-extra": "11.1.1", "graphql": "16.7.1", diff --git a/packages/internal/src/__tests__/__snapshots__/validateSchemaForReservedNames.test.ts.snap b/packages/internal/src/__tests__/__snapshots__/validateSchemaForReservedNames.test.ts.snap new file mode 100644 index 000000000000..3f30dbda5375 --- /dev/null +++ b/packages/internal/src/__tests__/__snapshots__/validateSchemaForReservedNames.test.ts.snap @@ -0,0 +1,19 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`SDL with no reserved names used SDL is invalid because uses a reserved name as a type 1`] = ` +"The type named 'Float' is a reserved GraphQL name. +Please rename it to something more specific, like: ApplicationFloat. +" +`; + +exports[`SDL with no reserved names used because uses a reserved name as an input 1`] = ` +"The input type named 'Float' is a reserved GraphQL name. +Please rename it to something more specific, like: ApplicationFloat. +" +`; + +exports[`SDL with no reserved names used because uses a reserved name as an interface 1`] = ` +"The interface named 'Float' is a reserved GraphQL name. +Please rename it to something more specific, like: ApplicationFloat. +" +`; diff --git a/packages/internal/src/__tests__/validateSchemaForAuthDirectives.test.ts b/packages/internal/src/__tests__/validateSchemaForAuthDirectives.test.ts index 977e41b3c3b5..3d745d9e1a82 100644 --- a/packages/internal/src/__tests__/validateSchemaForAuthDirectives.test.ts +++ b/packages/internal/src/__tests__/validateSchemaForAuthDirectives.test.ts @@ -8,7 +8,7 @@ import { DocumentNode } from 'graphql' import { getPaths } from '@redwoodjs/project-config' import { - validateSchemaForDirectives, + validateSchema, DIRECTIVE_REQUIRED_ERROR_MESSAGE, DIRECTIVE_INVALID_ROLE_TYPES_ERROR_MESSAGE, } from '../validateSchema' @@ -43,7 +43,7 @@ const validateSdlFile = async (sdlFile: string) => { // Merge in the rootSchema with JSON scalars, etc. const mergedDocumentNode = mergeTypeDefs([projectDocumentNodes]) - validateSchemaForDirectives(mergedDocumentNode) + validateSchema(mergedDocumentNode) } describe('SDL uses auth directives', () => { diff --git a/packages/internal/src/__tests__/validateSchemaForReservedNames.test.ts b/packages/internal/src/__tests__/validateSchemaForReservedNames.test.ts new file mode 100644 index 000000000000..695337441c6a --- /dev/null +++ b/packages/internal/src/__tests__/validateSchemaForReservedNames.test.ts @@ -0,0 +1,177 @@ +import path from 'path' + +import { DocumentNode } from 'graphql' +import gql from 'graphql-tag' + +import { validateSchema } from '../validateSchema' + +const FIXTURE_PATH = path.resolve( + __dirname, + '../../../../__fixtures__/example-todo-main' +) + +beforeAll(() => { + process.env.RWJS_CWD = FIXTURE_PATH +}) +afterAll(() => { + delete process.env.RWJS_CWD +}) + +const validateSdlFile = async (document: DocumentNode) => { + validateSchema(document) +} + +describe('SDL with no reserved names used', () => { + describe('SDL is valid', () => { + test('with proper type definition names', async () => { + const document = gql` + type Message { + from: String + body: String + } + + type Query { + room(id: ID!): [Message!]! @skipAuth + } + + input SendMessageInput { + roomId: ID! + from: String! + body: String! + } + + type Mutation { + sendMessage(input: SendMessageInput!): Message! @skipAuth + } + ` + + await expect(validateSdlFile(document)).resolves.not.toThrowError() + }) + test('with proper interface interface definition names', async () => { + const document = gql` + interface Node { + id: ID! + } + + type Message implements Node { + id: ID! + from: String + body: String + } + + type Query { + room(id: ID!): [Message!]! @skipAuth + } + ` + await expect(validateSdlFile(document)).resolves.not.toThrowError() + }) + test('with proper interface input type definition names', async () => { + const document = gql` + type Message { + from: String + body: String + } + + type Query { + room(id: ID!): [Message!]! @skipAuth + } + + input SendMessageInput { + roomId: ID! + from: String! + body: String! + } + + type Mutation { + sendMessage(input: SendMessageInput!): Message! @skipAuth + } + ` + await expect(validateSdlFile(document)).resolves.not.toThrowError() + }) + }) + + describe('SDL is invalid', () => { + test('because uses a reserved name as a type', async () => { + const document = gql` + type Float { + from: String + body: String + } + + type Query { + room(id: ID!): [Message!]! @skipAuth + } + + input SendMessageInput { + roomId: ID! + from: String! + body: String! + } + + type Mutation { + sendMessage(input: SendMessageInput!): Message! @skipAuth + } + ` + await expect( + validateSdlFile(document) + ).rejects.toThrowErrorMatchingSnapshot() + }) + }) + + test('because uses a reserved name as an input', async () => { + const document = gql` + type Message { + from: String + body: String + } + + type Query { + room(id: ID!): [Message!]! @skipAuth + } + + input Float { + roomId: ID! + from: String! + body: String! + } + + type Mutation { + sendMessage(input: SendMessageInput!): Message! @skipAuth + } + ` + await expect( + validateSdlFile(document) + ).rejects.toThrowErrorMatchingSnapshot() + }) + + test('because uses a reserved name as an interface', async () => { + const document = gql` + interface Float { + id: ID! + } + + type Message implements Float { + id: ID! + from: String + body: String + } + + type Query { + room(id: ID!): [Message!]! @skipAuth + } + + input SendMessageInput { + roomId: ID! + from: String! + body: String! + } + + type Mutation { + sendMessage(input: SendMessageInput!): Message! @skipAuth + } + ` + await expect( + validateSdlFile(document) + ).rejects.toThrowErrorMatchingSnapshot() + }) +}) diff --git a/packages/internal/src/project.ts b/packages/internal/src/project.ts index c1607d7341cd..d16a458e536c 100644 --- a/packages/internal/src/project.ts +++ b/packages/internal/src/project.ts @@ -29,3 +29,29 @@ export const getTsConfigs = () => { web: webTsConfig?.config ?? null, } } + +export const isTypeScriptProject = () => { + const paths = getPaths() + return ( + fs.existsSync(path.join(paths.web.base, 'tsconfig.json')) || + fs.existsSync(path.join(paths.api.base, 'tsconfig.json')) + ) +} + +export const isServerFileSetup = () => { + const serverFilePath = path.join( + getPaths().api.src, + `server.${isTypeScriptProject() ? 'ts' : 'js'}` + ) + + return fs.existsSync(serverFilePath) +} + +export const isRealtimeSetup = () => { + const realtimePath = path.join( + getPaths().api.lib, + `realtime.${isTypeScriptProject() ? 'ts' : 'js'}` + ) + + return fs.existsSync(realtimePath) +} diff --git a/packages/internal/src/validateSchema.ts b/packages/internal/src/validateSchema.ts index 613ccf2ee437..83c525005b1f 100644 --- a/packages/internal/src/validateSchema.ts +++ b/packages/internal/src/validateSchema.ts @@ -6,20 +6,74 @@ import { DocumentNode, Kind, ObjectTypeDefinitionNode, visit } from 'graphql' import { rootSchema } from '@redwoodjs/graphql-server' import { getPaths } from '@redwoodjs/project-config' +import { isServerFileSetup, isRealtimeSetup } from './project' + export const DIRECTIVE_REQUIRED_ERROR_MESSAGE = 'You must specify one of @requireAuth, @skipAuth or a custom directive' export const DIRECTIVE_INVALID_ROLE_TYPES_ERROR_MESSAGE = 'Please check that the requireAuth roles is a string or an array of strings.' -export function validateSchemaForDirectives( + +/** + * These are names that are commonly used in GraphQL schemas as scalars + * and would cause a conflict if used as a type name. + * + * Note: Query, Mutation, and Subscription are not included here because + * they are checked for separately. + */ +export const RESERVED_TYPES = [ + 'Int', + 'Float', + 'Boolean', + 'String', + 'DateTime', + 'ID', + 'uid', + 'as', +] + +export function validateSchema( schemaDocumentNode: DocumentNode, - typesToCheck: string[] = ['Query', 'Mutation', 'Subscription'] + typesToCheck: string[] = ['Query', 'Mutation'] ) { const validationOutput: string[] = [] + const reservedNameValidationOutput: Record = [] const directiveRoleValidationOutput: Record = [] + // Is Subscriptions are enabled with Redwood Realtime, then enforce a rule + // that a Subscription type needs to have a authentication directive applied, + // just as Query and Mutation requires + if (isServerFileSetup() && isRealtimeSetup()) { + typesToCheck.push('Subscription') + } + visit(schemaDocumentNode, { + InterfaceTypeDefinition(typeNode) { + // Warn that an interface definition in the SDL is using a reserved GraphQL type + if (RESERVED_TYPES.includes(typeNode.name.value)) { + reservedNameValidationOutput.push({ + objectType: 'interface', + name: typeNode.name.value, + }) + } + }, + InputObjectTypeDefinition(typeNode) { + // Warn that an input definition in the SDL is using a reserved GraphQL type + if (RESERVED_TYPES.includes(typeNode.name.value)) { + reservedNameValidationOutput.push({ + objectType: 'input type', + name: typeNode.name.value, + }) + } + }, ObjectTypeDefinition(typeNode) { + // Warn that a type definition in the SDL is using a reserved GraphQL type + if (RESERVED_TYPES.includes(typeNode.name.value)) { + reservedNameValidationOutput.push({ + objectType: 'type', + name: typeNode.name.value, + }) + } if (typesToCheck.includes(typeNode.name.value)) { for (const field of typeNode.fields || ([] as ObjectTypeDefinitionNode[])) { @@ -102,6 +156,15 @@ export function validateSchemaForDirectives( )} \n\nFor example: @requireAuth(roles: "admin") or @requireAuth(roles: ["admin", "editor"])` ) } + + if (reservedNameValidationOutput.length > 0) { + const reservedNameMsg = reservedNameValidationOutput.map( + (output: Record) => { + return `The ${output.objectType} named '${output.name}' is a reserved GraphQL name.\nPlease rename it to something more specific, like: Application${output.name}.\n` + } + ) + throw new TypeError(reservedNameMsg.join('\n')) + } } export const loadAndValidateSdls = async () => { @@ -137,5 +200,5 @@ export const loadAndValidateSdls = async () => { projectDocumentNodes, ]) - validateSchemaForDirectives(mergedDocumentNode) + validateSchema(mergedDocumentNode) } diff --git a/packages/prerender/package.json b/packages/prerender/package.json index 5da98fc05955..e0f0c1efb606 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/prerender", - "version": "6.0.3", + "version": "6.0.4", "description": "RedwoodJS prerender", "repository": { "type": "git", @@ -25,12 +25,12 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.22.6", - "@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", + "@redwoodjs/auth": "6.0.4", + "@redwoodjs/internal": "6.0.4", + "@redwoodjs/project-config": "6.0.4", + "@redwoodjs/router": "6.0.4", + "@redwoodjs/structure": "6.0.4", + "@redwoodjs/web": "6.0.4", "@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 a580933e2903..f332870989c3 100644 --- a/packages/project-config/package.json +++ b/packages/project-config/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/project-config", - "version": "6.0.3", + "version": "6.0.4", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -29,7 +29,7 @@ "string-env-interpolation": "1.0.1" }, "devDependencies": { - "esbuild": "0.18.16", + "esbuild": "0.18.19", "jest": "29.6.1", "rimraf": "5.0.1", "typescript": "5.1.6" diff --git a/packages/realtime/package.json b/packages/realtime/package.json index 903c5b47071f..8309bb542af8 100644 --- a/packages/realtime/package.json +++ b/packages/realtime/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/realtime", - "version": "6.0.3", + "version": "6.0.4", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -37,7 +37,7 @@ "@envelop/core": "4.0.0", "@envelop/testing": "6.0.0", "@envelop/types": "4.0.0", - "esbuild": "0.18.16", + "esbuild": "0.18.19", "jest": "29.6.1", "nodemon": "2.0.22", "typescript": "5.1.6" diff --git a/packages/record/package.json b/packages/record/package.json index c4aefd9a3caf..38d18f9673c2 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/record", - "version": "6.0.3", + "version": "6.0.4", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -29,14 +29,14 @@ "dependencies": { "@babel/runtime-corejs3": "7.22.6", "@prisma/client": "5.1.0", - "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/project-config": "6.0.4", "core-js": "3.31.1" }, "devDependencies": { "@babel/cli": "7.22.9", "@babel/core": "7.22.9", "@prisma/internals": "5.1.0", - "esbuild": "0.18.16", + "esbuild": "0.18.19", "jest": "29.6.1" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/router/package.json b/packages/router/package.json index 9495268cc24c..7677bdd0d406 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/router", - "version": "6.0.3", + "version": "6.0.4", "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.3", + "@redwoodjs/auth": "6.0.4", "core-js": "3.31.1" }, "devDependencies": { diff --git a/packages/router/src/__tests__/routeScrollReset.test.tsx b/packages/router/src/__tests__/routeScrollReset.test.tsx new file mode 100644 index 000000000000..bf9475f62b0e --- /dev/null +++ b/packages/router/src/__tests__/routeScrollReset.test.tsx @@ -0,0 +1,93 @@ +import React from 'react' + +import '@testing-library/jest-dom/extend-expect' +import { act, cleanup, render, screen } from '@testing-library/react' + +import { navigate } from '../history' +import { Route, Router, routes } from '../router' + +describe('Router scroll reset', () => { + const Page1 = () =>
Page 1
+ const Page2 = () =>
Page 2
+ const TestRouter = () => ( + + + + + ) + + // Redfine the mocks here again (already done in jest.setup) + // Otherwise the mock doesn't clear for some reason + globalThis.scrollTo = jest.fn() + + beforeEach(async () => { + ;(globalThis.scrollTo as jest.Mock).mockClear() + render() + + // Make sure we're starting on the home route + await screen.getByText('Page 1') + }) + + afterEach(async () => { + // @NOTE: for some reason, the Router state does not reset between renders + act(() => navigate('/')) + cleanup() + }) + + it('resets on location/path change', async () => { + act(() => + navigate( + // @ts-expect-error - AvailableRoutes built in project only + routes.page2() + ) + ) + + await screen.getByText('Page 2') + + expect(globalThis.scrollTo).toHaveBeenCalledTimes(1) + }) + + it('resets on location/path and queryChange change', async () => { + act(() => + navigate( + // @ts-expect-error - AvailableRoutes built in project only + routes.page2({ + tab: 'three', + }) + ) + ) + + await screen.getByText('Page 2') + + expect(globalThis.scrollTo).toHaveBeenCalledTimes(1) + }) + + it('resets scroll on query params (search) change on the same page', async () => { + act(() => + // We're staying on page 1, but changing the query params + navigate( + // @ts-expect-error - AvailableRoutes built in project only + routes.page1({ + queryParam1: 'foo', + }) + ) + ) + + await screen.getByText('Page 1') + + expect(globalThis.scrollTo).toHaveBeenCalledTimes(1) + }) + + it('does NOT reset on hash change', async () => { + await screen.getByText('Page 1') + + act(() => + // Stay on page 1, but change the hash + navigate(`#route=66`, { replace: true }) + ) + + await screen.getByText('Page 1') + + expect(globalThis.scrollTo).not.toHaveBeenCalled() + }) +}) diff --git a/packages/router/src/active-route-loader.tsx b/packages/router/src/active-route-loader.tsx index 61e6cf6190eb..cacbee622dd1 100644 --- a/packages/router/src/active-route-loader.tsx +++ b/packages/router/src/active-route-loader.tsx @@ -70,8 +70,6 @@ export const ActiveRouteLoader = ({ return } - globalThis?.scrollTo(0, 0) - if (announcementRef.current) { announcementRef.current.innerText = getAnnouncement() } diff --git a/packages/router/src/location.tsx b/packages/router/src/location.tsx index bccad5cdff37..4719abeaebeb 100644 --- a/packages/router/src/location.tsx +++ b/packages/router/src/location.tsx @@ -11,24 +11,32 @@ export interface LocationContextType { const LocationContext = createNamedContext('Location') +interface Location { + pathname: string + search?: string + hash?: string +} interface LocationProviderProps { - location?: { - pathname: string - search?: string - hash?: string - } + location?: Location trailingSlashes?: TrailingSlashesTypes children?: React.ReactNode } -class LocationProvider extends React.Component { +interface LocationProviderState { + context: Location +} + +class LocationProvider extends React.Component< + LocationProviderProps, + LocationProviderState +> { // When prerendering, there might be more than one level of location // providers. Use the values from the one above. static contextType = LocationContext declare context: React.ContextType HISTORY_LISTENER_ID: string | undefined = undefined - state = { + state: LocationProviderState = { context: this.getContext(), } @@ -82,7 +90,17 @@ class LocationProvider extends React.Component { componentDidMount() { this.HISTORY_LISTENER_ID = gHistory.listen(() => { - this.setState(() => ({ context: this.getContext() })) + const context = this.getContext() + this.setState((lastState) => { + if ( + context.pathname !== lastState.context.pathname || + context.search !== lastState.context.search + ) { + globalThis?.scrollTo(0, 0) + } + + return { context } + }) }) } diff --git a/packages/router/src/util.ts b/packages/router/src/util.ts index ebb2188e2fcf..5b22dcf56e5d 100644 --- a/packages/router/src/util.ts +++ b/packages/router/src/util.ts @@ -122,7 +122,7 @@ type SupportedRouterParamTypes = keyof typeof coreParamTypes * => { match: true, params: {} } */ export function matchPath( - route: string, + routeDefinition: string, pathname: string, { userParamTypes, @@ -138,10 +138,11 @@ export function matchPath( // Get the names and the transform types for the given route. const allParamTypes = { ...coreParamTypes, ...userParamTypes } - const { matchRegex, routeParams } = getRouteRegexAndParams(route, { - matchSubPaths, - allParamTypes, - }) + const { matchRegex, routeParams: routeParamsDefinition } = + getRouteRegexAndParams(routeDefinition, { + matchSubPaths, + allParamTypes, + }) // Does the `pathname` match the route? const matches = [...pathname.matchAll(matchRegex)] @@ -151,10 +152,12 @@ export function matchPath( } // Map extracted values to their param name, casting the value if needed const providedParams = matches[0].slice(1) - if (routeParams.length > 0) { + + // @NOTE: refers to definiton e.g. '/page/{id}', not the actual params + if (routeParamsDefinition.length > 0) { const params = providedParams.reduce>( (acc, value, index) => { - const [name, transformName] = routeParams[index] + const [name, transformName] = routeParamsDefinition[index] const typeInfo = allParamTypes[transformName as SupportedRouterParamTypes] diff --git a/packages/structure/package.json b/packages/structure/package.json index affebf580075..6beb4a9f5f72 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/structure", - "version": "6.0.3", + "version": "6.0.4", "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.3", + "@redwoodjs/project-config": "6.0.4", "@types/line-column": "1.0.0", "camelcase": "6.3.0", "core-js": "3.31.1", diff --git a/packages/studio/frontend/package.json b/packages/studio/frontend/package.json index 7faad7e84e2f..cf820dc685e8 100644 --- a/packages/studio/frontend/package.json +++ b/packages/studio/frontend/package.json @@ -44,6 +44,6 @@ "postcss": "8.4.27", "tailwindcss": "3.3.2", "typescript": "5.1.6", - "vite": "4.4.8" + "vite": "4.4.9" } } diff --git a/packages/studio/package.json b/packages/studio/package.json index 25f7ca11cf4a..b80667bf60ab 100644 --- a/packages/studio/package.json +++ b/packages/studio/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/studio", - "version": "6.0.3", + "version": "6.0.4", "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.3", - "@redwoodjs/project-config": "6.0.3", + "@redwoodjs/internal": "6.0.4", + "@redwoodjs/project-config": "6.0.4", "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 c540c4188a06..7f016b2996e1 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/telemetry", - "version": "6.0.3", + "version": "6.0.4", "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.3", - "@redwoodjs/structure": "6.0.3", + "@redwoodjs/project-config": "6.0.4", + "@redwoodjs/structure": "6.0.4", "@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 2ce24320eb3f..9dad5067b2c2 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/testing", - "version": "6.0.3", + "version": "6.0.4", "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.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", + "@redwoodjs/auth": "6.0.4", + "@redwoodjs/graphql-server": "6.0.4", + "@redwoodjs/internal": "6.0.4", + "@redwoodjs/project-config": "6.0.4", + "@redwoodjs/router": "6.0.4", + "@redwoodjs/web": "6.0.4", "@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 810de8bdda81..fe8a8bbf7407 100644 --- a/packages/tui/package.json +++ b/packages/tui/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/tui", - "version": "6.0.3", + "version": "6.0.4", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -33,7 +33,7 @@ "stdout-update": "1.6.8" }, "devDependencies": { - "esbuild": "0.18.16", + "esbuild": "0.18.19", "jest": "29.6.1", "typescript": "5.1.6" } diff --git a/packages/vite/package.json b/packages/vite/package.json index a168e5152db3..f8d2dbfffb07 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/vite", - "version": "6.0.3", + "version": "6.0.4", "description": "Vite configuration package for Redwood", "repository": { "type": "git", @@ -64,9 +64,9 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.22.6", - "@redwoodjs/internal": "6.0.3", - "@redwoodjs/project-config": "6.0.3", - "@redwoodjs/web": "6.0.3", + "@redwoodjs/internal": "6.0.4", + "@redwoodjs/project-config": "6.0.4", + "@redwoodjs/web": "6.0.4", "@swc/core": "1.3.60", "@vitejs/plugin-react": "4.0.4", "acorn-loose": "8.3.0", @@ -78,7 +78,7 @@ "isbot": "3.6.8", "react": "18.3.0-canary-035a41c4e-20230704", "react-server-dom-webpack": "18.3.0-canary-035a41c4e-20230704", - "vite": "4.4.8", + "vite": "4.4.9", "yargs-parser": "21.1.1" }, "devDependencies": { diff --git a/packages/web-server/package.json b/packages/web-server/package.json index b5d9caa044de..e06b868b8846 100644 --- a/packages/web-server/package.json +++ b/packages/web-server/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/web-server", - "version": "6.0.3", + "version": "6.0.4", "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.3", + "@redwoodjs/project-config": "6.0.4", "chalk": "4.1.2", "dotenv-defaults": "5.0.2", "fast-glob": "3.3.1", @@ -34,7 +34,7 @@ }, "devDependencies": { "@types/yargs-parser": "21.0.0", - "esbuild": "0.18.16", + "esbuild": "0.18.19", "typescript": "5.1.6" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/web/package.json b/packages/web/package.json index 6f419541cf3d..302acb1fe6fc 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/web", - "version": "6.0.3", + "version": "6.0.4", "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.3", + "@redwoodjs/auth": "6.0.4", "core-js": "3.31.1", "graphql": "16.7.1", "graphql-tag": "2.12.6", diff --git a/tasks/test-project/rebuild-test-project-fixture.js b/tasks/test-project/rebuild-test-project-fixture.js index 1d26ecc07a9d..c4363c45689b 100755 --- a/tasks/test-project/rebuild-test-project-fixture.js +++ b/tasks/test-project/rebuild-test-project-fixture.js @@ -297,22 +297,6 @@ async function runCommand() { await tuiTask({ step: 1, - title: 'Temporary (v6): Add storybook and vite canary to web dependencies', - content: - 'Adding storybook and @redwoodjs/vite@6.0.0-canary.450\n' + - ' ⏱ This could take a while...', - task: () => { - return exec( - 'yarn', - ['workspace web add -D storybook @redwoodjs/vite@6.0.0-canary.450'], - getExecaOptions(OUTPUT_PROJECT_PATH) - ) - }, - skip: skipStep(startStep, 1), - }) - - await tuiTask({ - step: 2, title: '[link] Building Redwood framework', content: 'yarn build:clean && yarn build', task: async () => { @@ -322,11 +306,11 @@ async function runCommand() { getExecaOptions(RW_FRAMEWORKPATH) ) }, - skip: skipStep(startStep, 2), + skip: skipStep(startStep, 1), }) await tuiTask({ - step: 3, + step: 2, title: '[link] Adding framework dependencies to project', content: 'Adding framework dependencies to project...', task: () => { @@ -336,21 +320,21 @@ async function runCommand() { 'pipe' // TODO: Remove this when everything is using @rwjs/tui ) }, - skip: skipStep(startStep, 3), + skip: skipStep(startStep, 2), }) await tuiTask({ - step: 4, + step: 3, title: 'Installing node_modules', content: 'yarn install', task: () => { return exec('yarn install', getExecaOptions(OUTPUT_PROJECT_PATH)) }, - skip: skipStep(startStep, 4), + skip: skipStep(startStep, 3), }) await tuiTask({ - step: 5, + step: 4, title: 'Updating ports in redwood.toml...', task: () => { // We do this, to make it easier to run multiple test projects in parallel @@ -373,11 +357,11 @@ async function runCommand() { fs.writeFileSync(REDWOOD_TOML_PATH, newRedwoodToml) }, - skip: skipStep(startStep, 5), + skip: skipStep(startStep, 4), }) await tuiTask({ - step: 6, + step: 5, title: '[link] Copying framework packages to project', task: () => { return copyFrameworkPackages( @@ -386,12 +370,12 @@ async function runCommand() { 'pipe' ) }, - skip: skipStep(startStep, 6), + skip: skipStep(startStep, 5), }) // Note that we undo this at the end await tuiTask({ - step: 7, + step: 6, title: '[link] Add rwfw project:copy postinstall', task: () => { return updatePkgJsonScripts({ @@ -401,33 +385,33 @@ async function runCommand() { }, }) }, - skip: skipStep(startStep, 7), + skip: skipStep(startStep, 6), }) await tuiTask({ - step: 8, + step: 7, title: 'Apply web codemods', task: () => { return webTasks(OUTPUT_PROJECT_PATH, { linkWithLatestFwBuild: true, }) }, - skip: skipStep(startStep, 8), + skip: skipStep(startStep, 7), }) await tuiTask({ - step: 9, + step: 8, title: 'Apply api codemods', task: () => { return apiTasks(OUTPUT_PROJECT_PATH, { linkWithLatestFwBuild: true, }) }, - skip: skipStep(startStep, 9), + skip: skipStep(startStep, 8), }) await tuiTask({ - step: 10, + step: 9, title: 'Running prisma migrate reset', task: () => { return exec( @@ -436,11 +420,11 @@ async function runCommand() { getExecaOptions(OUTPUT_PROJECT_PATH) ) }, - skip: skipStep(startStep, 10), + skip: skipStep(startStep, 9), }) await tuiTask({ - step: 11, + step: 10, title: 'Lint --fix all the things', task: async () => { try { @@ -469,11 +453,11 @@ async function runCommand() { } } }, - skip: skipStep(startStep, 11), + skip: skipStep(startStep, 10), }) await tuiTask({ - step: 12, + step: 11, title: 'Replace and Cleanup Fixture', task: async () => { // @TODO: This only works on UNIX, we should use path.join everywhere @@ -507,11 +491,11 @@ async function runCommand() { // then removes new Project temp directory await copyProject() }, - skip: skipStep(startStep, 12), + skip: skipStep(startStep, 11), }) await tuiTask({ - step: 13, + step: 12, title: 'All done!', task: () => { console.log('-'.repeat(30)) diff --git a/yarn.lock b/yarn.lock index a7aa1341bbf2..387dfc410968 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2627,9 +2627,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/android-arm64@npm:0.18.16" +"@esbuild/android-arm64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/android-arm64@npm:0.18.19" conditions: os=android & cpu=arm64 languageName: node linkType: hard @@ -2641,9 +2641,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/android-arm@npm:0.18.16" +"@esbuild/android-arm@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/android-arm@npm:0.18.19" conditions: os=android & cpu=arm languageName: node linkType: hard @@ -2655,9 +2655,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-x64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/android-x64@npm:0.18.16" +"@esbuild/android-x64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/android-x64@npm:0.18.19" conditions: os=android & cpu=x64 languageName: node linkType: hard @@ -2669,9 +2669,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/darwin-arm64@npm:0.18.16" +"@esbuild/darwin-arm64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/darwin-arm64@npm:0.18.19" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -2683,9 +2683,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/darwin-x64@npm:0.18.16" +"@esbuild/darwin-x64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/darwin-x64@npm:0.18.19" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -2697,9 +2697,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/freebsd-arm64@npm:0.18.16" +"@esbuild/freebsd-arm64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/freebsd-arm64@npm:0.18.19" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard @@ -2711,9 +2711,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/freebsd-x64@npm:0.18.16" +"@esbuild/freebsd-x64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/freebsd-x64@npm:0.18.19" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard @@ -2725,9 +2725,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/linux-arm64@npm:0.18.16" +"@esbuild/linux-arm64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/linux-arm64@npm:0.18.19" conditions: os=linux & cpu=arm64 languageName: node linkType: hard @@ -2739,9 +2739,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/linux-arm@npm:0.18.16" +"@esbuild/linux-arm@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/linux-arm@npm:0.18.19" conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -2753,9 +2753,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/linux-ia32@npm:0.18.16" +"@esbuild/linux-ia32@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/linux-ia32@npm:0.18.19" conditions: os=linux & cpu=ia32 languageName: node linkType: hard @@ -2767,9 +2767,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/linux-loong64@npm:0.18.16" +"@esbuild/linux-loong64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/linux-loong64@npm:0.18.19" conditions: os=linux & cpu=loong64 languageName: node linkType: hard @@ -2781,9 +2781,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/linux-mips64el@npm:0.18.16" +"@esbuild/linux-mips64el@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/linux-mips64el@npm:0.18.19" conditions: os=linux & cpu=mips64el languageName: node linkType: hard @@ -2795,9 +2795,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/linux-ppc64@npm:0.18.16" +"@esbuild/linux-ppc64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/linux-ppc64@npm:0.18.19" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard @@ -2809,9 +2809,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/linux-riscv64@npm:0.18.16" +"@esbuild/linux-riscv64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/linux-riscv64@npm:0.18.19" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard @@ -2823,9 +2823,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/linux-s390x@npm:0.18.16" +"@esbuild/linux-s390x@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/linux-s390x@npm:0.18.19" conditions: os=linux & cpu=s390x languageName: node linkType: hard @@ -2837,9 +2837,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/linux-x64@npm:0.18.16" +"@esbuild/linux-x64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/linux-x64@npm:0.18.19" conditions: os=linux & cpu=x64 languageName: node linkType: hard @@ -2851,9 +2851,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/netbsd-x64@npm:0.18.16" +"@esbuild/netbsd-x64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/netbsd-x64@npm:0.18.19" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard @@ -2865,9 +2865,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/openbsd-x64@npm:0.18.16" +"@esbuild/openbsd-x64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/openbsd-x64@npm:0.18.19" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard @@ -2879,9 +2879,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/sunos-x64@npm:0.18.16" +"@esbuild/sunos-x64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/sunos-x64@npm:0.18.19" conditions: os=sunos & cpu=x64 languageName: node linkType: hard @@ -2893,9 +2893,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/win32-arm64@npm:0.18.16" +"@esbuild/win32-arm64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/win32-arm64@npm:0.18.19" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -2907,9 +2907,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/win32-ia32@npm:0.18.16" +"@esbuild/win32-ia32@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/win32-ia32@npm:0.18.19" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard @@ -2921,9 +2921,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.18.16": - version: 0.18.16 - resolution: "@esbuild/win32-x64@npm:0.18.16" +"@esbuild/win32-x64@npm:0.18.19": + version: 0.18.19 + resolution: "@esbuild/win32-x64@npm:0.18.19" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -3066,16 +3066,16 @@ __metadata: languageName: node linkType: hard -"@eslint-community/regexpp@npm:^4.4.0": - version: 4.5.1 - resolution: "@eslint-community/regexpp@npm:4.5.1" - checksum: d79cbd99cc4dcfbb17e8dd30a30bb5aec5da9c60b9471043f886f116615bb15f0d417cb0ca638cefedba0b4c67c339e2011b53d88264a4540775f042a5879e01 +"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.6.1": + version: 4.6.2 + resolution: "@eslint-community/regexpp@npm:4.6.2" + checksum: da800788298f8419f4c4e04eaa4e3c97e7f57537e822e7b150de662e420e3d437816b863e490807bd0b00e715b0989f9d8864bf54357cbcfa84e4255b910789d languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.1.0": - version: 2.1.0 - resolution: "@eslint/eslintrc@npm:2.1.0" +"@eslint/eslintrc@npm:^2.1.1": + version: 2.1.1 + resolution: "@eslint/eslintrc@npm:2.1.1" dependencies: ajv: ^6.12.4 debug: ^4.3.2 @@ -3086,14 +3086,14 @@ __metadata: js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: 6ffbc3e7867b377754492539af0e2f5b55645a2c67279a70508fe09080bc76d49ba64b579e59a2a04014f84d0768301736fbcdd94c7b3ad4f0e648c32bf21e43 + checksum: 104ec8997206eabc87de84b87a2852efce0ff98730d377061734da2554c79c9b6d417fbe66248ef5566a0501ef41fddec3a00f79b77731102903586a63b2ed34 languageName: node linkType: hard -"@eslint/js@npm:8.44.0": - version: 8.44.0 - resolution: "@eslint/js@npm:8.44.0" - checksum: ce7b966f8804228e4d5725d44d3c8fb7fc427176f077401323a02e082f628d207133a25704330e610ebe3254fdf1acb186f779d1242fd145a758fdcc4486a660 +"@eslint/js@npm:^8.46.0": + version: 8.46.0 + resolution: "@eslint/js@npm:8.46.0" + checksum: 674c5800e4e9829322aa84195b23c59db326cb42190ac0284bdfe70b2442d544837f3006d8d8c166afaa86ab7072df1b77f7fdb43a60aa2bb1ede90d82e38540 languageName: node linkType: hard @@ -5496,12 +5496,12 @@ __metadata: languageName: node linkType: hard -"@nrwl/nx-cloud@npm:16.0.5": - version: 16.0.5 - resolution: "@nrwl/nx-cloud@npm:16.0.5" +"@nrwl/nx-cloud@npm:16.2.0": + version: 16.2.0 + resolution: "@nrwl/nx-cloud@npm:16.2.0" dependencies: - nx-cloud: 16.0.5 - checksum: 3d3d5900026a2984ddd6d7d5962a5c8ed1bc84fb7ea52268604d5b05cf77cca8757edf42ddacf774ca778937c133f94ab330e968296a4b0f14a962b9f9fc9f4e + nx-cloud: 16.2.0 + checksum: f64edb06a6567e764812105b7ee440f3d2828bf946813cf630e443a0e72ea8017203f347c1d916026af8522021f36e47be8dc8374847fd89e9c678ae32bc427a languageName: node linkType: hard @@ -7248,7 +7248,7 @@ __metadata: languageName: node linkType: hard -"@redwoodjs/api-server@6.0.3, @redwoodjs/api-server@workspace:packages/api-server": +"@redwoodjs/api-server@6.0.4, @redwoodjs/api-server@workspace:packages/api-server": version: 0.0.0-use.local resolution: "@redwoodjs/api-server@workspace:packages/api-server" dependencies: @@ -7259,7 +7259,7 @@ __metadata: "@fastify/http-proxy": 9.2.1 "@fastify/static": 6.10.2 "@fastify/url-data": 5.3.1 - "@redwoodjs/project-config": 6.0.3 + "@redwoodjs/project-config": 6.0.4 "@types/aws-lambda": 8.10.119 "@types/lodash": 4.14.195 "@types/qs": 6.9.7 @@ -7289,7 +7289,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/api@6.0.3, @redwoodjs/api@workspace:packages/api": +"@redwoodjs/api@6.0.4, @redwoodjs/api@workspace:packages/api": version: 0.0.0-use.local resolution: "@redwoodjs/api@workspace:packages/api" dependencies: @@ -7309,7 +7309,7 @@ __metadata: jsonwebtoken: 9.0.0 memjs: 1.3.1 pascalcase: 1.0.0 - pino: 8.14.1 + pino: 8.15.0 redis: 4.6.7 split2: 4.2.0 title-case: 3.0.3 @@ -7338,7 +7338,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/api": 6.0.3 + "@redwoodjs/api": 6.0.4 "@types/jsonwebtoken": 9.0.2 core-js: 3.31.1 jest: 29.6.1 @@ -7355,7 +7355,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/cli-helpers": 6.0.3 + "@redwoodjs/cli-helpers": 6.0.4 "@types/yargs": 17.0.24 core-js: 3.31.1 jest: 29.6.1 @@ -7371,7 +7371,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/auth": 6.0.3 + "@redwoodjs/auth": 6.0.4 "@types/react": 18.2.14 core-js: 3.31.1 jest: 29.6.1 @@ -7389,7 +7389,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/api": 6.0.3 + "@redwoodjs/api": 6.0.4 "@types/aws-lambda": 8.10.119 "@types/jsonwebtoken": 9.0.2 core-js: 3.31.1 @@ -7407,7 +7407,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/cli-helpers": 6.0.3 + "@redwoodjs/cli-helpers": 6.0.4 "@types/yargs": 17.0.24 core-js: 3.31.1 jest: 29.6.1 @@ -7423,7 +7423,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/auth": 6.0.3 + "@redwoodjs/auth": 6.0.4 "@types/netlify-identity-widget": 1.9.3 "@types/react": 18.2.14 core-js: 3.31.1 @@ -7443,7 +7443,7 @@ __metadata: "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 "@clerk/clerk-sdk-node": 4.10.15 - "@redwoodjs/api": 6.0.3 + "@redwoodjs/api": 6.0.4 "@types/aws-lambda": 8.10.119 core-js: 3.31.1 jest: 29.6.1 @@ -7458,7 +7458,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/cli-helpers": 6.0.3 + "@redwoodjs/cli-helpers": 6.0.4 "@types/yargs": 17.0.24 core-js: 3.31.1 jest: 29.6.1 @@ -7475,7 +7475,7 @@ __metadata: "@babel/runtime-corejs3": 7.22.6 "@clerk/clerk-react": 4.22.0 "@clerk/types": 3.46.1 - "@redwoodjs/auth": 6.0.3 + "@redwoodjs/auth": 6.0.4 "@types/react": 18.2.14 core-js: 3.31.1 jest: 29.6.1 @@ -7493,7 +7493,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/cli-helpers": 6.0.3 + "@redwoodjs/cli-helpers": 6.0.4 "@types/yargs": 17.0.24 core-js: 3.31.1 jest: 29.6.1 @@ -7508,7 +7508,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/api": 6.0.3 + "@redwoodjs/api": 6.0.4 "@simplewebauthn/server": 7.3.1 "@types/crypto-js": 4.1.1 "@types/md5": 2.3.2 @@ -7530,7 +7530,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/cli-helpers": 6.0.3 + "@redwoodjs/cli-helpers": 6.0.4 "@simplewebauthn/browser": 7.2.0 "@simplewebauthn/typescript-types": 7.0.0 "@types/secure-random-password": 0.2.1 @@ -7551,7 +7551,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/auth": 6.0.3 + "@redwoodjs/auth": 6.0.4 "@simplewebauthn/browser": 7.2.0 "@simplewebauthn/typescript-types": 7.0.0 "@types/react": 18.2.14 @@ -7569,7 +7569,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/api": 6.0.3 + "@redwoodjs/api": 6.0.4 "@types/aws-lambda": 8.10.119 core-js: 3.31.1 firebase-admin: 11.10.1 @@ -7585,7 +7585,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/cli-helpers": 6.0.3 + "@redwoodjs/cli-helpers": 6.0.4 "@types/yargs": 17.0.24 core-js: 3.31.1 jest: 29.6.1 @@ -7600,7 +7600,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/auth": 6.0.3 + "@redwoodjs/auth": 6.0.4 "@types/react": 18.2.14 core-js: 3.31.1 firebase: 10.1.0 @@ -7619,7 +7619,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/api": 6.0.3 + "@redwoodjs/api": 6.0.4 "@types/aws-lambda": 8.10.119 "@types/jsonwebtoken": 9.0.2 core-js: 3.31.1 @@ -7636,7 +7636,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/cli-helpers": 6.0.3 + "@redwoodjs/cli-helpers": 6.0.4 "@types/yargs": 17.0.24 core-js: 3.31.1 jest: 29.6.1 @@ -7651,7 +7651,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/auth": 6.0.3 + "@redwoodjs/auth": 6.0.4 "@types/netlify-identity-widget": 1.9.3 "@types/react": 18.2.14 core-js: 3.31.1 @@ -7670,7 +7670,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/api": 6.0.3 + "@redwoodjs/api": 6.0.4 "@types/aws-lambda": 8.10.119 "@types/jsonwebtoken": 9.0.2 core-js: 3.31.1 @@ -7687,7 +7687,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/cli-helpers": 6.0.3 + "@redwoodjs/cli-helpers": 6.0.4 "@types/yargs": 17.0.24 core-js: 3.31.1 jest: 29.6.1 @@ -7720,7 +7720,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/api": 6.0.3 + "@redwoodjs/api": 6.0.4 "@types/jsonwebtoken": 9.0.2 core-js: 3.31.1 jest: 29.6.1 @@ -7739,7 +7739,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/cli-helpers": 6.0.3 + "@redwoodjs/cli-helpers": 6.0.4 "@types/yargs": 17.0.24 core-js: 3.31.1 jest: 29.6.1 @@ -7754,7 +7754,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/auth": 6.0.3 + "@redwoodjs/auth": 6.0.4 "@types/react": 18.2.14 core-js: 3.31.1 jest: 29.6.1 @@ -7766,7 +7766,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/auth@6.0.3, @redwoodjs/auth@workspace:packages/auth": +"@redwoodjs/auth@6.0.4, @redwoodjs/auth@workspace:packages/auth": version: 0.0.0-use.local resolution: "@redwoodjs/auth@workspace:packages/auth" dependencies: @@ -7783,7 +7783,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/cli-helpers@6.0.3, @redwoodjs/cli-helpers@workspace:packages/cli-helpers": +"@redwoodjs/cli-helpers@6.0.4, @redwoodjs/cli-helpers@workspace:packages/cli-helpers": version: 0.0.0-use.local resolution: "@redwoodjs/cli-helpers@workspace:packages/cli-helpers" dependencies: @@ -7791,8 +7791,8 @@ __metadata: "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 "@opentelemetry/api": 1.4.1 - "@redwoodjs/project-config": 6.0.3 - "@redwoodjs/telemetry": 6.0.3 + "@redwoodjs/project-config": 6.0.4 + "@redwoodjs/telemetry": 6.0.4 "@types/lodash": 4.14.195 "@types/pascalcase": 1.0.1 "@types/yargs": 17.0.24 @@ -7814,16 +7814,16 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/cli-storybook@workspace:packages/cli-packages/storybook" dependencies: - "@redwoodjs/cli-helpers": 6.0.3 - "@redwoodjs/project-config": 6.0.3 - "@redwoodjs/telemetry": 6.0.3 + "@redwoodjs/cli-helpers": 6.0.4 + "@redwoodjs/project-config": 6.0.4 + "@redwoodjs/telemetry": 6.0.4 "@storybook/addon-a11y": 7.2.0 "@storybook/addon-docs": 7.2.0 "@storybook/addon-essentials": 7.2.0 "@storybook/react-webpack5": 7.2.0 "@types/yargs": 17.0.24 chalk: 4.1.2 - esbuild: 0.18.16 + esbuild: 0.18.19 execa: 5.1.1 fast-glob: 3.3.1 jest: 29.6.1 @@ -7834,7 +7834,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/cli@6.0.3, @redwoodjs/cli@workspace:packages/cli": +"@redwoodjs/cli@6.0.4, @redwoodjs/cli@workspace:packages/cli": version: 0.0.0-use.local resolution: "@redwoodjs/cli@workspace:packages/cli" dependencies: @@ -7849,14 +7849,14 @@ __metadata: "@opentelemetry/sdk-trace-node": 1.15.0 "@opentelemetry/semantic-conventions": 1.15.0 "@prisma/internals": 5.1.0 - "@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 + "@redwoodjs/api-server": 6.0.4 + "@redwoodjs/cli-helpers": 6.0.4 + "@redwoodjs/fastify": 6.0.4 + "@redwoodjs/internal": 6.0.4 + "@redwoodjs/prerender": 6.0.4 + "@redwoodjs/project-config": 6.0.4 + "@redwoodjs/structure": 6.0.4 + "@redwoodjs/telemetry": 6.0.4 "@types/crypto-js": 4.1.1 "@types/secure-random-password": 0.2.1 boxen: 5.1.2 @@ -7915,7 +7915,7 @@ __metadata: "@babel/runtime-corejs3": 7.22.6 "@babel/traverse": 7.22.8 "@iarna/toml": 2.2.5 - "@redwoodjs/project-config": 6.0.3 + "@redwoodjs/project-config": 6.0.4 "@svgr/core": 8.0.0 "@svgr/plugin-jsx": 8.0.1 "@types/babel__core": 7.20.1 @@ -7961,12 +7961,12 @@ __metadata: "@babel/preset-typescript": 7.22.5 "@babel/runtime-corejs3": 7.22.6 "@pmmmwh/react-refresh-webpack-plugin": 0.5.10 - "@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 + "@redwoodjs/cli": 6.0.4 + "@redwoodjs/eslint-config": 6.0.4 + "@redwoodjs/internal": 6.0.4 + "@redwoodjs/project-config": 6.0.4 + "@redwoodjs/testing": 6.0.4 + "@redwoodjs/web-server": 6.0.4 "@types/lodash": 4.14.195 babel-loader: 9.1.3 babel-plugin-auto-import: 1.1.0 @@ -7978,7 +7978,7 @@ __metadata: css-loader: 6.8.1 css-minimizer-webpack-plugin: 5.0.1 dotenv-webpack: 8.0.1 - esbuild: 0.18.16 + esbuild: 0.18.19 fast-glob: 3.3.1 file-loader: 6.2.0 graphql: 16.7.1 @@ -8021,7 +8021,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/eslint-config@6.0.3, @redwoodjs/eslint-config@workspace:packages/eslint-config": +"@redwoodjs/eslint-config@6.0.4, @redwoodjs/eslint-config@workspace:packages/eslint-config": version: 0.0.0-use.local resolution: "@redwoodjs/eslint-config@workspace:packages/eslint-config" dependencies: @@ -8029,12 +8029,12 @@ __metadata: "@babel/core": 7.22.9 "@babel/eslint-parser": 7.22.9 "@babel/eslint-plugin": 7.22.5 - "@redwoodjs/eslint-plugin": 6.0.3 - "@redwoodjs/internal": 6.0.3 - "@redwoodjs/project-config": 6.0.3 + "@redwoodjs/eslint-plugin": 6.0.4 + "@redwoodjs/internal": 6.0.4 + "@redwoodjs/project-config": 6.0.4 "@typescript-eslint/eslint-plugin": 5.61.0 "@typescript-eslint/parser": 5.61.0 - eslint: 8.45.0 + eslint: 8.46.0 eslint-config-prettier: 8.8.0 eslint-import-resolver-babel-module: 5.3.2 eslint-plugin-babel: 5.3.1 @@ -8050,7 +8050,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/eslint-plugin@6.0.3, @redwoodjs/eslint-plugin@workspace:packages/eslint-plugin": +"@redwoodjs/eslint-plugin@6.0.4, @redwoodjs/eslint-plugin@workspace:packages/eslint-plugin": version: 0.0.0-use.local resolution: "@redwoodjs/eslint-plugin@workspace:packages/eslint-plugin" dependencies: @@ -8058,28 +8058,28 @@ __metadata: "@types/estree": 1.0.1 "@typescript-eslint/parser": 5.61.0 "@typescript-eslint/utils": 5.61.0 - esbuild: 0.18.16 - eslint: 8.45.0 + esbuild: 0.18.19 + eslint: 8.46.0 fast-glob: 3.3.1 glob: 10.3.1 typescript: 5.1.6 languageName: unknown linkType: soft -"@redwoodjs/fastify@6.0.3, @redwoodjs/fastify@workspace:packages/fastify": +"@redwoodjs/fastify@6.0.4, @redwoodjs/fastify@workspace:packages/fastify": version: 0.0.0-use.local resolution: "@redwoodjs/fastify@workspace:packages/fastify" dependencies: "@fastify/http-proxy": 9.2.1 "@fastify/static": 6.10.2 "@fastify/url-data": 5.3.1 - "@redwoodjs/graphql-server": 6.0.3 - "@redwoodjs/project-config": 6.0.3 + "@redwoodjs/graphql-server": 6.0.4 + "@redwoodjs/project-config": 6.0.4 "@types/aws-lambda": 8.10.119 "@types/lodash": 4.14.195 "@types/qs": 6.9.7 ansi-colors: 4.1.3 - esbuild: 0.18.16 + esbuild: 0.18.19 fast-glob: 3.3.1 fastify: 4.21.0 fastify-raw-body: 4.2.1 @@ -8111,7 +8111,7 @@ __metadata: pascalcase: 1.0.0 react: 18.3.0-canary-035a41c4e-20230704 react-dom: 18.3.0-canary-035a41c4e-20230704 - react-hook-form: 7.45.2 + react-hook-form: 7.45.4 typescript: 5.1.6 peerDependencies: graphql: 16.7.1 @@ -8119,7 +8119,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/graphql-server@6.0.3, @redwoodjs/graphql-server@workspace:packages/graphql-server": +"@redwoodjs/graphql-server@6.0.4, @redwoodjs/graphql-server@workspace:packages/graphql-server": version: 0.0.0-use.local resolution: "@redwoodjs/graphql-server@workspace:packages/graphql-server" dependencies: @@ -8138,9 +8138,9 @@ __metadata: "@graphql-tools/schema": 10.0.0 "@graphql-tools/utils": 10.0.1 "@opentelemetry/api": 1.4.1 - "@redwoodjs/api": 6.0.3 - "@redwoodjs/project-config": 6.0.3 - "@redwoodjs/realtime": 6.0.3 + "@redwoodjs/api": 6.0.4 + "@redwoodjs/project-config": 6.0.4 + "@redwoodjs/realtime": 6.0.4 "@types/jsonwebtoken": 9.0.2 "@types/lodash": 4.14.195 "@types/uuid": 9.0.2 @@ -8159,7 +8159,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/internal@6.0.3, @redwoodjs/internal@workspace:packages/internal": +"@redwoodjs/internal@6.0.4, @redwoodjs/internal@workspace:packages/internal": version: 0.0.0-use.local resolution: "@redwoodjs/internal@workspace:packages/internal" dependencies: @@ -8181,9 +8181,9 @@ __metadata: "@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.3 - "@redwoodjs/project-config": 6.0.3 - "@redwoodjs/router": 6.0.3 + "@redwoodjs/graphql-server": 6.0.4 + "@redwoodjs/project-config": 6.0.4 + "@redwoodjs/router": 6.0.4 "@sdl-codegen/node": 0.0.10 "@types/babel-plugin-tester": 9.0.5 "@types/babel__core": 7.20.1 @@ -8194,7 +8194,7 @@ __metadata: chalk: 4.1.2 core-js: 3.31.1 deepmerge: 4.3.1 - esbuild: 0.18.16 + esbuild: 0.18.19 fast-glob: 3.3.1 fs-extra: 11.1.1 graphql: 16.7.1 @@ -8215,19 +8215,19 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/prerender@6.0.3, @redwoodjs/prerender@workspace:packages/prerender": +"@redwoodjs/prerender@6.0.4, @redwoodjs/prerender@workspace:packages/prerender": version: 0.0.0-use.local resolution: "@redwoodjs/prerender@workspace:packages/prerender" dependencies: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@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 + "@redwoodjs/auth": 6.0.4 + "@redwoodjs/internal": 6.0.4 + "@redwoodjs/project-config": 6.0.4 + "@redwoodjs/router": 6.0.4 + "@redwoodjs/structure": 6.0.4 + "@redwoodjs/web": 6.0.4 "@types/mime-types": 2.1.1 "@whatwg-node/fetch": 0.9.9 babel-plugin-ignore-html-and-css-imports: 0.1.0 @@ -8244,13 +8244,13 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/project-config@6.0.3, @redwoodjs/project-config@workspace:packages/project-config": +"@redwoodjs/project-config@6.0.4, @redwoodjs/project-config@workspace:packages/project-config": version: 0.0.0-use.local resolution: "@redwoodjs/project-config@workspace:packages/project-config" dependencies: "@iarna/toml": 2.2.5 deepmerge: 4.3.1 - esbuild: 0.18.16 + esbuild: 0.18.19 fast-glob: 3.3.1 jest: 29.6.1 rimraf: 5.0.1 @@ -8259,7 +8259,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/realtime@6.0.3, @redwoodjs/realtime@workspace:packages/realtime": +"@redwoodjs/realtime@6.0.4, @redwoodjs/realtime@workspace:packages/realtime": version: 0.0.0-use.local resolution: "@redwoodjs/realtime@workspace:packages/realtime" dependencies: @@ -8273,7 +8273,7 @@ __metadata: "@graphql-yoga/subscription": 4.0.0 "@n1ru4l/graphql-live-query": 0.10.0 "@n1ru4l/in-memory-live-query-store": 0.10.0 - esbuild: 0.18.16 + esbuild: 0.18.19 graphql: 16.7.1 ioredis: 5.3.2 jest: 29.6.1 @@ -8296,14 +8296,14 @@ __metadata: "@babel/runtime-corejs3": 7.22.6 "@prisma/client": 5.1.0 "@prisma/internals": 5.1.0 - "@redwoodjs/project-config": 6.0.3 + "@redwoodjs/project-config": 6.0.4 core-js: 3.31.1 - esbuild: 0.18.16 + esbuild: 0.18.19 jest: 29.6.1 languageName: unknown linkType: soft -"@redwoodjs/router@6.0.3, @redwoodjs/router@workspace:packages/router": +"@redwoodjs/router@6.0.4, @redwoodjs/router@workspace:packages/router": version: 0.0.0-use.local resolution: "@redwoodjs/router@workspace:packages/router" dependencies: @@ -8311,7 +8311,7 @@ __metadata: "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 "@reach/skip-nav": 0.18.0 - "@redwoodjs/auth": 6.0.3 + "@redwoodjs/auth": 6.0.4 "@types/react": 18.2.14 "@types/react-dom": 18.2.6 core-js: 3.31.1 @@ -8325,7 +8325,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/structure@6.0.3, @redwoodjs/structure@workspace:packages/structure": +"@redwoodjs/structure@6.0.4, @redwoodjs/structure@workspace:packages/structure": version: 0.0.0-use.local resolution: "@redwoodjs/structure@workspace:packages/structure" dependencies: @@ -8334,7 +8334,7 @@ __metadata: "@babel/runtime-corejs3": 7.22.6 "@iarna/toml": 2.2.5 "@prisma/internals": 5.1.0 - "@redwoodjs/project-config": 6.0.3 + "@redwoodjs/project-config": 6.0.4 "@types/fs-extra": 11.0.1 "@types/line-column": 1.0.0 "@types/lodash": 4.14.195 @@ -8375,8 +8375,8 @@ __metadata: "@fastify/http-proxy": 9.2.1 "@fastify/static": 6.10.2 "@fastify/url-data": 5.3.1 - "@redwoodjs/internal": 6.0.3 - "@redwoodjs/project-config": 6.0.3 + "@redwoodjs/internal": 6.0.4 + "@redwoodjs/project-config": 6.0.4 "@types/aws-lambda": 8.10.119 "@types/crypto-js": 4.1.1 "@types/jsonwebtoken": 9.0.2 @@ -8411,15 +8411,15 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/telemetry@6.0.3, @redwoodjs/telemetry@workspace:packages/telemetry": +"@redwoodjs/telemetry@6.0.4, @redwoodjs/telemetry@workspace:packages/telemetry": version: 0.0.0-use.local resolution: "@redwoodjs/telemetry@workspace:packages/telemetry" dependencies: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/project-config": 6.0.3 - "@redwoodjs/structure": 6.0.3 + "@redwoodjs/project-config": 6.0.4 + "@redwoodjs/structure": 6.0.4 "@types/envinfo": 7.8.1 "@types/uuid": 9.0.2 "@types/yargs": 17.0.24 @@ -8434,19 +8434,19 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/testing@6.0.3, @redwoodjs/testing@workspace:packages/testing": +"@redwoodjs/testing@6.0.4, @redwoodjs/testing@workspace:packages/testing": version: 0.0.0-use.local resolution: "@redwoodjs/testing@workspace:packages/testing" dependencies: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@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 + "@redwoodjs/auth": 6.0.4 + "@redwoodjs/graphql-server": 6.0.4 + "@redwoodjs/internal": 6.0.4 + "@redwoodjs/project-config": 6.0.4 + "@redwoodjs/router": 6.0.4 + "@redwoodjs/web": 6.0.4 "@testing-library/jest-dom": 5.16.5 "@testing-library/react": 14.0.0 "@testing-library/user-event": 14.4.3 @@ -8471,14 +8471,14 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/tui@6.0.3, @redwoodjs/tui@workspace:packages/tui": +"@redwoodjs/tui@6.0.4, @redwoodjs/tui@workspace:packages/tui": version: 0.0.0-use.local resolution: "@redwoodjs/tui@workspace:packages/tui" dependencies: boxen: 5.1.2 chalk: 4.1.2 enquirer: 2.3.6 - esbuild: 0.18.16 + esbuild: 0.18.19 jest: 29.6.1 stdout-update: 1.6.8 typescript: 5.1.6 @@ -8491,9 +8491,9 @@ __metadata: dependencies: "@babel/cli": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/internal": 6.0.3 - "@redwoodjs/project-config": 6.0.3 - "@redwoodjs/web": 6.0.3 + "@redwoodjs/internal": 6.0.4 + "@redwoodjs/project-config": 6.0.4 + "@redwoodjs/web": 6.0.4 "@swc/core": 1.3.60 "@types/express": 4 "@types/react": 18.2.14 @@ -8511,7 +8511,7 @@ __metadata: react: 18.3.0-canary-035a41c4e-20230704 react-server-dom-webpack: 18.3.0-canary-035a41c4e-20230704 typescript: 5.1.6 - vite: 4.4.8 + vite: 4.4.9 yargs-parser: 21.1.1 bin: rw-dev-fe: ./dist/devFeServer.js @@ -8522,15 +8522,15 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/web-server@6.0.3, @redwoodjs/web-server@workspace:packages/web-server": +"@redwoodjs/web-server@6.0.4, @redwoodjs/web-server@workspace:packages/web-server": version: 0.0.0-use.local resolution: "@redwoodjs/web-server@workspace:packages/web-server" dependencies: - "@redwoodjs/project-config": 6.0.3 + "@redwoodjs/project-config": 6.0.4 "@types/yargs-parser": 21.0.0 chalk: 4.1.2 dotenv-defaults: 5.0.2 - esbuild: 0.18.16 + esbuild: 0.18.19 fast-glob: 3.3.1 fastify: 4.21.0 typescript: 5.1.6 @@ -8540,7 +8540,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/web@6.0.3, @redwoodjs/web@workspace:packages/web": +"@redwoodjs/web@6.0.4, @redwoodjs/web@workspace:packages/web": version: 0.0.0-use.local resolution: "@redwoodjs/web@workspace:packages/web" dependencies: @@ -8548,7 +8548,7 @@ __metadata: "@babel/cli": 7.22.9 "@babel/core": 7.22.9 "@babel/runtime-corejs3": 7.22.6 - "@redwoodjs/auth": 6.0.3 + "@redwoodjs/auth": 6.0.4 "@testing-library/jest-dom": 5.16.5 "@testing-library/react": 14.0.0 "@types/prop-types": 15.7.5 @@ -12323,7 +12323,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^6.1.0, ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.12.4, ajv@npm:^6.12.5": +"ajv@npm:^6.1.0, ajv@npm:^6.10.2, ajv@npm:^6.12.4, ajv@npm:^6.12.5": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -15488,13 +15488,13 @@ __metadata: "@opentelemetry/resources": 1.15.0 "@opentelemetry/sdk-trace-node": 1.15.0 "@opentelemetry/semantic-conventions": 1.15.0 - "@redwoodjs/tui": 6.0.3 + "@redwoodjs/tui": 6.0.4 "@types/babel__core": 7.20.1 chalk: 4.1.2 check-node-version: 4.2.1 ci-info: 3.8.0 envinfo: 7.9.0 - esbuild: 0.18.16 + esbuild: 0.18.19 execa: 5.1.1 fs-extra: 11.1.1 jest: 29.6.1 @@ -17165,32 +17165,32 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:0.18.16, esbuild@npm:^0.18.0, esbuild@npm:^0.18.10": - version: 0.18.16 - resolution: "esbuild@npm:0.18.16" - dependencies: - "@esbuild/android-arm": 0.18.16 - "@esbuild/android-arm64": 0.18.16 - "@esbuild/android-x64": 0.18.16 - "@esbuild/darwin-arm64": 0.18.16 - "@esbuild/darwin-x64": 0.18.16 - "@esbuild/freebsd-arm64": 0.18.16 - "@esbuild/freebsd-x64": 0.18.16 - "@esbuild/linux-arm": 0.18.16 - "@esbuild/linux-arm64": 0.18.16 - "@esbuild/linux-ia32": 0.18.16 - "@esbuild/linux-loong64": 0.18.16 - "@esbuild/linux-mips64el": 0.18.16 - "@esbuild/linux-ppc64": 0.18.16 - "@esbuild/linux-riscv64": 0.18.16 - "@esbuild/linux-s390x": 0.18.16 - "@esbuild/linux-x64": 0.18.16 - "@esbuild/netbsd-x64": 0.18.16 - "@esbuild/openbsd-x64": 0.18.16 - "@esbuild/sunos-x64": 0.18.16 - "@esbuild/win32-arm64": 0.18.16 - "@esbuild/win32-ia32": 0.18.16 - "@esbuild/win32-x64": 0.18.16 +"esbuild@npm:0.18.19, esbuild@npm:^0.18.0, esbuild@npm:^0.18.10": + version: 0.18.19 + resolution: "esbuild@npm:0.18.19" + dependencies: + "@esbuild/android-arm": 0.18.19 + "@esbuild/android-arm64": 0.18.19 + "@esbuild/android-x64": 0.18.19 + "@esbuild/darwin-arm64": 0.18.19 + "@esbuild/darwin-x64": 0.18.19 + "@esbuild/freebsd-arm64": 0.18.19 + "@esbuild/freebsd-x64": 0.18.19 + "@esbuild/linux-arm": 0.18.19 + "@esbuild/linux-arm64": 0.18.19 + "@esbuild/linux-ia32": 0.18.19 + "@esbuild/linux-loong64": 0.18.19 + "@esbuild/linux-mips64el": 0.18.19 + "@esbuild/linux-ppc64": 0.18.19 + "@esbuild/linux-riscv64": 0.18.19 + "@esbuild/linux-s390x": 0.18.19 + "@esbuild/linux-x64": 0.18.19 + "@esbuild/netbsd-x64": 0.18.19 + "@esbuild/openbsd-x64": 0.18.19 + "@esbuild/sunos-x64": 0.18.19 + "@esbuild/win32-arm64": 0.18.19 + "@esbuild/win32-ia32": 0.18.19 + "@esbuild/win32-x64": 0.18.19 dependenciesMeta: "@esbuild/android-arm": optional: true @@ -17238,7 +17238,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 7cb68f18fe10da783195d9b382956de6dc2084e60ef5843f17dc3a5114ba8f51578ff68076ec6039f0c583ba95f22fa0502a7b2eb9236d6d1bdd9987142d6021 + checksum: 328b16c96a7eba98c94ff9462a61dd00ca8f89a8f1bae89f2486e28fad816d6caa899e2a3994adf886990d1d64645bc8c7527b3cc6c698c4797477f634e0fad8 languageName: node linkType: hard @@ -17596,13 +17596,13 @@ __metadata: languageName: node linkType: hard -"eslint-scope@npm:^7.2.0": - version: 7.2.0 - resolution: "eslint-scope@npm:7.2.0" +"eslint-scope@npm:^7.2.2": + version: 7.2.2 + resolution: "eslint-scope@npm:7.2.2" dependencies: esrecurse: ^4.3.0 estraverse: ^5.2.0 - checksum: 5b48a3cc2485a3a58ca0bdecfb557c349009308a9b2afb24d070b1c0c254d445ee86d78bfee2c4ed6d1b8944307604a987c92f6d7e611e29de5d06256747a0ff + checksum: 613c267aea34b5a6d6c00514e8545ef1f1433108097e857225fed40d397dd6b1809dffd11c2fde23b37ca53d7bf935fe04d2a18e6fc932b31837b6ad67e1c116 languageName: node linkType: hard @@ -17613,33 +17613,33 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1": - version: 3.4.1 - resolution: "eslint-visitor-keys@npm:3.4.1" - checksum: b4ebd35aed5426cd81b1fb92487825f1acf47a31e91d76597a3ee0664d69627140c4dafaf9b319cfeb1f48c1113a393e21a734c669e6565a72e6fcc311bd9911 +"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.2": + version: 3.4.2 + resolution: "eslint-visitor-keys@npm:3.4.2" + checksum: 4521d1d470490c89fb613aec6fb2f0814b496a4618619ec8dfcc985640fe33c9c64f3dab882f50ebb401b4613f35f2601a9ef9a72b57739af5b0150fecdaf1f1 languageName: node linkType: hard -"eslint@npm:8.45.0": - version: 8.45.0 - resolution: "eslint@npm:8.45.0" +"eslint@npm:8.46.0": + version: 8.46.0 + resolution: "eslint@npm:8.46.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 - "@eslint-community/regexpp": ^4.4.0 - "@eslint/eslintrc": ^2.1.0 - "@eslint/js": 8.44.0 + "@eslint-community/regexpp": ^4.6.1 + "@eslint/eslintrc": ^2.1.1 + "@eslint/js": ^8.46.0 "@humanwhocodes/config-array": ^0.11.10 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 - ajv: ^6.10.0 + ajv: ^6.12.4 chalk: ^4.0.0 cross-spawn: ^7.0.2 debug: ^4.3.2 doctrine: ^3.0.0 escape-string-regexp: ^4.0.0 - eslint-scope: ^7.2.0 - eslint-visitor-keys: ^3.4.1 - espree: ^9.6.0 + eslint-scope: ^7.2.2 + eslint-visitor-keys: ^3.4.2 + espree: ^9.6.1 esquery: ^1.4.2 esutils: ^2.0.2 fast-deep-equal: ^3.1.3 @@ -17663,18 +17663,18 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 2a043b8d3b9a5684e2f66bd446c3dc8522cc7afbb0982d0a5be76ea1f578d0e617598a7b289616a861ab8272b57f6056acb2b264bec6302c9b0921a1cfa66fdb + checksum: 81abddb21e540dcd509ba08fdf524b494cbda69a62ffce2a61b5adfcdeb3cbf713f72c6cbb42932333decb4b067ae7a89e4cb5e908e0d42e4287d4f357576a72 languageName: node linkType: hard -"espree@npm:^9.0.0, espree@npm:^9.6.0": - version: 9.6.0 - resolution: "espree@npm:9.6.0" +"espree@npm:^9.0.0, espree@npm:^9.6.0, espree@npm:^9.6.1": + version: 9.6.1 + resolution: "espree@npm:9.6.1" dependencies: acorn: ^8.9.0 acorn-jsx: ^5.3.2 eslint-visitor-keys: ^3.4.1 - checksum: f064a43bcf7f435d34e600c056320dde1c15b3eeb5da24e7585ed6cf83adcbbeafb4fa4d062ff14281b0d246b0a9645dd9d3796a638099f19595004eee4ac8be + checksum: 1a2e9b4699b715347f62330bcc76aee224390c28bb02b31a3752e9d07549c473f5f986720483c6469cf3cfb3c9d05df612ffc69eb1ee94b54b739e67de9bb460 languageName: node linkType: hard @@ -25009,11 +25009,11 @@ __metadata: languageName: node linkType: hard -"nx-cloud@npm:16.0.5": - version: 16.0.5 - resolution: "nx-cloud@npm:16.0.5" +"nx-cloud@npm:16.2.0": + version: 16.2.0 + resolution: "nx-cloud@npm:16.2.0" dependencies: - "@nrwl/nx-cloud": 16.0.5 + "@nrwl/nx-cloud": 16.2.0 axios: 1.1.3 chalk: ^4.1.0 dotenv: ~10.0.0 @@ -25025,7 +25025,7 @@ __metadata: yargs-parser: ">=21.1.1" bin: nx-cloud: bin/nx-cloud.js - checksum: 02f0bf081c3f69c2682d9e21bc9e281df80a0e31852cd81cb8746d9dd07ebdc071c5138867ed9b84f922c0da40bd0170f2d735c4d8cf0768c24d6a47078ebf48 + checksum: ff642f4eb1002574d30789e5c9451d52ea5a78e37f639c7bed9bcdd236e7d46108d0a79bca978e7c0c4e24c4c2ae0b8ff747d64afc8dc115e1be990eea168c7d languageName: node linkType: hard @@ -26207,9 +26207,9 @@ __metadata: languageName: node linkType: hard -"pino@npm:8.14.1, pino@npm:^8.12.0": - version: 8.14.1 - resolution: "pino@npm:8.14.1" +"pino@npm:8.15.0, pino@npm:^8.12.0": + version: 8.15.0 + resolution: "pino@npm:8.15.0" dependencies: atomic-sleep: ^1.0.0 fast-redact: ^3.1.1 @@ -26224,7 +26224,7 @@ __metadata: thread-stream: ^2.0.0 bin: pino: bin.js - checksum: 0903238577141814b7bcab0278e0a249078e6cf8198630c9bb7a0dfba555ea303660632ea289d9bd721d8b964939adbfe90fd5a39dee7a6c9f967c0c5e3df8ae + checksum: 0288488d0426b68d1e3a7e0f11eda6b3e8e4d7cd9f8aa6e090afe03e604fa5039be62397528d78d6f30735e6416a54b4e07881107ef80c125076191399283688 languageName: node linkType: hard @@ -26688,7 +26688,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.2.14, postcss@npm:^8.4.21, postcss@npm:^8.4.24, postcss@npm:^8.4.26": +"postcss@npm:^8.2.14, postcss@npm:^8.4.21, postcss@npm:^8.4.24, postcss@npm:^8.4.27": version: 8.4.27 resolution: "postcss@npm:8.4.27" dependencies: @@ -27435,12 +27435,12 @@ __metadata: languageName: node linkType: hard -"react-hook-form@npm:7.45.2": - version: 7.45.2 - resolution: "react-hook-form@npm:7.45.2" +"react-hook-form@npm:7.45.4": + version: 7.45.4 + resolution: "react-hook-form@npm:7.45.4" peerDependencies: react: ^16.8.0 || ^17 || ^18 - checksum: 1b55ad7d5d9f2145710de19e941a5ac74c8630f21ebacefe855291debede2537cb98b971231f8cfdd7b2908b061d0db862dd22ae33f483cc5fc122ab240e6f7b + checksum: 09c016213ed09771e6e0c2f85b816a52ef5dc975324fbd676d2b056dd22de7447ac3fb38997f05c92e7cecc8f14f6fa931a8cc8c24ba569e72fe621333b835b2 languageName: node linkType: hard @@ -28435,9 +28435,9 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^3.25.2": - version: 3.26.2 - resolution: "rollup@npm:3.26.2" +"rollup@npm:^3.27.1": + version: 3.27.2 + resolution: "rollup@npm:3.27.2" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -28445,7 +28445,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: c23ee8dcd34fe854afe06e1ec6d6017b200c523795a7c0f876494afd4a279f1d1232b3f274fea9438ac8ec4ebf6ce202f17316f790a94dba8173e213d2b98d19 + checksum: feb1e76f50fb502e106954a621b2d0b3e2e92e2552f938a0cbef5f7931c9f4283d05076d47311a4582863205f377e3e2d7314a1626e3c7d9c7330527ddeb7562 languageName: node linkType: hard @@ -28493,7 +28493,7 @@ __metadata: cypress: 12.15.0 cypress-wait-until: 1.7.2 dependency-cruiser: 13.0.4 - eslint: 8.45.0 + eslint: 8.46.0 fast-glob: 3.3.1 fs-extra: 11.1.1 jest: 29.6.1 @@ -28507,7 +28507,7 @@ __metadata: nodemon: 2.0.22 npm-packlist: 7.0.4 nx: 16.4.1 - nx-cloud: 16.0.5 + nx-cloud: 16.2.0 octokit: 2.1.0 ora: 6.3.1 prompts: 2.4.2 @@ -31722,14 +31722,14 @@ __metadata: languageName: node linkType: hard -"vite@npm:4.4.8": - version: 4.4.8 - resolution: "vite@npm:4.4.8" +"vite@npm:4.4.9": + version: 4.4.9 + resolution: "vite@npm:4.4.9" dependencies: esbuild: ^0.18.10 fsevents: ~2.3.2 - postcss: ^8.4.26 - rollup: ^3.25.2 + postcss: ^8.4.27 + rollup: ^3.27.1 peerDependencies: "@types/node": ">= 14" less: "*" @@ -31758,7 +31758,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 4032fbbd67ae74d2d2f748218bb97c5b0005283ebc6cbb00374e55d418fe8852fdee20e25119cd6e2f1dd90c8c9bdb899a1dcd4fede12011befad2dbde9c0c56 + checksum: 80dbc632fd75b5866567c8fd605115c9d5718654dbf173f509cfd55c53f39dfbee24f62660e57fd5b11eb93f469a65abdbe6bae880ec8392bb70a5d0d7b6e6a9 languageName: node linkType: hard