diff --git a/.editorconfig b/.editorconfig index 871c2f2fb484..d60b940abe37 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,7 +7,7 @@ root = true [*] end_of_line = lf insert_final_newline = true -charset = utf8 +charset = utf-8 [*.{js,jsx,ts,tsx,graphql,sql,md,html,mjml,json,jsonc,json5,yml,yaml,template,sh,Dockerfile}] indent_style = space diff --git a/.gitignore b/.gitignore index 553242a9d907..b7c70b01b192 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.icloud +.cosine .idea .DS_Store node_modules diff --git a/docs/docs/authentication.md b/docs/docs/authentication.md index a742628a4754..cef3754ea978 100644 --- a/docs/docs/authentication.md +++ b/docs/docs/authentication.md @@ -130,12 +130,11 @@ const Routes = () => { // highlight-start - - {/* Or... */} + // highlight-end - + ) } @@ -153,9 +152,9 @@ const Routes = () => { - + - + // highlight-next-line @@ -163,9 +162,9 @@ const Routes = () => { // highlight-next-line - + - + ) } diff --git a/docs/docs/how-to/role-based-access-control.md b/docs/docs/how-to/role-based-access-control.md index 7e91ca9eec6a..da138d62d71f 100644 --- a/docs/docs/how-to/role-based-access-control.md +++ b/docs/docs/how-to/role-based-access-control.md @@ -238,52 +238,52 @@ export const getCurrentUser = async (decoded) => { #### How to Protect a Route -To protect a `Private` route for access by a single role: +To protect a `PrivateSet` route for access by a single role: ```jsx -import { Router, Route, Private } from '@redwoodjs/router' +import { Router, Route, PrivateSet } from '@redwoodjs/router' const Routes = () => { return ( - + - + ) } ``` -To protect a `Private` route for access by a multiple roles: +To protect a `PrivateSet` route for access by a multiple roles: ```jsx -import { Router, Route, Private } from '@redwoodjs/router' +import { Router, Route, PrivateSet } from '@redwoodjs/router' const Routes = () => { return ( - + - + ) } ``` -> Note: If you are using `Set` you can use its `private` attribute instead of the `` component. +> Note: If you are using `Set` you can use its `private` attribute instead of the `` component. If the currentUser is not assigned the role, they will be redirected to the page specified in the `unauthenticated` property. Therefore, you can define a specific page to be seen when attempting to access the protected route and denied access such as a "forbidden" page: ```jsx -import { Router, Route, Private } from '@redwoodjs/router' +import { Router, Route, PrivateSet } from '@redwoodjs/router' const Routes = () => { return ( - + - + diff --git a/docs/docs/prerender.md b/docs/docs/prerender.md index e0cb23e0887f..2ac27195086f 100644 --- a/docs/docs/prerender.md +++ b/docs/docs/prerender.md @@ -56,16 +56,16 @@ This will prerender your NotFoundPage to `404.html` in your dist folder. Note th For Private Routes, Redwood prerenders your Private Routes' `whileLoadingAuth` prop: ```jsx - + // Loading is shown while we're checking to see if the user's logged in } prerender/> - + ``` ### Rendering skeletons while authenticating Sometimes you want to render the shell of the page, while you wait for your authentication checks to happen. This can make the experience feel a lot snappier to the user, since they don't wait on a blank screen while their credentials are checked. -To do this, make use of the `whileLoadingAuth` prop on `` or a `` in your Routes file. For example, if we have a dashboard that you need to be logged in to access: +To do this, make use of the `whileLoadingAuth` prop on `` in your Routes file. For example, if we have a dashboard that you need to be logged in to access: ```js ./web/src/Routes.{tsx,js} // This renders the layout with skeleton loaders in the content area diff --git a/docs/docs/router.md b/docs/docs/router.md index 4bd2af5a7d51..08bbbfdd6d8f 100644 --- a/docs/docs/router.md +++ b/docs/docs/router.md @@ -46,8 +46,6 @@ The `path` prop specifies the URL path to match, starting with the beginning sla Some pages should only be visible to authenticated users. -We support this using private ``s or the `` component. Read more [further down](#private-set). - ## Sets of Routes You can group Routes into sets using the `Set` component. `Set` allows you to wrap a set of Routes in another component or array of components—usually a Context, a Layout, or both: @@ -145,16 +143,16 @@ Here's an example of how you'd use a private set: ``` -Private routes are important and should be easy to spot in your Routes file. The larger your Routes file gets, the more difficult it will probably become to find `` among your other Sets. So we also provide a `` component that's just an alias for ``. Most of our documentation uses ``. +Private routes are important and should be easy to spot in your Routes file. The larger your Routes file gets, the more difficult it will probably become to find `` among your other Sets. So we also provide a `` component that's just an alias for ``. Most of our documentation uses ``. -Here's the same example again, but now using `` +Here's the same example again, but now using `` ```jsx title="Routes.js" - + - + ``` @@ -164,9 +162,9 @@ To protect `Private` routes for access by a single role: ```jsx title="Routes.js" - + - + @@ -176,9 +174,9 @@ To protect `Private` routes for access by multiple roles: ```jsx title="Routes.js" - + - + @@ -574,13 +572,13 @@ When the lazy-loaded page is loading, `PageLoadingContext.Consumer` will pass `{ Let's say you have a dashboard area on your Redwood app, which can only be accessed after logging in. When Redwood Router renders your private page, it will first fetch the user's details, and only render the page if it determines the user is indeed logged in. -In order to display a loader while auth details are being retrieved you can add the `whileLoadingAuth` prop to your private ``, `` or the `` component: +In order to display a loader while auth details are being retrieved you can add the `whileLoadingAuth` prop to your private ``, `` or the `` component: ```jsx //Routes.js - {/* other routes */} - + ``` diff --git a/docs/docs/testing.md b/docs/docs/testing.md index fc1e2f77ca37..23b4a2afc340 100644 --- a/docs/docs/testing.md +++ b/docs/docs/testing.md @@ -274,6 +274,7 @@ render(
, { }) ``` ::: + ### Mocking useLocation To mock `useLocation` in your component tests, wrap the component with `LocationProvider`: @@ -288,6 +289,22 @@ render( ) ``` +### Mocking useParams + +To mock `useParams` in your component tests, wrap the component with `ParamsProvider`: + +```jsx +import { ParamsProvider } from '@redwoodjs/router'; + +render( + + + +) +``` + +The `allParams` argument accepts an object that will provide parameters as you expect them from the query parameters of a URL string. In the above example, we are assuming the URL looks like `/?param1=val1¶m2=val2`. + ### Queries In most cases you will want to exclude the design elements and structure of your components from your test. Then you're free to redesign the component all you want without also having to make the same changes to your test suite. Let's look at some of the functions that React Testing Library provides (they call them "[queries](https://testing-library.com/docs/queries/about/)") that let you check for *parts* of the rendered component, rather than a full string match. diff --git a/docs/docs/tutorial/chapter0/what-is-redwood.md b/docs/docs/tutorial/chapter0/what-is-redwood.md index 95e2e4de08ed..de104efb50e8 100644 --- a/docs/docs/tutorial/chapter0/what-is-redwood.md +++ b/docs/docs/tutorial/chapter0/what-is-redwood.md @@ -41,10 +41,10 @@ const Routes = () => { - + - + @@ -54,7 +54,7 @@ const Routes = () => { } ``` -You can probably get a sense of how all of this works without ever having seen a Redwood route before! Some routes can be marked as `` and will not be accessible without being logged in. Others can be wrapped in a "layout" (again, just a React component) to provide common styling shared between pages in your app. +You can probably get a sense of how all of this works without ever having seen a Redwood route before! Some routes can be marked as `` and will not be accessible without being logged in. Others can be wrapped in a "layout" (again, just a React component) to provide common styling shared between pages in your app. #### Prerender @@ -66,7 +66,7 @@ This is Redwood's version of static site generation, aka SSG. ### Authentication -The `` route limits access to users that are authenticated, but how do they authenticate? Redwood includes integrations to many popular third party authentication hosts (including [Auth0](https://auth0.com/), [Supabase](https://supabase.com/docs/guides/auth) and [Clerk](https://clerk.com/)). You can also [host your own auth](https://redwoodjs.com/docs/auth/dbauth), or write your own [custom authentication](https://redwoodjs.com/docs/auth/custom) option. If going self-hosted, we include login, signup, and reset password pages, as well as the option to include TouchID/FaceID and third party biometric readers! +The `` route limits access to users that are authenticated, but how do they authenticate? Redwood includes integrations to many popular third party authentication hosts (including [Auth0](https://auth0.com/), [Supabase](https://supabase.com/docs/guides/auth) and [Clerk](https://clerk.com/)). You can also [host your own auth](https://redwoodjs.com/docs/auth/dbauth), or write your own [custom authentication](https://redwoodjs.com/docs/auth/custom) option. If going self-hosted, we include login, signup, and reset password pages, as well as the option to include TouchID/FaceID and third party biometric readers! Once authenticated, how do you know what a user is allowed to do or not do? Redwood includes helpers for [role-based access control](https://redwoodjs.com/docs/how-to/role-based-access-control-rbac) that integrates on both the front- and backend. diff --git a/docs/docs/tutorial/chapter1/prerequisites.md b/docs/docs/tutorial/chapter1/prerequisites.md index 4013773b7d2c..e791b79c006e 100644 --- a/docs/docs/tutorial/chapter1/prerequisites.md +++ b/docs/docs/tutorial/chapter1/prerequisites.md @@ -46,14 +46,21 @@ Please do upgrade accordingly. Then proceed to the Redwood installation when you There are many ways to install and manage both Node.js and Yarn. If you're installing for the first time, we recommend the following: -**1. Yarn** -We recommend following the [instructions via Yarnpkg.com](https://yarnpkg.com/getting-started/install). - -**2. Node.js** +**1. Node.js** Using the recommended [LTS version from Nodejs.org](https://nodejs.org/en/) is preferred. - `nvm` is a great tool for managing multiple versions of Node on one system. It takes a bit more effort to set up and learn, however. Follow the [nvm installation instructions](https://github.com/nvm-sh/nvm#installing-and-updating). (Windows users should go to [nvm-windows](https://github.com/coreybutler/nvm-windows/releases)). For **Mac** users with Homebrew installed, you can alternatively use it to [install `nvm`](https://formulae.brew.sh/formula/nvm). Or, refer to our how to guide [using nvm](../../how-to/using-nvm.md). +**2. Yarn** +As of Node.js v18+, Node.js ships with a CLI tool called [Corepack](https://nodejs.org/docs/latest-v18.x/api/corepack.html) to manage package managers. All you have to do is enable it, then you'll have Yarn: + +``` +corepack enable +yarn -v +``` + +The version of Yarn will probably be `1.22.21`, but don't worry—in your Redwood project, Corepack will know to use a modern version of Yarn because of the `packageManager` field in the root `package.json`. + **Windows:** Recommended Development Setup - JavaScript development on Windows has specific requirements in addition to Yarn and npm. Follow our simple setup guide: diff --git a/docs/docs/tutorial/chapter4/authentication.md b/docs/docs/tutorial/chapter4/authentication.md index 1cee5a8d3dd4..80b403b7f022 100644 --- a/docs/docs/tutorial/chapter4/authentication.md +++ b/docs/docs/tutorial/chapter4/authentication.md @@ -195,7 +195,7 @@ Try reloading the Posts admin and we'll see something that's 50% correct: ![image](https://user-images.githubusercontent.com/300/146462761-d21c93f0-289a-4e11-bccf-8e4e68f21438.png) -Going to the admin section now prevents a non-logged in user from seeing posts, great! This is the result of the `@requireAuth` directive in `api/src/graphql/posts.sdl.{js,ts}`: you're not authenticated so GraphQL will not respond to your request for data. But, ideally they wouldn't be able to see the admin pages themselves. Let's fix that with a new component in the Routes file, ``: +Going to the admin section now prevents a non-logged in user from seeing posts, great! This is the result of the `@requireAuth` directive in `api/src/graphql/posts.sdl.{js,ts}`: you're not authenticated so GraphQL will not respond to your request for data. But, ideally they wouldn't be able to see the admin pages themselves. Let's fix that with a new component in the Routes file, ``: @@ -213,7 +213,7 @@ const Routes = () => { return ( // highlight-next-line - + @@ -221,7 +221,7 @@ const Routes = () => { // highlight-next-line - + @@ -252,7 +252,7 @@ const Routes = () => { return ( // highlight-next-line - + @@ -260,7 +260,7 @@ const Routes = () => { // highlight-next-line - + @@ -278,7 +278,7 @@ export default Routes -We wrap the routes we want to be private (that is, only accessible when logged in) in the `` component, and tell our app where to send them if they are unauthenticated. In this case they should go to the `home` route. +We wrap the routes we want to be private (that is, only accessible when logged in) in the `` component, and tell our app where to send them if they are unauthenticated. In this case they should go to the `home` route. Try going back to [http://localhost:8910/admin/posts](http://localhost:8910/admin/posts) now and—yikes! @@ -288,7 +288,7 @@ Well, we couldn't get to the admin pages, but we also can't see our blog posts a It's because the `posts` query in `posts.sdl.{js,ts}` is used by both the homepage *and* the posts admin page. Since it has the `@requireAuth` directive, it's locked down and can only be accessed when logged in. But we *do* want people that aren't logged in to be able to view the posts on the homepage! -Now that our admin pages are behind a `` route, what if we set the `posts` query to be `@skipAuth` instead? Let's try: +Now that our admin pages are behind a `` route, what if we set the `posts` query to be `@skipAuth` instead? Let's try: @@ -888,7 +888,7 @@ You can generate a new value with the `yarn rw g secret` command. It only output ## Wrapping Up -Believe it or not, that's pretty much it for authentication! You can use the combination of `@requireAuth` and `@skipAuth` directives to lock down access to GraphQL query/mutations, and the `` component to restrict access to entire pages of your app. If you only want to restrict access to certain components, or certain parts of a component, you can always get `isAuthenticated` from the `useAuth()` hook and then render one thing or another. +Believe it or not, that's pretty much it for authentication! You can use the combination of `@requireAuth` and `@skipAuth` directives to lock down access to GraphQL query/mutations, and the `` component to restrict access to entire pages of your app. If you only want to restrict access to certain components, or certain parts of a component, you can always get `isAuthenticated` from the `useAuth()` hook and then render one thing or another. Head over to the Redwood docs to read more about [self-hosted](../../auth/dbauth.md) and [third-party authentication](../../authentication.md#official-integrations). diff --git a/docs/package.json b/docs/package.json index ea76743b6c47..74baccb986f1 100644 --- a/docs/package.json +++ b/docs/package.json @@ -38,6 +38,6 @@ "devDependencies": { "@docusaurus/module-type-aliases": "3.0.0", "@docusaurus/tsconfig": "3.0.0", - "typescript": "5.2.2" + "typescript": "5.3.2" } } diff --git a/docs/versioned_docs/version-6.0/authentication.md b/docs/versioned_docs/version-6.0/authentication.md index a742628a4754..d026aa91bb17 100644 --- a/docs/versioned_docs/version-6.0/authentication.md +++ b/docs/versioned_docs/version-6.0/authentication.md @@ -117,11 +117,11 @@ Much of what the functions it returns do is self explanatory, but the options th ### Protecting routes -You can require that a user be authenticated to navigate to a route by wrapping it in the `Private` component or the `Set` component with the `private` prop set to `true`. +You can require that a user be authenticated to navigate to a route by wrapping it in the `PrivateSet` component. An unauthenticated user will be redirected to the route specified in either component's `unauthenticated` prop: ```tsx title="web/src/Routes.tsx" -import { Router, Route, Private } from '@redwoodjs/router' +import { Router, Route, PrivateSet } from '@redwoodjs/router' const Routes = () => { return ( @@ -130,21 +130,21 @@ const Routes = () => { // highlight-start - + {/* Or... */} // highlight-end - + ) } ``` -You can also restrict access by role by passing a role or an array of roles to the `Private` or `Set` component's `hasRole` prop: +You can also restrict access by role by passing a role or an array of roles to the `PrivateSet` component's `hasRole` prop: ```tsx title="web/src/Routes.tsx" -import { Router, Route, Private, Set } from '@redwoodjs/router' +import { Router, Route, PrivateSet, Set } from '@redwoodjs/router' const Routes = () => { return ( @@ -153,9 +153,9 @@ const Routes = () => { - + - + // highlight-next-line @@ -163,9 +163,9 @@ const Routes = () => { // highlight-next-line - + - + ) } diff --git a/docs/versioned_docs/version-6.0/how-to/role-based-access-control.md b/docs/versioned_docs/version-6.0/how-to/role-based-access-control.md index 7e91ca9eec6a..dbe467f68964 100644 --- a/docs/versioned_docs/version-6.0/how-to/role-based-access-control.md +++ b/docs/versioned_docs/version-6.0/how-to/role-based-access-control.md @@ -246,9 +246,9 @@ import { Router, Route, Private } from '@redwoodjs/router' const Routes = () => { return ( - + - + ) } @@ -262,28 +262,28 @@ import { Router, Route, Private } from '@redwoodjs/router' const Routes = () => { return ( - + - + ) } ``` -> Note: If you are using `Set` you can use its `private` attribute instead of the `` component. +> Note: If you are using `Set` you can use its `private` attribute instead of the `` component. If the currentUser is not assigned the role, they will be redirected to the page specified in the `unauthenticated` property. Therefore, you can define a specific page to be seen when attempting to access the protected route and denied access such as a "forbidden" page: ```jsx -import { Router, Route, Private } from '@redwoodjs/router' +import { Router, Route, PrivateSet } from '@redwoodjs/router' const Routes = () => { return ( - + - + diff --git a/docs/versioned_docs/version-6.0/prerender.md b/docs/versioned_docs/version-6.0/prerender.md index 210e01358341..fa467aea495c 100644 --- a/docs/versioned_docs/version-6.0/prerender.md +++ b/docs/versioned_docs/version-6.0/prerender.md @@ -56,16 +56,16 @@ This will prerender your NotFoundPage to `404.html` in your dist folder. Note th For Private Routes, Redwood prerenders your Private Routes' `whileLoadingAuth` prop: ```jsx - + // Loading is shown while we're checking to see if the user's logged in } prerender/> - + ``` ### Rendering skeletons while authenticating Sometimes you want to render the shell of the page, while you wait for your authentication checks to happen. This can make the experience feel a lot snappier to the user, since they don't wait on a blank screen while their credentials are checked. -To do this, make use of the `whileLoadingAuth` prop on `` or a `` in your Routes file. For example, if we have a dashboard that you need to be logged in to access: +To do this, make use of the `whileLoadingAuth` prop on `` in your Routes file. For example, if we have a dashboard that you need to be logged in to access: ```js ./web/src/Routes.{tsx,js} // This renders the layout with skeleton loaders in the content area diff --git a/docs/versioned_docs/version-6.0/router.md b/docs/versioned_docs/version-6.0/router.md index 4bd2af5a7d51..98d1493d9ab9 100644 --- a/docs/versioned_docs/version-6.0/router.md +++ b/docs/versioned_docs/version-6.0/router.md @@ -46,7 +46,7 @@ The `path` prop specifies the URL path to match, starting with the beginning sla Some pages should only be visible to authenticated users. -We support this using private ``s or the `` component. Read more [further down](#private-set). +We support this using private `` component. Read more [further down](#private-set). ## Sets of Routes @@ -145,40 +145,40 @@ Here's an example of how you'd use a private set: ``` -Private routes are important and should be easy to spot in your Routes file. The larger your Routes file gets, the more difficult it will probably become to find `` among your other Sets. So we also provide a `` component that's just an alias for ``. Most of our documentation uses ``. +Private routes are important and should be easy to spot in your Routes file. The larger your Routes file gets, the more difficult it will probably become to find `` among your other Sets. So we also provide a `` component that's just an alias for ``. Most of our documentation uses ``. -Here's the same example again, but now using `` +Here's the same example again, but now using `` ```jsx title="Routes.js" - + - + ``` For more fine-grained control, you can specify `roles` (which takes a string for a single role or an array of roles), and the router will check to see that the current user is authorized before giving them access to the Route. If they're not, they will be redirected to the page specified in the `unauthenticated` prop, such as a "forbidden" page. Read more about Role-based Access Control in Redwood [here](how-to/role-based-access-control.md). -To protect `Private` routes for access by a single role: +To protect `PrivateSet` routes for access by a single role: ```jsx title="Routes.js" - + - + ``` -To protect `Private` routes for access by multiple roles: +To protect `PrivateSet` routes for access by multiple roles: ```jsx title="Routes.js" - + - + @@ -574,13 +574,13 @@ When the lazy-loaded page is loading, `PageLoadingContext.Consumer` will pass `{ Let's say you have a dashboard area on your Redwood app, which can only be accessed after logging in. When Redwood Router renders your private page, it will first fetch the user's details, and only render the page if it determines the user is indeed logged in. -In order to display a loader while auth details are being retrieved you can add the `whileLoadingAuth` prop to your private ``, `` or the `` component: +In order to display a loader while auth details are being retrieved you can add the `whileLoadingAuth` prop to your private ``, `` component: ```jsx //Routes.js - {/* other routes */} - + ``` diff --git a/docs/versioned_docs/version-6.0/tutorial/chapter4/authentication.md b/docs/versioned_docs/version-6.0/tutorial/chapter4/authentication.md index 7ab3656994c4..562d7b34b0a3 100644 --- a/docs/versioned_docs/version-6.0/tutorial/chapter4/authentication.md +++ b/docs/versioned_docs/version-6.0/tutorial/chapter4/authentication.md @@ -195,7 +195,7 @@ Try reloading the Posts admin and we'll see something that's 50% correct: ![image](https://user-images.githubusercontent.com/300/146462761-d21c93f0-289a-4e11-bccf-8e4e68f21438.png) -Going to the admin section now prevents a non-logged in user from seeing posts, great! This is the result of the `@requireAuth` directive in `api/src/graphql/posts.sdl.{js,ts}`: you're not authenticated so GraphQL will not respond to your request for data. But, ideally they wouldn't be able to see the admin pages themselves. Let's fix that with a new component in the Routes file, ``: +Going to the admin section now prevents a non-logged in user from seeing posts, great! This is the result of the `@requireAuth` directive in `api/src/graphql/posts.sdl.{js,ts}`: you're not authenticated so GraphQL will not respond to your request for data. But, ideally they wouldn't be able to see the admin pages themselves. Let's fix that with a new component in the Routes file, ``: @@ -213,7 +213,7 @@ const Routes = () => { return ( // highlight-next-line - + @@ -221,7 +221,7 @@ const Routes = () => { // highlight-next-line - + @@ -241,7 +241,7 @@ export default Routes ```jsx title="web/src/Routes.tsx" // highlight-next-line -import { Private, Router, Route, Set } from '@redwoodjs/router' +import { PrivateSet, Router, Route, Set } from '@redwoodjs/router' import ScaffoldLayout from 'src/layouts/ScaffoldLayout' import BlogLayout from 'src/layouts/BlogLayout' @@ -252,7 +252,7 @@ const Routes = () => { return ( // highlight-next-line - + @@ -260,7 +260,7 @@ const Routes = () => { // highlight-next-line - + @@ -278,7 +278,7 @@ export default Routes -We wrap the routes we want to be private (that is, only accessible when logged in) in the `` component, and tell our app where to send them if they are unauthenticated. In this case they should go to the `home` route. +We wrap the routes we want to be private (that is, only accessible when logged in) in the `` component, and tell our app where to send them if they are unauthenticated. In this case they should go to the `home` route. Try going back to [http://localhost:8910/admin/posts](http://localhost:8910/admin/posts) now and—yikes! @@ -288,7 +288,7 @@ Well, we couldn't get to the admin pages, but we also can't see our blog posts a It's because the `posts` query in `posts.sdl.{js,ts}` is used by both the homepage *and* the posts admin page. Since it has the `@requireAuth` directive, it's locked down and can only be accessed when logged in. But we *do* want people that aren't logged in to be able to view the posts on the homepage! -Now that our admin pages are behind a `` route, what if we set the `posts` query to be `@skipAuth` instead? Let's try: +Now that our admin pages are behind a `` route, what if we set the `posts` query to be `@skipAuth` instead? Let's try: @@ -888,7 +888,7 @@ You can generate a new value with the `yarn rw g secret` command. It only output ## Wrapping Up -Believe it or not, that's pretty much it for authentication! You can use the combination of `@requireAuth` and `@skipAuth` directives to lock down access to GraphQL query/mutations, and the `` component to restrict access to entire pages of your app. If you only want to restrict access to certain components, or certain parts of a component, you can always get `isAuthenticated` from the `useAuth()` hook and then render one thing or another. +Believe it or not, that's pretty much it for authentication! You can use the combination of `@requireAuth` and `@skipAuth` directives to lock down access to GraphQL query/mutations, and the `` component to restrict access to entire pages of your app. If you only want to restrict access to certain components, or certain parts of a component, you can always get `isAuthenticated` from the `useAuth()` hook and then render one thing or another. Head over to the Redwood docs to read more about [self-hosted](../../auth/dbauth.md) and [third-party authentication](../../authentication.md#official-integrations). diff --git a/docs/versioned_docs/version-6.0/tutorial/chapter7/rbac.md b/docs/versioned_docs/version-6.0/tutorial/chapter7/rbac.md index c7603aec30c6..bac9123c38c4 100644 --- a/docs/versioned_docs/version-6.0/tutorial/chapter7/rbac.md +++ b/docs/versioned_docs/version-6.0/tutorial/chapter7/rbac.md @@ -156,21 +156,21 @@ export const hasRole = (roles: AllowedRoles): boolean => { ### Restricting Access via Routes -The easiest way to prevent access to an entire URL is via the Router. The `` component takes a prop `roles` in which you can give a list of only those role(s) that should have access: +The easiest way to prevent access to an entire URL is via the Router. The `` component takes a prop `roles` in which you can give a list of only those role(s) that should have access: ```jsx title="web/src/Routes.jsx" // highlight-next-line - + - + ``` diff --git a/docs/yarn.lock b/docs/yarn.lock index f9cad65037d3..ed89a3ce8990 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -4988,7 +4988,7 @@ __metadata: react: 18.2.0 react-dom: 18.2.0 react-player: 2.13.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -11184,23 +11184,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.2.2": - version: 5.2.2 - resolution: "typescript@npm:5.2.2" +"typescript@npm:5.3.2": + version: 5.3.2 + resolution: "typescript@npm:5.3.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 91ae3e6193d0ddb8656d4c418a033f0f75dec5e077ebbc2bd6d76439b93f35683936ee1bdc0e9cf94ec76863aa49f27159b5788219b50e1cd0cd6d110aa34b07 + checksum: d7dbe1fbe19039e36a65468ea64b5d338c976550394ba576b7af9c68ed40c0bc5d12ecce390e4b94b287a09a71bd3229f19c2d5680611f35b7c53a3898791159 languageName: node linkType: hard -"typescript@patch:typescript@5.2.2#~builtin": - version: 5.2.2 - resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin::version=5.2.2&hash=f3b441" +"typescript@patch:typescript@5.3.2#~builtin": + version: 5.3.2 + resolution: "typescript@patch:typescript@npm%3A5.3.2#~builtin::version=5.3.2&hash=e012d7" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 062c1cee1990e6b9419ce8a55162b8dc917eb87f807e4de0327dbc1c2fa4e5f61bc0dd4e034d38ff541d1ed0479b53bcee8e4de3a4075c51a1724eb6216cb6f5 + checksum: 73c8bad74e732d93211c9d77f28b03307e2f5fc6a0afc73f4b783261ab567686a16d6ae958bdaef383a00be1b0b8c8b6741dd6ca3d13af4963fa7e47456d49c7 languageName: node linkType: hard diff --git a/package.json b/package.json index b56ae4b8662a..4556d1a7a101 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@babel/runtime-corejs3": "7.23.4", "@faker-js/faker": "8.0.2", "@npmcli/arborist": "6.5.0", - "@playwright/test": "1.40.0", + "@playwright/test": "1.40.1", "@testing-library/jest-dom": "5.17.0", "@testing-library/react": "14.1.2", "@testing-library/user-event": "14.5.1", @@ -101,7 +101,7 @@ "rimraf": "5.0.5", "tstyche": "1.0.0-beta.3", "tsx": "3.12.7", - "typescript": "5.2.2", + "typescript": "5.3.2", "yargs": "17.7.2", "zx": "7.2.3" }, diff --git a/packages/api-server/package.json b/packages/api-server/package.json index ac37f244fa0b..4a6657005f69 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -59,7 +59,7 @@ "@types/yargs": "17.0.31", "aws-lambda": "1.0.7", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/api/package.json b/packages/api/package.json index a22aea3adb84..e62da8c0bbf5 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -54,7 +54,7 @@ "redis": "4.6.7", "split2": "4.2.0", "ts-toolbelt": "9.6.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { "memjs": "1.3.1", diff --git a/packages/auth-providers/auth0/api/README.md b/packages/auth-providers/auth0/api/README.md index d27ea3626dac..10ba2ea0959a 100644 --- a/packages/auth-providers/auth0/api/README.md +++ b/packages/auth-providers/auth0/api/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/auth0/api/package.json b/packages/auth-providers/auth0/api/package.json index afb361089541..2a7a1fd080e7 100644 --- a/packages/auth-providers/auth0/api/package.json +++ b/packages/auth-providers/auth0/api/package.json @@ -33,7 +33,7 @@ "@redwoodjs/api": "6.0.7", "@types/jsonwebtoken": "9.0.5", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/auth0/setup/README.md b/packages/auth-providers/auth0/setup/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/auth0/setup/README.md +++ b/packages/auth-providers/auth0/setup/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/auth0/setup/package.json b/packages/auth-providers/auth0/setup/package.json index 79735ed35742..e9b596f60293 100644 --- a/packages/auth-providers/auth0/setup/package.json +++ b/packages/auth-providers/auth0/setup/package.json @@ -31,7 +31,7 @@ "@babel/core": "^7.22.20", "@types/yargs": "17.0.31", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/auth0/web/README.md b/packages/auth-providers/auth0/web/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/auth0/web/README.md +++ b/packages/auth-providers/auth0/web/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/auth0/web/package.json b/packages/auth-providers/auth0/web/package.json index ea289508a958..0e42b708c221 100644 --- a/packages/auth-providers/auth0/web/package.json +++ b/packages/auth-providers/auth0/web/package.json @@ -33,7 +33,7 @@ "@types/react": "18.2.37", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { "@auth0/auth0-spa-js": "2.1.2" diff --git a/packages/auth-providers/azureActiveDirectory/api/README.md b/packages/auth-providers/azureActiveDirectory/api/README.md index d27ea3626dac..10ba2ea0959a 100644 --- a/packages/auth-providers/azureActiveDirectory/api/README.md +++ b/packages/auth-providers/azureActiveDirectory/api/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/azureActiveDirectory/api/package.json b/packages/auth-providers/azureActiveDirectory/api/package.json index 095f13e60d46..7b9302e5b9a2 100644 --- a/packages/auth-providers/azureActiveDirectory/api/package.json +++ b/packages/auth-providers/azureActiveDirectory/api/package.json @@ -34,7 +34,7 @@ "@types/aws-lambda": "8.10.126", "@types/jsonwebtoken": "9.0.5", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/azureActiveDirectory/setup/README.md b/packages/auth-providers/azureActiveDirectory/setup/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/azureActiveDirectory/setup/README.md +++ b/packages/auth-providers/azureActiveDirectory/setup/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/azureActiveDirectory/setup/package.json b/packages/auth-providers/azureActiveDirectory/setup/package.json index 2199a3e75e5e..c5ee5404d34a 100644 --- a/packages/auth-providers/azureActiveDirectory/setup/package.json +++ b/packages/auth-providers/azureActiveDirectory/setup/package.json @@ -31,7 +31,7 @@ "@babel/core": "^7.22.20", "@types/yargs": "17.0.31", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/azureActiveDirectory/web/README.md b/packages/auth-providers/azureActiveDirectory/web/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/azureActiveDirectory/web/README.md +++ b/packages/auth-providers/azureActiveDirectory/web/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/azureActiveDirectory/web/package.json b/packages/auth-providers/azureActiveDirectory/web/package.json index 919bea9e00f1..cd0fb8cc1093 100644 --- a/packages/auth-providers/azureActiveDirectory/web/package.json +++ b/packages/auth-providers/azureActiveDirectory/web/package.json @@ -34,7 +34,7 @@ "@types/react": "18.2.37", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { "@azure/msal-browser": "2.38.3" diff --git a/packages/auth-providers/clerk/api/README.md b/packages/auth-providers/clerk/api/README.md index d27ea3626dac..10ba2ea0959a 100644 --- a/packages/auth-providers/clerk/api/README.md +++ b/packages/auth-providers/clerk/api/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/clerk/api/package.json b/packages/auth-providers/clerk/api/package.json index babb0c59a13b..4bca9272f68a 100644 --- a/packages/auth-providers/clerk/api/package.json +++ b/packages/auth-providers/clerk/api/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.23.4", - "@clerk/clerk-sdk-node": "4.12.21", + "@clerk/clerk-sdk-node": "4.12.22", "core-js": "3.33.3" }, "devDependencies": { @@ -32,7 +32,7 @@ "@redwoodjs/api": "6.0.7", "@types/aws-lambda": "8.10.126", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/clerk/setup/README.md b/packages/auth-providers/clerk/setup/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/clerk/setup/README.md +++ b/packages/auth-providers/clerk/setup/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/clerk/setup/package.json b/packages/auth-providers/clerk/setup/package.json index ef4d600de238..c5085cbcf53d 100644 --- a/packages/auth-providers/clerk/setup/package.json +++ b/packages/auth-providers/clerk/setup/package.json @@ -31,7 +31,7 @@ "@babel/core": "^7.22.20", "@types/yargs": "17.0.31", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/clerk/web/README.md b/packages/auth-providers/clerk/web/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/clerk/web/README.md +++ b/packages/auth-providers/clerk/web/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/clerk/web/package.json b/packages/auth-providers/clerk/web/package.json index 4bd800fbbd6a..32eb5e55e21c 100644 --- a/packages/auth-providers/clerk/web/package.json +++ b/packages/auth-providers/clerk/web/package.json @@ -29,15 +29,15 @@ "devDependencies": { "@babel/cli": "7.23.4", "@babel/core": "^7.22.20", - "@clerk/clerk-react": "4.28.0", + "@clerk/clerk-react": "4.28.1", "@clerk/types": "3.58.0", "@types/react": "18.2.37", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { - "@clerk/clerk-react": "4.28.0" + "@clerk/clerk-react": "4.28.1" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/custom/setup/README.md b/packages/auth-providers/custom/setup/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/custom/setup/README.md +++ b/packages/auth-providers/custom/setup/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/custom/setup/package.json b/packages/auth-providers/custom/setup/package.json index 4c960caaaad3..127e5021eee4 100644 --- a/packages/auth-providers/custom/setup/package.json +++ b/packages/auth-providers/custom/setup/package.json @@ -31,7 +31,7 @@ "@babel/core": "^7.22.20", "@types/yargs": "17.0.31", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/dbAuth/api/README.md b/packages/auth-providers/dbAuth/api/README.md index d27ea3626dac..10ba2ea0959a 100644 --- a/packages/auth-providers/dbAuth/api/README.md +++ b/packages/auth-providers/dbAuth/api/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/dbAuth/api/package.json b/packages/auth-providers/dbAuth/api/package.json index 0a3543c99fe3..40a867f71b84 100644 --- a/packages/auth-providers/dbAuth/api/package.json +++ b/packages/auth-providers/dbAuth/api/package.json @@ -37,7 +37,7 @@ "@types/md5": "2.3.5", "@types/uuid": "9.0.7", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/dbAuth/setup/README.md b/packages/auth-providers/dbAuth/setup/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/dbAuth/setup/README.md +++ b/packages/auth-providers/dbAuth/setup/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/dbAuth/setup/package.json b/packages/auth-providers/dbAuth/setup/package.json index 02d14b15d12b..b914c8c62b9a 100644 --- a/packages/auth-providers/dbAuth/setup/package.json +++ b/packages/auth-providers/dbAuth/setup/package.json @@ -35,7 +35,7 @@ "@simplewebauthn/typescript-types": "7.4.0", "@types/yargs": "17.0.31", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/dbAuth/web/README.md b/packages/auth-providers/dbAuth/web/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/dbAuth/web/README.md +++ b/packages/auth-providers/dbAuth/web/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/dbAuth/web/package.json b/packages/auth-providers/dbAuth/web/package.json index aabf6f9221ad..aeab2a98ddd9 100644 --- a/packages/auth-providers/dbAuth/web/package.json +++ b/packages/auth-providers/dbAuth/web/package.json @@ -35,7 +35,7 @@ "@types/react": "18.2.37", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/firebase/api/README.md b/packages/auth-providers/firebase/api/README.md index d27ea3626dac..10ba2ea0959a 100644 --- a/packages/auth-providers/firebase/api/README.md +++ b/packages/auth-providers/firebase/api/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/firebase/api/package.json b/packages/auth-providers/firebase/api/package.json index 946bde706192..1f71f125c52b 100644 --- a/packages/auth-providers/firebase/api/package.json +++ b/packages/auth-providers/firebase/api/package.json @@ -32,7 +32,7 @@ "@redwoodjs/api": "6.0.7", "@types/aws-lambda": "8.10.126", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/firebase/setup/README.md b/packages/auth-providers/firebase/setup/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/firebase/setup/README.md +++ b/packages/auth-providers/firebase/setup/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/firebase/setup/package.json b/packages/auth-providers/firebase/setup/package.json index f0e66d967dc8..837a22caf6a4 100644 --- a/packages/auth-providers/firebase/setup/package.json +++ b/packages/auth-providers/firebase/setup/package.json @@ -31,7 +31,7 @@ "@babel/core": "^7.22.20", "@types/yargs": "17.0.31", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/firebase/web/README.md b/packages/auth-providers/firebase/web/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/firebase/web/README.md +++ b/packages/auth-providers/firebase/web/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/firebase/web/package.json b/packages/auth-providers/firebase/web/package.json index f1e7f31d0266..1d689654d73a 100644 --- a/packages/auth-providers/firebase/web/package.json +++ b/packages/auth-providers/firebase/web/package.json @@ -33,7 +33,7 @@ "firebase": "10.6.0", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { "firebase": "10.6.0" diff --git a/packages/auth-providers/netlify/api/README.md b/packages/auth-providers/netlify/api/README.md index d27ea3626dac..10ba2ea0959a 100644 --- a/packages/auth-providers/netlify/api/README.md +++ b/packages/auth-providers/netlify/api/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/netlify/api/package.json b/packages/auth-providers/netlify/api/package.json index 31ca10606fc6..887e98bcd54e 100644 --- a/packages/auth-providers/netlify/api/package.json +++ b/packages/auth-providers/netlify/api/package.json @@ -33,7 +33,7 @@ "@types/aws-lambda": "8.10.126", "@types/jsonwebtoken": "9.0.5", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/netlify/setup/README.md b/packages/auth-providers/netlify/setup/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/netlify/setup/README.md +++ b/packages/auth-providers/netlify/setup/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/netlify/setup/package.json b/packages/auth-providers/netlify/setup/package.json index 0ba67f461b88..ad4321ae2af0 100644 --- a/packages/auth-providers/netlify/setup/package.json +++ b/packages/auth-providers/netlify/setup/package.json @@ -31,7 +31,7 @@ "@babel/core": "^7.22.20", "@types/yargs": "17.0.31", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/netlify/web/README.md b/packages/auth-providers/netlify/web/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/netlify/web/README.md +++ b/packages/auth-providers/netlify/web/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/netlify/web/package.json b/packages/auth-providers/netlify/web/package.json index 5868b77fd8bc..84121580ed48 100644 --- a/packages/auth-providers/netlify/web/package.json +++ b/packages/auth-providers/netlify/web/package.json @@ -33,7 +33,7 @@ "@types/react": "18.2.37", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { "netlify-identity-widget": "1.9.2" diff --git a/packages/auth-providers/supabase/api/README.md b/packages/auth-providers/supabase/api/README.md index d27ea3626dac..10ba2ea0959a 100644 --- a/packages/auth-providers/supabase/api/README.md +++ b/packages/auth-providers/supabase/api/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/supabase/api/package.json b/packages/auth-providers/supabase/api/package.json index 07fd0aeb8e66..635b97f7dd43 100644 --- a/packages/auth-providers/supabase/api/package.json +++ b/packages/auth-providers/supabase/api/package.json @@ -33,7 +33,7 @@ "@types/aws-lambda": "8.10.126", "@types/jsonwebtoken": "9.0.5", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/supabase/setup/README.md b/packages/auth-providers/supabase/setup/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/supabase/setup/README.md +++ b/packages/auth-providers/supabase/setup/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/supabase/setup/package.json b/packages/auth-providers/supabase/setup/package.json index ca11ce9b42cc..bb91158b78a2 100644 --- a/packages/auth-providers/supabase/setup/package.json +++ b/packages/auth-providers/supabase/setup/package.json @@ -31,7 +31,7 @@ "@babel/core": "^7.22.20", "@types/yargs": "17.0.31", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/supabase/web/package.json b/packages/auth-providers/supabase/web/package.json index a69f31447472..c3aa0e633749 100644 --- a/packages/auth-providers/supabase/web/package.json +++ b/packages/auth-providers/supabase/web/package.json @@ -28,14 +28,14 @@ "devDependencies": { "@babel/cli": "7.23.4", "@babel/core": "^7.22.20", - "@supabase/supabase-js": "2.38.5", + "@supabase/supabase-js": "2.39.0", "@types/react": "18.2.37", "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { - "@supabase/supabase-js": "2.38.5" + "@supabase/supabase-js": "2.39.0" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/supertokens/api/README.md b/packages/auth-providers/supertokens/api/README.md index d27ea3626dac..10ba2ea0959a 100644 --- a/packages/auth-providers/supertokens/api/README.md +++ b/packages/auth-providers/supertokens/api/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/supertokens/api/package.json b/packages/auth-providers/supertokens/api/package.json index c7f3c9b74456..618e78a4d93a 100644 --- a/packages/auth-providers/supertokens/api/package.json +++ b/packages/auth-providers/supertokens/api/package.json @@ -33,7 +33,7 @@ "@redwoodjs/api": "6.0.7", "@types/jsonwebtoken": "9.0.5", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { "supertokens-node": "15.2.1" diff --git a/packages/auth-providers/supertokens/setup/README.md b/packages/auth-providers/supertokens/setup/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/supertokens/setup/README.md +++ b/packages/auth-providers/supertokens/setup/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/supertokens/setup/package.json b/packages/auth-providers/supertokens/setup/package.json index 6cc8e60d2b48..1ac97a3c3946 100644 --- a/packages/auth-providers/supertokens/setup/package.json +++ b/packages/auth-providers/supertokens/setup/package.json @@ -31,7 +31,7 @@ "@babel/core": "^7.22.20", "@types/yargs": "17.0.31", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/auth-providers/supertokens/web/README.md b/packages/auth-providers/supertokens/web/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth-providers/supertokens/web/README.md +++ b/packages/auth-providers/supertokens/web/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth-providers/supertokens/web/package.json b/packages/auth-providers/supertokens/web/package.json index 8b7f8415eb49..380378fe5f5b 100644 --- a/packages/auth-providers/supertokens/web/package.json +++ b/packages/auth-providers/supertokens/web/package.json @@ -33,7 +33,7 @@ "jest": "29.7.0", "react": "0.0.0-experimental-e5205658f-20230913", "supertokens-auth-react": "0.34.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { "supertokens-auth-react": "0.34.0" diff --git a/packages/auth/README.md b/packages/auth/README.md index 661208df586e..cba1dea094ac 100644 --- a/packages/auth/README.md +++ b/packages/auth/README.md @@ -21,7 +21,7 @@ both auth service providers and RW apps we recommend you start looking in `authFactory.ts` and then continue to `AuthProvider.tsx`. `AuthProvider.tsx` has most of our implementation together with all the custom hooks it uses. Another file to be accustomed with is `AuthContext.ts`. The interface in there -has pretty god code comments, and is what will be exposed to RW apps. +has pretty good code comments, and is what will be exposed to RW apps. ## getCurrentUser diff --git a/packages/auth/package.json b/packages/auth/package.json index e2a05c1da3ff..f3079660f465 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -33,7 +33,7 @@ "@testing-library/react": "14.1.2", "jest": "29.7.0", "msw": "1.3.2", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/babel-config/package.json b/packages/babel-config/package.json index d46d229d7cdf..8e1b1d2a4f85 100644 --- a/packages/babel-config/package.json +++ b/packages/babel-config/package.json @@ -41,7 +41,7 @@ "core-js": "3.33.3", "fast-glob": "3.3.2", "graphql": "16.8.1", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "devDependencies": { "@types/babel-plugin-tester": "9.0.9", diff --git a/packages/cli-helpers/package.json b/packages/cli-helpers/package.json index 8ff2c84db355..a25330690f02 100644 --- a/packages/cli-helpers/package.json +++ b/packages/cli-helpers/package.json @@ -45,7 +45,7 @@ "@types/pascalcase": "1.0.3", "@types/yargs": "17.0.31", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/cli-packages/dataMigrate/package.json b/packages/cli-packages/dataMigrate/package.json index 5fff37b37b62..5234fec4a69f 100644 --- a/packages/cli-packages/dataMigrate/package.json +++ b/packages/cli-packages/dataMigrate/package.json @@ -42,7 +42,7 @@ "fast-glob": "3.3.2", "jest": "29.7.0", "memfs": "4.6.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/cli-packages/storybook/package.json b/packages/cli-packages/storybook/package.json index 7b207fe94093..b7c818c7e11a 100644 --- a/packages/cli-packages/storybook/package.json +++ b/packages/cli-packages/storybook/package.json @@ -27,13 +27,13 @@ "@redwoodjs/cli-helpers": "6.0.7", "@redwoodjs/project-config": "6.0.7", "@redwoodjs/telemetry": "6.0.7", - "@storybook/addon-a11y": "7.5.3", - "@storybook/addon-docs": "7.5.3", - "@storybook/addon-essentials": "7.5.3", - "@storybook/react-webpack5": "7.5.3", + "@storybook/addon-a11y": "7.6.2", + "@storybook/addon-docs": "7.6.2", + "@storybook/addon-essentials": "7.6.2", + "@storybook/react-webpack5": "7.6.2", "chalk": "4.1.2", "execa": "5.1.1", - "storybook": "7.5.3", + "storybook": "7.6.2", "terminal-link": "2.1.1", "yargs": "17.7.2" }, @@ -42,7 +42,7 @@ "esbuild": "0.19.5", "fast-glob": "3.3.2", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 53e0e0a57713..d6e192c4ed97 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -84,7 +84,7 @@ "@babel/cli": "7.23.4", "@babel/core": "^7.22.20", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/cli/src/commands/experimental/setupDockerHandler.js b/packages/cli/src/commands/experimental/setupDockerHandler.js index 6e4824e8c0c0..c4f9170aea67 100644 --- a/packages/cli/src/commands/experimental/setupDockerHandler.js +++ b/packages/cli/src/commands/experimental/setupDockerHandler.js @@ -311,7 +311,7 @@ export async function handler({ force }) { "Lastly, ensure you have Docker. If you don't, see https://docs.docker.com/desktop/", '', "There's a lot in the Dockerfile and there's a reason for every line.", - 'Be sure to check ou the docs: https://redwoodjs.com/docs/docker', + 'Be sure to check out the docs: https://redwoodjs.com/docs/docker', ].join('\n') ) } catch (e) { diff --git a/packages/cli/src/commands/setup/graphiql/supportedProviders.js b/packages/cli/src/commands/setup/graphiql/supportedProviders.js index fdb50cafa9b5..f51fca9e8a3e 100644 --- a/packages/cli/src/commands/setup/graphiql/supportedProviders.js +++ b/packages/cli/src/commands/setup/graphiql/supportedProviders.js @@ -20,7 +20,9 @@ const getDBAuthHeader = async (userId) => { ) } - const { encryptSession } = await import('@redwoodjs/auth-dbauth-api') + const { + default: { encryptSession }, + } = await import('@redwoodjs/auth-dbauth-api') const id = isNumeric(userId) ? parseInt(userId) : userId const cookie = encryptSession(JSON.stringify({ id }) + ';' + uuidv4()) diff --git a/packages/cli/src/commands/setup/ui/libraries/mantine.js b/packages/cli/src/commands/setup/ui/libraries/mantine.js index 8723df80c2c0..d63158285f0b 100644 --- a/packages/cli/src/commands/setup/ui/libraries/mantine.js +++ b/packages/cli/src/commands/setup/ui/libraries/mantine.js @@ -1,6 +1,7 @@ import path from 'path' import execa from 'execa' +import fse from 'fs-extra' import { Listr } from 'listr2' import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers' @@ -28,10 +29,16 @@ const ALL_MANTINE_PACKAGES = [ ] const MANTINE_THEME_AND_COMMENTS = `\ -// This object will be used to override Mantine theme defaults. -// See https://mantine.dev/theming/mantine-provider/#theme-object for theming options +import { createTheme } from '@mantine/core' + +/** + * This object will be used to override Mantine theme defaults. + * See https://mantine.dev/theming/mantine-provider/#theme-object for theming options + * @type {import("@mantine/core").MantineThemeOverride} + */ const theme = {} -export default theme + +export default createTheme(theme) ` export function builder(yargs) { @@ -68,7 +75,9 @@ export async function handler({ force, install, packages }) { const installPackages = ( packages.includes(ALL_KEYWORD) ? ALL_MANTINE_PACKAGES : packages - ).map((pack) => `@mantine/${pack}`) + ) + .map((pack) => `@mantine/${pack}`) + .concat('postcss', 'postcss-preset-mantine', 'postcss-simple-vars') const tasks = new Listr( [ @@ -108,10 +117,37 @@ export async function handler({ force, install, packages }) { }, imports: [ "import { MantineProvider } from '@mantine/core'", - "import * as theme from 'config/mantine.config'", + "import theme from 'config/mantine.config'", + "import '@mantine/core/styles.css'", ], }), }, + { + title: 'Configuring PostCSS...', + task: () => { + /** + * Check if PostCSS config already exists. + * If it exists, throw an error. + */ + const postCSSConfigPath = rwPaths.web.postcss + + if (!force && fse.existsSync(postCSSConfigPath)) { + throw new Error( + 'PostCSS config already exists.\nUse --force to override existing config.' + ) + } else { + const postCSSConfig = fse.readFileSync( + path.join( + __dirname, + '../templates/mantine-postcss.config.js.template' + ), + 'utf-8' + ) + + return fse.outputFileSync(postCSSConfigPath, postCSSConfig) + } + }, + }, { title: `Creating Theme File...`, task: () => { diff --git a/packages/cli/src/commands/setup/ui/templates/mantine-postcss.config.js.template b/packages/cli/src/commands/setup/ui/templates/mantine-postcss.config.js.template new file mode 100644 index 000000000000..a49b840e2f6f --- /dev/null +++ b/packages/cli/src/commands/setup/ui/templates/mantine-postcss.config.js.template @@ -0,0 +1,35 @@ +/** + * `postcss-preset-mantine` includes the following PostCSS plugins: + * - postcss-nested + * - postcss-mixins with Mantine specific mixins + * - Custom plugin with em/rem functions + * Read more: https://mantine.dev/styles/postcss-preset/ + + * `postcss-simple-vars` enables use of SCSS-like variables inside CSS files: + * ```postcss + * $blue : #056ef0; + * $width-sm: rem(37.5); + * $selector: .my-component + * + * @media (min-width: $width-sm) { + * $selector { + * background: $blue; + * } + * } + * ``` + * Read more: https://github.com/postcss/postcss-simple-vars +*/ +module.exports = { + plugins: [ + require('postcss-preset-mantine'), + require('postcss-simple-vars')({ + variables: { + 'mantine-breakpoint-xs': '36em', + 'mantine-breakpoint-sm': '48em', + 'mantine-breakpoint-md': '62em', + 'mantine-breakpoint-lg': '75em', + 'mantine-breakpoint-xl': '88em', + }, + }), + ], +} diff --git a/packages/cli/src/commands/setup/ui/templates/mantine.storybook.preview.js.template b/packages/cli/src/commands/setup/ui/templates/mantine.storybook.preview.js.template index becfab191a9f..1e235f622ca0 100644 --- a/packages/cli/src/commands/setup/ui/templates/mantine.storybook.preview.js.template +++ b/packages/cli/src/commands/setup/ui/templates/mantine.storybook.preview.js.template @@ -1,7 +1,9 @@ import * as React from 'react' import { MantineProvider } from '@mantine/core' -import * as theme from 'config/mantine.config' +import theme from 'config/mantine.config' + +import '@mantine/core/styles.css' const withMantine = (StoryFn) => { return ( diff --git a/packages/codemods/package.json b/packages/codemods/package.json index 11721570717b..1e46fa45fad6 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -45,7 +45,7 @@ "pascalcase": "1.0.0", "prettier": "2.8.8", "tasuku": "2.0.1", - "typescript": "5.2.2", + "typescript": "5.3.2", "yargs": "17.7.2" }, "devDependencies": { diff --git a/packages/core/package.json b/packages/core/package.json index 2f763cb10628..aec66d9ef2b2 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -63,7 +63,7 @@ "resolve-url-loader": "5.0.0", "rimraf": "5.0.5", "style-loader": "3.3.3", - "typescript": "5.2.2", + "typescript": "5.3.2", "url-loader": "4.1.1", "webpack": "5.89.0", "webpack-bundle-analyzer": "4.9.1", diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index c04e43e28c44..f436a4f681b6 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -35,7 +35,7 @@ "devDependencies": { "@babel/cli": "7.23.4", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index ff025ba77a19..607ef69e89f1 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -31,7 +31,7 @@ "esbuild": "0.19.5", "fast-glob": "3.3.2", "glob": "10.3.10", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/fastify/package.json b/packages/fastify/package.json index 1b90b9ff9863..fdffbc9b40d2 100644 --- a/packages/fastify/package.json +++ b/packages/fastify/package.json @@ -35,7 +35,7 @@ "@types/lodash": "4.14.201", "@types/qs": "6.9.10", "esbuild": "0.19.5", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/forms/package.json b/packages/forms/package.json index c3a209256790..594661998be2 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -43,7 +43,7 @@ "nodemon": "3.0.1", "react": "0.0.0-experimental-e5205658f-20230913", "react-dom": "0.0.0-experimental-e5205658f-20230913", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { "graphql": "16.8.1", diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 655adbce09ef..46b92d5017f2 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -57,7 +57,7 @@ "aws-lambda": "1.0.7", "jest": "29.7.0", "jsonwebtoken": "9.0.2", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/internal/package.json b/packages/internal/package.json index 8ea9fed2c709..113980b83cf0 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -65,7 +65,7 @@ "systeminformation": "5.21.17", "terminal-link": "2.1.1", "ts-node": "10.9.1", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "devDependencies": { "@babel/cli": "7.23.4", diff --git a/packages/internal/src/__tests__/fixtures/nestedPages/web/src/Routes.js b/packages/internal/src/__tests__/fixtures/nestedPages/web/src/Routes.js index 43cf0d3c5bc7..f636475bd3c3 100644 --- a/packages/internal/src/__tests__/fixtures/nestedPages/web/src/Routes.js +++ b/packages/internal/src/__tests__/fixtures/nestedPages/web/src/Routes.js @@ -7,7 +7,7 @@ // 'src/pages/HomePage/HomePage.js' -> HomePage // 'src/pages/Admin/BooksPage/BooksPage.js' -> AdminBooksPage -import { Private, Route, Router, Set } from '@redwoodjs/router' +import { PrivateSet, Route, Router, Set } from '@redwoodjs/router' import AdminLayout from 'src/layouts/AdminLayout/AdminLayout' import MainLayout from 'src/layouts/MainLayout/MainLayout' @@ -44,7 +44,7 @@ const Routes = () => { - + @@ -52,7 +52,7 @@ const Routes = () => { - + ) } diff --git a/packages/mailer/core/package.json b/packages/mailer/core/package.json index 737474121a94..285e6a6d2afe 100644 --- a/packages/mailer/core/package.json +++ b/packages/mailer/core/package.json @@ -30,7 +30,7 @@ "esbuild": "0.19.5", "fast-glob": "3.3.2", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/mailer/handlers/in-memory/package.json b/packages/mailer/handlers/in-memory/package.json index f58f6d5910e8..b944aec1db39 100644 --- a/packages/mailer/handlers/in-memory/package.json +++ b/packages/mailer/handlers/in-memory/package.json @@ -29,7 +29,7 @@ "devDependencies": { "esbuild": "0.19.5", "fast-glob": "3.3.2", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/mailer/handlers/nodemailer/package.json b/packages/mailer/handlers/nodemailer/package.json index 58812d05aaa0..140cde7d00ee 100644 --- a/packages/mailer/handlers/nodemailer/package.json +++ b/packages/mailer/handlers/nodemailer/package.json @@ -31,7 +31,7 @@ "@types/nodemailer": "6", "esbuild": "0.19.5", "fast-glob": "3.3.2", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/mailer/handlers/resend/package.json b/packages/mailer/handlers/resend/package.json index c3ea0f69e46b..f3afafd51132 100644 --- a/packages/mailer/handlers/resend/package.json +++ b/packages/mailer/handlers/resend/package.json @@ -30,7 +30,7 @@ "devDependencies": { "esbuild": "0.19.5", "fast-glob": "3.3.2", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/mailer/handlers/studio/package.json b/packages/mailer/handlers/studio/package.json index 7a54a7ad5d23..a57310e458d7 100644 --- a/packages/mailer/handlers/studio/package.json +++ b/packages/mailer/handlers/studio/package.json @@ -31,7 +31,7 @@ "@types/nodemailer": "^6", "esbuild": "0.19.5", "fast-glob": "3.3.2", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/mailer/renderers/mjml-react/package.json b/packages/mailer/renderers/mjml-react/package.json index d8671ea77cfd..59b4b23d5d1e 100644 --- a/packages/mailer/renderers/mjml-react/package.json +++ b/packages/mailer/renderers/mjml-react/package.json @@ -32,7 +32,7 @@ "@types/mjml": "4", "esbuild": "0.19.5", "fast-glob": "3.3.2", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/mailer/renderers/react-email/package.json b/packages/mailer/renderers/react-email/package.json index 3af237f29bd4..8eb1e83ee84b 100644 --- a/packages/mailer/renderers/react-email/package.json +++ b/packages/mailer/renderers/react-email/package.json @@ -30,7 +30,7 @@ "devDependencies": { "esbuild": "0.19.5", "fast-glob": "3.3.2", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/prerender/package.json b/packages/prerender/package.json index 539a2b36212f..be2a8f07d786 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -44,7 +44,7 @@ "@types/mime-types": "2.1.4", "babel-plugin-tester": "11.0.4", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { "react": "0.0.0-experimental-e5205658f-20230913", diff --git a/packages/project-config/package.json b/packages/project-config/package.json index fd3081d47a60..5bf8e95fb44d 100644 --- a/packages/project-config/package.json +++ b/packages/project-config/package.json @@ -32,7 +32,7 @@ "esbuild": "0.19.5", "jest": "29.7.0", "rimraf": "5.0.5", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/realtime/package.json b/packages/realtime/package.json index 05986e81a7bc..d7a6291c91e6 100644 --- a/packages/realtime/package.json +++ b/packages/realtime/package.json @@ -42,7 +42,7 @@ "esbuild": "0.19.5", "jest": "29.7.0", "nodemon": "3.0.1", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { "ioredis": "^5.3.2" diff --git a/packages/router/package.json b/packages/router/package.json index 173c7480a70b..4b7edf033de0 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -37,7 +37,7 @@ "react": "0.0.0-experimental-e5205658f-20230913", "react-dom": "0.0.0-experimental-e5205658f-20230913", "tstyche": "1.0.0-beta.3", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { "react": "0.0.0-experimental-e5205658f-20230913", diff --git a/packages/router/src/__typetests__/routeParamsTypes.test.ts b/packages/router/src/__typetests__/routeParamsTypes.test.ts index 50680153709d..36c674d527ba 100644 --- a/packages/router/src/__typetests__/routeParamsTypes.test.ts +++ b/packages/router/src/__typetests__/routeParamsTypes.test.ts @@ -1,4 +1,4 @@ -import { context, describe, expect, test } from 'tstyche' +import { describe, expect, test } from 'tstyche' import type { RouteParams, ParamType } from '../routeParamsTypes' @@ -90,14 +90,12 @@ describe('RouteParams<>', () => { expect(globRoutes.description).type.toBeString() }) - context('Glob params in the middle', () => { - test('Multiple Glob route params', () => { - const middleGlob: RouteParams<'/repo/{folders...}/edit'> = { - folders: 'src/lib/auth.js', - } + test('Glob params in the middle', () => { + const middleGlob: RouteParams<'/repo/{folders...}/edit'> = { + folders: 'src/lib/auth.js', + } - expect(middleGlob.folders).type.toBeString() - }) + expect(middleGlob.folders).type.toBeString() }) test('Mixed typed and untyped params', () => { diff --git a/packages/structure/package.json b/packages/structure/package.json index fff3a8d24a00..a04cc564f621 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -63,7 +63,7 @@ "@types/node": "18.18.9", "@types/vscode": "1.79.1", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/structure/src/model/RWRoute.ts b/packages/structure/src/model/RWRoute.ts index 5a66caa7a69a..0d54fb180e62 100644 --- a/packages/structure/src/model/RWRoute.ts +++ b/packages/structure/src/model/RWRoute.ts @@ -192,7 +192,7 @@ export class RWRoute extends BaseNode { if (this.isPrivate && this.isNotFound) { yield err( this.jsxNode!, - "The 'Not Found' page cannot be within a tag" + "The 'Not Found' page cannot be within a or a tag" ) } if (this.isNotFound && this.path) { diff --git a/packages/studio/api/lib/authProviderEncoders/dbAuthEncoder.ts b/packages/studio/api/lib/authProviderEncoders/dbAuthEncoder.ts index 771fefca29a1..653ea878864a 100644 --- a/packages/studio/api/lib/authProviderEncoders/dbAuthEncoder.ts +++ b/packages/studio/api/lib/authProviderEncoders/dbAuthEncoder.ts @@ -17,7 +17,9 @@ export const getDBAuthHeader = async (userId?: string) => { ) } - const { encryptSession } = await import('@redwoodjs/auth-dbauth-api') + const { + default: { encryptSession }, + } = await import('@redwoodjs/auth-dbauth-api') const id = isNumeric(userId) ? parseInt(userId) : userId const cookie = encryptSession(JSON.stringify({ id }) + ';' + uuidv4()) diff --git a/packages/studio/package.json b/packages/studio/package.json index af10b8007225..312b0687d4ef 100644 --- a/packages/studio/package.json +++ b/packages/studio/package.json @@ -52,7 +52,7 @@ "yargs": "17.7.2" }, "devDependencies": { - "@apollo/client": "3.8.7", + "@apollo/client": "3.8.8", "@babel/cli": "7.23.4", "@babel/core": "^7.22.20", "@graphiql/plugin-explorer": "0.1.22", @@ -97,7 +97,7 @@ "react-split-pane": "0.1.92", "react-toastify": "9.1.3", "tailwindcss": "3.3.5", - "typescript": "5.2.2", + "typescript": "5.3.2", "use-url-search-params": "2.5.1", "vite": "4.5.0" }, diff --git a/packages/testing/package.json b/packages/testing/package.json index 3ef184022afe..12d65fba4bae 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -58,7 +58,7 @@ "devDependencies": { "@babel/cli": "7.23.4", "@babel/core": "^7.22.20", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/testing/src/web/__tests__/MockRouter.test.tsx b/packages/testing/src/web/__tests__/MockRouter.test.tsx index fc4953652153..6a1ef2f78a3d 100644 --- a/packages/testing/src/web/__tests__/MockRouter.test.tsx +++ b/packages/testing/src/web/__tests__/MockRouter.test.tsx @@ -2,7 +2,7 @@ import React from 'react' import { render } from '@testing-library/react' -import { Route, Private } from '@redwoodjs/router' +import { Route, PrivateSet } from '@redwoodjs/router' import { routes, Router } from '../MockRouter' @@ -14,10 +14,10 @@ describe('MockRouter', () => { - + - + ) diff --git a/packages/tui/package.json b/packages/tui/package.json index adea57dcddc8..188da69201dc 100644 --- a/packages/tui/package.json +++ b/packages/tui/package.json @@ -35,6 +35,6 @@ "devDependencies": { "esbuild": "0.19.5", "jest": "29.7.0", - "typescript": "5.2.2" + "typescript": "5.3.2" } } diff --git a/packages/vite/bins/rw-vite-build.mjs b/packages/vite/bins/rw-vite-build.mjs index e3aabaf7773e..eed357df4b34 100755 --- a/packages/vite/bins/rw-vite-build.mjs +++ b/packages/vite/bins/rw-vite-build.mjs @@ -1,3 +1,4 @@ +#!/usr/bin/env node import fs from 'node:fs' import yargsParser from 'yargs-parser' diff --git a/packages/vite/bins/rw-vite-dev.mjs b/packages/vite/bins/rw-vite-dev.mjs index ffd641c01433..ba0e4e5a205a 100755 --- a/packages/vite/bins/rw-vite-dev.mjs +++ b/packages/vite/bins/rw-vite-dev.mjs @@ -1,3 +1,4 @@ +#!/usr/bin/env node import { createServer } from 'vite' import yargsParser from 'yargs-parser' diff --git a/packages/vite/package.json b/packages/vite/package.json index 37de5bda8a75..026753b60089 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -69,7 +69,7 @@ "@redwoodjs/web": "6.0.7", "@swc/core": "1.3.60", "@vitejs/plugin-react": "4.2.0", - "@whatwg-node/server": "0.9.16", + "@whatwg-node/server": "0.9.18", "acorn-loose": "8.3.0", "buffer": "6.0.3", "busboy": "^1.6.0", @@ -92,7 +92,7 @@ "glob": "10.3.10", "jest": "29.7.0", "rollup": "3.29.4", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/vite/src/__tests__/fixtures/nestedPages/web/src/Routes.js b/packages/vite/src/__tests__/fixtures/nestedPages/web/src/Routes.js index 43cf0d3c5bc7..f636475bd3c3 100644 --- a/packages/vite/src/__tests__/fixtures/nestedPages/web/src/Routes.js +++ b/packages/vite/src/__tests__/fixtures/nestedPages/web/src/Routes.js @@ -7,7 +7,7 @@ // 'src/pages/HomePage/HomePage.js' -> HomePage // 'src/pages/Admin/BooksPage/BooksPage.js' -> AdminBooksPage -import { Private, Route, Router, Set } from '@redwoodjs/router' +import { PrivateSet, Route, Router, Set } from '@redwoodjs/router' import AdminLayout from 'src/layouts/AdminLayout/AdminLayout' import MainLayout from 'src/layouts/MainLayout/MainLayout' @@ -44,7 +44,7 @@ const Routes = () => { - + @@ -52,7 +52,7 @@ const Routes = () => { - + ) } diff --git a/packages/vite/src/buildFeServer.ts b/packages/vite/src/buildFeServer.ts index b242dc9c7ae1..bdff87e4812f 100644 --- a/packages/vite/src/buildFeServer.ts +++ b/packages/vite/src/buildFeServer.ts @@ -58,7 +58,7 @@ export const buildFeServer = async ({ verbose, webDir }: BuildOptions = {}) => { entries: rwPaths.web.entries, webDist: rwPaths.web.dist, webDistServer: rwPaths.web.distServer, - webDistEntries: rwPaths.web.distServerEntries, + webDistServerEntries: rwPaths.web.distServerEntries, webRouteManifest: rwPaths.web.routeManifest, }) } @@ -149,7 +149,7 @@ export const buildFeServer = async ({ verbose, webDir }: BuildOptions = {}) => { acc[route.pathDefinition] = { name: route.name, bundle: route.relativeFilePath - ? clientBuildManifest[route.relativeFilePath]?.file + ? clientBuildManifest[route.relativeFilePath]?.file ?? null : null, matchRegexString: route.matchRegexString, // @NOTE this is the path definition, not the actual path @@ -165,10 +165,14 @@ export const buildFeServer = async ({ verbose, webDir }: BuildOptions = {}) => { : null, renderMode: route.renderMode, } + return acc }, {}) - await fs.writeFile(rwPaths.web.routeManifest, JSON.stringify(routeManifest)) + await fs.writeFile( + rwPaths.web.routeManifest, + JSON.stringify(routeManifest, null, 2) + ) } // TODO (STREAMING) Hacky work around because when you don't have a App.routeHook, esbuild doesn't create diff --git a/packages/vite/src/buildRscFeServer.ts b/packages/vite/src/buildRscFeServer.ts index 607f83fc8492..1fdd6e191ecc 100644 --- a/packages/vite/src/buildRscFeServer.ts +++ b/packages/vite/src/buildRscFeServer.ts @@ -1,17 +1,9 @@ -import fs from 'fs/promises' -import path from 'path' - -import react from '@vitejs/plugin-react' -import { build as viteBuild } from 'vite' -import type { Manifest as ViteBuildManifest } from 'vite' - -import type { RouteSpec } from '@redwoodjs/internal/dist/routes' - -import { onWarn } from './lib/onWarn' -import { rscBuild } from './rscBuild' -import type { RWRouteManifest } from './types' -import { serverBuild } from './waku-lib/build-server' -import { rscIndexPlugin } from './waku-lib/vite-plugin-rsc' +import { rscBuildAnalyze } from './rsc/rscBuildAnalyze' +import { rscBuildClient } from './rsc/rscBuildClient' +import { rscBuildClientEntriesMappings } from './rsc/rscBuildClientEntriesFile' +import { rscBuildCopyCssAssets } from './rsc/rscBuildCopyCssAssets' +import { rscBuildRouteManifest } from './rsc/rscBuildRouteManifest' +import { rscBuildServer } from './rsc/rscBuildServer' interface Args { viteConfigPath: string @@ -20,7 +12,7 @@ interface Args { entries: string webDist: string webDistServer: string - webDistEntries: string + webDistServerEntries: string webRouteManifest: string } @@ -31,236 +23,41 @@ export const buildRscFeServer = async ({ entries, webDist, webDistServer, - webDistEntries, + webDistServerEntries, webRouteManifest, }: Args) => { - // Step 1: Analyze all files and generate a list of RSCs and RSFs - const { clientEntryFiles, serverEntryFiles } = await rscBuild(viteConfigPath) - - // Step 2: Generate the client bundle - const clientBuildOutput = await viteBuild({ - // configFile: viteConfigPath, - root: webSrc, - plugins: [react(), rscIndexPlugin()], - build: { - outDir: webDist, - emptyOutDir: true, // Needed because `outDir` is not inside `root` - // TODO (RSC) Enable this when we switch to a server-first approach - // emptyOutDir: false, // Already done when building server - rollupOptions: { - onwarn: onWarn, - input: { - main: webHtml, - ...clientEntryFiles, - }, - preserveEntrySignatures: 'exports-only', - output: { - // This is not ideal. See - // https://rollupjs.org/faqs/#why-do-additional-imports-turn-up-in-my-entry-chunks-when-code-splitting - // But we need it to prevent `import 'client-only'` from being - // hoisted into App.tsx - // TODO (RSC): Fix when https://github.com/rollup/rollup/issues/5235 - // is resolved - hoistTransitiveImports: false, - }, - }, - manifest: 'client-build-manifest.json', - }, - esbuild: { - logLevel: 'debug', - }, - }) + // Analyze all files and generate a list of RSCs and RSFs + const { clientEntryFiles, serverEntryFiles } = await rscBuildAnalyze( + viteConfigPath + ) - if (!('output' in clientBuildOutput)) { - throw new Error('Unexpected vite client build output') - } + // Generate the client bundle + const clientBuildOutput = await rscBuildClient( + webSrc, + webHtml, + webDist, + clientEntryFiles + ) - // Step 3: Generate the server output - const serverBuildOutput = await serverBuild( + // Generate the server output + const serverBuildOutput = await rscBuildServer( entries, clientEntryFiles, serverEntryFiles, {} ) - // TODO (RSC) Some css is now duplicated in two files (i.e. for client - // components). Probably don't want that. - // Also not sure if this works on "soft" rerenders (i.e. not a full page - // load) - await Promise.all( - serverBuildOutput.output - .filter((item) => { - return item.type === 'asset' && item.fileName.endsWith('.css') - }) - .map((cssAsset) => { - return fs.copyFile( - path.join(webDistServer, cssAsset.fileName), - path.join(webDist, cssAsset.fileName) - ) - }) - ) + // Copy CSS assets from server to client + await rscBuildCopyCssAssets(serverBuildOutput, webDist, webDistServer) - const clientEntries: Record = {} - for (const item of clientBuildOutput.output) { - const { name, fileName } = item - const entryFile = - name && - // TODO (RSC) Can't we just compare the names? `item.name === name` - serverBuildOutput.output.find( - (item) => - 'moduleIds' in item && - item.moduleIds.includes(clientEntryFiles[name] as string) - )?.fileName - - if (entryFile) { - console.log('entryFile', entryFile) - if (process.platform === 'win32') { - const entryFileSlash = entryFile.replaceAll('\\', '/') - console.log('entryFileSlash', entryFileSlash) - // Prevent errors on Windows like - // Error: No client entry found for D:/a/redwood/rsc-project/web/dist/server/assets/rsc0.js - clientEntries[entryFileSlash] = fileName - } else { - clientEntries[entryFile] = fileName - } - } - } - - console.log('clientEntries', clientEntries) - - await fs.appendFile( - webDistEntries, - `export const clientEntries=${JSON.stringify(clientEntries)};` + // Mappings from server to client asset file names + await rscBuildClientEntriesMappings( + clientBuildOutput, + serverBuildOutput, + clientEntryFiles, + webDistServerEntries ) - // // Step 1A: Generate the client bundle - // await buildWeb({ verbose }) - - // const rollupInput = { - // entries: rwPaths.web.entryServer, - // ...clientEntryFiles, - // ...serverEntryFiles, - // } - - // Step 1B: Generate the server output - // await build({ - // // TODO (RSC) I had this marked as 'FIXME'. I guess I just need to make - // // sure we still include it, or at least make it possible for users to pass - // // in their own config - // // configFile: viteConfig, - // ssr: { - // noExternal: Array.from(clientEntryFileSet).map( - // // TODO (RSC) I think the comment below is from waku. We don't care - // // about pnpm, do we? Does it also affect yarn? - // // FIXME this might not work with pnpm - // // TODO (RSC) No idea what's going on here - // (filename) => { - // const nodeModulesPath = path.join(rwPaths.base, 'node_modules') - // console.log('nodeModulesPath', nodeModulesPath) - // const relativePath = path.relative(nodeModulesPath, filename) - // console.log('relativePath', relativePath) - // console.log('first split', relativePath.split('/')[0]) - - // return relativePath.split('/')[0] - // } - // ), - // }, - // build: { - // // Because we configure the root to be web/src, we need to go up one level - // outDir: rwPaths.web.distServer, - // // TODO (RSC) Maybe we should re-enable this. I can't remember anymore) - // // What does 'ssr' even mean? - // // ssr: rwPaths.web.entryServer, - // rollupOptions: { - // input: { - // // TODO (RSC) entries: rwPaths.web.entryServer, - // ...clientEntryFiles, - // ...serverEntryFiles, - // }, - // output: { - // banner: (chunk) => { - // console.log('chunk', chunk) - - // // HACK to bring directives to the front - // let code = '' - - // if (chunk.moduleIds.some((id) => clientEntryFileSet.has(id))) { - // code += '"use client";' - // } - - // if (chunk.moduleIds.some((id) => serverEntryFileSet.has(id))) { - // code += '"use server";' - // } - - // console.log('code', code) - // return code - // }, - // entryFileNames: (chunkInfo) => { - // console.log('chunkInfo', chunkInfo) - - // // TODO (RSC) Don't hardcode 'entry.server' - // if (chunkInfo.name === 'entry.server') { - // return '[name].js' - // } - - // return 'assets/[name].js' - // }, - // }, - // }, - // }, - // envFile: false, - // logLevel: verbose ? 'info' : 'warn', - // }) - - // Step 3: Generate route-manifest.json - - // TODO When https://github.com/tc39/proposal-import-attributes and - // https://github.com/microsoft/TypeScript/issues/53656 have both landed we - // should try to do this instead: - // const clientBuildManifest: ViteBuildManifest = await import( - // path.join(getPaths().web.dist, 'client-build-manifest.json'), - // { with: { type: 'json' } } - // ) - // NOTES: - // * There's a related babel plugin here - // https://babeljs.io/docs/babel-plugin-syntax-import-attributes - // * Included in `preset-env` if you set `shippedProposals: true` - // * We had this before, but with `assert` instead of `with`. We really - // should be using `with`. See motivation in issues linked above. - // * With `assert` and `@babel/plugin-syntax-import-assertions` the - // code compiled and ran properly, but Jest tests failed, complaining - // about the syntax. - const manifestPath = path.join(webDist, 'client-build-manifest.json') - const manifestStr = await fs.readFile(manifestPath, 'utf-8') - const clientBuildManifest: ViteBuildManifest = JSON.parse(manifestStr) - - // TODO (RSC) We don't have support for a router yet, so skip all routes - const routesList = [] as RouteSpec[] // getProjectRoutes() - - // This is all a no-op for now - const routeManifest = routesList.reduce((acc, route) => { - acc[route.pathDefinition] = { - name: route.name, - bundle: route.relativeFilePath - ? clientBuildManifest[route.relativeFilePath].file - : null, - matchRegexString: route.matchRegexString, - // NOTE this is the path definition, not the actual path - // E.g. /blog/post/{id:Int} - pathDefinition: route.pathDefinition, - hasParams: route.hasParams, - routeHooks: null, - redirect: route.redirect - ? { - to: route.redirect?.to, - permanent: false, - } - : null, - renderMode: route.renderMode, - } - - return acc - }, {}) - - await fs.writeFile(webRouteManifest, JSON.stringify(routeManifest)) + // Write a route manifest + await rscBuildRouteManifest(webRouteManifest) } diff --git a/packages/vite/src/rscBuild.ts b/packages/vite/src/rsc/rscBuildAnalyze.ts similarity index 89% rename from packages/vite/src/rscBuild.ts rename to packages/vite/src/rsc/rscBuildAnalyze.ts index 070b929a9ab0..bda200a0ff0e 100644 --- a/packages/vite/src/rscBuild.ts +++ b/packages/vite/src/rsc/rscBuildAnalyze.ts @@ -3,16 +3,17 @@ import { build as viteBuild } from 'vite' import { getPaths } from '@redwoodjs/project-config' -import { onWarn } from './lib/onWarn' -import { rscAnalyzePlugin } from './waku-lib/vite-plugin-rsc' +import { onWarn } from '../lib/onWarn' +import { rscAnalyzePlugin } from '../waku-lib/vite-plugin-rsc' /** - * RSC build. Step 1 of 3. + * RSC build. Step 1. + * buildFeServer -> buildRscFeServer -> rscBuildAnalyze * Uses rscAnalyzePlugin to collect client and server entry points * Starts building the AST in entries.ts * Doesn't output any files, only collects a list of RSCs and RSFs */ -export async function rscBuild(viteConfigPath: string) { +export async function rscBuildAnalyze(viteConfigPath: string) { const rwPaths = getPaths() const clientEntryFileSet = new Set() const serverEntryFileSet = new Set() diff --git a/packages/vite/src/rsc/rscBuildClient.ts b/packages/vite/src/rsc/rscBuildClient.ts new file mode 100644 index 000000000000..650273c3dbd4 --- /dev/null +++ b/packages/vite/src/rsc/rscBuildClient.ts @@ -0,0 +1,56 @@ +import react from '@vitejs/plugin-react' +import { build as viteBuild } from 'vite' + +import { onWarn } from '../lib/onWarn' +import { rscIndexPlugin } from '../waku-lib/vite-plugin-rsc' + +/** + * RSC build. Step 2. + * buildFeServer -> buildRscFeServer -> rscBuildClient + * Generate the client bundle + */ +export async function rscBuildClient( + webSrc: string, + webHtml: string, + webDist: string, + clientEntryFiles: Record +) { + const clientBuildOutput = await viteBuild({ + // configFile: viteConfigPath, + root: webSrc, + plugins: [react(), rscIndexPlugin()], + build: { + outDir: webDist, + emptyOutDir: true, // Needed because `outDir` is not inside `root` + // TODO (RSC) Enable this when we switch to a server-first approach + // emptyOutDir: false, // Already done when building server + rollupOptions: { + onwarn: onWarn, + input: { + main: webHtml, + ...clientEntryFiles, + }, + preserveEntrySignatures: 'exports-only', + output: { + // This is not ideal. See + // https://rollupjs.org/faqs/#why-do-additional-imports-turn-up-in-my-entry-chunks-when-code-splitting + // But we need it to prevent `import 'client-only'` from being + // hoisted into App.tsx + // TODO (RSC): Fix when https://github.com/rollup/rollup/issues/5235 + // is resolved + hoistTransitiveImports: false, + }, + }, + manifest: 'client-build-manifest.json', + }, + esbuild: { + logLevel: 'debug', + }, + }) + + if (!('output' in clientBuildOutput)) { + throw new Error('Unexpected vite client build output') + } + + return clientBuildOutput.output +} diff --git a/packages/vite/src/rsc/rscBuildClientEntriesFile.ts b/packages/vite/src/rsc/rscBuildClientEntriesFile.ts new file mode 100644 index 000000000000..4c65f2a9d455 --- /dev/null +++ b/packages/vite/src/rsc/rscBuildClientEntriesFile.ts @@ -0,0 +1,49 @@ +import fs from 'fs/promises' + +import type { rscBuildClient } from './rscBuildClient' +import type { rscBuildServer } from './rscBuildServer' + +/** + * RSC build. Step 5. + * Append a mapping of server asset names to client asset names to the + * `web/dist/server/entries.js` file. + */ +export function rscBuildClientEntriesMappings( + clientBuildOutput: Awaited>, + serverBuildOutput: Awaited>, + clientEntryFiles: Record, + webDistServerEntries: string +) { + const clientEntries: Record = {} + for (const item of clientBuildOutput) { + const { name, fileName } = item + const entryFile = + name && + // TODO (RSC) Can't we just compare the names? `item.name === name` + serverBuildOutput.find( + (item) => + 'moduleIds' in item && + item.moduleIds.includes(clientEntryFiles[name] as string) + )?.fileName + + if (entryFile) { + console.log('entryFile', entryFile) + if (process.platform === 'win32') { + const entryFileSlash = entryFile.replaceAll('\\', '/') + console.log('entryFileSlash', entryFileSlash) + // Prevent errors on Windows like + // Error: No client entry found for D:/a/redwood/rsc-project/web/dist/server/assets/rsc0.js + clientEntries[entryFileSlash] = fileName + } else { + clientEntries[entryFile] = fileName + } + } + } + + console.log('clientEntries', clientEntries) + + return fs.appendFile( + webDistServerEntries, + `export const clientEntries=${JSON.stringify(clientEntries)};` + ) +} diff --git a/packages/vite/src/rsc/rscBuildCopyCssAssets.ts b/packages/vite/src/rsc/rscBuildCopyCssAssets.ts new file mode 100644 index 000000000000..37bf0927246f --- /dev/null +++ b/packages/vite/src/rsc/rscBuildCopyCssAssets.ts @@ -0,0 +1,31 @@ +import fs from 'fs/promises' +import path from 'path' + +import type { rscBuildServer } from './rscBuildServer' + +/** + * RSC build. Step 4. + * Copy CSS assets from server to client + */ +export function rscBuildCopyCssAssets( + serverBuildOutput: Awaited>, + webDist: string, + webDistServer: string +) { + // TODO (RSC) Some css is now duplicated in two files (i.e. for client + // components). Probably don't want that. + // Also not sure if this works on "soft" rerenders (i.e. not a full page + // load) + return Promise.all( + serverBuildOutput + .filter((item) => { + return item.type === 'asset' && item.fileName.endsWith('.css') + }) + .map((cssAsset) => { + return fs.copyFile( + path.join(webDistServer, cssAsset.fileName), + path.join(webDist, cssAsset.fileName) + ) + }) + ) +} diff --git a/packages/vite/src/rsc/rscBuildRouteManifest.ts b/packages/vite/src/rsc/rscBuildRouteManifest.ts new file mode 100644 index 000000000000..db2e82f57a0e --- /dev/null +++ b/packages/vite/src/rsc/rscBuildRouteManifest.ts @@ -0,0 +1,52 @@ +import fs from 'fs/promises' +import path from 'path' + +import type { Manifest as ViteBuildManifest } from 'vite' + +import { getProjectRoutes } from '@redwoodjs/internal/dist/routes' +import { getPaths } from '@redwoodjs/project-config' + +import type { RWRouteManifest } from '../types' + +/** + * RSC build. Step 6. + * Generate a route manifest file for the web server side. + */ +export async function rscBuildRouteManifest(webRouteManifest: string) { + const manifestPath = path.join( + getPaths().web.dist, + 'client-build-manifest.json' + ) + const buildManifestStr = await fs.readFile(manifestPath, 'utf-8') + const clientBuildManifest: ViteBuildManifest = JSON.parse(buildManifestStr) + + const routesList = getProjectRoutes() + + const routeManifest = routesList.reduce((acc, route) => { + acc[route.pathDefinition] = { + name: route.name, + bundle: route.relativeFilePath + ? clientBuildManifest[route.relativeFilePath]?.file ?? null + : null, + matchRegexString: route.matchRegexString, + // NOTE this is the path definition, not the actual path + // E.g. /blog/post/{id:Int} + pathDefinition: route.pathDefinition, + hasParams: route.hasParams, + routeHooks: null, + redirect: route.redirect + ? { + to: route.redirect?.to, + permanent: false, + } + : null, + renderMode: route.renderMode, + } + + return acc + }, {}) + + console.log('routeManifest', JSON.stringify(routeManifest, null, 2)) + + return fs.writeFile(webRouteManifest, JSON.stringify(routeManifest, null, 2)) +} diff --git a/packages/vite/src/waku-lib/build-server.ts b/packages/vite/src/rsc/rscBuildServer.ts similarity index 95% rename from packages/vite/src/waku-lib/build-server.ts rename to packages/vite/src/rsc/rscBuildServer.ts index fca7c113ce7a..1848f7b1ed37 100644 --- a/packages/vite/src/waku-lib/build-server.ts +++ b/packages/vite/src/rsc/rscBuildServer.ts @@ -1,4 +1,3 @@ -// TODO (RSC) Take ownership of this file and move it out ouf the waku-lib folder import path from 'node:path' import react from '@vitejs/plugin-react' @@ -8,8 +7,12 @@ import { getPaths } from '@redwoodjs/project-config' import { onWarn } from '../lib/onWarn' -// This is part of step 3. It's invoked from ./buildRscFeServer -export async function serverBuild( +/** + * RSC build. Step 3. + * buildFeServer -> buildRscFeServer -> rscBuildClient + * Generate the client bundle + */ +export async function rscBuildServer( entriesFile: string, clientEntryFiles: Record, serverEntryFiles: Record, @@ -123,5 +126,5 @@ export async function serverBuild( throw new Error('Unexpected vite server build output') } - return serverBuildOutput + return serverBuildOutput.output } diff --git a/packages/vite/src/rsc/rscRequestHandler.ts b/packages/vite/src/rsc/rscRequestHandler.ts index 3b428cc5ed2f..b33f58ba9ebe 100644 --- a/packages/vite/src/rsc/rscRequestHandler.ts +++ b/packages/vite/src/rsc/rscRequestHandler.ts @@ -18,7 +18,7 @@ export function createRscRequestHandler() { console.log("req.headers['rw-rsc']", req.headers['rw-rsc']) // https://www.rfc-editor.org/rfc/rfc6648 - // SHOULD NOT prefix their parameter names with "X-" or similar constructs. + // "SHOULD NOT prefix their parameter names with "X-" or similar constructs." if (req.headers['rw-rsc'] !== '1') { return next() } diff --git a/packages/vite/src/runFeServer.ts b/packages/vite/src/runFeServer.ts index 37655cf1da47..6810fa9212e5 100644 --- a/packages/vite/src/runFeServer.ts +++ b/packages/vite/src/runFeServer.ts @@ -127,28 +127,28 @@ export async function runFeServer() { const getStylesheetLinks = () => indexEntry.css || [] const clientEntry = '/' + indexEntry.file - // `routeManifest` is empty for RSC builds for now, so we're not doing SSR - // when we have RSC experimental support enabled - for (const route of Object.values(routeManifest)) { - const routeHandler = await createReactStreamingHandler({ - route, - clientEntryPath: clientEntry, - getStylesheetLinks, - }) - - // if it is a 404, register it at the end somehow. - if (!route.matchRegexString) { - continue + if (!rwConfig.experimental?.rsc?.enabled) { + for (const route of Object.values(routeManifest)) { + const routeHandler = await createReactStreamingHandler({ + route, + clientEntryPath: clientEntry, + getStylesheetLinks, + }) + + // if it is a 404, register it at the end somehow. + if (!route.matchRegexString) { + continue + } + + // @TODO: we don't need regexes here + // Param matching, etc. all handled within the route handler now + const expressPathDef = route.hasParams + ? route.matchRegexString + : route.pathDefinition + + // Wrap with whatg/server adapter. Express handler -> Fetch API handler + app.get(expressPathDef, createServerAdapter(routeHandler)) } - - // @TODO: we don't need regexes here - // Param matching, etc. all handled within the route handler now - const expressPathDef = route.hasParams - ? route.matchRegexString - : route.pathDefinition - - // Wrap with whatg/server adapter. Express handler -> Fetch API handler - app.get(expressPathDef, createServerAdapter(routeHandler)) } // Mounting middleware at /rw-rsc will strip /rw-rsc from req.url diff --git a/packages/vite/src/streaming/createReactStreamingHandler.ts b/packages/vite/src/streaming/createReactStreamingHandler.ts index ebbf2cc4b13d..2fd3356dc747 100644 --- a/packages/vite/src/streaming/createReactStreamingHandler.ts +++ b/packages/vite/src/streaming/createReactStreamingHandler.ts @@ -37,8 +37,10 @@ export const createReactStreamingHandler = async ( let fallbackDocumentImport: any if (isProd) { - entryServerImport = await import(rwPaths.web.distEntryServer) - fallbackDocumentImport = await import(rwPaths.web.distDocumentServer) + entryServerImport = await import(makeFilePath(rwPaths.web.distEntryServer)) + fallbackDocumentImport = await import( + makeFilePath(rwPaths.web.distDocumentServer) + ) } // @NOTE: we are returning a FetchAPI handler @@ -134,3 +136,8 @@ export const createReactStreamingHandler = async ( return reactResponse } } + +function makeFilePath(path: string): string { + // Without this, absolute paths can't be imported on Windows + return 'file:///' + path +} diff --git a/packages/web-server/package.json b/packages/web-server/package.json index 3c0ac0b341f6..eb6c5a6bc878 100644 --- a/packages/web-server/package.json +++ b/packages/web-server/package.json @@ -37,7 +37,7 @@ "devDependencies": { "@types/yargs-parser": "21.0.3", "esbuild": "0.19.5", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/web/package.json b/packages/web/package.json index ad6242cef339..83438435a88f 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -36,7 +36,7 @@ "test:watch": "yarn test --watch" }, "dependencies": { - "@apollo/client": "3.8.7", + "@apollo/client": "3.8.8", "@babel/runtime-corejs3": "7.23.4", "@redwoodjs/auth": "6.0.7", "core-js": "3.33.3", @@ -62,7 +62,7 @@ "react": "0.0.0-experimental-e5205658f-20230913", "react-dom": "0.0.0-experimental-e5205658f-20230913", "tstyche": "1.0.0-beta.3", - "typescript": "5.2.2" + "typescript": "5.3.2" }, "peerDependencies": { "react": "0.0.0-experimental-e5205658f-20230913", diff --git a/yarn.lock b/yarn.lock index c22c747752b3..f845c87b46fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -125,17 +125,16 @@ __metadata: languageName: node linkType: hard -"@apollo/client@npm:3.8.7": - version: 3.8.7 - resolution: "@apollo/client@npm:3.8.7" +"@apollo/client@npm:3.8.8": + version: 3.8.8 + resolution: "@apollo/client@npm:3.8.8" dependencies: "@graphql-typed-document-node/core": ^3.1.1 - "@wry/context": ^0.7.3 "@wry/equality": ^0.5.6 - "@wry/trie": ^0.4.3 + "@wry/trie": ^0.5.0 graphql-tag: ^2.12.6 hoist-non-react-statics: ^3.3.2 - optimism: ^0.17.5 + optimism: ^0.18.0 prop-types: ^15.7.2 response-iterator: ^0.2.6 symbol-observable: ^4.0.0 @@ -157,7 +156,7 @@ __metadata: optional: true subscriptions-transport-ws: optional: true - checksum: e88be52f6393ab0625999abf7f6ed6c1035e5f290a738477210f9563d85d369b3dcb86dff7613be84a012192b66c2fae18ee9d5acf55f2b0ca30c1cc77c38559 + checksum: a097fb49d68fa77d59f8d63f73f0335624608102ebe2a30270d679b50f3fc2d697298fde8619571b419c93660a5ba90874d93e3b10efc8d910d752f14df1770b languageName: node linkType: hard @@ -398,43 +397,43 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.22.13": - version: 7.22.13 - resolution: "@babel/code-frame@npm:7.22.13" +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/code-frame@npm:7.23.5" dependencies: - "@babel/highlight": ^7.22.13 + "@babel/highlight": ^7.23.4 chalk: ^2.4.2 - checksum: f4cc8ae1000265677daf4845083b72f88d00d311adb1a93c94eb4b07bf0ed6828a81ae4ac43ee7d476775000b93a28a9cddec18fbdc5796212d8dcccd5de72bd + checksum: a10e843595ddd9f97faa99917414813c06214f4d9205294013e20c70fbdf4f943760da37dec1d998bf3e6fc20fa2918a47c0e987a7e458663feb7698063ad7c6 languageName: node linkType: hard -"@babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/compat-data@npm:7.23.3" - checksum: c6af331753c34ee8a5678bc94404320826cb56b1dda3efc1311ec8fb0774e78225132f3c1acc988440ace667f14a838e297a822692b95758aa63da406e1f97a1 +"@babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.23.3, @babel/compat-data@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/compat-data@npm:7.23.5" + checksum: 081278ed46131a890ad566a59c61600a5f9557bd8ee5e535890c8548192532ea92590742fd74bd9db83d74c669ef8a04a7e1c85cdea27f960233e3b83c3a957c languageName: node linkType: hard -"@babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.12.9, @babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0, @babel/core@npm:^7.21.3, @babel/core@npm:^7.22.0, @babel/core@npm:^7.22.20, @babel/core@npm:^7.22.9, @babel/core@npm:^7.23.3, @babel/core@npm:^7.7.5": - version: 7.23.3 - resolution: "@babel/core@npm:7.23.3" +"@babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.12.9, @babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0, @babel/core@npm:^7.18.9, @babel/core@npm:^7.21.3, @babel/core@npm:^7.22.20, @babel/core@npm:^7.23.0, @babel/core@npm:^7.23.2, @babel/core@npm:^7.23.3": + version: 7.23.5 + resolution: "@babel/core@npm:7.23.5" dependencies: "@ampproject/remapping": ^2.2.0 - "@babel/code-frame": ^7.22.13 - "@babel/generator": ^7.23.3 + "@babel/code-frame": ^7.23.5 + "@babel/generator": ^7.23.5 "@babel/helper-compilation-targets": ^7.22.15 "@babel/helper-module-transforms": ^7.23.3 - "@babel/helpers": ^7.23.2 - "@babel/parser": ^7.23.3 + "@babel/helpers": ^7.23.5 + "@babel/parser": ^7.23.5 "@babel/template": ^7.22.15 - "@babel/traverse": ^7.23.3 - "@babel/types": ^7.23.3 + "@babel/traverse": ^7.23.5 + "@babel/types": ^7.23.5 convert-source-map: ^2.0.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.2.3 semver: ^6.3.1 - checksum: 08d43b749e24052d12713a7fb1f0c0d1275d4fb056d00846faeb8da79ecf6d0ba91a11b6afec407b8b0f9388d00e2c2f485f282bef0ade4d6d0a17de191a4287 + checksum: 311a512a870ee330a3f9a7ea89e5df790b2b5af0b1bd98b10b4edc0de2ac440f0df4d69ea2c0ee38a4b89041b9a495802741d93603be7d4fd834ec8bb6970bd2 languageName: node linkType: hard @@ -464,7 +463,7 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:7.23.4, @babel/generator@npm:^7.12.11, @babel/generator@npm:^7.14.0, @babel/generator@npm:^7.18.13, @babel/generator@npm:^7.22.9, @babel/generator@npm:^7.23.3, @babel/generator@npm:^7.7.2": +"@babel/generator@npm:7.23.4": version: 7.23.4 resolution: "@babel/generator@npm:7.23.4" dependencies: @@ -476,6 +475,18 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.14.0, @babel/generator@npm:^7.18.13, @babel/generator@npm:^7.23.0, @babel/generator@npm:^7.23.5, @babel/generator@npm:^7.7.2": + version: 7.23.5 + resolution: "@babel/generator@npm:7.23.5" + dependencies: + "@babel/types": ^7.23.5 + "@jridgewell/gen-mapping": ^0.3.2 + "@jridgewell/trace-mapping": ^0.3.17 + jsesc: ^2.5.1 + checksum: 14c6e874f796c4368e919bed6003bb0adc3ce837760b08f9e646d20aeb5ae7d309723ce6e4f06bcb4a2b5753145446c8e4425851380f695e40e71e1760f49e7b + languageName: node + linkType: hard + "@babel/helper-annotate-as-pure@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-annotate-as-pure@npm:7.22.5" @@ -689,17 +700,17 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.22.20, @babel/helper-validator-identifier@npm:^7.22.5": +"@babel/helper-validator-identifier@npm:^7.22.20": version: 7.22.20 resolution: "@babel/helper-validator-identifier@npm:7.22.20" checksum: dcad63db345fb110e032de46c3688384b0008a42a4845180ce7cd62b1a9c0507a1bed727c4d1060ed1a03ae57b4d918570259f81724aaac1a5b776056f37504e languageName: node linkType: hard -"@babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.22.5": - version: 7.22.15 - resolution: "@babel/helper-validator-option@npm:7.22.15" - checksum: e9661bf80ba18e2dd978217b350fb07298e57ac417f4f1ab9fa011505e20e4857f2c3b4b538473516a9dc03af5ce3a831e5ed973311c28326f4c330b6be981c2 +"@babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/helper-validator-option@npm:7.23.5" + checksum: af45d5c0defb292ba6fd38979e8f13d7da63f9623d8ab9ededc394f67eb45857d2601278d151ae9affb6e03d5d608485806cd45af08b4468a0515cf506510e94 languageName: node linkType: hard @@ -714,25 +725,25 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.23.2": - version: 7.23.2 - resolution: "@babel/helpers@npm:7.23.2" +"@babel/helpers@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/helpers@npm:7.23.5" dependencies: "@babel/template": ^7.22.15 - "@babel/traverse": ^7.23.2 - "@babel/types": ^7.23.0 - checksum: 3a6a939c5277a27486e7c626812f0643b35d1c053ac2eb66911f5ae6c0a4e4bcdd40750eba36b766b0ee8a753484287f50ae56232a5f8f2947116723e44b9e35 + "@babel/traverse": ^7.23.5 + "@babel/types": ^7.23.5 + checksum: a37e2728eb4378a4888e5d614e28de7dd79b55ac8acbecd0e5c761273e2a02a8f33b34b1932d9069db55417ace2937cbf8ec37c42f1030ce6d228857d7ccaa4f languageName: node linkType: hard -"@babel/highlight@npm:^7.22.13": - version: 7.22.13 - resolution: "@babel/highlight@npm:7.22.13" +"@babel/highlight@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/highlight@npm:7.23.4" dependencies: - "@babel/helper-validator-identifier": ^7.22.5 + "@babel/helper-validator-identifier": ^7.22.20 chalk: ^2.4.2 js-tokens: ^4.0.0 - checksum: 65f20132c7ada5d82d343dc23ca61bcd040980f7bd59e480532bcd7f7895aa7abe58470ae8a4f851fd244b71b42a7ad915f7c515fef8f1c2e003777721ebdbe6 + checksum: fbff9fcb2f5539289c3c097d130e852afd10d89a3a08ac0b5ebebbc055cc84a4bcc3dcfed463d488cde12dd0902ef1858279e31d7349b2e8cee43913744bda33 languageName: node linkType: hard @@ -754,12 +765,12 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.1.6, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.8, @babel/parser@npm:^7.20.15, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.16, @babel/parser@npm:^7.22.7, @babel/parser@npm:^7.23.3, @babel/parser@npm:^7.3.2": - version: 7.23.3 - resolution: "@babel/parser@npm:7.23.3" +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.1.6, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.8, @babel/parser@npm:^7.20.15, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.16, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.23.5, @babel/parser@npm:^7.3.2": + version: 7.23.5 + resolution: "@babel/parser@npm:7.23.5" bin: parser: ./bin/babel-parser.js - checksum: 0fe11eadd4146a9155305b5bfece0f8223a3b1b97357ffa163c0156940de92e76cd0e7a173de819b8692767147e62f33389b312d1537f84cede51092672df6ef + checksum: 3356aa90d7bafb4e2c7310e7c2c3d443c4be4db74913f088d3d577a1eb914ea4188e05fd50a47ce907a27b755c4400c4e3cbeee73dbeb37761f6ca85954f5a20 languageName: node linkType: hard @@ -952,14 +963,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-flow@npm:^7.0.0, @babel/plugin-syntax-flow@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-syntax-flow@npm:7.22.5" +"@babel/plugin-syntax-flow@npm:^7.0.0, @babel/plugin-syntax-flow@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-syntax-flow@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 07afc7df02141597968532bfbfa3f6c0ad21a2bdd885d0e5e035dcf60fdf35f0995631c9750b464e1a6f2feea14160a82787f914e88e8f7115dc99f09853e43e + checksum: 8a5e1e8b6a3728a2c8fe6d70c09a43642e737d9c0485e1b041cd3a6021ef05376ec3c9137be3b118c622ba09b5770d26fdc525473f8d06d4ab9e46de2783dd0a languageName: node linkType: hard @@ -1140,9 +1151,9 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-async-generator-functions@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.3" +"@babel/plugin-transform-async-generator-functions@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.4" dependencies: "@babel/helper-environment-visitor": ^7.22.20 "@babel/helper-plugin-utils": ^7.22.5 @@ -1150,7 +1161,7 @@ __metadata: "@babel/plugin-syntax-async-generators": ^7.8.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: e846f282658e097fce4fccf3ee29289bf05f0654846a5994727a36f0cdc2e47abdffd4be4fa65787e94aa975824fae894c90afbfdc8caacd46c12c7f43e99d7f + checksum: f2eef4de609975a3f7da7832576b5ffc93e43c80f87e1a99e886b0f8591096cfc4c37e2d5f52fdeaa2a9c09a25a59f3e621159abaca75d3193922a5c0e4cbe0c languageName: node linkType: hard @@ -1178,14 +1189,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-block-scoping@npm:^7.0.0, @babel/plugin-transform-block-scoping@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-block-scoping@npm:7.23.3" +"@babel/plugin-transform-block-scoping@npm:^7.0.0, @babel/plugin-transform-block-scoping@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-block-scoping@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: ccaeded7954c196811d22a35322579254cda52676e823682b6234885a3aaf88fe0d5152dacaec43db9031dcf35a050a5343e36028e5905b0ba9c02d36b30a57f + checksum: 83006804dddf980ab1bcd6d67bc381e24b58c776507c34f990468f820d0da71dba3697355ca4856532fa2eeb2a1e3e73c780f03760b5507a511cbedb0308e276 languageName: node linkType: hard @@ -1201,22 +1212,22 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-class-static-block@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-class-static-block@npm:7.23.3" +"@babel/plugin-transform-class-static-block@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-class-static-block@npm:7.23.4" dependencies: "@babel/helper-create-class-features-plugin": ^7.22.15 "@babel/helper-plugin-utils": ^7.22.5 "@babel/plugin-syntax-class-static-block": ^7.14.5 peerDependencies: "@babel/core": ^7.12.0 - checksum: 89cdb66d7bc834cd51659eb7286a6bee23add0bc114943d68c4b6c0c834178cf0d55183df0cf508fec9c55ed4155641360e6f55a91c16fe826ccaf1adf381922 + checksum: fdca96640ef29d8641a7f8de106f65f18871b38cc01c0f7b696d2b49c76b77816b30a812c08e759d06dd10b4d9b3af6b5e4ac22a2017a88c4077972224b77ab0 languageName: node linkType: hard -"@babel/plugin-transform-classes@npm:^7.0.0, @babel/plugin-transform-classes@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-classes@npm:7.23.3" +"@babel/plugin-transform-classes@npm:^7.0.0, @babel/plugin-transform-classes@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/plugin-transform-classes@npm:7.23.5" dependencies: "@babel/helper-annotate-as-pure": ^7.22.5 "@babel/helper-compilation-targets": ^7.22.15 @@ -1229,7 +1240,7 @@ __metadata: globals: ^11.1.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 88bfd332db0ba5cbfb8557a2ba5a7185151aebc9cfe3035b014aa6d795556acbe672bb8c78da3c9fd1d23f55a333d14b5daa127ef037f5ced5198b6d79a146d6 + checksum: 07988f52b4893151887d1ea6ff79e5fe834078c5731bd09babd5659edbbae21ea4e2de326a02443a63fd776b4c945da6177f07875b56fe66e0b7899e830a9e92 languageName: node linkType: hard @@ -1279,15 +1290,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-dynamic-import@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-dynamic-import@npm:7.23.3" +"@babel/plugin-transform-dynamic-import@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-dynamic-import@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": ^7.22.5 "@babel/plugin-syntax-dynamic-import": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: df3fd130312dc53d068fa76333991dce5e86987b023af8c3b502bd7d36a8e67da6f718e61dc838576a9fbacd06628e29607ee22d9bae30705485c14130eab201 + checksum: 19ae4a4a2ca86d35224734c41c48b2aa6a13139f3cfa1cbd18c0e65e461de8b65687dec7e52b7a72bb49db04465394c776aa1b13a2af5dc975b2a0cde3dcab67 languageName: node linkType: hard @@ -1303,27 +1314,27 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-export-namespace-from@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-export-namespace-from@npm:7.23.3" +"@babel/plugin-transform-export-namespace-from@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-export-namespace-from@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": ^7.22.5 "@babel/plugin-syntax-export-namespace-from": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 390c6626dcda99023629049d92090242b4575351a4a7b47f97febabd2381f2cd0f624de661d8de8d1f715fedd63753cfd1feddead19e5960c27b88e447465b81 + checksum: 38bf04f851e36240bbe83ace4169da626524f4107bfb91f05b4ad93a5fb6a36d5b3d30b8883c1ba575ccfc1bac7938e90ca2e3cb227f7b3f4a9424beec6fd4a7 languageName: node linkType: hard -"@babel/plugin-transform-flow-strip-types@npm:^7.0.0, @babel/plugin-transform-flow-strip-types@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-flow-strip-types@npm:7.22.5" +"@babel/plugin-transform-flow-strip-types@npm:^7.0.0, @babel/plugin-transform-flow-strip-types@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-flow-strip-types@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-flow": ^7.22.5 + "@babel/plugin-syntax-flow": ^7.23.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 5949a8e5214e3fc65d31dab0551423cea9d9eef35faa5d0004707ba7347baf96166aa400907ce7498f754db4e1e9d039ca434a508546b0dc9fdae9a42e814c1a + checksum: 9ab627f9668fc1f95564b26bffd6706f86205960d9ccc168236752fbef65dbe10aa0ce74faae12f48bb3b72ec7f38ef2a78b4874c222c1e85754e981639f3b33 languageName: node linkType: hard @@ -1351,15 +1362,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-json-strings@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-json-strings@npm:7.23.3" +"@babel/plugin-transform-json-strings@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-json-strings@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": ^7.22.5 "@babel/plugin-syntax-json-strings": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: e1cef6a485b9da32aba9449fb459dac062dfc401f3d6ad48e7fbdcb73bbe470c995cc15ce5c421b95efe1e9a90d5507eb606360fe10b6d8cb869dd5dae7a2562 + checksum: 39e82223992a9ad857722ae051291935403852ad24b0dd64c645ca1c10517b6bf9822377d88643fed8b3e61a4e3f7e5ae41cf90eb07c40a786505d47d5970e54 languageName: node linkType: hard @@ -1374,15 +1385,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-logical-assignment-operators@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.23.3" +"@babel/plugin-transform-logical-assignment-operators@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": ^7.22.5 "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 23b7588b26d420c8b132bd08916d49871ca0c8db892f6b58637b10e2a0d918163d413c505db880a9157fc2e61d089040f139298a60d837ccbd0efca0474ac7ca + checksum: 87b034dd13143904e405887e6125d76c27902563486efc66b7d9a9d8f9406b76c6ac42d7b37224014af5783d7edb465db0cdecd659fa3227baad0b3a6a35deff languageName: node linkType: hard @@ -1409,7 +1420,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-modules-commonjs@npm:^7.0.0, @babel/plugin-transform-modules-commonjs@npm:^7.13.8, @babel/plugin-transform-modules-commonjs@npm:^7.23.3": +"@babel/plugin-transform-modules-commonjs@npm:^7.0.0, @babel/plugin-transform-modules-commonjs@npm:^7.13.8, @babel/plugin-transform-modules-commonjs@npm:^7.23.0, @babel/plugin-transform-modules-commonjs@npm:^7.23.3": version: 7.23.3 resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.3" dependencies: @@ -1471,7 +1482,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.4, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.23.3": +"@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.4, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.11, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.23.4": version: 7.23.4 resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.4" dependencies: @@ -1483,21 +1494,21 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-numeric-separator@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-numeric-separator@npm:7.23.3" +"@babel/plugin-transform-numeric-separator@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-numeric-separator@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": ^7.22.5 "@babel/plugin-syntax-numeric-separator": ^7.10.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: d3748cce20e8752e61dfda55e275c699459a3ff8d0bb46585da813136e04066b1ce70b71beef504fcdc8d4cca3c955112cea96d5e9fd5a42a5bc8956d05236c2 + checksum: e34902da4f5588dc4812c92cb1f6a5e3e3647baf7b4623e30942f551bf1297621abec4e322ebfa50b320c987c0f34d9eb4355b3d289961d9035e2126e3119c12 languageName: node linkType: hard -"@babel/plugin-transform-object-rest-spread@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-object-rest-spread@npm:7.23.3" +"@babel/plugin-transform-object-rest-spread@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-object-rest-spread@npm:7.23.4" dependencies: "@babel/compat-data": ^7.23.3 "@babel/helper-compilation-targets": ^7.22.15 @@ -1506,7 +1517,7 @@ __metadata: "@babel/plugin-transform-parameters": ^7.23.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 31ab631aaba945c118662943e5f1f54a21f07d64f06e06b25d55871168c460f3eeeccdf7b05aa74a1340e2cfbe781ad3c7ceccd0c2585d39f7b73ba11ebaa9d0 + checksum: b56017992ffe7fcd1dd9a9da67c39995a141820316266bcf7d77dc912980d228ccbd3f36191d234f5cc389b09157b5d2a955e33e8fb368319534affd1c72b262 languageName: node linkType: hard @@ -1522,28 +1533,28 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-optional-catch-binding@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.23.3" +"@babel/plugin-transform-optional-catch-binding@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": ^7.22.5 "@babel/plugin-syntax-optional-catch-binding": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 85ac1e94ee8f21648816151628ff931cc16143ec8c904649a1ecfd8960160290eccc5a197b4ae3ee7a1c7a27a7c4189e61b4de24483d5bad4040784afe2d206f + checksum: 4ef61812af0e4928485e28301226ce61139a8b8cea9e9a919215ebec4891b9fea2eb7a83dc3090e2679b7d7b2c8653da601fbc297d2addc54a908b315173991e languageName: node linkType: hard -"@babel/plugin-transform-optional-chaining@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.3" +"@babel/plugin-transform-optional-chaining@npm:^7.23.0, @babel/plugin-transform-optional-chaining@npm:^7.23.3, @babel/plugin-transform-optional-chaining@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": ^7.22.5 "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5 "@babel/plugin-syntax-optional-chaining": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 2b358962169d871392aa292a67527e5335909438da0ddbb0d19e7838c0f8a2081cc751a49e6e534ac4d6c932254531a205ac22b197f64fc4c89f41bf9f595497 + checksum: 305b773c29ad61255b0e83ec1e92b2f7af6aa58be4cba1e3852bddaa14f7d2afd7b4438f41c28b179d6faac7eb8d4fb5530a17920294f25d459b8f84406bfbfb languageName: node linkType: hard @@ -1570,9 +1581,9 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-private-property-in-object@npm:^7.22.11, @babel/plugin-transform-private-property-in-object@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-private-property-in-object@npm:7.23.3" +"@babel/plugin-transform-private-property-in-object@npm:^7.22.11, @babel/plugin-transform-private-property-in-object@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-private-property-in-object@npm:7.23.4" dependencies: "@babel/helper-annotate-as-pure": ^7.22.5 "@babel/helper-create-class-features-plugin": ^7.22.15 @@ -1580,7 +1591,7 @@ __metadata: "@babel/plugin-syntax-private-property-in-object": ^7.14.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 9211dd25a6e87a01535f2d97a663fa6de3472b963c8dcfaacce229a2e3fa6500f2e9fc690bc100a540fc7b66c8364faf7ef19b32e9c9b9791e4561b742c15ed3 + checksum: 8d31b28f24204b4d13514cd3a8f3033abf575b1a6039759ddd6e1d82dd33ba7281f9bc85c9f38072a665d69bfa26dc40737eefaf9d397b024654a483d2357bf5 languageName: node linkType: hard @@ -1822,14 +1833,14 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:^7.22.20, @babel/preset-env@npm:^7.22.9": - version: 7.23.3 - resolution: "@babel/preset-env@npm:7.23.3" +"@babel/preset-env@npm:^7.22.20, @babel/preset-env@npm:^7.23.2": + version: 7.23.5 + resolution: "@babel/preset-env@npm:7.23.5" dependencies: - "@babel/compat-data": ^7.23.3 + "@babel/compat-data": ^7.23.5 "@babel/helper-compilation-targets": ^7.22.15 "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-validator-option": ^7.22.15 + "@babel/helper-validator-option": ^7.23.5 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.23.3 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.23.3 "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": ^7.23.3 @@ -1853,25 +1864,25 @@ __metadata: "@babel/plugin-syntax-top-level-await": ^7.14.5 "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6 "@babel/plugin-transform-arrow-functions": ^7.23.3 - "@babel/plugin-transform-async-generator-functions": ^7.23.3 + "@babel/plugin-transform-async-generator-functions": ^7.23.4 "@babel/plugin-transform-async-to-generator": ^7.23.3 "@babel/plugin-transform-block-scoped-functions": ^7.23.3 - "@babel/plugin-transform-block-scoping": ^7.23.3 + "@babel/plugin-transform-block-scoping": ^7.23.4 "@babel/plugin-transform-class-properties": ^7.23.3 - "@babel/plugin-transform-class-static-block": ^7.23.3 - "@babel/plugin-transform-classes": ^7.23.3 + "@babel/plugin-transform-class-static-block": ^7.23.4 + "@babel/plugin-transform-classes": ^7.23.5 "@babel/plugin-transform-computed-properties": ^7.23.3 "@babel/plugin-transform-destructuring": ^7.23.3 "@babel/plugin-transform-dotall-regex": ^7.23.3 "@babel/plugin-transform-duplicate-keys": ^7.23.3 - "@babel/plugin-transform-dynamic-import": ^7.23.3 + "@babel/plugin-transform-dynamic-import": ^7.23.4 "@babel/plugin-transform-exponentiation-operator": ^7.23.3 - "@babel/plugin-transform-export-namespace-from": ^7.23.3 + "@babel/plugin-transform-export-namespace-from": ^7.23.4 "@babel/plugin-transform-for-of": ^7.23.3 "@babel/plugin-transform-function-name": ^7.23.3 - "@babel/plugin-transform-json-strings": ^7.23.3 + "@babel/plugin-transform-json-strings": ^7.23.4 "@babel/plugin-transform-literals": ^7.23.3 - "@babel/plugin-transform-logical-assignment-operators": ^7.23.3 + "@babel/plugin-transform-logical-assignment-operators": ^7.23.4 "@babel/plugin-transform-member-expression-literals": ^7.23.3 "@babel/plugin-transform-modules-amd": ^7.23.3 "@babel/plugin-transform-modules-commonjs": ^7.23.3 @@ -1879,15 +1890,15 @@ __metadata: "@babel/plugin-transform-modules-umd": ^7.23.3 "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5 "@babel/plugin-transform-new-target": ^7.23.3 - "@babel/plugin-transform-nullish-coalescing-operator": ^7.23.3 - "@babel/plugin-transform-numeric-separator": ^7.23.3 - "@babel/plugin-transform-object-rest-spread": ^7.23.3 + "@babel/plugin-transform-nullish-coalescing-operator": ^7.23.4 + "@babel/plugin-transform-numeric-separator": ^7.23.4 + "@babel/plugin-transform-object-rest-spread": ^7.23.4 "@babel/plugin-transform-object-super": ^7.23.3 - "@babel/plugin-transform-optional-catch-binding": ^7.23.3 - "@babel/plugin-transform-optional-chaining": ^7.23.3 + "@babel/plugin-transform-optional-catch-binding": ^7.23.4 + "@babel/plugin-transform-optional-chaining": ^7.23.4 "@babel/plugin-transform-parameters": ^7.23.3 "@babel/plugin-transform-private-methods": ^7.23.3 - "@babel/plugin-transform-private-property-in-object": ^7.23.3 + "@babel/plugin-transform-private-property-in-object": ^7.23.4 "@babel/plugin-transform-property-literals": ^7.23.3 "@babel/plugin-transform-regenerator": ^7.23.3 "@babel/plugin-transform-reserved-words": ^7.23.3 @@ -1908,20 +1919,20 @@ __metadata: semver: ^6.3.1 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 36b02a86817ab5474bb74a8d62a110723b0b05904a52ddc5627cf89457525b8d5ac0739b8e435a6ae12ef8b90cd5fc191169898c3dc2ac9d2c84026b02f2580a + checksum: 2a0e1274dec045186e131c6433659b75492583290e8d41633c616f6bff829cb2e4b2f9a57f556283a54db3bd6aa697911e56a36f607911a29b731c445a5b5a06 languageName: node linkType: hard -"@babel/preset-flow@npm:^7.13.13, @babel/preset-flow@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/preset-flow@npm:7.22.5" +"@babel/preset-flow@npm:^7.13.13, @babel/preset-flow@npm:^7.22.15": + version: 7.23.3 + resolution: "@babel/preset-flow@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-validator-option": ^7.22.5 - "@babel/plugin-transform-flow-strip-types": ^7.22.5 + "@babel/helper-validator-option": ^7.22.15 + "@babel/plugin-transform-flow-strip-types": ^7.23.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: d3a54fbaa6da304bedc08847876f23c4bd6f9b13eb8b675ae48c45c678066f7610437b16a8972209c5250bdb205bde8800b8055a844922488b899fdbfe295f31 + checksum: 1cf109925791f2af679f03289848d27596b4f27cb0ad4ee74a8dd4c1cbecc119bdef3b45cbbe12489bc9bdf61163f94c1c0bf6013cc58c325f1cc99edc01bda9 languageName: node linkType: hard @@ -1938,7 +1949,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-react@npm:^7.22.15, @babel/preset-react@npm:^7.22.5": +"@babel/preset-react@npm:^7.22.15": version: 7.23.3 resolution: "@babel/preset-react@npm:7.23.3" dependencies: @@ -1954,7 +1965,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-typescript@npm:^7.13.0, @babel/preset-typescript@npm:^7.22.15": +"@babel/preset-typescript@npm:^7.13.0, @babel/preset-typescript@npm:^7.22.15, @babel/preset-typescript@npm:^7.23.0": version: 7.23.3 resolution: "@babel/preset-typescript@npm:7.23.3" dependencies: @@ -2021,32 +2032,32 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.22.20, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/traverse@npm:7.23.3" +"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.22.20, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/traverse@npm:7.23.5" dependencies: - "@babel/code-frame": ^7.22.13 - "@babel/generator": ^7.23.3 + "@babel/code-frame": ^7.23.5 + "@babel/generator": ^7.23.5 "@babel/helper-environment-visitor": ^7.22.20 "@babel/helper-function-name": ^7.23.0 "@babel/helper-hoist-variables": ^7.22.5 "@babel/helper-split-export-declaration": ^7.22.6 - "@babel/parser": ^7.23.3 - "@babel/types": ^7.23.3 + "@babel/parser": ^7.23.5 + "@babel/types": ^7.23.5 debug: ^4.1.0 globals: ^11.1.0 - checksum: 3c2784f4765185126d64fd5eebce0413b7aee6d54f779998594a343a7f973a9693a441ba27533df84e7ab7ce22f1239c6837f35e903132a1b25f7fc7a67bc30f + checksum: c5ea793080ca6719b0a1612198fd25e361cee1f3c14142d7a518d2a1eeb5c1d21f7eec1b26c20ea6e1ddd8ed12ab50b960ff95ffd25be353b6b46e1b54d6f825 languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.1.6, @babel/types@npm:^7.16.8, @babel/types@npm:^7.18.13, @babel/types@npm:^7.2.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.3, @babel/types@npm:^7.23.4, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": - version: 7.23.4 - resolution: "@babel/types@npm:7.23.4" +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.1.6, @babel/types@npm:^7.16.8, @babel/types@npm:^7.18.13, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.23.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": + version: 7.23.5 + resolution: "@babel/types@npm:7.23.5" dependencies: "@babel/helper-string-parser": ^7.23.4 "@babel/helper-validator-identifier": ^7.22.20 to-fast-properties: ^2.0.0 - checksum: 231954418e0d052a8e69c9d84dde31baffd91d38d99624d18f160e14aa32b094b9e3e91c9c065ea88ea80c6e1589b17bb8b843b950c20c112f32c17482f7cf1f + checksum: 7dd5e2f59828ed046ad0b06b039df2524a8b728d204affb4fc08da2502b9dd3140b1356b5166515d229dc811539a8b70dcd4bc507e06d62a89f4091a38d0b0fb languageName: node linkType: hard @@ -2141,11 +2152,11 @@ __metadata: languageName: node linkType: hard -"@clerk/backend@npm:0.34.1": - version: 0.34.1 - resolution: "@clerk/backend@npm:0.34.1" +"@clerk/backend@npm:0.34.2": + version: 0.34.2 + resolution: "@clerk/backend@npm:0.34.2" dependencies: - "@clerk/shared": 1.1.0 + "@clerk/shared": 1.1.1 "@clerk/types": 3.58.0 "@peculiar/webcrypto": 1.4.1 "@types/node": 16.18.6 @@ -2154,29 +2165,29 @@ __metadata: node-fetch-native: 1.0.1 snakecase-keys: 5.4.4 tslib: 2.4.1 - checksum: a996653a9c4a68e314aa12168d14e545939e7f0cd7db139275c1fcdc278ab7aaf39564b08817332c9293a7042383620bb25ead0b7eaa098dcef17ef40f8d939d + checksum: 0780d96e6d2896b23853550ff6d38257f77849eedde21c2da19bd7c39ebe46413aaff92ce3ee2496f647cd9c006986a34e0c182a493ef637f0e2ff5012b5c676 languageName: node linkType: hard -"@clerk/clerk-react@npm:4.28.0": - version: 4.28.0 - resolution: "@clerk/clerk-react@npm:4.28.0" +"@clerk/clerk-react@npm:4.28.1": + version: 4.28.1 + resolution: "@clerk/clerk-react@npm:4.28.1" dependencies: - "@clerk/shared": 1.1.0 + "@clerk/shared": 1.1.1 "@clerk/types": 3.58.0 tslib: 2.4.1 peerDependencies: react: ">=16" - checksum: c8d0472ecc3c52d8ae41d3b14a6e01d5d66b7322bb30176a896d858b31c8c8775c9f4a68fa3a2eb3a2559f5e51362eb0f90fddc36536bc6b3a1b8f397dbad6be + checksum: 2ef1c60b59ca8a56ad2a1e2aa2b18e3f520a93f298039d274ed1e3b48e88f347885591c5efbf92b40d0fdbfa7f1c3083ae4aa37c0d579c08d6818d127f776fa5 languageName: node linkType: hard -"@clerk/clerk-sdk-node@npm:4.12.21": - version: 4.12.21 - resolution: "@clerk/clerk-sdk-node@npm:4.12.21" +"@clerk/clerk-sdk-node@npm:4.12.22": + version: 4.12.22 + resolution: "@clerk/clerk-sdk-node@npm:4.12.22" dependencies: - "@clerk/backend": 0.34.1 - "@clerk/shared": 1.1.0 + "@clerk/backend": 0.34.2 + "@clerk/shared": 1.1.1 "@clerk/types": 3.58.0 "@types/cookies": 0.7.7 "@types/express": 4.17.14 @@ -2184,13 +2195,13 @@ __metadata: camelcase-keys: 6.2.2 snakecase-keys: 3.2.1 tslib: 2.4.1 - checksum: 23346e33d2e291046042b2feae684fa3efa22d3a66ae30e411b4bba5c08166cf7679c6e4a66807ebaaa73539214d2a5bb050d7a1f32ec3a208f2bfb185da8b3b + checksum: 4eb43f57d4d71f083ee1156ec3456363205e442a64b1c5be8d6cad9e05e7c8612637a83667c9507981aee0481eb643a6152e3a2fd5b8f675a720c17048f94ac5 languageName: node linkType: hard -"@clerk/shared@npm:1.1.0": - version: 1.1.0 - resolution: "@clerk/shared@npm:1.1.0" +"@clerk/shared@npm:1.1.1": + version: 1.1.1 + resolution: "@clerk/shared@npm:1.1.1" dependencies: glob-to-regexp: 0.4.1 js-cookie: 3.0.1 @@ -2200,7 +2211,7 @@ __metadata: peerDependenciesMeta: react: optional: true - checksum: 2fe53d0838668f56813942398d3e80652a7475f6b94907da47eb34dccc0e55c4d2fdbdfb837e6b75d4c96fa3b7d6fa179f122bb35382a237554d1583b373c8ff + checksum: b46df70a1a5ae1381b760241700a78c2f08a7ca0890bc49dd8d3fd8d825db205dc9101283674c51aef49b19bc46cf367b0a022d4f39512d1074264c023314a5a languageName: node linkType: hard @@ -4859,7 +4870,7 @@ __metadata: languageName: node linkType: hard -"@istanbuljs/schema@npm:^0.1.2, @istanbuljs/schema@npm:^0.1.3": +"@istanbuljs/schema@npm:^0.1.2": version: 0.1.3 resolution: "@istanbuljs/schema@npm:0.1.3" checksum: 61c5286771676c9ca3eb2bd8a7310a9c063fb6e0e9712225c8471c582d157392c88f5353581c8c9adbe0dff98892317d2fdfc56c3499aa42e0194405206a963a @@ -5145,7 +5156,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/sourcemap-codec@npm:^1.4.10": +"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.15": version: 1.4.15 resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" checksum: 0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5 @@ -6671,18 +6682,18 @@ __metadata: languageName: node linkType: hard -"@playwright/test@npm:1.40.0": - version: 1.40.0 - resolution: "@playwright/test@npm:1.40.0" +"@playwright/test@npm:1.40.1": + version: 1.40.1 + resolution: "@playwright/test@npm:1.40.1" dependencies: - playwright: 1.40.0 + playwright: 1.40.1 bin: playwright: cli.js - checksum: f8856466128100cd7b152fdbf55f36b294c11a3c67dd8ba40fd383c58d3c559d7efb78b5173f40e54952eec421cad126f24a12e44fb37ea911a99c8ab87b3207 + checksum: 1edbc9659fb6a9c5299cacd9a0c7d3fdc88939036642d8f367e13d267d808ae3f88ca9d00e9981e3bcd5f584ccefba38d24eda6b23d27895908f203dc35f339e languageName: node linkType: hard -"@pmmmwh/react-refresh-webpack-plugin@npm:0.5.11, @pmmmwh/react-refresh-webpack-plugin@npm:^0.5.5": +"@pmmmwh/react-refresh-webpack-plugin@npm:0.5.11, @pmmmwh/react-refresh-webpack-plugin@npm:^0.5.11": version: 0.5.11 resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.11" dependencies: @@ -7936,7 +7947,7 @@ __metadata: pretty-ms: 7.0.1 qs: 6.11.2 split2: 4.2.0 - typescript: 5.2.2 + typescript: 5.3.2 yargs: 17.7.2 bin: rw-api-server-watch: ./dist/watch.js @@ -7970,7 +7981,7 @@ __metadata: split2: 4.2.0 title-case: 3.0.3 ts-toolbelt: 9.6.0 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: memjs: 1.3.1 redis: 4.6.7 @@ -8000,7 +8011,7 @@ __metadata: jest: 29.7.0 jsonwebtoken: 9.0.2 jwks-rsa: 3.1.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8015,7 +8026,7 @@ __metadata: "@types/yargs": 17.0.31 core-js: 3.33.3 jest: 29.7.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8032,7 +8043,7 @@ __metadata: core-js: 3.33.3 jest: 29.7.0 react: 0.0.0-experimental-e5205658f-20230913 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: "@auth0/auth0-spa-js": 2.1.2 languageName: unknown @@ -8052,7 +8063,7 @@ __metadata: jest: 29.7.0 jsonwebtoken: 9.0.2 jwks-rsa: 3.1.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8067,7 +8078,7 @@ __metadata: "@types/yargs": 17.0.31 core-js: 3.33.3 jest: 29.7.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8085,7 +8096,7 @@ __metadata: core-js: 3.33.3 jest: 29.7.0 react: 0.0.0-experimental-e5205658f-20230913 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: "@azure/msal-browser": 2.38.3 languageName: unknown @@ -8098,12 +8109,12 @@ __metadata: "@babel/cli": 7.23.4 "@babel/core": ^7.22.20 "@babel/runtime-corejs3": 7.23.4 - "@clerk/clerk-sdk-node": 4.12.21 + "@clerk/clerk-sdk-node": 4.12.22 "@redwoodjs/api": 6.0.7 "@types/aws-lambda": 8.10.126 core-js: 3.33.3 jest: 29.7.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8118,7 +8129,7 @@ __metadata: "@types/yargs": 17.0.31 core-js: 3.33.3 jest: 29.7.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8129,16 +8140,16 @@ __metadata: "@babel/cli": 7.23.4 "@babel/core": ^7.22.20 "@babel/runtime-corejs3": 7.23.4 - "@clerk/clerk-react": 4.28.0 + "@clerk/clerk-react": 4.28.1 "@clerk/types": 3.58.0 "@redwoodjs/auth": 6.0.7 "@types/react": 18.2.37 core-js: 3.33.3 jest: 29.7.0 react: 0.0.0-experimental-e5205658f-20230913 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: - "@clerk/clerk-react": 4.28.0 + "@clerk/clerk-react": 4.28.1 languageName: unknown linkType: soft @@ -8153,7 +8164,7 @@ __metadata: "@types/yargs": 17.0.31 core-js: 3.33.3 jest: 29.7.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8173,7 +8184,7 @@ __metadata: core-js: 3.33.3 jest: 29.7.0 md5: 2.3.0 - typescript: 5.2.2 + typescript: 5.3.2 uuid: 9.0.1 languageName: unknown linkType: soft @@ -8193,7 +8204,7 @@ __metadata: jest: 29.7.0 prompts: 2.4.2 terminal-link: 2.1.1 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8211,7 +8222,7 @@ __metadata: core-js: 3.33.3 jest: 29.7.0 react: 0.0.0-experimental-e5205658f-20230913 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8227,7 +8238,7 @@ __metadata: core-js: 3.33.3 firebase-admin: 11.11.0 jest: 29.7.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8242,7 +8253,7 @@ __metadata: "@types/yargs": 17.0.31 core-js: 3.33.3 jest: 29.7.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8259,7 +8270,7 @@ __metadata: firebase: 10.6.0 jest: 29.7.0 react: 0.0.0-experimental-e5205658f-20230913 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: firebase: 10.6.0 languageName: unknown @@ -8278,7 +8289,7 @@ __metadata: core-js: 3.33.3 jest: 29.7.0 jsonwebtoken: 9.0.2 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8293,7 +8304,7 @@ __metadata: "@types/yargs": 17.0.31 core-js: 3.33.3 jest: 29.7.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8310,7 +8321,7 @@ __metadata: core-js: 3.33.3 jest: 29.7.0 react: 0.0.0-experimental-e5205658f-20230913 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: netlify-identity-widget: 1.9.2 languageName: unknown @@ -8329,7 +8340,7 @@ __metadata: core-js: 3.33.3 jest: 29.7.0 jsonwebtoken: 9.0.2 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8344,7 +8355,7 @@ __metadata: "@types/yargs": 17.0.31 core-js: 3.33.3 jest: 29.7.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8355,14 +8366,14 @@ __metadata: "@babel/cli": 7.23.4 "@babel/core": ^7.22.20 "@babel/runtime-corejs3": 7.23.4 - "@supabase/supabase-js": 2.38.5 + "@supabase/supabase-js": 2.39.0 "@types/react": 18.2.37 core-js: 3.33.3 jest: 29.7.0 react: 0.0.0-experimental-e5205658f-20230913 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: - "@supabase/supabase-js": 2.38.5 + "@supabase/supabase-js": 2.39.0 languageName: unknown linkType: soft @@ -8379,7 +8390,7 @@ __metadata: jest: 29.7.0 jsonwebtoken: 9.0.2 jwks-rsa: 3.1.0 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: supertokens-node: 15.2.1 languageName: unknown @@ -8396,7 +8407,7 @@ __metadata: "@types/yargs": 17.0.31 core-js: 3.33.3 jest: 29.7.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8413,7 +8424,7 @@ __metadata: jest: 29.7.0 react: 0.0.0-experimental-e5205658f-20230913 supertokens-auth-react: 0.34.0 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: supertokens-auth-react: 0.34.0 languageName: unknown @@ -8432,7 +8443,7 @@ __metadata: jest: 29.7.0 msw: 1.3.2 react: 0.0.0-experimental-e5205658f-20230913 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8465,7 +8476,7 @@ __metadata: fast-glob: 3.3.2 graphql: 16.8.1 jest: 29.7.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8488,7 +8499,7 @@ __metadata: listr2: 6.6.1 memfs: 4.6.0 terminal-link: 2.1.1 - typescript: 5.2.2 + typescript: 5.3.2 yargs: 17.7.2 bin: up: ./dist/bin.js @@ -8520,7 +8531,7 @@ __metadata: prettier: 2.8.8 prompts: 2.4.2 terminal-link: 2.1.1 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8531,19 +8542,19 @@ __metadata: "@redwoodjs/cli-helpers": 6.0.7 "@redwoodjs/project-config": 6.0.7 "@redwoodjs/telemetry": 6.0.7 - "@storybook/addon-a11y": 7.5.3 - "@storybook/addon-docs": 7.5.3 - "@storybook/addon-essentials": 7.5.3 - "@storybook/react-webpack5": 7.5.3 + "@storybook/addon-a11y": 7.6.2 + "@storybook/addon-docs": 7.6.2 + "@storybook/addon-essentials": 7.6.2 + "@storybook/react-webpack5": 7.6.2 "@types/yargs": 17.0.31 chalk: 4.1.2 esbuild: 0.19.5 execa: 5.1.1 fast-glob: 3.3.2 jest: 29.7.0 - storybook: 7.5.3 + storybook: 7.6.2 terminal-link: 2.1.1 - typescript: 5.2.2 + typescript: 5.3.2 yargs: 17.7.2 languageName: unknown linkType: soft @@ -8604,7 +8615,7 @@ __metadata: systeminformation: 5.21.17 terminal-link: 2.1.1 title-case: 3.0.3 - typescript: 5.2.2 + typescript: 5.3.2 uuid: 9.0.1 yargs: 17.7.2 bin: @@ -8649,7 +8660,7 @@ __metadata: prettier: 2.8.8 tasuku: 2.0.1 tempy: 1.0.1 - typescript: 5.2.2 + typescript: 5.3.2 yargs: 17.7.2 bin: codemods: ./dist/codemods.js @@ -8688,7 +8699,7 @@ __metadata: resolve-url-loader: 5.0.0 rimraf: 5.0.5 style-loader: 3.3.3 - typescript: 5.2.2 + typescript: 5.3.2 url-loader: 4.1.1 webpack: 5.89.0 webpack-bundle-analyzer: 4.9.1 @@ -8741,7 +8752,7 @@ __metadata: eslint-plugin-react-hooks: 4.6.0 jest: 29.7.0 prettier: 2.8.8 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8757,7 +8768,7 @@ __metadata: eslint: 8.54.0 fast-glob: 3.3.2 glob: 10.3.10 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8780,7 +8791,7 @@ __metadata: fastify-raw-body: 4.3.0 lodash: 4.17.21 qs: 6.11.2 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8807,7 +8818,7 @@ __metadata: react: 0.0.0-experimental-e5205658f-20230913 react-dom: 0.0.0-experimental-e5205658f-20230913 react-hook-form: 7.48.2 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: graphql: 16.8.1 react: 0.0.0-experimental-e5205658f-20230913 @@ -8850,7 +8861,7 @@ __metadata: jest: 29.7.0 jsonwebtoken: 9.0.2 lodash: 4.17.21 - typescript: 5.2.2 + typescript: 5.3.2 uuid: 9.0.1 languageName: unknown linkType: soft @@ -8902,7 +8913,7 @@ __metadata: terminal-link: 2.1.1 ts-node: 10.9.1 tsx: 3.12.7 - typescript: 5.2.2 + typescript: 5.3.2 bin: rw-gen: ./dist/generate/generate.js rw-gen-watch: ./dist/generate/watch.js @@ -8917,7 +8928,7 @@ __metadata: esbuild: 0.19.5 fast-glob: 3.3.2 jest: 29.7.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8928,7 +8939,7 @@ __metadata: "@redwoodjs/mailer-core": 6.0.7 esbuild: 0.19.5 fast-glob: 3.3.2 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8941,7 +8952,7 @@ __metadata: esbuild: 0.19.5 fast-glob: 3.3.2 nodemailer: 6.9.7 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8953,7 +8964,7 @@ __metadata: esbuild: 0.19.5 fast-glob: 3.3.2 resend: 1.1.0 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8966,7 +8977,7 @@ __metadata: "@types/nodemailer": ^6 esbuild: 0.19.5 fast-glob: 3.3.2 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8980,7 +8991,7 @@ __metadata: esbuild: 0.19.5 fast-glob: 3.3.2 mjml: 4.14.1 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -8992,7 +9003,7 @@ __metadata: "@redwoodjs/mailer-core": 6.0.7 esbuild: 0.19.5 fast-glob: 3.3.2 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -9018,7 +9029,7 @@ __metadata: graphql: 16.8.1 jest: 29.7.0 mime-types: 2.1.35 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: react: 0.0.0-experimental-e5205658f-20230913 react-dom: 0.0.0-experimental-e5205658f-20230913 @@ -9036,7 +9047,7 @@ __metadata: jest: 29.7.0 rimraf: 5.0.5 string-env-interpolation: 1.0.1 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -9061,7 +9072,7 @@ __metadata: ioredis: 5.3.2 jest: 29.7.0 nodemon: 3.0.1 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: ioredis: ^5.3.2 peerDependenciesMeta: @@ -9102,7 +9113,7 @@ __metadata: react: 0.0.0-experimental-e5205658f-20230913 react-dom: 0.0.0-experimental-e5205658f-20230913 tstyche: 1.0.0-beta.3 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: react: 0.0.0-experimental-e5205658f-20230913 react-dom: 0.0.0-experimental-e5205658f-20230913 @@ -9140,7 +9151,7 @@ __metadata: lru-cache: 7.18.3 proxyquire: 2.1.3 ts-morph: 15.1.0 - typescript: 5.2.2 + typescript: 5.3.2 vscode-languageserver: 6.1.1 vscode-languageserver-textdocument: 1.0.8 vscode-languageserver-types: 3.17.3 @@ -9152,7 +9163,7 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/studio@workspace:packages/studio" dependencies: - "@apollo/client": 3.8.7 + "@apollo/client": 3.8.8 "@babel/cli": 7.23.4 "@babel/core": ^7.22.20 "@babel/runtime-corejs3": 7.23.4 @@ -9221,7 +9232,7 @@ __metadata: sqlite: 4.2.1 sqlite3: 5.1.6 tailwindcss: 3.3.5 - typescript: 5.2.2 + typescript: 5.3.2 use-url-search-params: 2.5.1 uuid: 9.0.1 vite: 4.5.0 @@ -9284,7 +9295,7 @@ __metadata: jest-watch-typeahead: 2.2.2 msw: 1.3.2 ts-toolbelt: 9.6.0 - typescript: 5.2.2 + typescript: 5.3.2 whatwg-fetch: 3.6.19 languageName: unknown linkType: soft @@ -9299,7 +9310,7 @@ __metadata: esbuild: 0.19.5 jest: 29.7.0 stdout-update: 1.6.8 - typescript: 5.2.2 + typescript: 5.3.2 languageName: unknown linkType: soft @@ -9318,7 +9329,7 @@ __metadata: "@types/react": 18.2.37 "@types/yargs-parser": 21.0.3 "@vitejs/plugin-react": 4.2.0 - "@whatwg-node/server": 0.9.16 + "@whatwg-node/server": 0.9.18 acorn-loose: 8.3.0 buffer: 6.0.3 busboy: ^1.6.0 @@ -9332,7 +9343,7 @@ __metadata: react: 0.0.0-experimental-e5205658f-20230913 react-server-dom-webpack: 0.0.0-experimental-e5205658f-20230913 rollup: 3.29.4 - typescript: 5.2.2 + typescript: 5.3.2 vite: 4.5.0 yargs-parser: 21.1.1 bin: @@ -9357,7 +9368,7 @@ __metadata: esbuild: 0.19.5 fast-glob: 3.3.2 fastify: 4.24.3 - typescript: 5.2.2 + typescript: 5.3.2 yargs-parser: 21.1.1 bin: rw-web-server: ./dist/server.js @@ -9368,7 +9379,7 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/web@workspace:packages/web" dependencies: - "@apollo/client": 3.8.7 + "@apollo/client": 3.8.8 "@apollo/experimental-nextjs-app-support": 0.5.1 "@babel/cli": 7.23.4 "@babel/core": ^7.22.20 @@ -9392,7 +9403,7 @@ __metadata: stacktracey: 2.1.8 ts-toolbelt: 9.6.0 tstyche: 1.0.0-beta.3 - typescript: 5.2.2 + typescript: 5.3.2 peerDependencies: react: 0.0.0-experimental-e5205658f-20230913 react-dom: 0.0.0-experimental-e5205658f-20230913 @@ -9562,140 +9573,71 @@ __metadata: languageName: node linkType: hard -"@storybook/addon-a11y@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-a11y@npm:7.5.3" +"@storybook/addon-a11y@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/addon-a11y@npm:7.6.2" dependencies: - "@storybook/addon-highlight": 7.5.3 - "@storybook/channels": 7.5.3 - "@storybook/client-logger": 7.5.3 - "@storybook/components": 7.5.3 - "@storybook/core-events": 7.5.3 - "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.5.3 - "@storybook/preview-api": 7.5.3 - "@storybook/theming": 7.5.3 - "@storybook/types": 7.5.3 + "@storybook/addon-highlight": 7.6.2 axe-core: ^4.2.0 - lodash: ^4.17.21 - react-resize-detector: ^7.1.2 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 62b7bb256bbd2c9f63ee8701d070543231e5e0ecd599bdd4982edc762357b9d02d630cc7f47d91de4e24bdb6810a79b90a05aaea99cc23ffe74e67b1dbdc6d1b + checksum: 6e161281e50b6a7a1274fd7c6f1b08517a3e23773adc7f84a244afa7381617dd8b1ac5e3fc5f08a30cab4e8d36edcdb89536156310b165d9bc6b288ee673f6ba languageName: node linkType: hard -"@storybook/addon-actions@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-actions@npm:7.5.3" +"@storybook/addon-actions@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/addon-actions@npm:7.6.2" dependencies: - "@storybook/client-logger": 7.5.3 - "@storybook/components": 7.5.3 - "@storybook/core-events": 7.5.3 + "@storybook/core-events": 7.6.2 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.5.3 - "@storybook/preview-api": 7.5.3 - "@storybook/theming": 7.5.3 - "@storybook/types": 7.5.3 + "@types/uuid": ^9.0.1 dequal: ^2.0.2 - lodash: ^4.17.21 polished: ^4.2.2 - prop-types: ^15.7.2 - react-inspector: ^6.0.0 - telejson: ^7.2.0 - ts-dedent: ^2.0.0 uuid: ^9.0.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: c9077396239e03370a6010f6cf60cfa566fab7e39c013d887f78398a17b29774d34991eaa8560add3692c25a12ac1db01b15b7a8552709b1d700aac0b7e24c5f + checksum: f3e77c3e4ba01b946a9e70d84192d3bc8b76b166a64640886658f1c46c5ef7c19256adbf6c9aa028e143138d403c067c58cc115fc939a510740968781f72d1f8 languageName: node linkType: hard -"@storybook/addon-backgrounds@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-backgrounds@npm:7.5.3" +"@storybook/addon-backgrounds@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/addon-backgrounds@npm:7.6.2" dependencies: - "@storybook/client-logger": 7.5.3 - "@storybook/components": 7.5.3 - "@storybook/core-events": 7.5.3 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.5.3 - "@storybook/preview-api": 7.5.3 - "@storybook/theming": 7.5.3 - "@storybook/types": 7.5.3 memoizerific: ^1.11.3 ts-dedent: ^2.0.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 70308dbec3cc77e3978d1036e5dc442c3ec84904d5d44e877c286d1db56d7f0d87dc5eea1284160006111b10e2e57f9b4c55025fd953dbcc3717a5e9c6025d63 + checksum: 4f5125d2bf043ad008c1a0e721ed56b7f71237eb42e1403266a901e7a7a1a90a3f34865529d76f4c1741c84f6c4c2321a3700811729e8a73430482e91fabf1fa languageName: node linkType: hard -"@storybook/addon-controls@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-controls@npm:7.5.3" - dependencies: - "@storybook/blocks": 7.5.3 - "@storybook/client-logger": 7.5.3 - "@storybook/components": 7.5.3 - "@storybook/core-common": 7.5.3 - "@storybook/core-events": 7.5.3 - "@storybook/manager-api": 7.5.3 - "@storybook/node-logger": 7.5.3 - "@storybook/preview-api": 7.5.3 - "@storybook/theming": 7.5.3 - "@storybook/types": 7.5.3 +"@storybook/addon-controls@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/addon-controls@npm:7.6.2" + dependencies: + "@storybook/blocks": 7.6.2 lodash: ^4.17.21 ts-dedent: ^2.0.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 43d39c726ff9c21aab0472f0b56e17633b2c1bc4ad3c445b0e718eff92efde29a3c6c5b4d3cd50841c9d03fe6b8231873e9dedf178e4b11efaa79ff717ca25b3 + checksum: 7adb0fcb997847210dc9bd1f38f4a760a8ec389699459a413ff3428a389abfbc778bd59c0add624e74151f69f80be07e7b12d2c4477f0d40a87cb7bccb2ee941 languageName: node linkType: hard -"@storybook/addon-docs@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-docs@npm:7.5.3" +"@storybook/addon-docs@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/addon-docs@npm:7.6.2" dependencies: "@jest/transform": ^29.3.1 "@mdx-js/react": ^2.1.5 - "@storybook/blocks": 7.5.3 - "@storybook/client-logger": 7.5.3 - "@storybook/components": 7.5.3 - "@storybook/csf-plugin": 7.5.3 - "@storybook/csf-tools": 7.5.3 + "@storybook/blocks": 7.6.2 + "@storybook/client-logger": 7.6.2 + "@storybook/components": 7.6.2 + "@storybook/csf-plugin": 7.6.2 + "@storybook/csf-tools": 7.6.2 "@storybook/global": ^5.0.0 "@storybook/mdx2-csf": ^1.0.0 - "@storybook/node-logger": 7.5.3 - "@storybook/postinstall": 7.5.3 - "@storybook/preview-api": 7.5.3 - "@storybook/react-dom-shim": 7.5.3 - "@storybook/theming": 7.5.3 - "@storybook/types": 7.5.3 + "@storybook/node-logger": 7.6.2 + "@storybook/postinstall": 7.6.2 + "@storybook/preview-api": 7.6.2 + "@storybook/react-dom-shim": 7.6.2 + "@storybook/theming": 7.6.2 + "@storybook/types": 7.6.2 fs-extra: ^11.1.0 remark-external-links: ^8.0.0 remark-slug: ^6.0.0 @@ -9703,155 +9645,95 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: a54f608cbf9f67db3dde5c2fc8ce05579a2a3ca449cf52a919535710881d88d6548fffad8c1fc7964a16d6e68578a85b5cf1ab3d15b691a0154d94ab444feab1 - languageName: node - linkType: hard - -"@storybook/addon-essentials@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-essentials@npm:7.5.3" - dependencies: - "@storybook/addon-actions": 7.5.3 - "@storybook/addon-backgrounds": 7.5.3 - "@storybook/addon-controls": 7.5.3 - "@storybook/addon-docs": 7.5.3 - "@storybook/addon-highlight": 7.5.3 - "@storybook/addon-measure": 7.5.3 - "@storybook/addon-outline": 7.5.3 - "@storybook/addon-toolbars": 7.5.3 - "@storybook/addon-viewport": 7.5.3 - "@storybook/core-common": 7.5.3 - "@storybook/manager-api": 7.5.3 - "@storybook/node-logger": 7.5.3 - "@storybook/preview-api": 7.5.3 + checksum: c669cceb2933ddff951fb3cc648fccfa3b094abe05e86b1f7ba21c8b6d0cde3555334a055b8b8dc454f71829e7b09dfa00fd1461e6131f4e668f3087244946ca + languageName: node + linkType: hard + +"@storybook/addon-essentials@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/addon-essentials@npm:7.6.2" + dependencies: + "@storybook/addon-actions": 7.6.2 + "@storybook/addon-backgrounds": 7.6.2 + "@storybook/addon-controls": 7.6.2 + "@storybook/addon-docs": 7.6.2 + "@storybook/addon-highlight": 7.6.2 + "@storybook/addon-measure": 7.6.2 + "@storybook/addon-outline": 7.6.2 + "@storybook/addon-toolbars": 7.6.2 + "@storybook/addon-viewport": 7.6.2 + "@storybook/core-common": 7.6.2 + "@storybook/manager-api": 7.6.2 + "@storybook/node-logger": 7.6.2 + "@storybook/preview-api": 7.6.2 ts-dedent: ^2.0.0 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 4f74cb0558c965b04e955004f8902464341bc87f790d6b80b2824a8707b4038ca3334634f7a0e29c814de913b38eb1e116bb58db86f8819ea37bd5d6cb927a39 + checksum: f06d72e36821ab052988b45b2f0bbdd00774e362b7358a0b4c9a2af105442861fc38e99ebdd41b2252e633a4f14d3ed6e952093ced0dcb4d65808c21ae971393 languageName: node linkType: hard -"@storybook/addon-highlight@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-highlight@npm:7.5.3" +"@storybook/addon-highlight@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/addon-highlight@npm:7.6.2" dependencies: - "@storybook/core-events": 7.5.3 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.5.3 - checksum: d0d8665682bcbc4241489e75695dba4fa831803ddbe17c0936dc7a1e1981237f8698b6b228031594def37a2df9a7ce217afc279aa4f3af052c67c2579972bf70 + checksum: 6dbe1e9748cd648eb052addeaab8eed08e3ba214f47903a3b335fdf69fb63d708f17274c6d12ffa718172552becdc1aed018cc39bbce058510032b5feb4ea71f languageName: node linkType: hard -"@storybook/addon-measure@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-measure@npm:7.5.3" +"@storybook/addon-measure@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/addon-measure@npm:7.6.2" dependencies: - "@storybook/client-logger": 7.5.3 - "@storybook/components": 7.5.3 - "@storybook/core-events": 7.5.3 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.5.3 - "@storybook/preview-api": 7.5.3 - "@storybook/types": 7.5.3 tiny-invariant: ^1.3.1 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 48a7bf4d6b252ec1b892ece3ee0bf3385ede2aa7a284f49443fe77d36d64cc12366051a6ad3b403da7282f2e631253722b76cf7310f0110c5da812fa27c8cc6b + checksum: 3bea1722990723079816c6835d01963b380985f4f3cef550c616413ca5ae83ad0d3767c46a3a8ceae5e8c411c94d1ef5f9c6e76247ef37d604543853f14a0bfb languageName: node linkType: hard -"@storybook/addon-outline@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-outline@npm:7.5.3" +"@storybook/addon-outline@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/addon-outline@npm:7.6.2" dependencies: - "@storybook/client-logger": 7.5.3 - "@storybook/components": 7.5.3 - "@storybook/core-events": 7.5.3 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.5.3 - "@storybook/preview-api": 7.5.3 - "@storybook/types": 7.5.3 ts-dedent: ^2.0.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 754413dc06a7fc4a0e0bd8e64553443afd0930b387ddeec5b32ef1e84ba9740d0944f9e60d793d8797fd588400c09fdfb3c5aa9330955bb4967e0b1c1fa3f309 + checksum: c6b5fe54fe220fefcc2de3c3d6ac9775b1218a7b4780fa6ba5722441b9d0f7247fe3f3c747bfe188e75d609ce2ec333f5aeb4b6cba29e2488d6aaf50c122f500 languageName: node linkType: hard -"@storybook/addon-toolbars@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-toolbars@npm:7.5.3" - dependencies: - "@storybook/client-logger": 7.5.3 - "@storybook/components": 7.5.3 - "@storybook/manager-api": 7.5.3 - "@storybook/preview-api": 7.5.3 - "@storybook/theming": 7.5.3 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: d0c393c9e16b14654fdc92a78eaf20b2c0685fa1ac9c1d1011c11e72cc5ad69a187ef7ac2e6568e3a77c32a53c524da126b55f3d7a31d97d958bc809d34b79c8 +"@storybook/addon-toolbars@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/addon-toolbars@npm:7.6.2" + checksum: 56deec18bf820b237d99d9e8ce8b214357f18bee5b9de382a4ad6606a4ac18169c0a2222045a49b42d1bc08ae39bf69dc51558f16c8fced130f933b85db6ef74 languageName: node linkType: hard -"@storybook/addon-viewport@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-viewport@npm:7.5.3" +"@storybook/addon-viewport@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/addon-viewport@npm:7.6.2" dependencies: - "@storybook/client-logger": 7.5.3 - "@storybook/components": 7.5.3 - "@storybook/core-events": 7.5.3 - "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.5.3 - "@storybook/preview-api": 7.5.3 - "@storybook/theming": 7.5.3 memoizerific: ^1.11.3 - prop-types: ^15.7.2 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 50207e3bb943ea43914513324fc35c8036556a797c20f1b66bf89615a7158450652d78bbe9ae09a11c539d4dcfeb8a716f1bb41d92e3fecca61aa1ac5bf8646f + checksum: f37adf8c30b81f4f8d6e4d3bd93401eba13b41093b2be2ca5530b5b50a066e9f96d6ddc85f3cfca7558b202b433ff16174a61bde3eb9b3038c2c9e89c7243b1f languageName: node linkType: hard -"@storybook/blocks@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/blocks@npm:7.5.3" - dependencies: - "@storybook/channels": 7.5.3 - "@storybook/client-logger": 7.5.3 - "@storybook/components": 7.5.3 - "@storybook/core-events": 7.5.3 - "@storybook/csf": ^0.1.0 - "@storybook/docs-tools": 7.5.3 +"@storybook/blocks@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/blocks@npm:7.6.2" + dependencies: + "@storybook/channels": 7.6.2 + "@storybook/client-logger": 7.6.2 + "@storybook/components": 7.6.2 + "@storybook/core-events": 7.6.2 + "@storybook/csf": ^0.1.2 + "@storybook/docs-tools": 7.6.2 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.5.3 - "@storybook/preview-api": 7.5.3 - "@storybook/theming": 7.5.3 - "@storybook/types": 7.5.3 + "@storybook/manager-api": 7.6.2 + "@storybook/preview-api": 7.6.2 + "@storybook/theming": 7.6.2 + "@storybook/types": 7.6.2 "@types/lodash": ^4.14.167 color-convert: ^2.0.1 dequal: ^2.0.2 @@ -9867,18 +9749,18 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: d7036bea0ff1137063dd7aab28a6fe2e114809127b7f53aadfae272b752b1ffaaf54ec8cbdff689da54285d64cfff58108885fe8f937748efc71a7bbdae0bf75 + checksum: 4c43543604de7686bc1c0d011a07e5f7df2c03fc4541bcb5e0dec5e9ff7bb21a720b12428dde8affc84636b43039a486fc2935a7983c176a2af175add1feeff1 languageName: node linkType: hard -"@storybook/builder-manager@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/builder-manager@npm:7.5.3" +"@storybook/builder-manager@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/builder-manager@npm:7.6.2" dependencies: "@fal-works/esbuild-plugin-global-externals": ^2.1.2 - "@storybook/core-common": 7.5.3 - "@storybook/manager": 7.5.3 - "@storybook/node-logger": 7.5.3 + "@storybook/core-common": 7.6.2 + "@storybook/manager": 7.6.2 + "@storybook/node-logger": 7.6.2 "@types/ejs": ^3.1.1 "@types/find-cache-dir": ^3.2.1 "@yarnpkg/esbuild-plugin-pnp": ^3.0.0-rc.10 @@ -9891,36 +9773,37 @@ __metadata: fs-extra: ^11.1.0 process: ^0.11.10 util: ^0.12.4 - checksum: 35ed5138a7b7fd968539a3b177a3b8b9a2eff4ddea0a05eb1134188a5c14c0d4334a8e7ac6e5bb5a2eea0c1fe7eec079eee7e056a9584933fd1e9f01def98157 + checksum: 1a1fdb968d0cc27c0ce6c999a779e0a59a2d387059ef3364c8c8325e1e34a952c62a088cca381f013d3c5ec271a56d5bff8f2c7f5e8079e4230806c0a5835aa5 languageName: node linkType: hard -"@storybook/builder-webpack5@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/builder-webpack5@npm:7.5.3" +"@storybook/builder-webpack5@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/builder-webpack5@npm:7.6.2" dependencies: - "@babel/core": ^7.22.0 - "@storybook/channels": 7.5.3 - "@storybook/client-logger": 7.5.3 - "@storybook/core-common": 7.5.3 - "@storybook/core-events": 7.5.3 - "@storybook/core-webpack": 7.5.3 - "@storybook/node-logger": 7.5.3 - "@storybook/preview": 7.5.3 - "@storybook/preview-api": 7.5.3 + "@babel/core": ^7.23.2 + "@storybook/channels": 7.6.2 + "@storybook/client-logger": 7.6.2 + "@storybook/core-common": 7.6.2 + "@storybook/core-events": 7.6.2 + "@storybook/core-webpack": 7.6.2 + "@storybook/node-logger": 7.6.2 + "@storybook/preview": 7.6.2 + "@storybook/preview-api": 7.6.2 "@swc/core": ^1.3.82 "@types/node": ^18.0.0 "@types/semver": ^7.3.4 babel-loader: ^9.0.0 - babel-plugin-named-exports-order: ^0.0.2 browser-assert: ^1.2.1 case-sensitive-paths-webpack-plugin: ^2.4.0 constants-browserify: ^1.0.0 css-loader: ^6.7.1 + es-module-lexer: ^1.4.1 express: ^4.17.3 fork-ts-checker-webpack-plugin: ^8.0.0 fs-extra: ^11.1.0 html-webpack-plugin: ^5.5.0 + magic-string: ^0.30.5 path-browserify: ^1.0.1 process: ^0.11.10 semver: ^7.3.7 @@ -9938,40 +9821,40 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: ac979ca329a55796743790adcd1279ee92628c81dfc2fb1d2a399b00baf88b5ed99b4ba386bc39177ded26edf8e3a75ced2cd89c5d361865edd358fd288d0fc4 + checksum: 87c5b0e96cf8e9efd86cd5c9ce6707ea9350d86b6ed07ced12d0b7b284409bbc0394376d8354234e601396360b9ffa0e1e4a5e57e5ad7679e5bafb2aa5cf54ee languageName: node linkType: hard -"@storybook/channels@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/channels@npm:7.5.3" +"@storybook/channels@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/channels@npm:7.6.2" dependencies: - "@storybook/client-logger": 7.5.3 - "@storybook/core-events": 7.5.3 + "@storybook/client-logger": 7.6.2 + "@storybook/core-events": 7.6.2 "@storybook/global": ^5.0.0 qs: ^6.10.0 telejson: ^7.2.0 tiny-invariant: ^1.3.1 - checksum: 875977b663c0d9d82e47206fa94bbe2f072b2e8700e1f7bec9a0848bbc368247c270d1823221b3455292dd68cc580483a03849bc43e92c551b2224932ff57f92 + checksum: 809f360668ff8b1875e9b2b4068d9a437a84e5e2abc524bd74fb55b5e7051d3f8a5e14a75131e5f0f795ebd9fadc606219ae6da5c7c955bf46a9da3058393601 languageName: node linkType: hard -"@storybook/cli@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/cli@npm:7.5.3" +"@storybook/cli@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/cli@npm:7.6.2" dependencies: - "@babel/core": ^7.22.9 - "@babel/preset-env": ^7.22.9 - "@babel/types": ^7.22.5 + "@babel/core": ^7.23.2 + "@babel/preset-env": ^7.23.2 + "@babel/types": ^7.23.0 "@ndelangen/get-tarball": ^3.0.7 - "@storybook/codemod": 7.5.3 - "@storybook/core-common": 7.5.3 - "@storybook/core-events": 7.5.3 - "@storybook/core-server": 7.5.3 - "@storybook/csf-tools": 7.5.3 - "@storybook/node-logger": 7.5.3 - "@storybook/telemetry": 7.5.3 - "@storybook/types": 7.5.3 + "@storybook/codemod": 7.6.2 + "@storybook/core-common": 7.6.2 + "@storybook/core-events": 7.6.2 + "@storybook/core-server": 7.6.2 + "@storybook/csf-tools": 7.6.2 + "@storybook/node-logger": 7.6.2 + "@storybook/telemetry": 7.6.2 + "@storybook/types": 7.6.2 "@types/semver": ^7.3.4 "@yarnpkg/fslib": 2.10.3 "@yarnpkg/libzip": 2.3.0 @@ -9988,7 +9871,7 @@ __metadata: get-port: ^5.1.1 giget: ^1.0.0 globby: ^11.0.2 - jscodeshift: ^0.14.0 + jscodeshift: ^0.15.1 leven: ^3.1.0 ora: ^5.4.1 prettier: ^2.8.0 @@ -10004,79 +9887,79 @@ __metadata: bin: getstorybook: ./bin/index.js sb: ./bin/index.js - checksum: 8d1e694fb39d805482f5b61fa9b2c4fcc5fa70cfe97ba64e0be220b73faaf69454e7347f1630618e53e6c3abb6c152c57df72f6b93b103a172b8930f4286f480 + checksum: 311bcd47b18a726243fdc4122422ec36d9ed0785a93a33d63f4767a32344efdda34105350d0576a1e0df1d8ffece2d74f8b640c6a69432e6282e309140826fe6 languageName: node linkType: hard -"@storybook/client-logger@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/client-logger@npm:7.5.3" +"@storybook/client-logger@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/client-logger@npm:7.6.2" dependencies: "@storybook/global": ^5.0.0 - checksum: 43997b47a4e49b38c599a08de1cec7a6ae6f000ec35a1d676522325aba60bc11507ad18cb0f40954bcfd77dfbb853493687e4e8fd88e2fdac07cd282ecc0d0bf + checksum: f76f58747d8ccf719a09d62d2bea5c840d6ba660f3d6eeaf6abe0ee87873d5f900c953f797269521f00b8175136882d05edb3a667bffb0a8785cabb2f206d3ed languageName: node linkType: hard -"@storybook/codemod@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/codemod@npm:7.5.3" +"@storybook/codemod@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/codemod@npm:7.6.2" dependencies: - "@babel/core": ^7.22.9 - "@babel/preset-env": ^7.22.9 - "@babel/types": ^7.22.5 - "@storybook/csf": ^0.1.0 - "@storybook/csf-tools": 7.5.3 - "@storybook/node-logger": 7.5.3 - "@storybook/types": 7.5.3 + "@babel/core": ^7.23.2 + "@babel/preset-env": ^7.23.2 + "@babel/types": ^7.23.0 + "@storybook/csf": ^0.1.2 + "@storybook/csf-tools": 7.6.2 + "@storybook/node-logger": 7.6.2 + "@storybook/types": 7.6.2 "@types/cross-spawn": ^6.0.2 cross-spawn: ^7.0.3 globby: ^11.0.2 - jscodeshift: ^0.14.0 + jscodeshift: ^0.15.1 lodash: ^4.17.21 prettier: ^2.8.0 recast: ^0.23.1 - checksum: 83c3e2306a00e2351b1a9930fe1a85eeffb5cee5a92946339352094c01d6d5c223ec3be075e35e7d1abd9957a69046d32f414625cfc245c6b567d76443567c20 + checksum: d4355d982c3fe8a0d04f1a539d8fbef280b02a18588cd05033c6462e9420f7b64a104c8f01cd439d8f88e78ddb5985a304cee23249c7316a4fcf5896f03f8ded languageName: node linkType: hard -"@storybook/components@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/components@npm:7.5.3" +"@storybook/components@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/components@npm:7.6.2" dependencies: "@radix-ui/react-select": ^1.2.2 "@radix-ui/react-toolbar": ^1.0.4 - "@storybook/client-logger": 7.5.3 - "@storybook/csf": ^0.1.0 + "@storybook/client-logger": 7.6.2 + "@storybook/csf": ^0.1.2 "@storybook/global": ^5.0.0 - "@storybook/theming": 7.5.3 - "@storybook/types": 7.5.3 + "@storybook/theming": 7.6.2 + "@storybook/types": 7.6.2 memoizerific: ^1.11.3 use-resize-observer: ^9.1.0 util-deprecate: ^1.0.2 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 7d25a5fa2d7c8686c455ee260989e2cf5c0ad3e9d8ba1093a1e43c5647775c06ef79c084b539cbc9fee4753ee175759a7d0e2715d22c7b929687620ad9f4e841 + checksum: f188df3c35772aea06acfa0f4b9a017b4b31325859545bb5d6ff578deb4f513f2a31efd18159ae4c7553805e0f17bbda499e1400a6671949c3349a753bb9a169 languageName: node linkType: hard -"@storybook/core-client@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/core-client@npm:7.5.3" +"@storybook/core-client@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/core-client@npm:7.6.2" dependencies: - "@storybook/client-logger": 7.5.3 - "@storybook/preview-api": 7.5.3 - checksum: 41c21431f803843c2cf43c72685f10df9282fbe0730623000979296e864770d38c444b4812ed81e6a14bdbfc7ad778761b5c68dd27a8888029cb23e6f82cb1c3 + "@storybook/client-logger": 7.6.2 + "@storybook/preview-api": 7.6.2 + checksum: e25aef17e5f0e8e55306adc791ff54a6bae7973a784f5a4cd16c49fee8a49ce387f0001ba183a6fa2bfef46aa3ef3c19ebc6290021d68b26a43f9273849d932e languageName: node linkType: hard -"@storybook/core-common@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/core-common@npm:7.5.3" +"@storybook/core-common@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/core-common@npm:7.6.2" dependencies: - "@storybook/core-events": 7.5.3 - "@storybook/node-logger": 7.5.3 - "@storybook/types": 7.5.3 + "@storybook/core-events": 7.6.2 + "@storybook/node-logger": 7.6.2 + "@storybook/types": 7.6.2 "@types/find-cache-dir": ^3.2.1 "@types/node": ^18.0.0 "@types/node-fetch": ^2.6.4 @@ -10097,38 +9980,38 @@ __metadata: pretty-hrtime: ^1.0.3 resolve-from: ^5.0.0 ts-dedent: ^2.0.0 - checksum: f099aca961729abaeafdf224e61da64237632bf13088dea703d13036c89d7b0a188ce4ac4b0d26d40523ddb8b8d12a64a26dac2c5514f7ed7939c47340acba4f + checksum: 2b9cf28eff0271c12936038c79dba83505a51ed66350e904e529782285754b801e6c049b5b69db9f892ab20a30e657843137e99511af1e33d4cc578121a0091f languageName: node linkType: hard -"@storybook/core-events@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/core-events@npm:7.5.3" +"@storybook/core-events@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/core-events@npm:7.6.2" dependencies: ts-dedent: ^2.0.0 - checksum: 2c0db835f840e8001928cc032b55531f9225eb146aaf069437925c2f55ad28a15eea287885c3cd59b9be3bb31822dc427fe9a33d79bc0861ceb3f6ee5395766d + checksum: 974c1f3358d349dd367c44f89fc59d5c9e6f2233e58ca373e15e78ff1dfce8035a9a1cf39d8a4ee79dc832d9fb089d2858405a894d6cf0065fc1ba6eba518954 languageName: node linkType: hard -"@storybook/core-server@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/core-server@npm:7.5.3" +"@storybook/core-server@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/core-server@npm:7.6.2" dependencies: "@aw-web-design/x-default-browser": 1.4.126 "@discoveryjs/json-ext": ^0.5.3 - "@storybook/builder-manager": 7.5.3 - "@storybook/channels": 7.5.3 - "@storybook/core-common": 7.5.3 - "@storybook/core-events": 7.5.3 - "@storybook/csf": ^0.1.0 - "@storybook/csf-tools": 7.5.3 + "@storybook/builder-manager": 7.6.2 + "@storybook/channels": 7.6.2 + "@storybook/core-common": 7.6.2 + "@storybook/core-events": 7.6.2 + "@storybook/csf": ^0.1.2 + "@storybook/csf-tools": 7.6.2 "@storybook/docs-mdx": ^0.1.0 "@storybook/global": ^5.0.0 - "@storybook/manager": 7.5.3 - "@storybook/node-logger": 7.5.3 - "@storybook/preview-api": 7.5.3 - "@storybook/telemetry": 7.5.3 - "@storybook/types": 7.5.3 + "@storybook/manager": 7.6.2 + "@storybook/node-logger": 7.6.2 + "@storybook/preview-api": 7.6.2 + "@storybook/telemetry": 7.6.2 + "@storybook/types": 7.6.2 "@types/detect-port": ^1.3.0 "@types/node": ^18.0.0 "@types/pretty-hrtime": ^1.0.0 @@ -10155,56 +10038,56 @@ __metadata: util-deprecate: ^1.0.2 watchpack: ^2.2.0 ws: ^8.2.3 - checksum: 6fa783f3efbd6e2cbfb2d29c8d4da8c5bf6daa0c1615bd6484bfd92115c45295fc91de095961f178cb28f5e95cc73c62f67d59c53c5d972ba3fdd1e086d006f4 + checksum: 103b2c2034e93f7dec5fb16e61ac27c668964c7b0984a9281c8b95e9dd67ecfa2f869b95d022276d20f4ea0d185592b34e7c3106f83ae430541ac3b48ef27272 languageName: node linkType: hard -"@storybook/core-webpack@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/core-webpack@npm:7.5.3" +"@storybook/core-webpack@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/core-webpack@npm:7.6.2" dependencies: - "@storybook/core-common": 7.5.3 - "@storybook/node-logger": 7.5.3 - "@storybook/types": 7.5.3 + "@storybook/core-common": 7.6.2 + "@storybook/node-logger": 7.6.2 + "@storybook/types": 7.6.2 "@types/node": ^18.0.0 ts-dedent: ^2.0.0 - checksum: 996a12ef62406fc54da0d8c6ebd597b824059fd8597c831e241ea1f4115dcdcdaeff9c1572cbe66a949194295436ba0a029555964d03effa3babfe2ee7024eb7 + checksum: e4d8054d217055c873d7dfb0cf4425760df0aeb973d01dcf4251d2a7ddd1e4a62e0a1ece5d20219b999e6fda6fa684e4a4f2af81acae055029e9ba1316cfca1a languageName: node linkType: hard -"@storybook/csf-plugin@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/csf-plugin@npm:7.5.3" +"@storybook/csf-plugin@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/csf-plugin@npm:7.6.2" dependencies: - "@storybook/csf-tools": 7.5.3 + "@storybook/csf-tools": 7.6.2 unplugin: ^1.3.1 - checksum: 700ef994b1694faf5955d37e52569b8e20f15d800c3aa8ff4a24b02f5a0cf1467a07d72149314b46de477bb710d7d523ca05b20f97f953b28323aa41b30930da + checksum: 34d8ed092b06f3b40d981311c6219dc4259a131483431ec98fd03f342124774a0a507ef7bf476c7a0c3cfe14806c6227f513c875d5c30d19afe951b70868ec92 languageName: node linkType: hard -"@storybook/csf-tools@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/csf-tools@npm:7.5.3" +"@storybook/csf-tools@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/csf-tools@npm:7.6.2" dependencies: - "@babel/generator": ^7.22.9 - "@babel/parser": ^7.22.7 - "@babel/traverse": ^7.22.8 - "@babel/types": ^7.22.5 - "@storybook/csf": ^0.1.0 - "@storybook/types": 7.5.3 + "@babel/generator": ^7.23.0 + "@babel/parser": ^7.23.0 + "@babel/traverse": ^7.23.2 + "@babel/types": ^7.23.0 + "@storybook/csf": ^0.1.2 + "@storybook/types": 7.6.2 fs-extra: ^11.1.0 recast: ^0.23.1 ts-dedent: ^2.0.0 - checksum: d92300f8bb1c70b2313f3fe8fdae5a88fd46b8ca6403ac74543b695289bddd827a7ed8e46b31b1ebc87c5a3b5f4c07a3652f05ff00e85a66df5159bbfc36e2df + checksum: da374028d90337c54588f253ac4c3820b9fadd5787a5f9575441ae16a2bf4d22627231fe503dc07e9bcba7357f963a97e411b089651f5b896b365682a7291532 languageName: node linkType: hard -"@storybook/csf@npm:^0.1.0": - version: 0.1.1 - resolution: "@storybook/csf@npm:0.1.1" +"@storybook/csf@npm:^0.1.2": + version: 0.1.2 + resolution: "@storybook/csf@npm:0.1.2" dependencies: type-fest: ^2.19.0 - checksum: 999bb87fbbe047a559bbaa5baf2ed84872fcd5cdcae3c1169f8e4c641eefe8759d09a09034a78ed114032c0e5cf6301b7fa89e5e3ce60d75cf0bd5e33ec0a6e7 + checksum: b51a55292e5d2af8b1d135a28ecaa94f8860ddfedcb393adfa2cca1ee23853156066f737d8be1cb5412f572781aa525dc0b2f6e4a6f6ce805489f0149efe837c languageName: node linkType: hard @@ -10215,17 +10098,18 @@ __metadata: languageName: node linkType: hard -"@storybook/docs-tools@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/docs-tools@npm:7.5.3" +"@storybook/docs-tools@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/docs-tools@npm:7.6.2" dependencies: - "@storybook/core-common": 7.5.3 - "@storybook/preview-api": 7.5.3 - "@storybook/types": 7.5.3 + "@storybook/core-common": 7.6.2 + "@storybook/preview-api": 7.6.2 + "@storybook/types": 7.6.2 "@types/doctrine": ^0.0.3 + assert: ^2.1.0 doctrine: ^3.0.0 lodash: ^4.17.21 - checksum: 1726947cbe552531831df426f55e297e2ad8dce5af274ab09ba52aa667f656420705301a34776d38a503728e86f4b6a4301566dfa543d40c909fd652f1b2a4a3 + checksum: d4fd8487e9127b9745a84c410ae18988cab2eaa1f24c334cdd3d836cee628806a95c6995bf61bb0c14c640d75928f03499fe7a72ea37c8aa5a8c88a06147a991 languageName: node linkType: hard @@ -10236,18 +10120,18 @@ __metadata: languageName: node linkType: hard -"@storybook/manager-api@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/manager-api@npm:7.5.3" +"@storybook/manager-api@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/manager-api@npm:7.6.2" dependencies: - "@storybook/channels": 7.5.3 - "@storybook/client-logger": 7.5.3 - "@storybook/core-events": 7.5.3 - "@storybook/csf": ^0.1.0 + "@storybook/channels": 7.6.2 + "@storybook/client-logger": 7.6.2 + "@storybook/core-events": 7.6.2 + "@storybook/csf": ^0.1.2 "@storybook/global": ^5.0.0 - "@storybook/router": 7.5.3 - "@storybook/theming": 7.5.3 - "@storybook/types": 7.5.3 + "@storybook/router": 7.6.2 + "@storybook/theming": 7.6.2 + "@storybook/types": 7.6.2 dequal: ^2.0.2 lodash: ^4.17.21 memoizerific: ^1.11.3 @@ -10255,17 +10139,14 @@ __metadata: store2: ^2.14.2 telejson: ^7.2.0 ts-dedent: ^2.0.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 8f48834b477ba07a252cb7a99e7513fab4d3f1cd52e4133e30de1984e43a5f86b94f55bfc06c218cfd98dc15ebb62d07f2f3929a37dbc74af29aaad0b779edea + checksum: 0cbd603df717f12b5fea245e02e1db6b08b22faedbd62c18ac3006c0d28f35c9ad24ca917064c04cd4c1b75152e27a1b051d4bcb7997104af28d3f54e72633bf languageName: node linkType: hard -"@storybook/manager@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/manager@npm:7.5.3" - checksum: 19e0a7d3791c0621c63fe1cbc6de6bdb92195d0cdff9259437c54763bd9958ddaaea75497a0be2b9ea8e5300e746f39c7c3ee5e0e1902a48f4f04a2f3aa0a23d +"@storybook/manager@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/manager@npm:7.6.2" + checksum: eba4ed4d3a852283b4956eb9c123f0cd6d47dcbb61bb7f105dc8bc0a8e30ad831a9cc962bb43a99c393037ef70ca521ea0e20b7e3e8528cf0680f083a152c1f1 languageName: node linkType: hard @@ -10276,38 +10157,39 @@ __metadata: languageName: node linkType: hard -"@storybook/node-logger@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/node-logger@npm:7.5.3" - checksum: 327f5eef43adcbbf9c5daa49c82ee8d57e6cf795defdde12b9988e04c66209ea99a49574f73a82c01c78331756dd5d50440a1d09cc7b3b6ff19e672d24390e94 +"@storybook/node-logger@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/node-logger@npm:7.6.2" + checksum: 3ba419ef1baedb248669bc01fdbd9fb7848e4de3787193c302144f416d78c4c7bcc42968cb798d0c756887cac1d5b91028658cc9bd2a355f2c7a5524f31694bb languageName: node linkType: hard -"@storybook/postinstall@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/postinstall@npm:7.5.3" - checksum: b2bc3a91ffedb83a54624d6880fa10fab86db86abd6aaa07bc130abd9ffab21f5be8d7e880173c911e58b56f2dfcab03ae0d6e6ce710997f1c323b378d917932 +"@storybook/postinstall@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/postinstall@npm:7.6.2" + checksum: d2ed4810e2024af030bfaa208ecdec0b89889d7f3ca9ec19c9c2cf1b5734e6a58afd5f5046d4503aef97441ef08a5dd190a92af3dcd0f52d5872af021d8047ff languageName: node linkType: hard -"@storybook/preset-react-webpack@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/preset-react-webpack@npm:7.5.3" - dependencies: - "@babel/preset-flow": ^7.22.5 - "@babel/preset-react": ^7.22.5 - "@pmmmwh/react-refresh-webpack-plugin": ^0.5.5 - "@storybook/core-webpack": 7.5.3 - "@storybook/docs-tools": 7.5.3 - "@storybook/node-logger": 7.5.3 - "@storybook/react": 7.5.3 +"@storybook/preset-react-webpack@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/preset-react-webpack@npm:7.6.2" + dependencies: + "@babel/preset-flow": ^7.22.15 + "@babel/preset-react": ^7.22.15 + "@pmmmwh/react-refresh-webpack-plugin": ^0.5.11 + "@storybook/core-webpack": 7.6.2 + "@storybook/docs-tools": 7.6.2 + "@storybook/node-logger": 7.6.2 + "@storybook/react": 7.6.2 "@storybook/react-docgen-typescript-plugin": 1.0.6--canary.9.0c3f3b7.0 "@types/node": ^18.0.0 "@types/semver": ^7.3.4 babel-plugin-add-react-displayname: ^0.0.5 - babel-plugin-react-docgen: ^4.2.1 fs-extra: ^11.1.0 - react-refresh: ^0.11.0 + magic-string: ^0.30.5 + react-docgen: ^7.0.0 + react-refresh: ^0.14.0 semver: ^7.3.7 webpack: 5 peerDependencies: @@ -10319,20 +10201,20 @@ __metadata: optional: true typescript: optional: true - checksum: f0db46025dce3858a816b2dd71c8b52587360988dee0f89d79f69043326207efae07ae9450678bddbcf28b85fa41bf231294bce8404a3017d99c1aaa395b263c + checksum: 8d10e44c3b834a50916a62b8bbf8e6b8722cef2809fa846956b7eb251fc4af1789de99c4095e43b3dfdf3c5ee236e7793670615e3169be69dc3e6283bdf26ae2 languageName: node linkType: hard -"@storybook/preview-api@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/preview-api@npm:7.5.3" +"@storybook/preview-api@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/preview-api@npm:7.6.2" dependencies: - "@storybook/channels": 7.5.3 - "@storybook/client-logger": 7.5.3 - "@storybook/core-events": 7.5.3 - "@storybook/csf": ^0.1.0 + "@storybook/channels": 7.6.2 + "@storybook/client-logger": 7.6.2 + "@storybook/core-events": 7.6.2 + "@storybook/csf": ^0.1.2 "@storybook/global": ^5.0.0 - "@storybook/types": 7.5.3 + "@storybook/types": 7.6.2 "@types/qs": ^6.9.5 dequal: ^2.0.2 lodash: ^4.17.21 @@ -10341,14 +10223,14 @@ __metadata: synchronous-promise: ^2.0.15 ts-dedent: ^2.0.0 util-deprecate: ^1.0.2 - checksum: 3acc48f1a9e801ff3b9e93261f68810a7f1827b777939dea0065c6385062c24e0e9081f3cca4b8b35d907dccbc2f1ea405ff8dcbfb6bbac9b4cd993f5ad23ccb + checksum: 561dd25b43abe002615e378e341e3c81debe9173f227be20cecfa3d70c2d914c01499fc60fb39f24d9247bff702580e25445110ae60636a32e55f03877a12578 languageName: node linkType: hard -"@storybook/preview@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/preview@npm:7.5.3" - checksum: e1f86b40f2d510f0f53ecb214c2cfb67f58c7f4b19456c1ef843e52e9caba4515d25c1ee74fcd514b5d4f74994d02d53f37f9b1c34a2209525b354f7fe8af111 +"@storybook/preview@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/preview@npm:7.6.2" + checksum: 564ddabcad0c3e8a2c65b1e61ff4425cbed3a533bdf3c771d7bd125a35fc858ba581f55dc0a8d8efd45b52bf5f3474b2f5da69355ee1aa689aa1668c3ec4143b languageName: node linkType: hard @@ -10370,23 +10252,23 @@ __metadata: languageName: node linkType: hard -"@storybook/react-dom-shim@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/react-dom-shim@npm:7.5.3" +"@storybook/react-dom-shim@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/react-dom-shim@npm:7.6.2" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 91314e9891ef7f80fe32c2c239b112dafbc739d5eba72f8fd2ccde62058b9e649280dd2245705f13cb00044d9482a8b6f358a8262018449f5feb8e5df5b96494 + checksum: 9e5fdd3a77522d136e2cbd2a230c2f7264f0f4114c0478c2b0901a8e624fc4f40836460fb2df12ab4cd01de98eb186bc3aa9698665c39769ee544c50c99b2ece languageName: node linkType: hard -"@storybook/react-webpack5@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/react-webpack5@npm:7.5.3" +"@storybook/react-webpack5@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/react-webpack5@npm:7.6.2" dependencies: - "@storybook/builder-webpack5": 7.5.3 - "@storybook/preset-react-webpack": 7.5.3 - "@storybook/react": 7.5.3 + "@storybook/builder-webpack5": 7.6.2 + "@storybook/preset-react-webpack": 7.6.2 + "@storybook/react": 7.6.2 "@types/node": ^18.0.0 peerDependencies: "@babel/core": ^7.22.0 @@ -10398,21 +10280,21 @@ __metadata: optional: true typescript: optional: true - checksum: 0e84dd5caffabfe75cf0405e1d40be8d26ac2d078198fc38494d90ede3d157042af86166c844186f6c32be76cab5bb774df7ee76526ec1020cc54f083cadaefc + checksum: 6ddcf5414b379c0f5ccda249c8f95a9fb8361c575d7efeb66f97612614e9e9dc1195ffc81c63691ef2e72c58db5ca87c6a70ef7bd8a2288d82892654dc9dc724 languageName: node linkType: hard -"@storybook/react@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/react@npm:7.5.3" +"@storybook/react@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/react@npm:7.6.2" dependencies: - "@storybook/client-logger": 7.5.3 - "@storybook/core-client": 7.5.3 - "@storybook/docs-tools": 7.5.3 + "@storybook/client-logger": 7.6.2 + "@storybook/core-client": 7.6.2 + "@storybook/docs-tools": 7.6.2 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.5.3 - "@storybook/react-dom-shim": 7.5.3 - "@storybook/types": 7.5.3 + "@storybook/preview-api": 7.6.2 + "@storybook/react-dom-shim": 7.6.2 + "@storybook/types": 7.6.2 "@types/escodegen": ^0.0.6 "@types/estree": ^0.0.51 "@types/node": ^18.0.0 @@ -10434,64 +10316,61 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 6433c12e12e1eb570d06bd1e03a8eacfcea08387b708bc3d423685d90c6de980ea39a79f5c188fa58c2b8b78fabbe0cb1c07136806f264eb05d2d50fd3532a13 + checksum: 24f929b34814dedea456483e5b19297eac1652c99cc5a455fd43ca630afdfddd969243d9fc0c67b04337c9626398d24962c5ad85e2ec779d9fde5e1d85d9c4fa languageName: node linkType: hard -"@storybook/router@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/router@npm:7.5.3" +"@storybook/router@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/router@npm:7.6.2" dependencies: - "@storybook/client-logger": 7.5.3 + "@storybook/client-logger": 7.6.2 memoizerific: ^1.11.3 qs: ^6.10.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 2d85a9c16e2817f38a66d1718dbe2b9b23a31676e991d4760273acb508c40491cb7ff91f14a563529c3cd15becc213c3e3f5cf3290001323a89528907388b368 + checksum: b24d9d94c1b60da90f43ad9ca53bab92503df0c4536686fd380479dc3d84e43bc8d669dd65ead3a688e67c53e776b65087176af2cca9639093ede815856ddb53 languageName: node linkType: hard -"@storybook/telemetry@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/telemetry@npm:7.5.3" +"@storybook/telemetry@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/telemetry@npm:7.6.2" dependencies: - "@storybook/client-logger": 7.5.3 - "@storybook/core-common": 7.5.3 - "@storybook/csf-tools": 7.5.3 + "@storybook/client-logger": 7.6.2 + "@storybook/core-common": 7.6.2 + "@storybook/csf-tools": 7.6.2 chalk: ^4.1.0 detect-package-manager: ^2.0.1 fetch-retry: ^5.0.2 fs-extra: ^11.1.0 read-pkg-up: ^7.0.1 - checksum: 6dc3eb14162ea7846913591b425701e9e238cad704bb00c062850b1db99417073a3c1e7a699768bb79968a4f11b4f4b542ba45845e578cf58665a7e101cf4f40 + checksum: 1186192649dc60eb3391234498a5a7deafdfe14398634d3e44ae73f7973760b45c98fa77c6c02daf7825db323c512ca3ad29388df23f7409d49657cf10fe9b8f languageName: node linkType: hard -"@storybook/theming@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/theming@npm:7.5.3" +"@storybook/theming@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/theming@npm:7.6.2" dependencies: "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0 - "@storybook/client-logger": 7.5.3 + "@storybook/client-logger": 7.6.2 "@storybook/global": ^5.0.0 memoizerific: ^1.11.3 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 30dc5fd55617fcd7f33a6c75ddd1b2b5e1e28ce2973425fb8764f5770292659e1676264252bd14909ac9843799ab2e0a5d9e83ad3b4a29848c54600264f8af10 + checksum: dce7aef6d608d49b3e2907305cb6bb8ab0111ead27d1eeeb1486f32e2dc4b45e38bef48c732c955a2849e3fafc2e5ed3d2bf7e351323aa83b741bf91559e3d1c languageName: node linkType: hard -"@storybook/types@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/types@npm:7.5.3" +"@storybook/types@npm:7.6.2": + version: 7.6.2 + resolution: "@storybook/types@npm:7.6.2" dependencies: - "@storybook/channels": 7.5.3 + "@storybook/channels": 7.6.2 "@types/babel__core": ^7.0.0 "@types/express": ^4.7.0 file-system-cache: 2.3.0 - checksum: 4219a92a6e7762ac5a1dae101aa1072f4c37607f6f2173ae70d224ddc294d9f70e55462eb42028a87e676840f2e87f1bc0e82b28bbb35207278405868b467eb7 + checksum: 583c37b43a3dd50b190c730bce19841ed55f8dc86bf64d98e59599ecd903870cf2bf9194cdbbf4ba0cbf75d6bd6a8d73565579c7e8726eef34a76fc5cbdb81eb languageName: node linkType: hard @@ -10552,9 +10431,9 @@ __metadata: languageName: node linkType: hard -"@supabase/supabase-js@npm:2.38.5": - version: 2.38.5 - resolution: "@supabase/supabase-js@npm:2.38.5" +"@supabase/supabase-js@npm:2.39.0": + version: 2.39.0 + resolution: "@supabase/supabase-js@npm:2.39.0" dependencies: "@supabase/functions-js": ^2.1.5 "@supabase/gotrue-js": ^2.56.0 @@ -10562,7 +10441,7 @@ __metadata: "@supabase/postgrest-js": ^1.8.6 "@supabase/realtime-js": ^2.8.4 "@supabase/storage-js": ^2.5.4 - checksum: 3ad07f817140f9853072dafb78829033c3d153e110ffbecf51a6c34cdf68e11af2eb5ae9dd37401fe28c4a4ecfaeb0ff7058f27f82a6c3cebd0a979800b43bab + checksum: ca3afb51a76ef3a6bcf10b50f3b0797e7534884d936eef966a30de08f8e6464bf4aaaac51f2ce453d8b8496da7d6b2829a35fe7126983731bdf70c6399325411 languageName: node linkType: hard @@ -11250,7 +11129,20 @@ __metadata: languageName: node linkType: hard -"@types/babel__core@npm:*, @types/babel__core@npm:7.20.4, @types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.20.4": +"@types/babel__core@npm:*, @types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.18.0, @types/babel__core@npm:^7.20.4": + version: 7.20.5 + resolution: "@types/babel__core@npm:7.20.5" + dependencies: + "@babel/parser": ^7.20.7 + "@babel/types": ^7.20.7 + "@types/babel__generator": "*" + "@types/babel__template": "*" + "@types/babel__traverse": "*" + checksum: bdee3bb69951e833a4b811b8ee9356b69a61ed5b7a23e1a081ec9249769117fa83aaaf023bb06562a038eb5845155ff663e2d5c75dd95c1d5ccc91db012868ff + languageName: node + linkType: hard + +"@types/babel__core@npm:7.20.4": version: 7.20.4 resolution: "@types/babel__core@npm:7.20.4" dependencies: @@ -11282,12 +11174,12 @@ __metadata: languageName: node linkType: hard -"@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.6": - version: 7.20.1 - resolution: "@types/babel__traverse@npm:7.20.1" +"@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.6, @types/babel__traverse@npm:^7.18.0": + version: 7.20.4 + resolution: "@types/babel__traverse@npm:7.20.4" dependencies: "@babel/types": ^7.20.7 - checksum: 5a6a3a26be090573309527184a31f1b82ef55f3d73d811c15f181d323e471305f2390651a04d49d4cd4ca41bbeabb53c9f7862a8e09eab5a0f8910a6aec6e867 + checksum: e76cb4974c7740fd61311152dc497e7b05c1c46ba554aab875544ab0a7457f343cafcad34ba8fb2ff543ab0e012ef2d3fa0c13f1a4e9a4cd9c4c703c7a2a8d62 languageName: node linkType: hard @@ -11567,6 +11459,13 @@ __metadata: languageName: node linkType: hard +"@types/doctrine@npm:^0.0.9": + version: 0.0.9 + resolution: "@types/doctrine@npm:0.0.9" + checksum: cdaca493f13c321cf0cacd1973efc0ae74569633145d9e6fc1128f32217a6968c33bea1f858275239fe90c98f3be57ec8f452b416a9ff48b8e8c1098b20fa51c + languageName: node + linkType: hard + "@types/ejs@npm:^3.1.1": version: 3.1.2 resolution: "@types/ejs@npm:3.1.2" @@ -12201,6 +12100,13 @@ __metadata: languageName: node linkType: hard +"@types/resolve@npm:^1.20.2": + version: 1.20.6 + resolution: "@types/resolve@npm:1.20.6" + checksum: a9b0549d816ff2c353077365d865a33655a141d066d0f5a3ba6fd4b28bc2f4188a510079f7c1f715b3e7af505a27374adce2a5140a3ece2a059aab3d6e1a4244 + languageName: node + linkType: hard + "@types/responselike@npm:^1.0.0": version: 1.0.0 resolution: "@types/responselike@npm:1.0.0" @@ -12361,7 +12267,7 @@ __metadata: languageName: node linkType: hard -"@types/uuid@npm:9.0.7": +"@types/uuid@npm:9.0.7, @types/uuid@npm:^9.0.1": version: 9.0.7 resolution: "@types/uuid@npm:9.0.7" checksum: b329ebd4f9d1d8e08d4f2cc211be4922d70d1149f73d5772630e4a3acfb5170c6d37b3d7a39a0412f1a56e86e8a844c7f297c798b082f90380608bf766688787 @@ -13031,17 +12937,26 @@ __metadata: languageName: node linkType: hard -"@whatwg-node/server@npm:0.9.16, @whatwg-node/server@npm:^0.9.1": - version: 0.9.16 - resolution: "@whatwg-node/server@npm:0.9.16" +"@whatwg-node/server@npm:0.9.18, @whatwg-node/server@npm:^0.9.1": + version: 0.9.18 + resolution: "@whatwg-node/server@npm:0.9.18" dependencies: "@whatwg-node/fetch": ^0.9.10 tslib: ^2.3.1 - checksum: 8de5ef7cd1bb462754043a83eda88c4b5848a5f7ae11d91def86c795e3fb71fcba41879e0483b7fe72c00a1661aaaa6721739a296662049460901f7f05b9ce67 + checksum: 9503a17fde50a3c2615584c8a3b54bbad3596756979b3abddb2617b1ce4eef28ef534e5f026b6661db32bac80db523bfd5eba470986be76daf99469319c716c2 languageName: node linkType: hard -"@wry/context@npm:^0.7.0, @wry/context@npm:^0.7.3": +"@wry/caches@npm:^1.0.0": + version: 1.0.1 + resolution: "@wry/caches@npm:1.0.1" + dependencies: + tslib: ^2.3.0 + checksum: a7bca3377f1131d3f1080f2e39d0692c9d1ca86bfd55734786f167f46aad28a4c8e772107324e8319843fb8068fdf98abcdea376d8a589316b1f0cdadf81f8b1 + languageName: node + linkType: hard + +"@wry/context@npm:^0.7.0": version: 0.7.3 resolution: "@wry/context@npm:0.7.3" dependencies: @@ -13068,6 +12983,15 @@ __metadata: languageName: node linkType: hard +"@wry/trie@npm:^0.5.0": + version: 0.5.0 + resolution: "@wry/trie@npm:0.5.0" + dependencies: + tslib: ^2.3.0 + checksum: 8c8cfcac96ba4bc69dabf02740e19e613f501b398e80bacc32cd95e87228f75ecb41cd1a76a65abae9756c0f61ab3536e0da52de28857456f9381ffdf5995d3e + languageName: node + linkType: hard + "@xmldom/xmldom@npm:^0.8.3": version: 0.8.8 resolution: "@xmldom/xmldom@npm:0.8.8" @@ -14006,15 +13930,16 @@ __metadata: languageName: node linkType: hard -"assert@npm:^2.0.0": - version: 2.0.0 - resolution: "assert@npm:2.0.0" +"assert@npm:^2.0.0, assert@npm:^2.1.0": + version: 2.1.0 + resolution: "assert@npm:2.1.0" dependencies: - es6-object-assign: ^1.1.0 - is-nan: ^1.2.1 - object-is: ^1.0.1 - util: ^0.12.0 - checksum: a25c7ebc07b52cc4dadd5c46d73472e7d4b86e40eb7ebaa12f78c1ba954dbe83612be5dea314b862fc364c305ab3bdbcd1c9d4ec2d92bc37214ae7d5596347f3 + call-bind: ^1.0.2 + is-nan: ^1.3.2 + object-is: ^1.1.5 + object.assign: ^4.1.4 + util: ^0.12.5 + checksum: 7271a5da883c256a1fa690677bf1dd9d6aa882139f2bed1cd15da4f9e7459683e1da8e32a203d6cc6767e5e0f730c77a9532a87b896b4b0af0dd535f668775f0 languageName: node linkType: hard @@ -14032,7 +13957,7 @@ __metadata: languageName: node linkType: hard -"ast-types@npm:0.14.2, ast-types@npm:^0.14.1, ast-types@npm:^0.14.2": +"ast-types@npm:0.14.2, ast-types@npm:^0.14.1": version: 0.14.2 resolution: "ast-types@npm:0.14.2" dependencies: @@ -14041,15 +13966,6 @@ __metadata: languageName: node linkType: hard -"ast-types@npm:0.15.2": - version: 0.15.2 - resolution: "ast-types@npm:0.15.2" - dependencies: - tslib: ^2.0.1 - checksum: 5b26e3656e9e8d1db8c8d14971d0cb88ca0138aacce72171cb4cd4555fc8dc53c07e821c568e57fe147366931708fefd25cb9d7e880d42ce9cb569947844c962 - languageName: node - linkType: hard - "ast-types@npm:^0.16.1": version: 0.16.1 resolution: "ast-types@npm:0.16.1" @@ -14429,13 +14345,6 @@ __metadata: languageName: node linkType: hard -"babel-plugin-named-exports-order@npm:^0.0.2": - version: 0.0.2 - resolution: "babel-plugin-named-exports-order@npm:0.0.2" - checksum: e1d001722bddabc296b74f7cd020418a3cce9ca7052d5dd5dbd2870745d9566e286d14707c0bbfc9d4b4b643031052b358124ec735069f214d22b0b6768daf9d - languageName: node - linkType: hard - "babel-plugin-polyfill-corejs2@npm:^0.4.6": version: 0.4.6 resolution: "babel-plugin-polyfill-corejs2@npm:0.4.6" @@ -14472,17 +14381,6 @@ __metadata: languageName: node linkType: hard -"babel-plugin-react-docgen@npm:^4.2.1": - version: 4.2.1 - resolution: "babel-plugin-react-docgen@npm:4.2.1" - dependencies: - ast-types: ^0.14.2 - lodash: ^4.17.15 - react-docgen: ^5.0.0 - checksum: 9f7af20e6ebd794beae14aa1ffe4f1c1c5855821a5a9f205099602c89b557e33b9cb3dc3fe0b3a2f2ca35007c6ab45f52da9695a681d8495ad0f5494ef78ec34 - languageName: node - linkType: hard - "babel-plugin-remove-code@npm:0.0.6": version: 0.0.6 resolution: "babel-plugin-remove-code@npm:0.0.6" @@ -15186,28 +15084,6 @@ __metadata: languageName: node linkType: hard -"c8@npm:^7.6.0": - version: 7.14.0 - resolution: "c8@npm:7.14.0" - dependencies: - "@bcoe/v8-coverage": ^0.2.3 - "@istanbuljs/schema": ^0.1.3 - find-up: ^5.0.0 - foreground-child: ^2.0.0 - istanbul-lib-coverage: ^3.2.0 - istanbul-lib-report: ^3.0.0 - istanbul-reports: ^3.1.4 - rimraf: ^3.0.2 - test-exclude: ^6.0.0 - v8-to-istanbul: ^9.0.0 - yargs: ^16.2.0 - yargs-parser: ^20.2.9 - bin: - c8: bin/c8.js - checksum: 8946f55f2dcc85bf146f429a3deeede78502da245e515a2d181342475d8d8698b4055ec1d9b887ab8e1615f49c1a2af4d63557e68b2005844572fb785991e148 - languageName: node - linkType: hard - "cacache@npm:^12.0.2": version: 12.0.4 resolution: "cacache@npm:12.0.4" @@ -18741,10 +18617,10 @@ __metadata: languageName: node linkType: hard -"es-module-lexer@npm:^1.2.1": - version: 1.3.0 - resolution: "es-module-lexer@npm:1.3.0" - checksum: cbd9bdc65458d4c4bd0d22a1c792926bfdf7bb6a96a9ed04da7d31f317159bd4945d2dbeb318717f9214f9695ee85a8fae64a5d25bf360baa82b58079032fc7a +"es-module-lexer@npm:^1.2.1, es-module-lexer@npm:^1.4.1": + version: 1.4.1 + resolution: "es-module-lexer@npm:1.4.1" + checksum: b7260a138668554d3f0ddcc728cb4b60c2fa463f15545cf155ecbdd5450a1348952d58298a7f48642e900ee579f21d7f5304b6b3c61b3d9fc2d4b2109b5a9dff languageName: node linkType: hard @@ -18801,13 +18677,6 @@ __metadata: languageName: node linkType: hard -"es6-object-assign@npm:^1.1.0": - version: 1.1.0 - resolution: "es6-object-assign@npm:1.1.0" - checksum: 11c165ae16866aca897dee9b689402f0e871589e859809343ef9e0fdd067133684db16fd15abdba2a99e7319222b9f43e6b747baabb909cee9d0ecbac8deebee - languageName: node - linkType: hard - "es6-symbol@npm:^3.1.1, es6-symbol@npm:^3.1.3": version: 3.1.3 resolution: "es6-symbol@npm:3.1.3" @@ -19402,17 +19271,6 @@ __metadata: languageName: node linkType: hard -"estree-to-babel@npm:^3.1.0": - version: 3.2.1 - resolution: "estree-to-babel@npm:3.2.1" - dependencies: - "@babel/traverse": ^7.1.6 - "@babel/types": ^7.2.0 - c8: ^7.6.0 - checksum: c7949b141f569528b2608ab715d593a04f7e2e529df04e0b595d0a7dea819b410e71d1f04716e43ac1480942afc5701cb5151ad2906ee8402969651a389881bb - languageName: node - linkType: hard - "esutils@npm:^2.0.2": version: 2.0.3 resolution: "esutils@npm:2.0.3" @@ -20429,16 +20287,6 @@ __metadata: languageName: node linkType: hard -"foreground-child@npm:^2.0.0": - version: 2.0.0 - resolution: "foreground-child@npm:2.0.0" - dependencies: - cross-spawn: ^7.0.0 - signal-exit: ^3.0.2 - checksum: 6719982783a448162f9a01500757fb2053bc5dcd4d67c7cd30739b38ccc01b39f84e408c30989d1d8774519c021c0498e2450ab127690fb09d7f2568fd94ffcc - languageName: node - linkType: hard - "foreground-child@npm:^3.1.0": version: 3.1.1 resolution: "foreground-child@npm:3.1.1" @@ -22962,7 +22810,7 @@ __metadata: languageName: node linkType: hard -"is-nan@npm:^1.2.1": +"is-nan@npm:^1.3.2": version: 1.3.2 resolution: "is-nan@npm:1.3.2" dependencies: @@ -23415,7 +23263,7 @@ __metadata: languageName: node linkType: hard -"istanbul-reports@npm:^3.1.3, istanbul-reports@npm:^3.1.4": +"istanbul-reports@npm:^3.1.3": version: 3.1.5 resolution: "istanbul-reports@npm:3.1.5" dependencies: @@ -24095,19 +23943,20 @@ __metadata: languageName: node linkType: hard -"jscodeshift@npm:^0.14.0": - version: 0.14.0 - resolution: "jscodeshift@npm:0.14.0" +"jscodeshift@npm:^0.15.1": + version: 0.15.1 + resolution: "jscodeshift@npm:0.15.1" dependencies: - "@babel/core": ^7.13.16 - "@babel/parser": ^7.13.16 - "@babel/plugin-proposal-class-properties": ^7.13.0 - "@babel/plugin-proposal-nullish-coalescing-operator": ^7.13.8 - "@babel/plugin-proposal-optional-chaining": ^7.13.12 - "@babel/plugin-transform-modules-commonjs": ^7.13.8 - "@babel/preset-flow": ^7.13.13 - "@babel/preset-typescript": ^7.13.0 - "@babel/register": ^7.13.16 + "@babel/core": ^7.23.0 + "@babel/parser": ^7.23.0 + "@babel/plugin-transform-class-properties": ^7.22.5 + "@babel/plugin-transform-modules-commonjs": ^7.23.0 + "@babel/plugin-transform-nullish-coalescing-operator": ^7.22.11 + "@babel/plugin-transform-optional-chaining": ^7.23.0 + "@babel/plugin-transform-private-methods": ^7.22.5 + "@babel/preset-flow": ^7.22.15 + "@babel/preset-typescript": ^7.23.0 + "@babel/register": ^7.22.15 babel-core: ^7.0.0-bridge.0 chalk: ^4.1.2 flow-parser: 0.* @@ -24115,14 +23964,17 @@ __metadata: micromatch: ^4.0.4 neo-async: ^2.5.0 node-dir: ^0.1.17 - recast: ^0.21.0 + recast: ^0.23.3 temp: ^0.8.4 write-file-atomic: ^2.3.0 peerDependencies: "@babel/preset-env": ^7.1.6 + peerDependenciesMeta: + "@babel/preset-env": + optional: true bin: jscodeshift: bin/jscodeshift.js - checksum: dab63bdb4b7e67d79634fcd3f5dc8b227146e9f68aa88700bc49c5a45b6339d05bd934a98aa53d29abd04f81237d010e7e037799471b2aab66ec7b9a7d752786 + checksum: 334de6ffa776a68b3f59f2f18a285ea977f3339d85e3517f3854761e65769ffa7e453c35cde320fc969106d573df39bd3fb08b23db54ae17c1b1516e5bf05742 languageName: node linkType: hard @@ -25520,6 +25372,15 @@ __metadata: languageName: node linkType: hard +"magic-string@npm:^0.30.5": + version: 0.30.5 + resolution: "magic-string@npm:0.30.5" + dependencies: + "@jridgewell/sourcemap-codec": ^1.4.15 + checksum: 38ac220ca7539e96da7ea2f38d85796bdf5c69b6bcae728c4bc2565084e6dc326b9174ee9770bea345cf6c9b3a24041b767167874fab5beca874d2356a9d1520 + languageName: node + linkType: hard + "mailparser@npm:^3.6.5": version: 3.6.5 resolution: "mailparser@npm:3.6.5" @@ -27084,7 +26945,7 @@ __metadata: languageName: node linkType: hard -"node-dir@npm:^0.1.10, node-dir@npm:^0.1.17": +"node-dir@npm:^0.1.17": version: 0.1.17 resolution: "node-dir@npm:0.1.17" dependencies: @@ -27834,7 +27695,7 @@ __metadata: languageName: node linkType: hard -"object-is@npm:^1.0.1, object-is@npm:^1.1.5": +"object-is@npm:^1.1.5": version: 1.1.5 resolution: "object-is@npm:1.1.5" dependencies: @@ -28051,14 +27912,15 @@ __metadata: languageName: node linkType: hard -"optimism@npm:^0.17.5": - version: 0.17.5 - resolution: "optimism@npm:0.17.5" +"optimism@npm:^0.18.0": + version: 0.18.0 + resolution: "optimism@npm:0.18.0" dependencies: + "@wry/caches": ^1.0.0 "@wry/context": ^0.7.0 "@wry/trie": ^0.4.3 tslib: ^2.3.0 - checksum: 0c3a526e2dc1451735e66d2a6bef46a6395e8c7e7f6f323d998361ad281f01d91337a58ad4ad5fa5db18a87d6c9e64ff79a564aff9fb5d3ce614cb3d921c027d + checksum: 8e97c6d660cb80cf5f444209b9dd29ee6951fa7b344d4c4fc6d4aaf0ad0710dddaf834d0f5d7211b3658b15ef6c6a22cbcb98c7a8121e3fee9666fe0fd62d876 languageName: node linkType: hard @@ -28965,27 +28827,27 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.40.0": - version: 1.40.0 - resolution: "playwright-core@npm:1.40.0" +"playwright-core@npm:1.40.1": + version: 1.40.1 + resolution: "playwright-core@npm:1.40.1" bin: playwright-core: cli.js - checksum: 6973f34b023ee9ca7451715065afbb11c119b028ec866e44e7862118f17eafaa832d6bb388fa657124e88c290d7192cd5c125970a3c635d3d9336331ddba8d10 + checksum: 56c283012974982313a6ae583b975ee4af76d52059fb9a25d9cc616a11224685ec64682b391910c795d2b12d2ab5c7eec31124722c75c0b1703a76ac9b6fd1c2 languageName: node linkType: hard -"playwright@npm:1.40.0": - version: 1.40.0 - resolution: "playwright@npm:1.40.0" +"playwright@npm:1.40.1": + version: 1.40.1 + resolution: "playwright@npm:1.40.1" dependencies: fsevents: 2.3.2 - playwright-core: 1.40.0 + playwright-core: 1.40.1 dependenciesMeta: fsevents: optional: true bin: playwright: cli.js - checksum: 21bcf473950472881d500ac5f29dff9f529ac3bd667f9ec5eed6c6bc1be00a1b2bfbc3fe55c9db214c57bbbf102eea6ae894dd42d856cfbe3c8dbd60b58684a1 + checksum: 5dae164d1f69162da8d7eee52da651296fb885c76a8b36049f216975c751a0a826ff05795a1c0902dc0bd193fe606ae17d5def655f4cbcccb8d8b71afb74b950 languageName: node linkType: hard @@ -30148,23 +30010,21 @@ __metadata: languageName: node linkType: hard -"react-docgen@npm:^5.0.0": - version: 5.4.3 - resolution: "react-docgen@npm:5.4.3" - dependencies: - "@babel/core": ^7.7.5 - "@babel/generator": ^7.12.11 - "@babel/runtime": ^7.7.6 - ast-types: ^0.14.2 - commander: ^2.19.0 +"react-docgen@npm:^7.0.0": + version: 7.0.1 + resolution: "react-docgen@npm:7.0.1" + dependencies: + "@babel/core": ^7.18.9 + "@babel/traverse": ^7.18.9 + "@babel/types": ^7.18.9 + "@types/babel__core": ^7.18.0 + "@types/babel__traverse": ^7.18.0 + "@types/doctrine": ^0.0.9 + "@types/resolve": ^1.20.2 doctrine: ^3.0.0 - estree-to-babel: ^3.1.0 - neo-async: ^2.6.1 - node-dir: ^0.1.10 - strip-indent: ^3.0.0 - bin: - react-docgen: bin/react-docgen.js - checksum: c920e9611e08317f8fdae707114cf02baaa18e2f1bd23ed18f57e66b9e1042e51dc98cc9de828b03d018ccc4e26300c9a6c4f74e862fc94dc64029267c801a01 + resolve: ^1.22.1 + strip-indent: ^4.0.0 + checksum: 870c1193211f14497bf7a96137f96840dc058842ca75ff7251d91e88c3c71d7a41d5f1a124cc1b53bfbf1f2b6b58bfccc4dd6e22592814a5155d3894953274be languageName: node linkType: hard @@ -30310,15 +30170,6 @@ __metadata: languageName: node linkType: hard -"react-inspector@npm:^6.0.0": - version: 6.0.2 - resolution: "react-inspector@npm:6.0.2" - peerDependencies: - react: ^16.8.4 || ^17.0.0 || ^18.0.0 - checksum: 8f9b23c21b4d95722e28c9455c2bf00fd9437347714382594461f98e5b9954d60864d0f4e74e881639b065e752a97ba52a65e39930c234072e5bff291bb02b5e - languageName: node - linkType: hard - "react-is@npm:18.1.0": version: 18.1.0 resolution: "react-is@npm:18.1.0" @@ -30361,13 +30212,6 @@ __metadata: languageName: node linkType: hard -"react-refresh@npm:^0.11.0": - version: 0.11.0 - resolution: "react-refresh@npm:0.11.0" - checksum: cbb5616c7ba670bbd2f37ddadcdfefa66e727ea188e89733ccb8184d3b874631104b0bc016d5676a7ade4d9c79100b99b46b6ed10cd117ab5d1ddcbf8653a9f2 - languageName: node - linkType: hard - "react-remove-scroll-bar@npm:^2.3.3, react-remove-scroll-bar@npm:^2.3.4": version: 2.3.4 resolution: "react-remove-scroll-bar@npm:2.3.4" @@ -30434,18 +30278,6 @@ __metadata: languageName: node linkType: hard -"react-resize-detector@npm:^7.1.2": - version: 7.1.2 - resolution: "react-resize-detector@npm:7.1.2" - dependencies: - lodash: ^4.17.21 - peerDependencies: - react: ^16.0.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0 - checksum: 2285b0024bcc736c7d5e80279e819835a5e8bef0899778100d2434b1c4b10971e6ae253df073ca96a20cacc47b3c249bc675479e5fc4ec1f6652fcca7f48ec22 - languageName: node - linkType: hard - "react-resize-detector@npm:^8.0.4": version: 8.1.0 resolution: "react-resize-detector@npm:8.1.0" @@ -30821,28 +30653,16 @@ __metadata: languageName: node linkType: hard -"recast@npm:^0.21.0": - version: 0.21.5 - resolution: "recast@npm:0.21.5" - dependencies: - ast-types: 0.15.2 - esprima: ~4.0.0 - source-map: ~0.6.1 - tslib: ^2.0.1 - checksum: a45168c82195f24fa2c70293a624fece0069a2e8e8adb637f9963777735f81cb3bb62e55172db677ec3573b08b2daaf1eddd85b74da6fe0bd37c9b15eeaf94b4 - languageName: node - linkType: hard - -"recast@npm:^0.23.1": - version: 0.23.2 - resolution: "recast@npm:0.23.2" +"recast@npm:^0.23.1, recast@npm:^0.23.3": + version: 0.23.4 + resolution: "recast@npm:0.23.4" dependencies: assert: ^2.0.0 ast-types: ^0.16.1 esprima: ~4.0.0 source-map: ~0.6.1 tslib: ^2.0.1 - checksum: 48addbe43930bb265b292929571d1e845a56c70913c1c75c234f11c54d20b82c7ee647bcde657fc845f545769faacd1e44e66c5d46567e9fb8bff90e86c19948 + checksum: d719633be8029e28f23b8191d4a525c5dbdac721792ab3cb5e9dfcf1694fb93f3c147b186916195a9c7fa0711f1e4990ba457cdcee02faed3899d4a80da1bd1f languageName: node linkType: hard @@ -31562,7 +31382,7 @@ __metadata: "@babel/runtime-corejs3": 7.23.4 "@faker-js/faker": 8.0.2 "@npmcli/arborist": 6.5.0 - "@playwright/test": 1.40.0 + "@playwright/test": 1.40.1 "@testing-library/jest-dom": 5.17.0 "@testing-library/react": 14.1.2 "@testing-library/user-event": 14.5.1 @@ -31601,7 +31421,7 @@ __metadata: rimraf: 5.0.5 tstyche: 1.0.0-beta.3 tsx: 3.12.7 - typescript: 5.2.2 + typescript: 5.3.2 yargs: 17.7.2 zx: 7.2.3 languageName: unknown @@ -32855,15 +32675,15 @@ __metadata: languageName: node linkType: hard -"storybook@npm:7.5.3": - version: 7.5.3 - resolution: "storybook@npm:7.5.3" +"storybook@npm:7.6.2": + version: 7.6.2 + resolution: "storybook@npm:7.6.2" dependencies: - "@storybook/cli": 7.5.3 + "@storybook/cli": 7.6.2 bin: sb: ./index.js storybook: ./index.js - checksum: 9a2ad5dd703f86bf488efdd425eedb850cbbeca05d2d15f97bca5700d02234cd281f81c07b5d9566986e8d96901c9dc8536f449ba7c1c9e40707b670b9aa6820 + checksum: 3dc01272c94e42b02329a8c6d292207f5912b67a8b4b9b0027c0e64156f7757d27c1a69517553859766697e9928a893e47ff8455fc11fa192b24a69d2bdda69e languageName: node linkType: hard @@ -34499,23 +34319,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.2.2, typescript@npm:>=3 < 6": - version: 5.2.2 - resolution: "typescript@npm:5.2.2" +"typescript@npm:5.3.2, typescript@npm:>=3 < 6": + version: 5.3.2 + resolution: "typescript@npm:5.3.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 91ae3e6193d0ddb8656d4c418a033f0f75dec5e077ebbc2bd6d76439b93f35683936ee1bdc0e9cf94ec76863aa49f27159b5788219b50e1cd0cd6d110aa34b07 + checksum: d7dbe1fbe19039e36a65468ea64b5d338c976550394ba576b7af9c68ed40c0bc5d12ecce390e4b94b287a09a71bd3229f19c2d5680611f35b7c53a3898791159 languageName: node linkType: hard -"typescript@patch:typescript@5.2.2#~builtin, typescript@patch:typescript@>=3 < 6#~builtin": - version: 5.2.2 - resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin::version=5.2.2&hash=f3b441" +"typescript@patch:typescript@5.3.2#~builtin, typescript@patch:typescript@>=3 < 6#~builtin": + version: 5.3.2 + resolution: "typescript@patch:typescript@npm%3A5.3.2#~builtin::version=5.3.2&hash=e012d7" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 062c1cee1990e6b9419ce8a55162b8dc917eb87f807e4de0327dbc1c2fa4e5f61bc0dd4e034d38ff541d1ed0479b53bcee8e4de3a4075c51a1724eb6216cb6f5 + checksum: 73c8bad74e732d93211c9d77f28b03307e2f5fc6a0afc73f4b783261ab567686a16d6ae958bdaef383a00be1b0b8c8b6741dd6ca3d13af4963fa7e47456d49c7 languageName: node linkType: hard @@ -35034,7 +34854,7 @@ __metadata: languageName: node linkType: hard -"util@npm:^0.12.0, util@npm:^0.12.3, util@npm:^0.12.4": +"util@npm:^0.12.3, util@npm:^0.12.4, util@npm:^0.12.5": version: 0.12.5 resolution: "util@npm:0.12.5" dependencies: @@ -35120,7 +34940,7 @@ __metadata: languageName: node linkType: hard -"v8-to-istanbul@npm:^9.0.0, v8-to-istanbul@npm:^9.0.1": +"v8-to-istanbul@npm:^9.0.1": version: 9.1.0 resolution: "v8-to-istanbul@npm:9.1.0" dependencies: