From 39dfc314afe6fee080940302556ff7523707676f Mon Sep 17 00:00:00 2001 From: Daniel Choudhury Date: Mon, 9 May 2022 23:43:08 +0700 Subject: [PATCH 01/17] Fix/ts resolvers type (#5437) * Make resolvers callable, args are optional * Add g sdl to ci, reorder type-check * Update snapshot * Make args optional too * Dont print unused mappers Co-authored-by: Dominic Saadi <32992335+jtoar@users.noreply.github.com> --- .github/workflows/ci.yml | 15 ++++++++++----- .../__snapshots__/graphqlCodeGen.test.ts.snap | 10 +++------- packages/internal/src/generate/graphqlCodeGen.ts | 7 ++++--- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40f4b045815e..101da83c8228 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -238,11 +238,6 @@ jobs: yarn rw test web --no-watch working-directory: ${{ steps.setup_test_project.outputs.test_project_path }} - - name: Run "rw type-check" - run: | - yarn rw type-check - working-directory: ${{ steps.setup_test_project.outputs.test_project_path }} - - name: Run "rw check" run: | yarn rw check @@ -291,6 +286,16 @@ jobs: yarn rw g page ciTest working-directory: ${{ steps.setup_test_project.outputs.test_project_path }} + - name: Run "g sdl" + run: | + yarn rw g sdl userExample + working-directory: ${{ steps.setup_test_project.outputs.test_project_path }} + + - name: Run "rw type-check" + run: | + yarn rw type-check + working-directory: ${{ steps.setup_test_project.outputs.test_project_path }} + - name: Throw Error | Run `rw g sdl ` run: | yarn rw g sdl DoesNotExist diff --git a/packages/internal/src/__tests__/__snapshots__/graphqlCodeGen.test.ts.snap b/packages/internal/src/__tests__/__snapshots__/graphqlCodeGen.test.ts.snap index 8ceebf4b851a..b9ae584a55ce 100644 --- a/packages/internal/src/__tests__/__snapshots__/graphqlCodeGen.test.ts.snap +++ b/packages/internal/src/__tests__/__snapshots__/graphqlCodeGen.test.ts.snap @@ -9,8 +9,8 @@ export type Exact = { [K in keyof T]: T[K] export type MakeOptional = Omit & { [SubKey in K]?: Maybe }; export type MakeMaybe = Omit & { [SubKey in K]: Maybe }; export type ResolverFn = ( - args: TArgs, - obj: { root: TParent; context: TContext; info: GraphQLResolveInfo } + args?: TArgs, + obj?: { root: TParent; context: TContext; info: GraphQLResolveInfo } ) => Promise> | Partial; export type RequireFields = Omit & { [P in K]-?: NonNullable }; /** All built-in and custom scalars, mapped to their actual values */ @@ -78,11 +78,7 @@ export type Todo = { export type ResolverTypeWrapper = Promise | T; - -export type ResolverWithResolve = { - resolve: ResolverFn; -}; -export type Resolver = ResolverFn | ResolverWithResolve; +export type Resolver = ResolverFn; export type SubscriptionSubscribeFn = ( parent: TParent, diff --git a/packages/internal/src/generate/graphqlCodeGen.ts b/packages/internal/src/generate/graphqlCodeGen.ts index cca016df11c2..d69f7ce8f830 100644 --- a/packages/internal/src/generate/graphqlCodeGen.ts +++ b/packages/internal/src/generate/graphqlCodeGen.ts @@ -137,6 +137,7 @@ function getPluginConfig() { const pluginConfig: CodegenTypes.PluginConfig & typescriptResolvers.TypeScriptResolversPluginConfig = { + makeResolverTypeCallable: true, namingConvention: 'keep', // to allow camelCased query names scalars: { // We need these, otherwise these scalars are mapped to any @@ -152,10 +153,10 @@ function getPluginConfig() { // prevent type names being PetQueryQuery, RW generators already append // Query/Mutation/etc omitOperationSuffix: true, - + showUnusedMappers: false, customResolverFn: `( - args: TArgs, - obj: { root: TParent; context: TContext; info: GraphQLResolveInfo } + args?: TArgs, + obj?: { root: TParent; context: TContext; info: GraphQLResolveInfo } ) => Promise> | Partial;`, mappers: prismaModels, contextType: `@redwoodjs/graphql-server/dist/functions/types#RedwoodGraphQLContext`, From 905b9996dbb0b609a9974822644eff0fa4603f60 Mon Sep 17 00:00:00 2001 From: Aditya Pandey Date: Mon, 9 May 2022 23:07:13 +0530 Subject: [PATCH 02/17] fix: Run dedupe during upgrade on yarn 3 (#5458) Co-authored-by: Dominic Saadi <32992335+jtoar@users.noreply.github.com> --- packages/cli/src/commands/upgrade.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/cli/src/commands/upgrade.js b/packages/cli/src/commands/upgrade.js index c4ed34af58b5..c2cb6c016fea 100644 --- a/packages/cli/src/commands/upgrade.js +++ b/packages/cli/src/commands/upgrade.js @@ -278,24 +278,29 @@ const dedupeDeps = async (task, { verbose }) => { try { const yarnVersion = await getCmdMajorVersion('yarn') const npxVersion = await getCmdMajorVersion('npx') - if (yarnVersion > 1) { - task.skip('Deduplication is only required for <=1.x') - return - } let npxArgs = [] if (npxVersion > 6) { npxArgs = ['--yes'] } - await execa('npx', [...npxArgs, 'yarn-deduplicate'], { + const baseExecaArgsForDedupe = { shell: true, stdio: verbose ? 'inherit' : 'pipe', cwd: getPaths().base, - }) + } + if (yarnVersion > 1) { + await execa('yarn', ['dedupe'], baseExecaArgsForDedupe) + } else { + await execa( + 'npx', + [...npxArgs, 'yarn-deduplicate'], + baseExecaArgsForDedupe + ) + } } catch (e) { console.log(c.error(e.message)) throw new Error( - 'Could not finish deduplication. If the project is using yarn 1.x, please run `npx yarn-deduplicate`, before continuing' + 'Could not finish de-duplication. For yarn 1.x, please run `npx yarn-deduplicate`, or for yarn 3 run `yarn dedupe` before continuing' ) } await yarnInstall({ verbose }) From 5bca03925537cdbcf799a62664639ab8f331eece Mon Sep 17 00:00:00 2001 From: Yann <66469030+YannBirba@users.noreply.github.com> Date: Mon, 9 May 2022 20:43:50 +0200 Subject: [PATCH 03/17] Fixing type for BrowserOnly children (#5475) * Change children type to ReactElement in BrowserOnly from BrowserUtils * Update index.ts * Also change return type of browserOnly Co-authored-by: Daniel Choudhury --- packages/prerender/src/browserUtils/index.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/prerender/src/browserUtils/index.ts b/packages/prerender/src/browserUtils/index.ts index 2b801c589971..d76162e9aef4 100644 --- a/packages/prerender/src/browserUtils/index.ts +++ b/packages/prerender/src/browserUtils/index.ts @@ -1,3 +1,4 @@ +import type { ReactElement } from 'react' import { useMemo } from 'react' /* Web side prerender utils, to be used on the browser */ @@ -14,8 +15,8 @@ export const useIsBrowser = () => { }, []) } -export const BrowserOnly = ({ children }: { children: React.ReactNode }) => { +export const BrowserOnly = ({ children }: { children: ReactElement }) => { const isBrowser = useIsBrowser() - return isBrowser && children + return isBrowser ? children : null } From 2f1fa0227337233fb7f700925d9ac066226b9aee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 May 2022 23:26:55 +0000 Subject: [PATCH 04/17] chore(deps): update dependency @nhost/hasura-auth-js to v1.1.5 (#5478) Co-authored-by: Renovate Bot --- packages/auth/package.json | 2 +- yarn.lock | 41 +++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/packages/auth/package.json b/packages/auth/package.json index 2857e522224c..8e1ab11b86a3 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -33,7 +33,7 @@ "@clerk/clerk-js": "3.10.1", "@clerk/clerk-sdk-node": "3.4.0", "@clerk/types": "2.10.0", - "@nhost/hasura-auth-js": "1.1.4", + "@nhost/hasura-auth-js": "1.1.5", "@nhost/nhost-js": "1.1.9", "@supabase/supabase-js": "1.35.3", "@types/netlify-identity-widget": "1.9.3", diff --git a/yarn.lock b/yarn.lock index 5a7a4548f132..e351f1c50d61 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5090,24 +5090,25 @@ __metadata: languageName: node linkType: hard -"@nhost/core@npm:^0.5.2": - version: 0.5.2 - resolution: "@nhost/core@npm:0.5.2" +"@nhost/core@npm:0.5.3": + version: 0.5.3 + resolution: "@nhost/core@npm:0.5.3" dependencies: - axios: ^0.25.0 + axios: ^0.26.0 js-cookie: ^3.0.1 xstate: ^4.31.0 - checksum: d68fab1611272ae1a9ef7dee3ee4759c53fc74c5ad07f0f5a9827f5db26d62481aef18f2b00d9a399e10ca928c8cd5248bdca48afb83ab5e20faf652734866f3 + checksum: eaa114c2074a1159b9ab92f957f78a1d6eba422037731820ec39f0df5aef2cafee89a2a9a90087a631bc751dde7c8abd90f6dbcf5e5a16c61cdf9c000a6f5520 languageName: node linkType: hard -"@nhost/hasura-auth-js@npm:1.1.4, @nhost/hasura-auth-js@npm:^1.1.4": - version: 1.1.4 - resolution: "@nhost/hasura-auth-js@npm:1.1.4" +"@nhost/hasura-auth-js@npm:1.1.5, @nhost/hasura-auth-js@npm:^1.1.4": + version: 1.1.5 + resolution: "@nhost/hasura-auth-js@npm:1.1.5" dependencies: - "@nhost/core": ^0.5.2 + "@nhost/core": 0.5.3 jwt-decode: ^3.1.2 - checksum: 343307df2849f8c42c03dd1dde2ea32a2a535a746f3076396747131619bd06c7d89aaa96b4321f1ca71afca416bb9b2126457ea4a655a4d026cedc7ea523def2 + xstate: ^4.31.0 + checksum: 6a3867f0b0a5d44a8ee5c1aaf2594860b839186977683bfd58f939a2b1ca4054308429ee980b890d5a3237d94066fe65732b638242aa2da04d0bc16e86bb257f languageName: node linkType: hard @@ -6080,7 +6081,7 @@ __metadata: "@clerk/clerk-js": 3.10.1 "@clerk/clerk-sdk-node": 3.4.0 "@clerk/types": 2.10.0 - "@nhost/hasura-auth-js": 1.1.4 + "@nhost/hasura-auth-js": 1.1.5 "@nhost/nhost-js": 1.1.9 "@supabase/supabase-js": 1.35.3 "@types/netlify-identity-widget": 1.9.3 @@ -10819,12 +10820,12 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.25.0": - version: 0.25.0 - resolution: "axios@npm:0.25.0" +"axios@npm:^0.26.0": + version: 0.26.1 + resolution: "axios@npm:0.26.1" dependencies: - follow-redirects: ^1.14.7 - checksum: 33475dc847e8494341db5ff5d3ce3a830e511d9698eda1e2507618a0a875ca774e7c59b9194c70664e886699b5917416175da2ea5ccb67a2945f7cdc939d7c56 + follow-redirects: ^1.14.8 + checksum: 77ad7f1e6ca04fcd3fa8af1795b09d8b7c005b71a31f28d99ba40cda0bdcc12a4627801d7fac5efa62b9f667a8402bd54c669039694373bc8d44f6be611f785c languageName: node linkType: hard @@ -16755,13 +16756,13 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.7": - version: 1.14.9 - resolution: "follow-redirects@npm:1.14.9" +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.8": + version: 1.15.0 + resolution: "follow-redirects@npm:1.15.0" peerDependenciesMeta: debug: optional: true - checksum: 08c465c17cbf3011ad16516609ee476abffa8fd1ff78c2082f1ff43614cb06586a0ccc8e99e5ebe13da06d064367cb269789e3ca0e93e2ad5b24fdc30b4294b6 + checksum: 351dea908f3fd4492066584c52dfd2a748e7b7ff14926e3f44e1db1ef2f98d9bf778dc00808b4559bb3d4894f6613567eafdb62962577c0e1bbe3bdc1b282269 languageName: node linkType: hard From 4eb233c9011c11fed792340d69f777f1af58a25b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 May 2022 23:52:09 +0000 Subject: [PATCH 05/17] chore(deps): update dependency @nhost/nhost-js to v1.1.10 (#5479) --- packages/auth/package.json | 2 +- yarn.lock | 48 ++++++++++++-------------------------- 2 files changed, 16 insertions(+), 34 deletions(-) diff --git a/packages/auth/package.json b/packages/auth/package.json index 8e1ab11b86a3..5ff7af7a2aa5 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -34,7 +34,7 @@ "@clerk/clerk-sdk-node": "3.4.0", "@clerk/types": "2.10.0", "@nhost/hasura-auth-js": "1.1.5", - "@nhost/nhost-js": "1.1.9", + "@nhost/nhost-js": "1.1.10", "@supabase/supabase-js": "1.35.3", "@types/netlify-identity-widget": "1.9.3", "@types/react": "17.0.45", diff --git a/yarn.lock b/yarn.lock index e351f1c50d61..b4618d3b2759 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5101,7 +5101,7 @@ __metadata: languageName: node linkType: hard -"@nhost/hasura-auth-js@npm:1.1.5, @nhost/hasura-auth-js@npm:^1.1.4": +"@nhost/hasura-auth-js@npm:1.1.5": version: 1.1.5 resolution: "@nhost/hasura-auth-js@npm:1.1.5" dependencies: @@ -5112,27 +5112,27 @@ __metadata: languageName: node linkType: hard -"@nhost/hasura-storage-js@npm:^0.2.0": - version: 0.2.0 - resolution: "@nhost/hasura-storage-js@npm:0.2.0" +"@nhost/hasura-storage-js@npm:0.2.1": + version: 0.2.1 + resolution: "@nhost/hasura-storage-js@npm:0.2.1" dependencies: - axios: ^0.21.1 - checksum: 4a28fa72322f6b000e2fb79fe8212638526d7cc252bbad2c7cd42b2e5b9243cb2292ce96677aeb8c077d793836981add598cbc080bd18eaf2e39982dd79769a5 + axios: ^0.26.0 + checksum: a193a30cfdf2cda6ad0c47fe9ed8253decd2b8ca9712db61ec4776bb3e953669b3175c1da9e69e307b2b0d06fce188940be4829be69cd7176fdbf3698de67c62 languageName: node linkType: hard -"@nhost/nhost-js@npm:1.1.9": - version: 1.1.9 - resolution: "@nhost/nhost-js@npm:1.1.9" +"@nhost/nhost-js@npm:1.1.10": + version: 1.1.10 + resolution: "@nhost/nhost-js@npm:1.1.10" dependencies: - "@nhost/hasura-auth-js": ^1.1.4 - "@nhost/hasura-storage-js": ^0.2.0 - axios: ^0.23.0 + "@nhost/hasura-auth-js": 1.1.5 + "@nhost/hasura-storage-js": 0.2.1 + axios: ^0.26.0 jwt-decode: ^3.1.2 query-string: ^7.0.1 peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 - checksum: 2465ece64e1e55f7b32123797414ae04f682031a581215284dd5cc1fe0b4c8c5f694d8b0bae823bf16b69d255c5bb1eb330dec18e527a84b19a65c04077b47ec + checksum: 5781409d7b70e92f82697e4654af4c5d7d0aa2613b7093c70e5516526524b83b997b1b2d0c3b20f24297424de40b8e4c7ba07701c0defcfbeb7f7eb9d8d2304f languageName: node linkType: hard @@ -6082,7 +6082,7 @@ __metadata: "@clerk/clerk-sdk-node": 3.4.0 "@clerk/types": 2.10.0 "@nhost/hasura-auth-js": 1.1.5 - "@nhost/nhost-js": 1.1.9 + "@nhost/nhost-js": 1.1.10 "@supabase/supabase-js": 1.35.3 "@types/netlify-identity-widget": 1.9.3 "@types/react": 17.0.45 @@ -10802,24 +10802,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.21.1": - version: 0.21.4 - resolution: "axios@npm:0.21.4" - dependencies: - follow-redirects: ^1.14.0 - checksum: fbcff55ec68f71f02d3773d467db2fcecdf04e749826c82c2427a232f9eba63242150a05f15af9ef15818352b814257541155de0281f8fb2b7e8a5b79f7f2142 - languageName: node - linkType: hard - -"axios@npm:^0.23.0": - version: 0.23.0 - resolution: "axios@npm:0.23.0" - dependencies: - follow-redirects: ^1.14.4 - checksum: cbc30b027003c0a2695911ac2617a2869f954a442b3e95a0a8017677e6246e2b8c69126c57683a5124ff8fbcf434a4e8832b450c0ba650f85e1c6389bd055d84 - languageName: node - linkType: hard - "axios@npm:^0.26.0": version: 0.26.1 resolution: "axios@npm:0.26.1" @@ -16756,7 +16738,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.8": +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.8": version: 1.15.0 resolution: "follow-redirects@npm:1.15.0" peerDependenciesMeta: From f14aad309f83914404a0c93ead33c6da4df01234 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 May 2022 09:53:39 +0900 Subject: [PATCH 06/17] fix(deps): update dependency @types/aws-lambda to v8.10.97 (#5486) --- packages/api-server/package.json | 2 +- packages/api/package.json | 2 +- packages/testing/package.json | 2 +- yarn.lock | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 5fc80ddfbf89..59aad7bb67a8 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -49,7 +49,7 @@ "devDependencies": { "@babel/cli": "7.16.7", "@babel/core": "7.16.7", - "@types/aws-lambda": "8.10.96", + "@types/aws-lambda": "8.10.97", "@types/lodash.escape": "4.0.7", "@types/qs": "6.9.7", "@types/split2": "3.2.1", diff --git a/packages/api/package.json b/packages/api/package.json index 75300ac0fd1a..0b515d750740 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -49,7 +49,7 @@ "@babel/core": "7.16.7", "@clerk/clerk-sdk-node": "3.4.0", "@redwoodjs/auth": "1.3.1", - "@types/aws-lambda": "8.10.96", + "@types/aws-lambda": "8.10.97", "@types/crypto-js": "4.1.1", "@types/jsonwebtoken": "8.5.8", "@types/md5": "2.3.2", diff --git a/packages/testing/package.json b/packages/testing/package.json index f6dc2c20a039..3b32067a6800 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -40,7 +40,7 @@ "@testing-library/jest-dom": "5.16.4", "@testing-library/react": "12.1.5", "@testing-library/user-event": "14.1.1", - "@types/aws-lambda": "8.10.96", + "@types/aws-lambda": "8.10.97", "@types/babel-core": "6.25.7", "@types/jest": "27.5.0", "@types/node": "16.11.33", diff --git a/yarn.lock b/yarn.lock index b4618d3b2759..b46f03d37783 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5990,7 +5990,7 @@ __metadata: "@fastify/http-proxy": 7.1.0 "@fastify/static": 5.0.2 "@fastify/url-data": 4.0.0 - "@types/aws-lambda": 8.10.96 + "@types/aws-lambda": 8.10.97 "@types/lodash.escape": 4.0.7 "@types/qs": 6.9.7 "@types/split2": 3.2.1 @@ -6028,7 +6028,7 @@ __metadata: "@clerk/clerk-sdk-node": 3.4.0 "@prisma/client": 3.13.0 "@redwoodjs/auth": 1.3.1 - "@types/aws-lambda": 8.10.96 + "@types/aws-lambda": 8.10.97 "@types/crypto-js": 4.1.1 "@types/jsonwebtoken": 8.5.8 "@types/md5": 2.3.2 @@ -6551,7 +6551,7 @@ __metadata: "@testing-library/jest-dom": 5.16.4 "@testing-library/react": 12.1.5 "@testing-library/user-event": 14.1.1 - "@types/aws-lambda": 8.10.96 + "@types/aws-lambda": 8.10.97 "@types/babel-core": 6.25.7 "@types/jest": 27.5.0 "@types/node": 16.11.33 @@ -8134,10 +8134,10 @@ __metadata: languageName: node linkType: hard -"@types/aws-lambda@npm:8.10.96, @types/aws-lambda@npm:^8.10.83": - version: 8.10.96 - resolution: "@types/aws-lambda@npm:8.10.96" - checksum: 9bea4bd8ab6367f22d196be2179ee0dfbf42f975999ad530819af92c624518243ace270c849916ef2221dc666cbc27692db568f2bfc7c96c699dbe165fbaf739 +"@types/aws-lambda@npm:8.10.97, @types/aws-lambda@npm:^8.10.83": + version: 8.10.97 + resolution: "@types/aws-lambda@npm:8.10.97" + checksum: c9eb880f21444868605a283d4637f4b213b03752432ef5eed4212e65c7ec1317de188c0416dfd5b5c6ce4eebaa4266766a1fbc665045402d35ffb8da8ab27fe8 languageName: node linkType: hard From 8aea9abb78581e2a42769354fcbca39129e4a852 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 May 2022 03:23:45 +0000 Subject: [PATCH 07/17] chore(deps): update dependency firebase to v9.8.1 (#5485) Co-authored-by: Renovate Bot --- packages/auth/package.json | 2 +- yarn.lock | 54 +++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/auth/package.json b/packages/auth/package.json index 5ff7af7a2aa5..dbb5ab285699 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -38,7 +38,7 @@ "@supabase/supabase-js": "1.35.3", "@types/netlify-identity-widget": "1.9.3", "@types/react": "17.0.45", - "firebase": "9.8.0", + "firebase": "9.8.1", "firebase-admin": "10.2.0", "gotrue-js": "0.9.29", "jest": "27.5.1", diff --git a/yarn.lock b/yarn.lock index b46f03d37783..66bb44676801 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2685,16 +2685,16 @@ __metadata: languageName: node linkType: hard -"@firebase/app-compat@npm:0.1.24": - version: 0.1.24 - resolution: "@firebase/app-compat@npm:0.1.24" +"@firebase/app-compat@npm:0.1.25": + version: 0.1.25 + resolution: "@firebase/app-compat@npm:0.1.25" dependencies: - "@firebase/app": 0.7.23 + "@firebase/app": 0.7.24 "@firebase/component": 0.5.14 "@firebase/logger": 0.3.2 "@firebase/util": 1.6.0 tslib: ^2.1.0 - checksum: 4d19c02753dc62eaf3f82f5970cb9b7d78352844a3d21984e00d5bb9be66319c0b66cd76de565f390bc75f466ad7cfcfab07033f0e891b24c7cab7accc2b844d + checksum: 2309ac6b5fc3abd87bb510f631e587a44225fc2996ff5f29c89fdc1d225dbd713d1716ba3200706df62033ce3f3ec139b1f92ca091fe91e4b749aea9ef432755 languageName: node linkType: hard @@ -2705,24 +2705,24 @@ __metadata: languageName: node linkType: hard -"@firebase/app@npm:0.7.23": - version: 0.7.23 - resolution: "@firebase/app@npm:0.7.23" +"@firebase/app@npm:0.7.24": + version: 0.7.24 + resolution: "@firebase/app@npm:0.7.24" dependencies: "@firebase/component": 0.5.14 "@firebase/logger": 0.3.2 "@firebase/util": 1.6.0 idb: 7.0.1 tslib: ^2.1.0 - checksum: 76f802392bbbaab5714fc36fd64ae72a20e3b8e46e64573a917dee19b03ba408f3a3f4d283a56e8f3984188aa7eb6cab02e095e2dc938faae3b1fcbc4d5dd47c + checksum: 3d9cbb1d5a11c42db4319b43f737f337c8ca698736e0c0ccbe40fb7f9951d3882feddc37667e30c70c39536f95c6ac0afa9734b07c93bae6892b1e87b02ca602 languageName: node linkType: hard -"@firebase/auth-compat@npm:0.2.13": - version: 0.2.13 - resolution: "@firebase/auth-compat@npm:0.2.13" +"@firebase/auth-compat@npm:0.2.14": + version: 0.2.14 + resolution: "@firebase/auth-compat@npm:0.2.14" dependencies: - "@firebase/auth": 0.20.0 + "@firebase/auth": 0.20.1 "@firebase/auth-types": 0.11.0 "@firebase/component": 0.5.14 "@firebase/util": 1.6.0 @@ -2731,7 +2731,7 @@ __metadata: tslib: ^2.1.0 peerDependencies: "@firebase/app-compat": 0.x - checksum: 9283d5537fd75626293c1efc6da8e016bdec4c7cb34be4b751d7d0beb64f70a8d46e981feacd0e31afdab3d0310af4100e4eaed09cd8f7388ac4cb988072cd85 + checksum: fccd19203db65abc5dbda1cf6c5184ab9497dbe2520fa8cec02da096fcffc0e86e85e1052a353b446a4342e96f09b6addd8474644d980e47dab2786ac3816f42 languageName: node linkType: hard @@ -2755,9 +2755,9 @@ __metadata: languageName: node linkType: hard -"@firebase/auth@npm:0.20.0": - version: 0.20.0 - resolution: "@firebase/auth@npm:0.20.0" +"@firebase/auth@npm:0.20.1": + version: 0.20.1 + resolution: "@firebase/auth@npm:0.20.1" dependencies: "@firebase/component": 0.5.14 "@firebase/logger": 0.3.2 @@ -2767,7 +2767,7 @@ __metadata: tslib: ^2.1.0 peerDependencies: "@firebase/app": 0.x - checksum: d7d87acde51e3f9450f34868841e50085bd9cb6fcc5693cef3b579436f3a71d7cbeb5be89e8e3504f99305c6b962dfa88ef2df199c28bed2849abb6986dd4560 + checksum: 3d21b97f38fbb5b84a427a4d93ebb0cd5e3e18190500a06326817a57fc9cb3e3873879034c94152bdef8d7803c3bc1f3687ca6651a9dc6da1498a99fb14010ae languageName: node linkType: hard @@ -6087,7 +6087,7 @@ __metadata: "@types/netlify-identity-widget": 1.9.3 "@types/react": 17.0.45 core-js: 3.22.4 - firebase: 9.8.0 + firebase: 9.8.1 firebase-admin: 10.2.0 gotrue-js: 0.9.29 jest: 27.5.1 @@ -16663,19 +16663,19 @@ __metadata: languageName: node linkType: hard -"firebase@npm:9.8.0": - version: 9.8.0 - resolution: "firebase@npm:9.8.0" +"firebase@npm:9.8.1": + version: 9.8.1 + resolution: "firebase@npm:9.8.1" dependencies: "@firebase/analytics": 0.7.9 "@firebase/analytics-compat": 0.1.10 - "@firebase/app": 0.7.23 + "@firebase/app": 0.7.24 "@firebase/app-check": 0.5.8 "@firebase/app-check-compat": 0.2.8 - "@firebase/app-compat": 0.1.24 + "@firebase/app-compat": 0.1.25 "@firebase/app-types": 0.7.0 - "@firebase/auth": 0.20.0 - "@firebase/auth-compat": 0.2.13 + "@firebase/auth": 0.20.1 + "@firebase/auth-compat": 0.2.14 "@firebase/database": 0.13.0 "@firebase/database-compat": 0.2.0 "@firebase/firestore": 3.4.9 @@ -16693,7 +16693,7 @@ __metadata: "@firebase/storage": 0.9.6 "@firebase/storage-compat": 0.1.14 "@firebase/util": 1.6.0 - checksum: f6e618e4eafec7accb268a52864c39418069937065109643dcf017b257e74bb7dd08058c975f8d1e02a77a649cbcb868293c1e07d861aee9d6d471f00d7b00b5 + checksum: fd2d2f7ede78993d568f3669c2b2f574757c197204ae03591b35560173eaacede9e6bc85663c3767681778c1c8c683d5171c742f836b8e8833a92b3e20bf5966 languageName: node linkType: hard From 59cfcbd35c2d40c6f18e88829d06530deb517e59 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 May 2022 03:55:19 +0000 Subject: [PATCH 08/17] chore(deps): update dependency cypress to v9.6.1 (#5482) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d35c36943400..ea59c4da5015 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "babel-plugin-remove-code": "0.0.6", "boxen": "5.1.2", "core-js": "3.22.4", - "cypress": "9.6.0", + "cypress": "9.6.1", "cypress-wait-until": "1.7.2", "eslint": "8.15.0", "fast-glob": "3.2.11", diff --git a/yarn.lock b/yarn.lock index 66bb44676801..07b999bcfba1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13844,9 +13844,9 @@ __metadata: languageName: node linkType: hard -"cypress@npm:9.6.0": - version: 9.6.0 - resolution: "cypress@npm:9.6.0" +"cypress@npm:9.6.1": + version: 9.6.1 + resolution: "cypress@npm:9.6.1" dependencies: "@cypress/request": ^2.88.10 "@cypress/xvfb": ^1.2.4 @@ -13892,7 +13892,7 @@ __metadata: yauzl: ^2.10.0 bin: cypress: bin/cypress - checksum: 9f590c55c4cf7271aed1b4d0260dce9fd90333a6f56428b68a39794af6ea1421bccad921bcd43d5b57fb0572ce6ef8f16d5d477af610c16d4fc564db31baf066 + checksum: a15e08ba9aae5bc0ab1853c6eb2651553091e4cfcac0655f074102eaa05eeffb73888b06af7c0eeaa2271b2928cf5961e40a635a30e3b19754f8da5f951223f3 languageName: node linkType: hard @@ -27159,7 +27159,7 @@ __metadata: babel-plugin-remove-code: 0.0.6 boxen: 5.1.2 core-js: 3.22.4 - cypress: 9.6.0 + cypress: 9.6.1 cypress-wait-until: 1.7.2 eslint: 8.15.0 fast-glob: 3.2.11 From 3931ce89e50f67bbfb67ea860e7d3acb9148785b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 May 2022 14:14:49 +0900 Subject: [PATCH 09/17] fix(deps): update typescript-eslint monorepo to v5.23.0 (#5489) Co-authored-by: Renovate Bot --- packages/eslint-config/package.json | 4 +- yarn.lock | 98 ++++++++++++++--------------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index c5b230b7d331..f5d24532d611 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -16,8 +16,8 @@ "@babel/eslint-parser": "7.16.5", "@babel/eslint-plugin": "7.16.5", "@redwoodjs/internal": "1.3.1", - "@typescript-eslint/eslint-plugin": "5.22.0", - "@typescript-eslint/parser": "5.22.0", + "@typescript-eslint/eslint-plugin": "5.23.0", + "@typescript-eslint/parser": "5.23.0", "eslint": "8.15.0", "eslint-config-prettier": "8.5.0", "eslint-import-resolver-babel-module": "5.3.1", diff --git a/yarn.lock b/yarn.lock index 07b999bcfba1..4a38db760ab1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6269,8 +6269,8 @@ __metadata: "@babel/eslint-parser": 7.16.5 "@babel/eslint-plugin": 7.16.5 "@redwoodjs/internal": 1.3.1 - "@typescript-eslint/eslint-plugin": 5.22.0 - "@typescript-eslint/parser": 5.22.0 + "@typescript-eslint/eslint-plugin": 5.23.0 + "@typescript-eslint/parser": 5.23.0 eslint: 8.15.0 eslint-config-prettier: 8.5.0 eslint-import-resolver-babel-module: 5.3.1 @@ -9258,13 +9258,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:5.22.0": - version: 5.22.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.22.0" +"@typescript-eslint/eslint-plugin@npm:5.23.0": + version: 5.23.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.23.0" dependencies: - "@typescript-eslint/scope-manager": 5.22.0 - "@typescript-eslint/type-utils": 5.22.0 - "@typescript-eslint/utils": 5.22.0 + "@typescript-eslint/scope-manager": 5.23.0 + "@typescript-eslint/type-utils": 5.23.0 + "@typescript-eslint/utils": 5.23.0 debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 @@ -9277,42 +9277,42 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 65ac7404e482292e837c4fbac74c9b7ed9d5c770936bd503e8f806c05ca9f0e62528fb4bc1ddcca13ad414bee4309711df360ff4078dd2a73997cd5d3f8dfa81 + checksum: 72021ea7e81ea40de7b27df536a31ef724eaa2f1a8d1a75aa6ce7ceeb9b90479e19b3668fe5afaf2edd2eac3b44a01d5d26c059aa7b688933ab0d270eec2c1a8 languageName: node linkType: hard -"@typescript-eslint/parser@npm:5.22.0": - version: 5.22.0 - resolution: "@typescript-eslint/parser@npm:5.22.0" +"@typescript-eslint/parser@npm:5.23.0": + version: 5.23.0 + resolution: "@typescript-eslint/parser@npm:5.23.0" dependencies: - "@typescript-eslint/scope-manager": 5.22.0 - "@typescript-eslint/types": 5.22.0 - "@typescript-eslint/typescript-estree": 5.22.0 + "@typescript-eslint/scope-manager": 5.23.0 + "@typescript-eslint/types": 5.23.0 + "@typescript-eslint/typescript-estree": 5.23.0 debug: ^4.3.2 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 32c0e144dd96c2919f9867d77229479fbc1fa5a9a114d23a01dd97537abac035962fcebe2b125a6d18bbb643e26d874ff0837f9da324f86c097fb5f29c0dc5dd + checksum: eee2f6c2f03e30371bf9484a99e7e8880add5e799b936d15fc590d52f519d7853ce65ae22a7e217c06929ea2179ccb72270a95f9e62d4a0f7b791b18a1c4e982 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.22.0": - version: 5.22.0 - resolution: "@typescript-eslint/scope-manager@npm:5.22.0" +"@typescript-eslint/scope-manager@npm:5.23.0": + version: 5.23.0 + resolution: "@typescript-eslint/scope-manager@npm:5.23.0" dependencies: - "@typescript-eslint/types": 5.22.0 - "@typescript-eslint/visitor-keys": 5.22.0 - checksum: 1b30217f3bda9136c2cdaba6b45cd7de4e2d9ab82d524176d76c1edb7491f641292bf5e16a45d8ce0cd5d13b2f69b19f5be3d9e8058cac0d8f38770051446010 + "@typescript-eslint/types": 5.23.0 + "@typescript-eslint/visitor-keys": 5.23.0 + checksum: 8db061998dec41002a6650f4a029b14dc1a1ed98443ae0634ba1382f2b5010a6441b6396e6879c7bbf9a2ab4269c0f76770845435cdcacf90d15577f66f6cd52 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.22.0": - version: 5.22.0 - resolution: "@typescript-eslint/type-utils@npm:5.22.0" +"@typescript-eslint/type-utils@npm:5.23.0": + version: 5.23.0 + resolution: "@typescript-eslint/type-utils@npm:5.23.0" dependencies: - "@typescript-eslint/utils": 5.22.0 + "@typescript-eslint/utils": 5.23.0 debug: ^4.3.2 tsutils: ^3.21.0 peerDependencies: @@ -9320,23 +9320,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 614151b0cb7e870e49ba021b432eab02dc1aca8ddf4840c17572c6ce62a945a92137e075f3643583bd11dd812ec415f85a84ada5749b22ca40ec545bec5228eb + checksum: 96992359f96d7da6610f527caab32f9d0d54a32c4cfa1ff2a2cf6028cf68b213893d242e69ae0d5d78f67130f1182c5cfa673a20db35827d2399d270fd49706e languageName: node linkType: hard -"@typescript-eslint/types@npm:5.22.0": - version: 5.22.0 - resolution: "@typescript-eslint/types@npm:5.22.0" - checksum: b6bccb75307e71e0372b7b12c3043e54f072dfac975f056dd3ac84bebcc3ddc540bafe7abea7fefc5b67d886e471c07ecee31efd2082b2e02dfa301e2a0b5221 +"@typescript-eslint/types@npm:5.23.0": + version: 5.23.0 + resolution: "@typescript-eslint/types@npm:5.23.0" + checksum: 3709c5b5d78c2850835f98a2e8c5367516ce0dd901e1fbdbc63c5fe9822149673c236e8c48e2057ea88e8cadc2951cbff5b78377a566dca0a8baa0d8ef6250bd languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.22.0": - version: 5.22.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.22.0" +"@typescript-eslint/typescript-estree@npm:5.23.0": + version: 5.23.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.23.0" dependencies: - "@typescript-eslint/types": 5.22.0 - "@typescript-eslint/visitor-keys": 5.22.0 + "@typescript-eslint/types": 5.23.0 + "@typescript-eslint/visitor-keys": 5.23.0 debug: ^4.3.2 globby: ^11.0.4 is-glob: ^4.0.3 @@ -9345,33 +9345,33 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 85226e1a1bf920fe043b249946def11857b098b43c70f780b557a37610aa0d826af89da1c326e942089e2517004045a9c6b9fcc2d4e4e9b3352c4b93275543fd + checksum: 005448fd4408fbf865c72368ad8a513e1031bcb19d0fd04c5199b8088dee94121ca2246a445b2ab654d8c1baf547c6b449264c26f27d2e4cd475515b48b8ae2c languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.22.0": - version: 5.22.0 - resolution: "@typescript-eslint/utils@npm:5.22.0" +"@typescript-eslint/utils@npm:5.23.0": + version: 5.23.0 + resolution: "@typescript-eslint/utils@npm:5.23.0" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.22.0 - "@typescript-eslint/types": 5.22.0 - "@typescript-eslint/typescript-estree": 5.22.0 + "@typescript-eslint/scope-manager": 5.23.0 + "@typescript-eslint/types": 5.23.0 + "@typescript-eslint/typescript-estree": 5.23.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 28fca7acb0489b023b72a14b4ea65c3f091d360dd545d5b3678426b9b54efed7bcc86f623b67b8f046f6d84e686fbae4a20cdc12073bc00a0e55e14fff8b505b + checksum: 3fa8c95485763046150dd45c2d8cc8e1e79998a64c96bbcddbeab11858e7234eea4257ad89af40469d0f401ef50315bdb83cc0e62a856d28127ff1c4f5dfaebd languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.22.0": - version: 5.22.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.22.0" +"@typescript-eslint/visitor-keys@npm:5.23.0": + version: 5.23.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.23.0" dependencies: - "@typescript-eslint/types": 5.22.0 + "@typescript-eslint/types": 5.23.0 eslint-visitor-keys: ^3.0.0 - checksum: 0f0a222be96550b555c2899cf93aa24898ddf1a56f1370ce9a5b103cc7c73ac471be28a02102d3169f9a01737d0aae14041fa1dd6caf7bda20aa1416a270248e + checksum: 3b12f3acb7bcd18a66fa091b914d3fb8c3e61f06ffedf65a3c30f405cb8353167076300e56fb59136dab8916c97b3dfc2d40d4a51b5babcfd8ff84a23f2e683e languageName: node linkType: hard From 91bfc33312fb8024f7f41a5522b85ff7862ca028 Mon Sep 17 00:00:00 2001 From: Paine Leffler Date: Tue, 10 May 2022 00:18:39 -0500 Subject: [PATCH 10/17] fixed typo of roll to role (#5484) Co-authored-by: Paine Leffler Co-authored-by: Dominic Saadi <32992335+jtoar@users.noreply.github.com> --- docs/docs/tutorial/chapter7/rbac.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/tutorial/chapter7/rbac.md b/docs/docs/tutorial/chapter7/rbac.md index 5b7f7dab26d7..70a51c20459e 100644 --- a/docs/docs/tutorial/chapter7/rbac.md +++ b/docs/docs/tutorial/chapter7/rbac.md @@ -1244,7 +1244,7 @@ Having a role like "admin" implies that they can do everything...shouldn't they 1. Add "admin" to the list of roles in the `hasRole()` checks in components, `@requireAuth` directive, and `requireAuth()` check in services 2. Don't make any changes in the code, just give the user in the database additional roles—so admins will also have the "moderator" role in addition to "admin" -By virtue of the name "admin" it really feels like someone should only have that one single roll and be able to do everything. So in this case it might feel better to add "admin" to `hasRole()` and `requireAuth()`. +By virtue of the name "admin" it really feels like someone should only have that one single role and be able to do everything. So in this case it might feel better to add "admin" to `hasRole()` and `requireAuth()`. But, if you wanted to be more fine-grained with your roles then maybe the "admin" role should really be called "author". That way it makes it clear they only author posts, and if you want someone to be able to do both actions you can explicitly give them the "moderator" role in addition to "author." From 0c8b6f8e2322d3966be8f08f4ee8f2669e5a90a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 May 2022 05:47:31 +0000 Subject: [PATCH 11/17] fix(deps): update dependency graphql to v16.5.0 (#5488) Co-authored-by: Renovate Bot Co-authored-by: Dominic Saadi <32992335+jtoar@users.noreply.github.com> --- packages/core/package.json | 2 +- packages/forms/package.json | 4 ++-- packages/graphql-server/package.json | 2 +- packages/internal/package.json | 2 +- packages/structure/package.json | 2 +- packages/web/package.json | 2 +- yarn.lock | 22 +++++++++++----------- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 99e1c6901e2a..0d4db64dad04 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -67,7 +67,7 @@ "esbuild-loader": "2.18.0", "fast-glob": "3.2.11", "file-loader": "6.2.0", - "graphql": "16.4.0", + "graphql": "16.5.0", "graphql-tag": "2.12.6", "html-webpack-plugin": "5.5.0", "lodash.escaperegexp": "4.1.2", diff --git a/packages/forms/package.json b/packages/forms/package.json index b66dd33b1d35..9214b8d6d7bd 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -37,7 +37,7 @@ "@types/react": "17.0.45", "@types/react-dom": "17.0.16", "@types/testing-library__jest-dom": "5.14.3", - "graphql": "16.4.0", + "graphql": "16.5.0", "jest": "27.5.1", "nodemon": "2.0.16", "react": "17.0.2", @@ -45,7 +45,7 @@ "typescript": "4.6.4" }, "peerDependencies": { - "graphql": "16.4.0", + "graphql": "16.5.0", "react": "17.0.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 16557fda7ca0..d63c8b25690a 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -36,7 +36,7 @@ "@redwoodjs/api": "1.3.1", "core-js": "3.22.4", "cross-undici-fetch": "0.1.27", - "graphql": "16.4.0", + "graphql": "16.5.0", "graphql-scalars": "1.17.0", "graphql-tag": "2.12.6", "lodash.merge": "4.6.2", diff --git a/packages/internal/package.json b/packages/internal/package.json index 7aa8fff35bc6..c5ec226456d7 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -50,7 +50,7 @@ "fast-glob": "3.2.11", "findup-sync": "5.0.0", "fs-extra": "10.1.0", - "graphql": "16.4.0", + "graphql": "16.5.0", "kill-port": "1.6.1", "prettier": "2.6.2", "rimraf": "3.0.2", diff --git a/packages/structure/package.json b/packages/structure/package.json index 8653e2328500..bfe881813287 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -40,7 +40,7 @@ "dotenv-defaults": "5.0.0", "enquirer": "2.3.6", "findup-sync": "5.0.0", - "graphql": "16.4.0", + "graphql": "16.5.0", "lazy-get-decorator": "2.2.0", "line-column": "1.0.2", "lodash": "4.17.21", diff --git a/packages/web/package.json b/packages/web/package.json index 20a66b09dc5a..794da19731d4 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -40,7 +40,7 @@ "@babel/runtime-corejs3": "7.16.7", "@redwoodjs/auth": "1.3.1", "core-js": "3.22.4", - "graphql": "16.4.0", + "graphql": "16.5.0", "graphql-tag": "2.12.6", "react-helmet-async": "1.3.0", "react-hot-toast": "2.2.0", diff --git a/yarn.lock b/yarn.lock index 4a38db760ab1..e7dc1a8bdac6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6223,7 +6223,7 @@ __metadata: esbuild-loader: 2.18.0 fast-glob: 3.2.11 file-loader: 6.2.0 - graphql: 16.4.0 + graphql: 16.5.0 graphql-tag: 2.12.6 html-webpack-plugin: 5.5.0 jest: 27.5.1 @@ -6303,7 +6303,7 @@ __metadata: "@types/react-dom": 17.0.16 "@types/testing-library__jest-dom": 5.14.3 core-js: 3.22.4 - graphql: 16.4.0 + graphql: 16.5.0 jest: 27.5.1 nodemon: 2.0.16 pascalcase: 1.0.0 @@ -6312,7 +6312,7 @@ __metadata: react-hook-form: 7.30.0 typescript: 4.6.4 peerDependencies: - graphql: 16.4.0 + graphql: 16.5.0 react: 17.0.2 languageName: unknown linkType: soft @@ -6344,7 +6344,7 @@ __metadata: aws-lambda: 1.0.7 core-js: 3.22.4 cross-undici-fetch: 0.1.27 - graphql: 16.4.0 + graphql: 16.5.0 graphql-scalars: 1.17.0 graphql-tag: 2.12.6 jest: 27.5.1 @@ -6389,7 +6389,7 @@ __metadata: fast-glob: 3.2.11 findup-sync: 5.0.0 fs-extra: 10.1.0 - graphql: 16.4.0 + graphql: 16.5.0 graphql-tag: 2.12.6 jest: 27.5.1 kill-port: 1.6.1 @@ -6490,7 +6490,7 @@ __metadata: dotenv-defaults: 5.0.0 enquirer: 2.3.6 findup-sync: 5.0.0 - graphql: 16.4.0 + graphql: 16.5.0 jest: 27.5.1 lazy-get-decorator: 2.2.0 line-column: 1.0.2 @@ -6586,7 +6586,7 @@ __metadata: "@types/react-dom": 17.0.16 "@types/testing-library__jest-dom": 5.14.3 core-js: 3.22.4 - graphql: 16.4.0 + graphql: 16.5.0 graphql-tag: 2.12.6 jest: 27.5.1 nodemon: 2.0.16 @@ -17791,10 +17791,10 @@ __metadata: languageName: node linkType: hard -"graphql@npm:16.4.0, graphql@npm:^16.3.0": - version: 16.4.0 - resolution: "graphql@npm:16.4.0" - checksum: e93fbba004a6c121cbd618e060ea8bc672c4e324ee8b7e490245eb8c8a06e06a6806d196c19ce80522a4cf83031ed4bd837de5c2d9fcb5d39e24a586abed6d1e +"graphql@npm:16.5.0, graphql@npm:^16.3.0": + version: 16.5.0 + resolution: "graphql@npm:16.5.0" + checksum: 082bad733549a032fe313dd94b780c0e2a46a6a362183e02e2050f6e083fb49722afb1413b069314d5ba1bc3fa14e22817820a9e61e2bbcba8d35f925d0de60e languageName: node linkType: hard From 47bbdd1d8b23269002664df3be296d385e2268c5 Mon Sep 17 00:00:00 2001 From: Daniel Choudhury Date: Mon, 9 May 2022 23:43:08 +0700 Subject: [PATCH 12/17] Fix/ts resolvers type (#5437) * Make resolvers callable, args are optional * Add g sdl to ci, reorder type-check * Update snapshot * Make args optional too * Dont print unused mappers Co-authored-by: Dominic Saadi <32992335+jtoar@users.noreply.github.com> --- .github/workflows/ci.yml | 15 ++++++++++----- .../__snapshots__/graphqlCodeGen.test.ts.snap | 10 +++------- packages/internal/src/generate/graphqlCodeGen.ts | 7 ++++--- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a68eb01114a7..e1d48f037d43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -238,11 +238,6 @@ jobs: yarn rw test web --no-watch working-directory: ${{ steps.setup_test_project.outputs.test_project_path }} - - name: Run "rw type-check" - run: | - yarn rw type-check - working-directory: ${{ steps.setup_test_project.outputs.test_project_path }} - - name: Run "rw check" run: | yarn rw check @@ -291,6 +286,16 @@ jobs: yarn rw g page ciTest working-directory: ${{ steps.setup_test_project.outputs.test_project_path }} + - name: Run "g sdl" + run: | + yarn rw g sdl userExample + working-directory: ${{ steps.setup_test_project.outputs.test_project_path }} + + - name: Run "rw type-check" + run: | + yarn rw type-check + working-directory: ${{ steps.setup_test_project.outputs.test_project_path }} + - name: Throw Error | Run `rw g sdl ` run: | yarn rw g sdl DoesNotExist diff --git a/packages/internal/src/__tests__/__snapshots__/graphqlCodeGen.test.ts.snap b/packages/internal/src/__tests__/__snapshots__/graphqlCodeGen.test.ts.snap index 8ceebf4b851a..b9ae584a55ce 100644 --- a/packages/internal/src/__tests__/__snapshots__/graphqlCodeGen.test.ts.snap +++ b/packages/internal/src/__tests__/__snapshots__/graphqlCodeGen.test.ts.snap @@ -9,8 +9,8 @@ export type Exact = { [K in keyof T]: T[K] export type MakeOptional = Omit & { [SubKey in K]?: Maybe }; export type MakeMaybe = Omit & { [SubKey in K]: Maybe }; export type ResolverFn = ( - args: TArgs, - obj: { root: TParent; context: TContext; info: GraphQLResolveInfo } + args?: TArgs, + obj?: { root: TParent; context: TContext; info: GraphQLResolveInfo } ) => Promise> | Partial; export type RequireFields = Omit & { [P in K]-?: NonNullable }; /** All built-in and custom scalars, mapped to their actual values */ @@ -78,11 +78,7 @@ export type Todo = { export type ResolverTypeWrapper = Promise | T; - -export type ResolverWithResolve = { - resolve: ResolverFn; -}; -export type Resolver = ResolverFn | ResolverWithResolve; +export type Resolver = ResolverFn; export type SubscriptionSubscribeFn = ( parent: TParent, diff --git a/packages/internal/src/generate/graphqlCodeGen.ts b/packages/internal/src/generate/graphqlCodeGen.ts index cca016df11c2..d69f7ce8f830 100644 --- a/packages/internal/src/generate/graphqlCodeGen.ts +++ b/packages/internal/src/generate/graphqlCodeGen.ts @@ -137,6 +137,7 @@ function getPluginConfig() { const pluginConfig: CodegenTypes.PluginConfig & typescriptResolvers.TypeScriptResolversPluginConfig = { + makeResolverTypeCallable: true, namingConvention: 'keep', // to allow camelCased query names scalars: { // We need these, otherwise these scalars are mapped to any @@ -152,10 +153,10 @@ function getPluginConfig() { // prevent type names being PetQueryQuery, RW generators already append // Query/Mutation/etc omitOperationSuffix: true, - + showUnusedMappers: false, customResolverFn: `( - args: TArgs, - obj: { root: TParent; context: TContext; info: GraphQLResolveInfo } + args?: TArgs, + obj?: { root: TParent; context: TContext; info: GraphQLResolveInfo } ) => Promise> | Partial;`, mappers: prismaModels, contextType: `@redwoodjs/graphql-server/dist/functions/types#RedwoodGraphQLContext`, From 5f8fb615b9c8c3318bcf0f0a1f739be519a4eba1 Mon Sep 17 00:00:00 2001 From: Aditya Pandey Date: Mon, 9 May 2022 23:07:13 +0530 Subject: [PATCH 13/17] fix: Run dedupe during upgrade on yarn 3 (#5458) Co-authored-by: Dominic Saadi <32992335+jtoar@users.noreply.github.com> --- packages/cli/src/commands/upgrade.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/cli/src/commands/upgrade.js b/packages/cli/src/commands/upgrade.js index 18513e1429b6..1209d19f0fe7 100644 --- a/packages/cli/src/commands/upgrade.js +++ b/packages/cli/src/commands/upgrade.js @@ -278,24 +278,29 @@ const dedupeDeps = async (task, { verbose }) => { try { const yarnVersion = await getCmdMajorVersion('yarn') const npxVersion = await getCmdMajorVersion('npx') - if (yarnVersion > 1) { - task.skip('Deduplication is only required for <=1.x') - return - } let npxArgs = [] if (npxVersion > 6) { npxArgs = ['--yes'] } - await execa('npx', [...npxArgs, 'yarn-deduplicate'], { + const baseExecaArgsForDedupe = { shell: true, stdio: verbose ? 'inherit' : 'pipe', cwd: getPaths().base, - }) + } + if (yarnVersion > 1) { + await execa('yarn', ['dedupe'], baseExecaArgsForDedupe) + } else { + await execa( + 'npx', + [...npxArgs, 'yarn-deduplicate'], + baseExecaArgsForDedupe + ) + } } catch (e) { console.log(c.error(e.message)) throw new Error( - 'Could not finish deduplication. If the project is using yarn 1.x, please run `npx yarn-deduplicate`, before continuing' + 'Could not finish de-duplication. For yarn 1.x, please run `npx yarn-deduplicate`, or for yarn 3 run `yarn dedupe` before continuing' ) } await yarnInstall({ verbose }) From 577ffe1956c25accec22be02feb2d6699aaf5ecc Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Tue, 10 May 2022 14:48:22 +0900 Subject: [PATCH 14/17] Update yarn.lock --- yarn.lock | 88 +++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7501a3e89d08..3d56a33545d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5864,7 +5864,7 @@ __metadata: languageName: node linkType: hard -"@redwoodjs/api-server@1.3.0, @redwoodjs/api-server@workspace:packages/api-server": +"@redwoodjs/api-server@1.3.1, @redwoodjs/api-server@workspace:packages/api-server": version: 0.0.0-use.local resolution: "@redwoodjs/api-server@workspace:packages/api-server" dependencies: @@ -5901,7 +5901,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/api@1.3.0, @redwoodjs/api@workspace:packages/api": +"@redwoodjs/api@1.3.1, @redwoodjs/api@workspace:packages/api": version: 0.0.0-use.local resolution: "@redwoodjs/api@workspace:packages/api" dependencies: @@ -5909,7 +5909,7 @@ __metadata: "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 "@prisma/client": 3.13.0 - "@redwoodjs/auth": 1.3.0 + "@redwoodjs/auth": 1.3.1 "@types/crypto-js": 4.1.1 "@types/jsonwebtoken": 8.5.8 "@types/md5": 2.3.2 @@ -5947,7 +5947,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/auth@1.3.0, @redwoodjs/auth@workspace:packages/auth": +"@redwoodjs/auth@1.3.1, @redwoodjs/auth@workspace:packages/auth": version: 0.0.0-use.local resolution: "@redwoodjs/auth@workspace:packages/auth" dependencies: @@ -5974,18 +5974,18 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/cli@1.3.0, @redwoodjs/cli@workspace:packages/cli": +"@redwoodjs/cli@1.3.1, @redwoodjs/cli@workspace:packages/cli": version: 0.0.0-use.local resolution: "@redwoodjs/cli@workspace:packages/cli" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@prisma/sdk": 3.13.0 - "@redwoodjs/api-server": 1.3.0 - "@redwoodjs/internal": 1.3.0 - "@redwoodjs/prerender": 1.3.0 - "@redwoodjs/structure": 1.3.0 - "@redwoodjs/telemetry": 1.3.0 + "@redwoodjs/api-server": 1.3.1 + "@redwoodjs/internal": 1.3.1 + "@redwoodjs/prerender": 1.3.1 + "@redwoodjs/structure": 1.3.1 + "@redwoodjs/telemetry": 1.3.1 "@types/listr": 0.14.4 boxen: 5.1.2 camelcase: 6.3.0 @@ -6073,10 +6073,10 @@ __metadata: "@babel/preset-typescript": 7.16.7 "@babel/runtime-corejs3": 7.16.7 "@pmmmwh/react-refresh-webpack-plugin": 0.5.5 - "@redwoodjs/cli": 1.3.0 - "@redwoodjs/eslint-config": 1.3.0 - "@redwoodjs/internal": 1.3.0 - "@redwoodjs/testing": 1.3.0 + "@redwoodjs/cli": 1.3.1 + "@redwoodjs/eslint-config": 1.3.1 + "@redwoodjs/internal": 1.3.1 + "@redwoodjs/testing": 1.3.1 "@types/rimraf": 3.0.2 babel-loader: 8.2.3 babel-plugin-auto-import: 1.1.0 @@ -6129,7 +6129,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/eslint-config@1.3.0, @redwoodjs/eslint-config@workspace:packages/eslint-config": +"@redwoodjs/eslint-config@1.3.1, @redwoodjs/eslint-config@workspace:packages/eslint-config": version: 0.0.0-use.local resolution: "@redwoodjs/eslint-config@workspace:packages/eslint-config" dependencies: @@ -6137,7 +6137,7 @@ __metadata: "@babel/core": 7.16.7 "@babel/eslint-parser": 7.16.5 "@babel/eslint-plugin": 7.16.5 - "@redwoodjs/internal": 1.3.0 + "@redwoodjs/internal": 1.3.1 "@typescript-eslint/eslint-plugin": 5.20.0 "@typescript-eslint/parser": 5.20.0 eslint: 8.14.0 @@ -6184,7 +6184,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/graphql-server@1.3.0, @redwoodjs/graphql-server@workspace:packages/graphql-server": +"@redwoodjs/graphql-server@1.3.1, @redwoodjs/graphql-server@workspace:packages/graphql-server": version: 0.0.0-use.local resolution: "@redwoodjs/graphql-server@workspace:packages/graphql-server" dependencies: @@ -6202,8 +6202,8 @@ __metadata: "@graphql-tools/utils": 8.6.9 "@graphql-yoga/common": 2.5.0 "@prisma/client": 3.13.0 - "@redwoodjs/api": 1.3.0 - "@redwoodjs/auth": 1.3.0 + "@redwoodjs/api": 1.3.1 + "@redwoodjs/auth": 1.3.1 "@types/lodash.merge": 4.6.7 "@types/lodash.omitby": 4.6.7 "@types/uuid": 8.3.4 @@ -6221,7 +6221,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/internal@1.3.0, @redwoodjs/internal@workspace:packages/internal": +"@redwoodjs/internal@1.3.1, @redwoodjs/internal@workspace:packages/internal": version: 0.0.0-use.local resolution: "@redwoodjs/internal@workspace:packages/internal" dependencies: @@ -6239,7 +6239,7 @@ __metadata: "@graphql-codegen/typescript-operations": 2.3.5 "@graphql-codegen/typescript-react-apollo": 3.2.11 "@graphql-codegen/typescript-resolvers": 2.6.1 - "@redwoodjs/graphql-server": 1.3.0 + "@redwoodjs/graphql-server": 1.3.1 "@types/babel-plugin-tester": 9.0.4 "@types/babel__core": 7.1.19 "@types/findup-sync": 4.0.2 @@ -6272,17 +6272,17 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/prerender@1.3.0, @redwoodjs/prerender@workspace:packages/prerender": +"@redwoodjs/prerender@1.3.1, @redwoodjs/prerender@workspace:packages/prerender": version: 0.0.0-use.local resolution: "@redwoodjs/prerender@workspace:packages/prerender" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 - "@redwoodjs/auth": 1.3.0 - "@redwoodjs/internal": 1.3.0 - "@redwoodjs/router": 1.3.0 - "@redwoodjs/structure": 1.3.0 - "@redwoodjs/web": 1.3.0 + "@redwoodjs/auth": 1.3.1 + "@redwoodjs/internal": 1.3.1 + "@redwoodjs/router": 1.3.1 + "@redwoodjs/structure": 1.3.1 + "@redwoodjs/web": 1.3.1 "@types/mime-types": 2.1.1 babel-plugin-ignore-html-and-css-imports: 0.1.0 babel-plugin-tester: 10.1.0 @@ -6311,14 +6311,14 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/router@1.3.0, @redwoodjs/router@workspace:packages/router": +"@redwoodjs/router@1.3.1, @redwoodjs/router@workspace:packages/router": version: 0.0.0-use.local resolution: "@redwoodjs/router@workspace:packages/router" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@reach/skip-nav": 0.16.0 - "@redwoodjs/auth": 1.3.0 + "@redwoodjs/auth": 1.3.1 "@types/lodash.isequal": 4.5.6 core-js: 3.22.2 jest: 27.5.1 @@ -6330,14 +6330,14 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/structure@1.3.0, @redwoodjs/structure@workspace:packages/structure": +"@redwoodjs/structure@1.3.1, @redwoodjs/structure@workspace:packages/structure": version: 0.0.0-use.local resolution: "@redwoodjs/structure@workspace:packages/structure" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@prisma/sdk": 3.13.0 - "@redwoodjs/internal": 1.3.0 + "@redwoodjs/internal": 1.3.1 "@types/fs-extra": 9.0.13 "@types/line-column": 1.0.0 "@types/lodash": 4.14.182 @@ -6367,15 +6367,15 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/telemetry@1.3.0, @redwoodjs/telemetry@workspace:packages/telemetry": +"@redwoodjs/telemetry@1.3.1, @redwoodjs/telemetry@workspace:packages/telemetry": version: 0.0.0-use.local resolution: "@redwoodjs/telemetry@workspace:packages/telemetry" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/internal": 1.3.0 - "@redwoodjs/structure": 1.3.0 + "@redwoodjs/internal": 1.3.1 + "@redwoodjs/structure": 1.3.1 "@types/envinfo": 7.8.1 "@types/uuid": 8.3.4 "@types/yargs": 16.0.4 @@ -6389,17 +6389,17 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/testing@1.3.0, @redwoodjs/testing@workspace:packages/testing": +"@redwoodjs/testing@1.3.1, @redwoodjs/testing@workspace:packages/testing": version: 0.0.0-use.local resolution: "@redwoodjs/testing@workspace:packages/testing" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 - "@redwoodjs/auth": 1.3.0 - "@redwoodjs/graphql-server": 1.3.0 - "@redwoodjs/internal": 1.3.0 - "@redwoodjs/router": 1.3.0 - "@redwoodjs/web": 1.3.0 + "@redwoodjs/auth": 1.3.1 + "@redwoodjs/graphql-server": 1.3.1 + "@redwoodjs/internal": 1.3.1 + "@redwoodjs/router": 1.3.1 + "@redwoodjs/web": 1.3.1 "@storybook/addon-a11y": 6.4.22 "@storybook/addon-essentials": 6.4.22 "@storybook/builder-webpack5": 6.4.22 @@ -6426,7 +6426,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/web@1.3.0, @redwoodjs/web@workspace:packages/web": +"@redwoodjs/web@1.3.1, @redwoodjs/web@workspace:packages/web": version: 0.0.0-use.local resolution: "@redwoodjs/web@workspace:packages/web" dependencies: @@ -6434,7 +6434,7 @@ __metadata: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/auth": 1.3.0 + "@redwoodjs/auth": 1.3.1 "@testing-library/jest-dom": 5.16.4 "@testing-library/react": 12.1.5 "@types/react": 17.0.44 @@ -13257,8 +13257,8 @@ __metadata: "@babel/core": 7.16.7 "@babel/node": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/internal": 1.3.0 - "@redwoodjs/telemetry": 1.3.0 + "@redwoodjs/internal": 1.3.1 + "@redwoodjs/telemetry": 1.3.1 chalk: 4.1.2 check-node-version: 4.2.1 execa: 5.1.1 From 32507ee8a926a6bce68771576b0e03cce3db03cf Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Tue, 10 May 2022 14:51:09 +0900 Subject: [PATCH 15/17] v1.3.2 --- __fixtures__/test-project/api/package.json | 4 ++-- __fixtures__/test-project/package.json | 2 +- __fixtures__/test-project/web/package.json | 8 ++++---- lerna.json | 2 +- packages/api-server/package.json | 2 +- packages/api/package.json | 4 ++-- packages/auth/package.json | 2 +- packages/cli/package.json | 12 ++++++------ packages/codemods/package.json | 2 +- packages/core/package.json | 10 +++++----- packages/create-redwood-app/package.json | 6 +++--- .../create-redwood-app/template/api/package.json | 4 ++-- packages/create-redwood-app/template/package.json | 2 +- .../create-redwood-app/template/web/package.json | 6 +++--- packages/eslint-config/package.json | 4 ++-- packages/forms/package.json | 2 +- packages/graphql-server/package.json | 6 +++--- packages/internal/package.json | 4 ++-- packages/prerender/package.json | 12 ++++++------ packages/record/package.json | 2 +- packages/router/package.json | 4 ++-- packages/structure/package.json | 4 ++-- packages/telemetry/package.json | 6 +++--- packages/testing/package.json | 12 ++++++------ packages/web/package.json | 4 ++-- 25 files changed, 63 insertions(+), 63 deletions(-) diff --git a/__fixtures__/test-project/api/package.json b/__fixtures__/test-project/api/package.json index 03d12df94655..0bc256b00471 100644 --- a/__fixtures__/test-project/api/package.json +++ b/__fixtures__/test-project/api/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "@redwoodjs/api": "1.3.1", - "@redwoodjs/graphql-server": "1.3.1" + "@redwoodjs/api": "1.3.2", + "@redwoodjs/graphql-server": "1.3.2" } } diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json index f882d1e53288..41dc78a5dfbb 100644 --- a/__fixtures__/test-project/package.json +++ b/__fixtures__/test-project/package.json @@ -8,7 +8,7 @@ ] }, "devDependencies": { - "@redwoodjs/core": "1.3.1", + "@redwoodjs/core": "1.3.2", "autoprefixer": "^10.4.4", "postcss": "^8.4.12", "postcss-loader": "^6.2.1", diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json index b644f0eac668..159939ba2644 100644 --- a/__fixtures__/test-project/web/package.json +++ b/__fixtures__/test-project/web/package.json @@ -13,10 +13,10 @@ ] }, "dependencies": { - "@redwoodjs/auth": "1.3.1", - "@redwoodjs/forms": "1.3.1", - "@redwoodjs/router": "1.3.1", - "@redwoodjs/web": "1.3.1", + "@redwoodjs/auth": "1.3.2", + "@redwoodjs/forms": "1.3.2", + "@redwoodjs/router": "1.3.2", + "@redwoodjs/web": "1.3.2", "prop-types": "15.8.1", "react": "17.0.2", "react-dom": "17.0.2" diff --git a/lerna.json b/lerna.json index a6c22f476bbc..f8f5ff3fc6a9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.3.1", + "version": "1.3.2", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 3869510b1fad..b6ac77ed0a79 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/api-server", - "version": "1.3.1", + "version": "1.3.2", "description": "Redwood's HTTP server for Serverless Functions", "repository": { "type": "git", diff --git a/packages/api/package.json b/packages/api/package.json index 9721ac259260..0af542945d81 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/api", - "version": "1.3.1", + "version": "1.3.2", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -46,7 +46,7 @@ "devDependencies": { "@babel/cli": "7.16.7", "@babel/core": "7.16.7", - "@redwoodjs/auth": "1.3.1", + "@redwoodjs/auth": "1.3.2", "@types/crypto-js": "4.1.1", "@types/jsonwebtoken": "8.5.8", "@types/md5": "2.3.2", diff --git a/packages/auth/package.json b/packages/auth/package.json index 82e941b2e63f..557ad1f75bc0 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth", - "version": "1.3.1", + "version": "1.3.2", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/cli/package.json b/packages/cli/package.json index 4ce65bfefed6..26aa671376ac 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/cli", - "version": "1.3.1", + "version": "1.3.2", "description": "The Redwood Command Line", "repository": { "type": "git", @@ -29,11 +29,11 @@ }, "dependencies": { "@prisma/sdk": "3.13.0", - "@redwoodjs/api-server": "1.3.1", - "@redwoodjs/internal": "1.3.1", - "@redwoodjs/prerender": "1.3.1", - "@redwoodjs/structure": "1.3.1", - "@redwoodjs/telemetry": "1.3.1", + "@redwoodjs/api-server": "1.3.2", + "@redwoodjs/internal": "1.3.2", + "@redwoodjs/prerender": "1.3.2", + "@redwoodjs/structure": "1.3.2", + "@redwoodjs/telemetry": "1.3.2", "boxen": "5.1.2", "camelcase": "6.3.0", "chalk": "4.1.2", diff --git a/packages/codemods/package.json b/packages/codemods/package.json index e39929a6b2ea..e808ac8dd95e 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/codemods", - "version": "1.3.1", + "version": "1.3.2", "description": "Codemods to ease upgrading a RedwoodJS Project", "repository": { "type": "git", diff --git a/packages/core/package.json b/packages/core/package.json index 7e37de59278b..ab6f0ef5cf82 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/core", - "version": "1.3.1", + "version": "1.3.2", "description": "Foundational packages and config required to build RedwoodJS.", "repository": { "type": "git", @@ -46,10 +46,10 @@ "@babel/preset-typescript": "7.16.7", "@babel/runtime-corejs3": "7.16.7", "@pmmmwh/react-refresh-webpack-plugin": "0.5.5", - "@redwoodjs/cli": "1.3.1", - "@redwoodjs/eslint-config": "1.3.1", - "@redwoodjs/internal": "1.3.1", - "@redwoodjs/testing": "1.3.1", + "@redwoodjs/cli": "1.3.2", + "@redwoodjs/eslint-config": "1.3.2", + "@redwoodjs/internal": "1.3.2", + "@redwoodjs/testing": "1.3.2", "babel-loader": "8.2.3", "babel-plugin-auto-import": "1.1.0", "babel-plugin-graphql-tag": "3.3.0", diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index b3722b1ec08e..0050aad46989 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -1,6 +1,6 @@ { "name": "create-redwood-app", - "version": "1.3.1", + "version": "1.3.2", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -24,8 +24,8 @@ "@babel/core": "7.16.7", "@babel/node": "7.16.7", "@babel/runtime-corejs3": "7.16.7", - "@redwoodjs/internal": "1.3.1", - "@redwoodjs/telemetry": "1.3.1", + "@redwoodjs/internal": "1.3.2", + "@redwoodjs/telemetry": "1.3.2", "chalk": "4.1.2", "check-node-version": "4.2.1", "execa": "5.1.1", diff --git a/packages/create-redwood-app/template/api/package.json b/packages/create-redwood-app/template/api/package.json index 03d12df94655..0bc256b00471 100644 --- a/packages/create-redwood-app/template/api/package.json +++ b/packages/create-redwood-app/template/api/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "@redwoodjs/api": "1.3.1", - "@redwoodjs/graphql-server": "1.3.1" + "@redwoodjs/api": "1.3.2", + "@redwoodjs/graphql-server": "1.3.2" } } diff --git a/packages/create-redwood-app/template/package.json b/packages/create-redwood-app/template/package.json index ff0077573f4c..375d86e9e9c4 100644 --- a/packages/create-redwood-app/template/package.json +++ b/packages/create-redwood-app/template/package.json @@ -8,7 +8,7 @@ ] }, "devDependencies": { - "@redwoodjs/core": "1.3.1" + "@redwoodjs/core": "1.3.2" }, "eslintConfig": { "extends": "@redwoodjs/eslint-config", diff --git a/packages/create-redwood-app/template/web/package.json b/packages/create-redwood-app/template/web/package.json index aa51ec601d32..b69e93a6f1ff 100644 --- a/packages/create-redwood-app/template/web/package.json +++ b/packages/create-redwood-app/template/web/package.json @@ -13,9 +13,9 @@ ] }, "dependencies": { - "@redwoodjs/forms": "1.3.1", - "@redwoodjs/router": "1.3.1", - "@redwoodjs/web": "1.3.1", + "@redwoodjs/forms": "1.3.2", + "@redwoodjs/router": "1.3.2", + "@redwoodjs/web": "1.3.2", "prop-types": "15.8.1", "react": "17.0.2", "react-dom": "17.0.2" diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 194f38ef2790..05f7791789d9 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/eslint-config", - "version": "1.3.1", + "version": "1.3.2", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -15,7 +15,7 @@ "@babel/core": "7.16.7", "@babel/eslint-parser": "7.16.5", "@babel/eslint-plugin": "7.16.5", - "@redwoodjs/internal": "1.3.1", + "@redwoodjs/internal": "1.3.2", "@typescript-eslint/eslint-plugin": "5.20.0", "@typescript-eslint/parser": "5.20.0", "eslint": "8.14.0", diff --git a/packages/forms/package.json b/packages/forms/package.json index 8474f762fdf5..34aac839ca44 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/forms", - "version": "1.3.1", + "version": "1.3.2", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 396dbdf71bca..e3b8118340c0 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/graphql-server", - "version": "1.3.1", + "version": "1.3.2", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -32,7 +32,7 @@ "@graphql-tools/utils": "8.6.9", "@graphql-yoga/common": "2.5.0", "@prisma/client": "3.13.0", - "@redwoodjs/api": "1.3.1", + "@redwoodjs/api": "1.3.2", "core-js": "3.22.2", "cross-undici-fetch": "0.1.27", "graphql": "16.4.0", @@ -47,7 +47,7 @@ "@babel/core": "7.16.7", "@envelop/testing": "4.3.1", "@envelop/types": "2.0.0", - "@redwoodjs/auth": "1.3.1", + "@redwoodjs/auth": "1.3.2", "@types/lodash.merge": "4.6.7", "@types/lodash.omitby": "4.6.7", "@types/uuid": "8.3.4", diff --git a/packages/internal/package.json b/packages/internal/package.json index c3caa2da5e65..21289c8ccaa6 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/internal", - "version": "1.3.1", + "version": "1.3.2", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -40,7 +40,7 @@ "@graphql-codegen/typescript-operations": "2.3.5", "@graphql-codegen/typescript-react-apollo": "3.2.11", "@graphql-codegen/typescript-resolvers": "2.6.1", - "@redwoodjs/graphql-server": "1.3.1", + "@redwoodjs/graphql-server": "1.3.2", "babel-plugin-graphql-tag": "3.3.0", "babel-plugin-polyfill-corejs3": "0.5.0", "chalk": "4.1.2", diff --git a/packages/prerender/package.json b/packages/prerender/package.json index 8ce5892fc23b..17880f907279 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/prerender", - "version": "1.3.1", + "version": "1.3.2", "description": "RedwoodJS prerender", "repository": { "type": "git", @@ -24,11 +24,11 @@ "test:watch": "yarn test --watch" }, "dependencies": { - "@redwoodjs/auth": "1.3.1", - "@redwoodjs/internal": "1.3.1", - "@redwoodjs/router": "1.3.1", - "@redwoodjs/structure": "1.3.1", - "@redwoodjs/web": "1.3.1", + "@redwoodjs/auth": "1.3.2", + "@redwoodjs/internal": "1.3.2", + "@redwoodjs/router": "1.3.2", + "@redwoodjs/structure": "1.3.2", + "@redwoodjs/web": "1.3.2", "babel-plugin-ignore-html-and-css-imports": "0.1.0", "cheerio": "1.0.0-rc.10", "cross-undici-fetch": "0.1.27", diff --git a/packages/record/package.json b/packages/record/package.json index d7119a7cd4bf..a175f34e7041 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/record", - "version": "1.3.1", + "version": "1.3.2", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/router/package.json b/packages/router/package.json index de1bc59f0f54..a78aea12db44 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/router", - "version": "1.3.1", + "version": "1.3.2", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -23,7 +23,7 @@ }, "dependencies": { "@reach/skip-nav": "0.16.0", - "@redwoodjs/auth": "1.3.1", + "@redwoodjs/auth": "1.3.2", "core-js": "3.22.2", "lodash.isequal": "4.5.0" }, diff --git a/packages/structure/package.json b/packages/structure/package.json index ee29962b4c30..268e4da26c78 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/structure", - "version": "1.3.1", + "version": "1.3.2", "description": "noun: the arrangement of and relations between the parts or elements of something complex", "repository": { "type": "git", @@ -31,7 +31,7 @@ }, "dependencies": { "@prisma/sdk": "3.13.0", - "@redwoodjs/internal": "1.3.1", + "@redwoodjs/internal": "1.3.2", "@types/line-column": "1.0.0", "camelcase": "6.3.0", "deepmerge": "4.2.2", diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index a95cb91cadb4..78861f8b6d13 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/telemetry", - "version": "1.3.1", + "version": "1.3.2", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -27,8 +27,8 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.16.7", - "@redwoodjs/internal": "1.3.1", - "@redwoodjs/structure": "1.3.1", + "@redwoodjs/internal": "1.3.2", + "@redwoodjs/structure": "1.3.2", "ci-info": "3.3.0", "cross-undici-fetch": "0.1.27", "envinfo": "7.8.1", diff --git a/packages/testing/package.json b/packages/testing/package.json index e44f352e408f..3c39c1eea042 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/testing", - "version": "1.3.1", + "version": "1.3.2", "description": "Tools, wrappers and configuration for testing a Redwood project.", "repository": { "type": "git", @@ -26,11 +26,11 @@ "test:watch": "yarn test --watch" }, "dependencies": { - "@redwoodjs/auth": "1.3.1", - "@redwoodjs/graphql-server": "1.3.1", - "@redwoodjs/internal": "1.3.1", - "@redwoodjs/router": "1.3.1", - "@redwoodjs/web": "1.3.1", + "@redwoodjs/auth": "1.3.2", + "@redwoodjs/graphql-server": "1.3.2", + "@redwoodjs/internal": "1.3.2", + "@redwoodjs/router": "1.3.2", + "@redwoodjs/web": "1.3.2", "@storybook/addon-a11y": "6.4.22", "@storybook/addon-essentials": "6.4.22", "@storybook/builder-webpack5": "6.4.22", diff --git a/packages/web/package.json b/packages/web/package.json index 97fe0297ca97..4b36a9b40a4b 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/web", - "version": "1.3.1", + "version": "1.3.2", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -38,7 +38,7 @@ "dependencies": { "@apollo/client": "3.5.10", "@babel/runtime-corejs3": "7.16.7", - "@redwoodjs/auth": "1.3.1", + "@redwoodjs/auth": "1.3.2", "graphql": "16.4.0", "graphql-tag": "2.12.6", "react-helmet-async": "1.3.0", From 1254c28142a5e2980417be886ca20b83ec59e1e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 May 2022 06:15:22 +0000 Subject: [PATCH 16/17] fix(deps): update graphql-tools monorepo (#5487) Co-authored-by: Renovate Bot --- packages/graphql-server/package.json | 6 ++-- yarn.lock | 42 ++++++++++++++-------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index d63c8b25690a..9fe99775d26c 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -28,9 +28,9 @@ "@envelop/filter-operation-type": "3.3.1", "@envelop/parser-cache": "4.3.1", "@envelop/validation-cache": "4.3.1", - "@graphql-tools/merge": "8.2.10", - "@graphql-tools/schema": "8.3.10", - "@graphql-tools/utils": "8.6.9", + "@graphql-tools/merge": "8.2.11", + "@graphql-tools/schema": "8.3.11", + "@graphql-tools/utils": "8.6.10", "@graphql-yoga/common": "2.5.0", "@prisma/client": "3.13.0", "@redwoodjs/api": "1.3.1", diff --git a/yarn.lock b/yarn.lock index e7dc1a8bdac6..861020eb6b03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3580,15 +3580,15 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/merge@npm:8.2.10, @graphql-tools/merge@npm:^8.2.1": - version: 8.2.10 - resolution: "@graphql-tools/merge@npm:8.2.10" +"@graphql-tools/merge@npm:8.2.11, @graphql-tools/merge@npm:^8.2.1": + version: 8.2.11 + resolution: "@graphql-tools/merge@npm:8.2.11" dependencies: - "@graphql-tools/utils": 8.6.9 - tslib: ~2.3.0 + "@graphql-tools/utils": 8.6.10 + tslib: ~2.4.0 peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 - checksum: 6bda98c84ea1338d3b63912446cec58c4ce0ad42c3e1a44e30dcc2e9cab1fd0665036c77d94714eba391cab8cadcd2b39ffd1e04395bd1c049b517960a654a93 + checksum: 3a7d8b9d72032805859bdbce4c4d59b7103e268e25b54ed5e92dd4ef00ac72a4c1b44ba7390d3145caf400348640e703a33625d834c30e164684ed6de9b15a63 languageName: node linkType: hard @@ -3660,17 +3660,17 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/schema@npm:8.3.10, @graphql-tools/schema@npm:^8.1.2, @graphql-tools/schema@npm:^8.3.1": - version: 8.3.10 - resolution: "@graphql-tools/schema@npm:8.3.10" +"@graphql-tools/schema@npm:8.3.11, @graphql-tools/schema@npm:^8.1.2, @graphql-tools/schema@npm:^8.3.1": + version: 8.3.11 + resolution: "@graphql-tools/schema@npm:8.3.11" dependencies: - "@graphql-tools/merge": 8.2.10 - "@graphql-tools/utils": 8.6.9 - tslib: ~2.3.0 + "@graphql-tools/merge": 8.2.11 + "@graphql-tools/utils": 8.6.10 + tslib: ~2.4.0 value-or-promise: 1.0.11 peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 - checksum: da312e979dc66da5635bd56655240f4ec1675c775ebee150f5dbf61823dce58cbccaca4789590363fc5b72e2b038cb67a69c785af7f541b5bf6b393d9e26b658 + checksum: 12865ff65d51c3f08fc395524f2591df0b3601c6318ae3a594649c9daea1e8e75866036b98397ed7068bdc62b6dd72e5c22d8939f74528473c62d9267f5c18d5 languageName: node linkType: hard @@ -3714,14 +3714,14 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/utils@npm:8.6.9, @graphql-tools/utils@npm:^8.1.1, @graphql-tools/utils@npm:^8.3.0, @graphql-tools/utils@npm:^8.5.1, @graphql-tools/utils@npm:^8.5.2, @graphql-tools/utils@npm:^8.5.3, @graphql-tools/utils@npm:^8.5.4, @graphql-tools/utils@npm:^8.6.0, @graphql-tools/utils@npm:^8.6.1": - version: 8.6.9 - resolution: "@graphql-tools/utils@npm:8.6.9" +"@graphql-tools/utils@npm:8.6.10, @graphql-tools/utils@npm:^8.1.1, @graphql-tools/utils@npm:^8.3.0, @graphql-tools/utils@npm:^8.5.1, @graphql-tools/utils@npm:^8.5.2, @graphql-tools/utils@npm:^8.5.3, @graphql-tools/utils@npm:^8.5.4, @graphql-tools/utils@npm:^8.6.0, @graphql-tools/utils@npm:^8.6.1": + version: 8.6.10 + resolution: "@graphql-tools/utils@npm:8.6.10" dependencies: - tslib: ~2.3.0 + tslib: ~2.4.0 peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 - checksum: bdf56b31e1f716f81d91f389f6cecf11df09dcf879ff9d910d493c63be3d978f7daf97f7f4acb01171e4b5e75c9d576c7941612891748c94e7db0748ba089d2a + checksum: a36dfa166b56e95b9dc217936881617c40f15345dda3864a1118027dbb8c15aca13e3c1a3b53fa2344978bac9807b4a6e603e6746b61ca7975b0ee145f8c9a3a languageName: node linkType: hard @@ -6331,9 +6331,9 @@ __metadata: "@envelop/testing": 4.3.1 "@envelop/types": 2.0.0 "@envelop/validation-cache": 4.3.1 - "@graphql-tools/merge": 8.2.10 - "@graphql-tools/schema": 8.3.10 - "@graphql-tools/utils": 8.6.9 + "@graphql-tools/merge": 8.2.11 + "@graphql-tools/schema": 8.3.11 + "@graphql-tools/utils": 8.6.10 "@graphql-yoga/common": 2.5.0 "@prisma/client": 3.13.0 "@redwoodjs/api": 1.3.1 From 30794beccecf0b35cfb1826dd1577f372cc0b0ff Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Tue, 10 May 2022 15:26:57 +0900 Subject: [PATCH 17/17] Update yarn.lock --- yarn.lock | 88 +++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/yarn.lock b/yarn.lock index 861020eb6b03..48ea009fde8d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5979,7 +5979,7 @@ __metadata: languageName: node linkType: hard -"@redwoodjs/api-server@1.3.1, @redwoodjs/api-server@workspace:packages/api-server": +"@redwoodjs/api-server@1.3.2, @redwoodjs/api-server@workspace:packages/api-server": version: 0.0.0-use.local resolution: "@redwoodjs/api-server@workspace:packages/api-server" dependencies: @@ -6018,7 +6018,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/api@1.3.1, @redwoodjs/api@workspace:packages/api": +"@redwoodjs/api@1.3.2, @redwoodjs/api@workspace:packages/api": version: 0.0.0-use.local resolution: "@redwoodjs/api@workspace:packages/api" dependencies: @@ -6027,7 +6027,7 @@ __metadata: "@babel/runtime-corejs3": 7.16.7 "@clerk/clerk-sdk-node": 3.4.0 "@prisma/client": 3.13.0 - "@redwoodjs/auth": 1.3.1 + "@redwoodjs/auth": 1.3.2 "@types/aws-lambda": 8.10.97 "@types/crypto-js": 4.1.1 "@types/jsonwebtoken": 8.5.8 @@ -6069,7 +6069,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/auth@1.3.1, @redwoodjs/auth@workspace:packages/auth": +"@redwoodjs/auth@1.3.2, @redwoodjs/auth@workspace:packages/auth": version: 0.0.0-use.local resolution: "@redwoodjs/auth@workspace:packages/auth" dependencies: @@ -6099,7 +6099,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/cli@1.3.1, @redwoodjs/cli@workspace:packages/cli": +"@redwoodjs/cli@1.3.2, @redwoodjs/cli@workspace:packages/cli": version: 0.0.0-use.local resolution: "@redwoodjs/cli@workspace:packages/cli" dependencies: @@ -6107,11 +6107,11 @@ __metadata: "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 "@prisma/sdk": 3.13.0 - "@redwoodjs/api-server": 1.3.1 - "@redwoodjs/internal": 1.3.1 - "@redwoodjs/prerender": 1.3.1 - "@redwoodjs/structure": 1.3.1 - "@redwoodjs/telemetry": 1.3.1 + "@redwoodjs/api-server": 1.3.2 + "@redwoodjs/internal": 1.3.2 + "@redwoodjs/prerender": 1.3.2 + "@redwoodjs/structure": 1.3.2 + "@redwoodjs/telemetry": 1.3.2 "@types/listr": 0.14.4 boxen: 5.1.2 camelcase: 6.3.0 @@ -6203,10 +6203,10 @@ __metadata: "@babel/preset-typescript": 7.16.7 "@babel/runtime-corejs3": 7.16.7 "@pmmmwh/react-refresh-webpack-plugin": 0.5.5 - "@redwoodjs/cli": 1.3.1 - "@redwoodjs/eslint-config": 1.3.1 - "@redwoodjs/internal": 1.3.1 - "@redwoodjs/testing": 1.3.1 + "@redwoodjs/cli": 1.3.2 + "@redwoodjs/eslint-config": 1.3.2 + "@redwoodjs/internal": 1.3.2 + "@redwoodjs/testing": 1.3.2 "@types/rimraf": 3.0.2 babel-loader: 8.2.3 babel-plugin-auto-import: 1.1.0 @@ -6260,7 +6260,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/eslint-config@1.3.1, @redwoodjs/eslint-config@workspace:packages/eslint-config": +"@redwoodjs/eslint-config@1.3.2, @redwoodjs/eslint-config@workspace:packages/eslint-config": version: 0.0.0-use.local resolution: "@redwoodjs/eslint-config@workspace:packages/eslint-config" dependencies: @@ -6268,7 +6268,7 @@ __metadata: "@babel/core": 7.16.7 "@babel/eslint-parser": 7.16.5 "@babel/eslint-plugin": 7.16.5 - "@redwoodjs/internal": 1.3.1 + "@redwoodjs/internal": 1.3.2 "@typescript-eslint/eslint-plugin": 5.23.0 "@typescript-eslint/parser": 5.23.0 eslint: 8.15.0 @@ -6317,7 +6317,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/graphql-server@1.3.1, @redwoodjs/graphql-server@workspace:packages/graphql-server": +"@redwoodjs/graphql-server@1.3.2, @redwoodjs/graphql-server@workspace:packages/graphql-server": version: 0.0.0-use.local resolution: "@redwoodjs/graphql-server@workspace:packages/graphql-server" dependencies: @@ -6336,8 +6336,8 @@ __metadata: "@graphql-tools/utils": 8.6.10 "@graphql-yoga/common": 2.5.0 "@prisma/client": 3.13.0 - "@redwoodjs/api": 1.3.1 - "@redwoodjs/auth": 1.3.1 + "@redwoodjs/api": 1.3.2 + "@redwoodjs/auth": 1.3.2 "@types/lodash.merge": 4.6.7 "@types/lodash.omitby": 4.6.7 "@types/uuid": 8.3.4 @@ -6355,7 +6355,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/internal@1.3.1, @redwoodjs/internal@workspace:packages/internal": +"@redwoodjs/internal@1.3.2, @redwoodjs/internal@workspace:packages/internal": version: 0.0.0-use.local resolution: "@redwoodjs/internal@workspace:packages/internal" dependencies: @@ -6373,7 +6373,7 @@ __metadata: "@graphql-codegen/typescript-operations": 2.3.7 "@graphql-codegen/typescript-react-apollo": 3.2.13 "@graphql-codegen/typescript-resolvers": 2.6.3 - "@redwoodjs/graphql-server": 1.3.1 + "@redwoodjs/graphql-server": 1.3.2 "@types/babel-plugin-tester": 9.0.4 "@types/babel__core": 7.1.19 "@types/findup-sync": 4.0.2 @@ -6405,18 +6405,18 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/prerender@1.3.1, @redwoodjs/prerender@workspace:packages/prerender": +"@redwoodjs/prerender@1.3.2, @redwoodjs/prerender@workspace:packages/prerender": version: 0.0.0-use.local resolution: "@redwoodjs/prerender@workspace:packages/prerender" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/auth": 1.3.1 - "@redwoodjs/internal": 1.3.1 - "@redwoodjs/router": 1.3.1 - "@redwoodjs/structure": 1.3.1 - "@redwoodjs/web": 1.3.1 + "@redwoodjs/auth": 1.3.2 + "@redwoodjs/internal": 1.3.2 + "@redwoodjs/router": 1.3.2 + "@redwoodjs/structure": 1.3.2 + "@redwoodjs/web": 1.3.2 "@types/mime-types": 2.1.1 babel-plugin-ignore-html-and-css-imports: 0.1.0 babel-plugin-tester: 10.1.0 @@ -6447,7 +6447,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/router@1.3.1, @redwoodjs/router@workspace:packages/router": +"@redwoodjs/router@1.3.2, @redwoodjs/router@workspace:packages/router": version: 0.0.0-use.local resolution: "@redwoodjs/router@workspace:packages/router" dependencies: @@ -6455,7 +6455,7 @@ __metadata: "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 "@reach/skip-nav": 0.16.0 - "@redwoodjs/auth": 1.3.1 + "@redwoodjs/auth": 1.3.2 "@types/lodash.isequal": 4.5.6 "@types/react": 17.0.45 "@types/react-dom": 17.0.16 @@ -6469,7 +6469,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/structure@1.3.1, @redwoodjs/structure@workspace:packages/structure": +"@redwoodjs/structure@1.3.2, @redwoodjs/structure@workspace:packages/structure": version: 0.0.0-use.local resolution: "@redwoodjs/structure@workspace:packages/structure" dependencies: @@ -6477,7 +6477,7 @@ __metadata: "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 "@prisma/sdk": 3.13.0 - "@redwoodjs/internal": 1.3.1 + "@redwoodjs/internal": 1.3.2 "@types/fs-extra": 9.0.13 "@types/line-column": 1.0.0 "@types/lodash": 4.14.182 @@ -6508,15 +6508,15 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/telemetry@1.3.1, @redwoodjs/telemetry@workspace:packages/telemetry": +"@redwoodjs/telemetry@1.3.2, @redwoodjs/telemetry@workspace:packages/telemetry": version: 0.0.0-use.local resolution: "@redwoodjs/telemetry@workspace:packages/telemetry" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/internal": 1.3.1 - "@redwoodjs/structure": 1.3.1 + "@redwoodjs/internal": 1.3.2 + "@redwoodjs/structure": 1.3.2 "@types/envinfo": 7.8.1 "@types/uuid": 8.3.4 "@types/yargs": 17.0.10 @@ -6531,18 +6531,18 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/testing@1.3.1, @redwoodjs/testing@workspace:packages/testing": +"@redwoodjs/testing@1.3.2, @redwoodjs/testing@workspace:packages/testing": version: 0.0.0-use.local resolution: "@redwoodjs/testing@workspace:packages/testing" dependencies: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/auth": 1.3.1 - "@redwoodjs/graphql-server": 1.3.1 - "@redwoodjs/internal": 1.3.1 - "@redwoodjs/router": 1.3.1 - "@redwoodjs/web": 1.3.1 + "@redwoodjs/auth": 1.3.2 + "@redwoodjs/graphql-server": 1.3.2 + "@redwoodjs/internal": 1.3.2 + "@redwoodjs/router": 1.3.2 + "@redwoodjs/web": 1.3.2 "@storybook/addon-a11y": 6.4.22 "@storybook/addon-essentials": 6.4.22 "@storybook/builder-webpack5": 6.4.22 @@ -6570,7 +6570,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/web@1.3.1, @redwoodjs/web@workspace:packages/web": +"@redwoodjs/web@1.3.2, @redwoodjs/web@workspace:packages/web": version: 0.0.0-use.local resolution: "@redwoodjs/web@workspace:packages/web" dependencies: @@ -6578,7 +6578,7 @@ __metadata: "@babel/cli": 7.16.7 "@babel/core": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/auth": 1.3.1 + "@redwoodjs/auth": 1.3.2 "@testing-library/jest-dom": 5.16.4 "@testing-library/react": 12.1.5 "@types/prop-types": 15.7.5 @@ -13377,8 +13377,8 @@ __metadata: "@babel/core": 7.16.7 "@babel/node": 7.16.7 "@babel/runtime-corejs3": 7.16.7 - "@redwoodjs/internal": 1.3.1 - "@redwoodjs/telemetry": 1.3.1 + "@redwoodjs/internal": 1.3.2 + "@redwoodjs/telemetry": 1.3.2 chalk: 4.1.2 check-node-version: 4.2.1 core-js: 3.22.4