From fc19bde8743c3f1b55e30b0bfdc1096e04022c68 Mon Sep 17 00:00:00 2001 From: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com> Date: Mon, 26 Sep 2022 13:19:39 +0100 Subject: [PATCH 01/41] Setting query name in cell generator (#6442) Co-authored-by: Daniel Choudhury --- .../migration.sql | 0 .../migration.sql | 0 .../api/src/services/posts/posts.scenarios.ts | 4 +-- .../api/src/services/users/users.scenarios.ts | 4 +-- __fixtures__/test-project/web/package.json | 3 +- .../generate/cell/__tests__/cell.test.js | 33 ++++++++++++++++++- .../cli/src/commands/generate/cell/cell.js | 24 ++++++++++++-- .../src/commands/generate/cell/utils/utils.js | 5 +++ 8 files changed, 64 insertions(+), 9 deletions(-) rename __fixtures__/test-project/api/db/migrations/{20220918091756_create_post_user => 20220926103708_create_post_user}/migration.sql (100%) rename __fixtures__/test-project/api/db/migrations/{20220918091807_create_contact => 20220926103723_create_contact}/migration.sql (100%) diff --git a/__fixtures__/test-project/api/db/migrations/20220918091756_create_post_user/migration.sql b/__fixtures__/test-project/api/db/migrations/20220926103708_create_post_user/migration.sql similarity index 100% rename from __fixtures__/test-project/api/db/migrations/20220918091756_create_post_user/migration.sql rename to __fixtures__/test-project/api/db/migrations/20220926103708_create_post_user/migration.sql diff --git a/__fixtures__/test-project/api/db/migrations/20220918091807_create_contact/migration.sql b/__fixtures__/test-project/api/db/migrations/20220926103723_create_contact/migration.sql similarity index 100% rename from __fixtures__/test-project/api/db/migrations/20220918091807_create_contact/migration.sql rename to __fixtures__/test-project/api/db/migrations/20220926103723_create_contact/migration.sql diff --git a/__fixtures__/test-project/api/src/services/posts/posts.scenarios.ts b/__fixtures__/test-project/api/src/services/posts/posts.scenarios.ts index db7e35d2dd4a..6f23115cdf32 100644 --- a/__fixtures__/test-project/api/src/services/posts/posts.scenarios.ts +++ b/__fixtures__/test-project/api/src/services/posts/posts.scenarios.ts @@ -10,7 +10,7 @@ export const standard = defineScenario({ body: 'String', author: { create: { - email: 'String4857147', + email: 'String7848705', hashedPassword: 'String', fullName: 'String', salt: 'String', @@ -24,7 +24,7 @@ export const standard = defineScenario({ body: 'String', author: { create: { - email: 'String1125871', + email: 'String1920513', hashedPassword: 'String', fullName: 'String', salt: 'String', diff --git a/__fixtures__/test-project/api/src/services/users/users.scenarios.ts b/__fixtures__/test-project/api/src/services/users/users.scenarios.ts index 26207f6aaaad..e029dff0c869 100644 --- a/__fixtures__/test-project/api/src/services/users/users.scenarios.ts +++ b/__fixtures__/test-project/api/src/services/users/users.scenarios.ts @@ -6,7 +6,7 @@ export const standard = defineScenario({ user: { one: { data: { - email: 'String4815975', + email: 'String7590248', hashedPassword: 'String', fullName: 'String', salt: 'String', @@ -14,7 +14,7 @@ export const standard = defineScenario({ }, two: { data: { - email: 'String3376651', + email: 'String2966925', hashedPassword: 'String', fullName: 'String', salt: 'String', diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json index 5df1628f6c4a..cacf5a5e12ce 100644 --- a/__fixtures__/test-project/web/package.json +++ b/__fixtures__/test-project/web/package.json @@ -17,12 +17,13 @@ "@redwoodjs/forms": "3.0.2", "@redwoodjs/router": "3.0.2", "@redwoodjs/web": "3.0.2", + "humanize-string": "2.1.0", "prop-types": "15.8.1", "react": "17.0.2", "react-dom": "17.0.2" }, "devDependencies": { - "autoprefixer": "^10.4.11", + "autoprefixer": "^10.4.12", "postcss": "^8.4.16", "postcss-loader": "^7.0.1", "prettier-plugin-tailwindcss": "^0.1.13", diff --git a/packages/cli/src/commands/generate/cell/__tests__/cell.test.js b/packages/cli/src/commands/generate/cell/__tests__/cell.test.js index 89285bdf3659..cb61b2b31c8f 100644 --- a/packages/cli/src/commands/generate/cell/__tests__/cell.test.js +++ b/packages/cli/src/commands/generate/cell/__tests__/cell.test.js @@ -8,7 +8,7 @@ import * as cell from '../cell' jest.mock('@redwoodjs/structure', () => { return { getProject: () => ({ - cells: [{ queryOperationName: undefined }], + cells: [{ queryOperationName: 'AlreadyDefinedQueryName' }], }), } }) @@ -636,3 +636,34 @@ test('generates list a cell with a string primary id keys', () => { expect(modelWithStringIdList[STORY_PATH]).toMatchSnapshot() expect(modelWithStringIdList[MOCK_PATH]).toMatchSnapshot() }) + +describe('Custom query names', () => { + test('Accepts custom query names', async() => { + const generatedFiles = await cell.files({ + name: 'Clues', + tests: false, + stories: false, + query: 'FindBluesClues' + }) + + + + const CELL_PATH = path.normalize( + '/path/to/project/web/src/components/CluesCell/CluesCell.js' + ) + + + expect(generatedFiles[CELL_PATH]).toContain('query FindBluesClues {') + }) + + + test('Throws if a duplicated query name is used', async() => { + await expect(cell.files({ + name: 'Clues', + tests: false, + stories: false, + query: 'AlreadyDefinedQueryName' + })).rejects.toThrow('Specified query name: "AlreadyDefinedQueryName" is not unique') + }) + +}) diff --git a/packages/cli/src/commands/generate/cell/cell.js b/packages/cli/src/commands/generate/cell/cell.js index e0c4843b4950..d380ed453a40 100644 --- a/packages/cli/src/commands/generate/cell/cell.js +++ b/packages/cli/src/commands/generate/cell/cell.js @@ -17,6 +17,7 @@ import { import { checkProjectForQueryField, getIdType, + operationNameIsUnique, uniqueOperationName, } from './utils/utils' @@ -61,9 +62,20 @@ export const files = async ({ templateNameSuffix = 'List' // override operationName so that its find_operationName } - const operationName = await uniqueOperationName(cellName, { - list: shouldGenerateList, - }) + + let operationName = options.query + if (operationName) { + const userSpecifiedOperationNameIsUnique = await operationNameIsUnique( + operationName + ) + if (!userSpecifiedOperationNameIsUnique) { + throw new Error(`Specified query name: "${operationName}" is not unique!`) + } + } else { + operationName = await uniqueOperationName(cellName, { + list: shouldGenerateList, + }) + } const cellFile = templateForComponentFile({ name: cellName, @@ -152,6 +164,12 @@ export const { command, description, builder, handler } = 'Use when you want to generate a cell for a list of the model name.', type: 'boolean', }, + query: { + default: '', + description: + 'Use to enforce a specific query name within the generated cell - must be unique.', + type: 'string', + }, }, includeAdditionalTasks: ({ name: cellName }) => { return [ diff --git a/packages/cli/src/commands/generate/cell/utils/utils.js b/packages/cli/src/commands/generate/cell/utils/utils.js index 67fbfa8ee40f..347bcd0ebfe4 100644 --- a/packages/cli/src/commands/generate/cell/utils/utils.js +++ b/packages/cli/src/commands/generate/cell/utils/utils.js @@ -34,6 +34,11 @@ export const uniqueOperationName = async ( return uniqueOperationName(name, { index: index + 1 }) } +export const operationNameIsUnique = async (operationName) => { + const cellOperationNames = await getCellOperationNames() + return !cellOperationNames.includes(operationName) +} + export const getIdType = (model) => { return model.fields.find((field) => field.isId)?.type } From 9df1556de1939eb98babd2dd764dfda69252b2f3 Mon Sep 17 00:00:00 2001 From: Daniel Choudhury Date: Mon, 26 Sep 2022 16:33:54 +0100 Subject: [PATCH 02/41] fix(lint): Fix lint issues in cell test (#6453) --- .../generate/cell/__tests__/cell.test.js | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/packages/cli/src/commands/generate/cell/__tests__/cell.test.js b/packages/cli/src/commands/generate/cell/__tests__/cell.test.js index cb61b2b31c8f..5952cff0fb75 100644 --- a/packages/cli/src/commands/generate/cell/__tests__/cell.test.js +++ b/packages/cli/src/commands/generate/cell/__tests__/cell.test.js @@ -638,32 +638,31 @@ test('generates list a cell with a string primary id keys', () => { }) describe('Custom query names', () => { - test('Accepts custom query names', async() => { + test('Accepts custom query names', async () => { const generatedFiles = await cell.files({ name: 'Clues', tests: false, stories: false, - query: 'FindBluesClues' + query: 'FindBluesClues', }) - - - + const CELL_PATH = path.normalize( '/path/to/project/web/src/components/CluesCell/CluesCell.js' ) - expect(generatedFiles[CELL_PATH]).toContain('query FindBluesClues {') }) - - test('Throws if a duplicated query name is used', async() => { - await expect(cell.files({ - name: 'Clues', - tests: false, - stories: false, - query: 'AlreadyDefinedQueryName' - })).rejects.toThrow('Specified query name: "AlreadyDefinedQueryName" is not unique') + test('Throws if a duplicated query name is used', async () => { + await expect( + cell.files({ + name: 'Clues', + tests: false, + stories: false, + query: 'AlreadyDefinedQueryName', + }) + ).rejects.toThrow( + 'Specified query name: "AlreadyDefinedQueryName" is not unique' + ) }) - }) From efa913c521ba46efb2842860bae48ef028d0368d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 16:26:10 -0700 Subject: [PATCH 03/41] fix(deps): update dependency react-hook-form to v7.36.1 (#6457) --- packages/forms/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/forms/package.json b/packages/forms/package.json index b521187136ac..78c33cff4ace 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -25,7 +25,7 @@ "@babel/runtime-corejs3": "7.19.1", "core-js": "3.25.1", "pascalcase": "1.0.0", - "react-hook-form": "7.36.0" + "react-hook-form": "7.36.1" }, "devDependencies": { "@babel/cli": "7.18.10", diff --git a/yarn.lock b/yarn.lock index a7848f7358cf..5f101e56ab46 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6446,7 +6446,7 @@ __metadata: pascalcase: 1.0.0 react: 17.0.2 react-dom: 17.0.2 - react-hook-form: 7.36.0 + react-hook-form: 7.36.1 typescript: 4.7.4 peerDependencies: graphql: 16.6.0 @@ -26081,12 +26081,12 @@ __metadata: languageName: node linkType: hard -"react-hook-form@npm:7.36.0": - version: 7.36.0 - resolution: "react-hook-form@npm:7.36.0" +"react-hook-form@npm:7.36.1": + version: 7.36.1 + resolution: "react-hook-form@npm:7.36.1" peerDependencies: react: ^16.8.0 || ^17 || ^18 - checksum: c59d5cfd19617265d9123cf705e1d75c456d6559d6f64866f1b362497f855d0554ec9a197b33e00567ac42f1930a941a441616d7dbacc08444bbec704c901002 + checksum: 28a36ccd600f3781a35fa5eddb1b8ef2c73fa3388814f81d1a71e3d43eb8ff676d3d384dcd16322f29bc89c04d0a87be3972b97cc635b9af2b8f6cf8b55b1f87 languageName: node linkType: hard From b131619f70004b92c586fdb1aec035de668f4041 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 03:54:16 +0000 Subject: [PATCH 04/41] fix(deps): update dependency core-js to v3.25.3 (#6456) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- packages/api-server/package.json | 2 +- packages/api/package.json | 2 +- packages/auth/package.json | 2 +- packages/cli/package.json | 2 +- packages/codemods/package.json | 2 +- packages/core/package.json | 2 +- packages/create-redwood-app/package.json | 2 +- packages/forms/package.json | 2 +- packages/graphql-server/package.json | 2 +- packages/internal/package.json | 2 +- packages/prerender/package.json | 2 +- packages/record/package.json | 2 +- packages/router/package.json | 2 +- packages/structure/package.json | 2 +- packages/telemetry/package.json | 2 +- packages/testing/package.json | 2 +- packages/web/package.json | 2 +- yarn.lock | 44 ++++++++++++------------ 19 files changed, 40 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index abe667b8ff04..42f4800d7fc1 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "babel-plugin-auto-import": "1.1.0", "babel-plugin-remove-code": "0.0.6", "boxen": "5.1.2", - "core-js": "3.25.1", + "core-js": "3.25.3", "cypress": "10.8.0", "cypress-wait-until": "1.7.2", "eslint": "8.23.1", diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 6af8d5484517..bd70b6caa2ae 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -36,7 +36,7 @@ "ansi-colors": "4.1.3", "chalk": "4.1.2", "chokidar": "3.5.3", - "core-js": "3.25.1", + "core-js": "3.25.3", "fast-json-parse": "1.0.3", "fastify": "4.6.0", "fastify-raw-body": "4.1.0", diff --git a/packages/api/package.json b/packages/api/package.json index 34e063e5dd8d..b3ffaed10c5b 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -33,7 +33,7 @@ "@babel/runtime-corejs3": "7.19.1", "@prisma/client": "4.3.1", "base64url": "3.0.1", - "core-js": "3.25.1", + "core-js": "3.25.3", "cross-undici-fetch": "0.4.14", "crypto-js": "4.1.1", "humanize-string": "2.1.0", diff --git a/packages/auth/package.json b/packages/auth/package.json index 152926cfac42..f0f57f5239d3 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.19.1", - "core-js": "3.25.1" + "core-js": "3.25.3" }, "devDependencies": { "@auth0/auth0-spa-js": "1.22.4", diff --git a/packages/cli/package.json b/packages/cli/package.json index ddea8e6e0633..29cac3849b3e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -40,7 +40,7 @@ "chalk": "4.1.2", "concurrently": "7.3.0", "configstore": "3.1.5", - "core-js": "3.25.1", + "core-js": "3.25.3", "cross-env": "7.0.3", "decamelize": "5.0.0", "dotenv-defaults": "5.0.2", diff --git a/packages/codemods/package.json b/packages/codemods/package.json index 3477fe3bf521..1e930902a23d 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -27,7 +27,7 @@ "@babel/plugin-transform-typescript": "7.19.1", "@babel/runtime-corejs3": "7.19.1", "@vscode/ripgrep": "1.14.2", - "core-js": "3.25.1", + "core-js": "3.25.3", "cross-undici-fetch": "0.4.14", "deepmerge": "4.2.2", "execa": "5.1.1", diff --git a/packages/core/package.json b/packages/core/package.json index 4e788ddd043a..346e046e8885 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -59,7 +59,7 @@ "babel-plugin-module-resolver": "4.1.0", "babel-timing": "0.9.1", "copy-webpack-plugin": "11.0.0", - "core-js": "3.25.1", + "core-js": "3.25.3", "css-loader": "6.7.1", "css-minimizer-webpack-plugin": "4.0.0", "dotenv-webpack": "8.0.1", diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index c34d6e8fc795..03bc3d8c7e10 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -28,7 +28,7 @@ "@redwoodjs/telemetry": "3.0.2", "chalk": "4.1.2", "check-node-version": "4.2.1", - "core-js": "3.25.1", + "core-js": "3.25.3", "execa": "5.1.1", "fs-extra": "10.1.0", "listr": "0.14.3", diff --git a/packages/forms/package.json b/packages/forms/package.json index 78c33cff4ace..d8647cf84f9d 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.19.1", - "core-js": "3.25.1", + "core-js": "3.25.3", "pascalcase": "1.0.0", "react-hook-form": "7.36.1" }, diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 9f3efc92494d..74708b2b352c 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -34,7 +34,7 @@ "@graphql-yoga/common": "2.12.12", "@prisma/client": "4.3.1", "@redwoodjs/api": "3.0.2", - "core-js": "3.25.1", + "core-js": "3.25.3", "cross-undici-fetch": "0.4.14", "graphql": "16.6.0", "graphql-scalars": "1.17.0", diff --git a/packages/internal/package.json b/packages/internal/package.json index f627e24a0d95..7c037a5f5c80 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -45,7 +45,7 @@ "babel-plugin-graphql-tag": "3.3.0", "babel-plugin-polyfill-corejs3": "0.6.0", "chalk": "4.1.2", - "core-js": "3.25.1", + "core-js": "3.25.3", "deepmerge": "4.2.2", "esbuild": "0.15.7", "fast-glob": "3.2.12", diff --git a/packages/prerender/package.json b/packages/prerender/package.json index 618d6c91d07c..fbb397b6302a 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -32,7 +32,7 @@ "@redwoodjs/web": "3.0.2", "babel-plugin-ignore-html-and-css-imports": "0.1.0", "cheerio": "1.0.0-rc.12", - "core-js": "3.25.1", + "core-js": "3.25.3", "cross-undici-fetch": "0.4.14", "graphql": "16.6.0", "mime-types": "2.1.35" diff --git a/packages/record/package.json b/packages/record/package.json index 4a654914e8c7..65f028bab7f6 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -29,7 +29,7 @@ "dependencies": { "@babel/runtime-corejs3": "7.19.1", "@prisma/client": "4.3.1", - "core-js": "3.25.1" + "core-js": "3.25.3" }, "devDependencies": { "@babel/cli": "7.18.10", diff --git a/packages/router/package.json b/packages/router/package.json index a74a1ddb3d32..3f6b1fe4e91f 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -25,7 +25,7 @@ "@babel/runtime-corejs3": "7.19.1", "@reach/skip-nav": "0.16.0", "@redwoodjs/auth": "3.0.2", - "core-js": "3.25.1", + "core-js": "3.25.3", "lodash.isequal": "4.5.0" }, "devDependencies": { diff --git a/packages/structure/package.json b/packages/structure/package.json index f8c4886ef34c..c25e4925b934 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -35,7 +35,7 @@ "@redwoodjs/internal": "3.0.2", "@types/line-column": "1.0.0", "camelcase": "6.3.0", - "core-js": "3.25.1", + "core-js": "3.25.3", "deepmerge": "4.2.2", "dotenv-defaults": "5.0.2", "enquirer": "2.3.6", diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index a629e43bc794..b34fe74a90f2 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -30,7 +30,7 @@ "@redwoodjs/internal": "3.0.2", "@redwoodjs/structure": "3.0.2", "ci-info": "3.3.2", - "core-js": "3.25.1", + "core-js": "3.25.3", "cross-undici-fetch": "0.4.14", "envinfo": "7.8.1", "systeminformation": "5.12.4", diff --git a/packages/testing/package.json b/packages/testing/package.json index 4d8e3a098b3f..df0c027719ed 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -51,7 +51,7 @@ "@types/webpack": "5.28.0", "babel-jest": "29.0.3", "babel-plugin-inline-react-svg": "2.0.1", - "core-js": "3.25.1", + "core-js": "3.25.3", "fast-glob": "3.2.12", "jest": "29.0.3", "jest-environment-jsdom": "29.0.3", diff --git a/packages/web/package.json b/packages/web/package.json index 487194bc7e3e..f92c8d14d9c0 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -39,7 +39,7 @@ "@apollo/client": "3.6.9", "@babel/runtime-corejs3": "7.19.1", "@redwoodjs/auth": "3.0.2", - "core-js": "3.25.1", + "core-js": "3.25.3", "graphql": "16.6.0", "graphql-tag": "2.12.6", "react-helmet-async": "1.3.0", diff --git a/yarn.lock b/yarn.lock index 5f101e56ab46..533f6c17a600 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6127,7 +6127,7 @@ __metadata: aws-lambda: 1.0.7 chalk: 4.1.2 chokidar: 3.5.3 - core-js: 3.25.1 + core-js: 3.25.3 fast-json-parse: 1.0.3 fastify: 4.6.0 fastify-raw-body: 4.1.0 @@ -6166,7 +6166,7 @@ __metadata: "@types/uuid": 8.3.4 aws-lambda: 1.0.7 base64url: 3.0.1 - core-js: 3.25.1 + core-js: 3.25.3 cross-undici-fetch: 0.4.14 crypto-js: 4.1.1 humanize-string: 2.1.0 @@ -6223,7 +6223,7 @@ __metadata: "@supabase/supabase-js": 1.35.6 "@types/netlify-identity-widget": 1.9.3 "@types/react": 17.0.50 - core-js: 3.25.1 + core-js: 3.25.3 firebase: 9.9.3 firebase-admin: 10.3.0 gotrue-js: 0.9.29 @@ -6255,7 +6255,7 @@ __metadata: chalk: 4.1.2 concurrently: 7.3.0 configstore: 3.1.5 - core-js: 3.25.1 + core-js: 3.25.3 cross-env: 7.0.3 decamelize: 5.0.0 dotenv-defaults: 5.0.2 @@ -6303,7 +6303,7 @@ __metadata: "@types/prettier": 2.7.0 "@types/yargs": 17.0.12 "@vscode/ripgrep": 1.14.2 - core-js: 3.25.1 + core-js: 3.25.3 cross-undici-fetch: 0.4.14 deepmerge: 4.2.2 execa: 5.1.1 @@ -6353,7 +6353,7 @@ __metadata: babel-plugin-module-resolver: 4.1.0 babel-timing: 0.9.1 copy-webpack-plugin: 11.0.0 - core-js: 3.25.1 + core-js: 3.25.3 css-loader: 6.7.1 css-minimizer-webpack-plugin: 4.0.0 dotenv-webpack: 8.0.1 @@ -6439,7 +6439,7 @@ __metadata: "@types/react": 17.0.50 "@types/react-dom": 17.0.17 "@types/testing-library__jest-dom": 5.14.5 - core-js: 3.25.1 + core-js: 3.25.3 graphql: 16.6.0 jest: 29.0.3 nodemon: 2.0.20 @@ -6479,7 +6479,7 @@ __metadata: "@types/lodash.omitby": 4.6.7 "@types/uuid": 8.3.4 aws-lambda: 1.0.7 - core-js: 3.25.1 + core-js: 3.25.3 cross-undici-fetch: 0.4.14 graphql: 16.6.0 graphql-scalars: 1.17.0 @@ -6521,7 +6521,7 @@ __metadata: babel-plugin-polyfill-corejs3: 0.6.0 babel-plugin-tester: 10.1.0 chalk: 4.1.2 - core-js: 3.25.1 + core-js: 3.25.3 deepmerge: 4.2.2 esbuild: 0.15.7 fast-glob: 3.2.12 @@ -6560,7 +6560,7 @@ __metadata: babel-plugin-ignore-html-and-css-imports: 0.1.0 babel-plugin-tester: 10.1.0 cheerio: 1.0.0-rc.12 - core-js: 3.25.1 + core-js: 3.25.3 cross-undici-fetch: 0.4.14 graphql: 16.6.0 jest: 29.0.3 @@ -6581,7 +6581,7 @@ __metadata: "@babel/runtime-corejs3": 7.19.1 "@prisma/client": 4.3.1 "@prisma/internals": 4.3.1 - core-js: 3.25.1 + core-js: 3.25.3 esbuild: 0.15.7 jest: 29.0.3 languageName: unknown @@ -6599,7 +6599,7 @@ __metadata: "@types/lodash.isequal": 4.5.6 "@types/react": 17.0.50 "@types/react-dom": 17.0.17 - core-js: 3.25.1 + core-js: 3.25.3 jest: 29.0.3 lodash.isequal: 4.5.0 prop-types: 15.8.1 @@ -6625,7 +6625,7 @@ __metadata: "@types/node": 16.11.47 "@types/vscode": 1.70.0 camelcase: 6.3.0 - core-js: 3.25.1 + core-js: 3.25.3 deepmerge: 4.2.2 dotenv-defaults: 5.0.2 enquirer: 2.3.6 @@ -6661,7 +6661,7 @@ __metadata: "@types/uuid": 8.3.4 "@types/yargs": 17.0.12 ci-info: 3.3.2 - core-js: 3.25.1 + core-js: 3.25.3 cross-undici-fetch: 0.4.14 envinfo: 7.8.1 jest: 29.0.3 @@ -6702,7 +6702,7 @@ __metadata: "@types/webpack": 5.28.0 babel-jest: 29.0.3 babel-plugin-inline-react-svg: 2.0.1 - core-js: 3.25.1 + core-js: 3.25.3 fast-glob: 3.2.12 jest: 29.0.3 jest-environment-jsdom: 29.0.3 @@ -6729,7 +6729,7 @@ __metadata: "@types/react": 17.0.50 "@types/react-dom": 17.0.17 "@types/testing-library__jest-dom": 5.14.5 - core-js: 3.25.1 + core-js: 3.25.3 graphql: 16.6.0 graphql-tag: 2.12.6 jest: 29.0.3 @@ -13462,10 +13462,10 @@ __metadata: languageName: node linkType: hard -"core-js@npm:3.25.1, core-js@npm:^3.0.4, core-js@npm:^3.18.3, core-js@npm:^3.24.0, core-js@npm:^3.25.1, core-js@npm:^3.6.5, core-js@npm:^3.8.2": - version: 3.25.1 - resolution: "core-js@npm:3.25.1" - checksum: 02a81cfb63726eca66ee5f8588c11b2ac55713f5956158ed57e07982296c8bb4fc0bf32394dea5b6496d2965377aade3a7f9c78aaadde907e6aa3ee2b7f58dc0 +"core-js@npm:3.25.3, core-js@npm:^3.0.4, core-js@npm:^3.18.3, core-js@npm:^3.24.0, core-js@npm:^3.25.1, core-js@npm:^3.6.5, core-js@npm:^3.8.2": + version: 3.25.3 + resolution: "core-js@npm:3.25.3" + checksum: c10171de55552ac8d66e5608b69bf83d91cc814cb86bc3ff949429c46e48fd7b84d33137c1946807766631bab078dba10c158627de30fd907cbb7ac7f67ba6b7 languageName: node linkType: hard @@ -13647,7 +13647,7 @@ __metadata: "@types/prompts": 2.4.0 chalk: 4.1.2 check-node-version: 4.2.1 - core-js: 3.25.1 + core-js: 3.25.3 execa: 5.1.1 fs-extra: 10.1.0 jest: 29.0.3 @@ -27162,7 +27162,7 @@ __metadata: babel-plugin-auto-import: 1.1.0 babel-plugin-remove-code: 0.0.6 boxen: 5.1.2 - core-js: 3.25.1 + core-js: 3.25.3 cypress: 10.8.0 cypress-wait-until: 1.7.2 eslint: 8.23.1 From 8c6bc8ab1284d7fcf197918a10e9e4f2d537980a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 22:44:18 -0700 Subject: [PATCH 05/41] fix(deps): update dependency eslint to v8.24.0 (#6458) --- package.json | 2 +- packages/eslint-config/package.json | 2 +- yarn.lock | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 42f4800d7fc1..7cd94a6e451b 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "core-js": "3.25.3", "cypress": "10.8.0", "cypress-wait-until": "1.7.2", - "eslint": "8.23.1", + "eslint": "8.24.0", "fast-glob": "3.2.12", "fs-extra": "10.1.0", "is-port-reachable": "3.1.0", diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 43a3e4155766..71fe27bd661a 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -18,7 +18,7 @@ "@redwoodjs/internal": "3.0.2", "@typescript-eslint/eslint-plugin": "5.35.1", "@typescript-eslint/parser": "5.35.1", - "eslint": "8.23.1", + "eslint": "8.24.0", "eslint-config-prettier": "8.5.0", "eslint-import-resolver-babel-module": "5.3.1", "eslint-plugin-babel": "5.3.1", diff --git a/yarn.lock b/yarn.lock index 533f6c17a600..21f0c7c8a247 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3611,14 +3611,14 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.10.4": - version: 0.10.4 - resolution: "@humanwhocodes/config-array@npm:0.10.4" +"@humanwhocodes/config-array@npm:^0.10.5": + version: 0.10.5 + resolution: "@humanwhocodes/config-array@npm:0.10.5" dependencies: "@humanwhocodes/object-schema": ^1.2.1 debug: ^4.1.1 minimatch: ^3.0.4 - checksum: 3d606164d4ba05fd3861bc75c1c02fa26d287d85349ce2ee15b5d3f84fc49bf1950d3d93b0cb28cd53ac690b842731ce3f276b4edd9225a072d0c426b39baa15 + checksum: d8bdd91d8ff81e9663236de0650fa1d94457422bb1226604c66e7921ac0afee50148f1e935976eac98822761c98d92d0ca2e97e30c4c22c0ecdebdf8133e5e82 languageName: node linkType: hard @@ -6408,7 +6408,7 @@ __metadata: "@redwoodjs/internal": 3.0.2 "@typescript-eslint/eslint-plugin": 5.35.1 "@typescript-eslint/parser": 5.35.1 - eslint: 8.23.1 + eslint: 8.24.0 eslint-config-prettier: 8.5.0 eslint-import-resolver-babel-module: 5.3.1 eslint-plugin-babel: 5.3.1 @@ -15832,12 +15832,12 @@ __metadata: languageName: node linkType: hard -"eslint@npm:8.23.1": - version: 8.23.1 - resolution: "eslint@npm:8.23.1" +"eslint@npm:8.24.0": + version: 8.24.0 + resolution: "eslint@npm:8.24.0" dependencies: "@eslint/eslintrc": ^1.3.2 - "@humanwhocodes/config-array": ^0.10.4 + "@humanwhocodes/config-array": ^0.10.5 "@humanwhocodes/gitignore-to-minimatch": ^1.0.2 "@humanwhocodes/module-importer": ^1.0.1 ajv: ^6.10.0 @@ -15877,7 +15877,7 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: f91fd0fd7c6aa816299886df05b1a15e12052dde5746835720ad6c007be1d4b512d3c837345a7beac5e3c0e5a81570c6be09e721848f092935494a5eb29602fd + checksum: af70b6aff3403ca025049eec69dfb20b72755de1a3384781305cdb9887c76f21d05387fe15bba7771e5f185b47818704845c8fcfc82b4fb16168c9299081e6e8 languageName: node linkType: hard @@ -27165,7 +27165,7 @@ __metadata: core-js: 3.25.3 cypress: 10.8.0 cypress-wait-until: 1.7.2 - eslint: 8.23.1 + eslint: 8.24.0 fast-glob: 3.2.12 fs-extra: 10.1.0 is-port-reachable: 3.1.0 From 816d1d8402129a38f4699c996135013d94cb6115 Mon Sep 17 00:00:00 2001 From: Ari Mendelow Date: Tue, 27 Sep 2022 02:50:32 -0400 Subject: [PATCH 06/41] Update local-postgres-setup.md (#6436) Fix brew install command - postgresql is deprecated. Running `brew services start postgresql` will throw an error if formula `postgresql@14` is not installed. --- docs/docs/local-postgres-setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/local-postgres-setup.md b/docs/docs/local-postgres-setup.md index 26c4409eb52b..73563c3ddeec 100644 --- a/docs/docs/local-postgres-setup.md +++ b/docs/docs/local-postgres-setup.md @@ -12,7 +12,7 @@ likely going to want to run the same database you use in production locally at s If you're on a Mac, we recommend using Homebrew: ```bash -brew install postgres +brew install postgres@14 ``` > **Install Postgres? I've messed up my Postgres installation so many times, I wish I could just uninstall everything and start over!** From 6207a7037e1acb54beb0179aa450fa5650168bb8 Mon Sep 17 00:00:00 2001 From: Aditya Pandey Date: Tue, 27 Sep 2022 00:58:10 -0600 Subject: [PATCH 07/41] Add docs for `sourceMap` flag in `redwood.toml` (#6445) Co-authored-by: Dominic Saadi --- docs/docs/app-configuration-redwood-toml.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/docs/app-configuration-redwood-toml.md b/docs/docs/app-configuration-redwood-toml.md index a5c16fde1980..9d8db6d2c748 100644 --- a/docs/docs/app-configuration-redwood-toml.md +++ b/docs/docs/app-configuration-redwood-toml.md @@ -41,6 +41,7 @@ For certain options, instead of having to deal with build tools like webpack dir | `includeEnvironmentVariables` | Environment variables to include | `[]` | | `path` | Path to the web side | `"./web"` | | `port` | Port to listen on | `8910` | +| `sourceMap` | Enable source maps for production builds | `false` | | `target` | Target for the web side | `"browser"` | | `title` | Title of your Redwood app | `"Redwood App"` | From c9ed9f28722cf74508fb6847de4bd8da9556cdbf Mon Sep 17 00:00:00 2001 From: Daniel Choudhury Date: Tue, 27 Sep 2022 07:58:33 +0100 Subject: [PATCH 08/41] docs(crwa): Fix incorrect command to test crwa canary (#6435) --- packages/create-redwood-app/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/create-redwood-app/README.md b/packages/create-redwood-app/README.md index c52fe4eb1fd6..db2bccae8333 100644 --- a/packages/create-redwood-app/README.md +++ b/packages/create-redwood-app/README.md @@ -102,12 +102,12 @@ This will create a new project using the local `template/` codebase ### How to run other published versions for debugging By default yarn create will pick the latest stable version to run, but you can specify a different version via yarn too! -To try the canary version using yarn, run: +To try the canary version, run: ``` -yarn create redwood-app@canary -p create-redwood-app /path/to/project +npx create-redwood-app@canary /path/to/project ``` -Note that this will still create a project with the latest stable version, but run the canary version of create-redwood-app, and is only useful for debugging. +Note that this will still create a project with the latest stable version, but run the canary version of create-redwood-app, and is mainly useful for debugging this package, and not the redwood canary release. You can specify any tag or version instead of `@canary` From e8661a2104851814a8440abe800b578e762dfac5 Mon Sep 17 00:00:00 2001 From: Daniel Choudhury Date: Tue, 27 Sep 2022 08:52:37 +0100 Subject: [PATCH 09/41] fix(deploy): Fix deploy on Fly.io (#6454) --- packages/cli/src/commands/buildHandler.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/commands/buildHandler.js b/packages/cli/src/commands/buildHandler.js index a9cdf05c436e..1e9d9220563f 100644 --- a/packages/cli/src/commands/buildHandler.js +++ b/packages/cli/src/commands/buildHandler.js @@ -50,7 +50,8 @@ export const handler = async ({ return } - const prerenderRoutes = prerender ? detectPrerenderRoutes() : [] + const prerenderRoutes = + prerender && side.includes('web') ? detectPrerenderRoutes() : [] const shouldGeneratePrismaClient = prisma && (side.includes('api') || prerenderRoutes.length > 0) From 3e1b840f174733b5340c0bed654fb7d9b132602e Mon Sep 17 00:00:00 2001 From: Peter Colapietro Date: Tue, 27 Sep 2022 03:58:16 -0400 Subject: [PATCH 10/41] chore(nx): bust build cache on babel config change (#6443) nx uses caching to determine which steps to do/not do when running something like yarn build Out of the box it does it's best to determine which changes correctly trigger a rebuild, however it doesn't really account for config files such as a babel config. Changes to the babel config file, need to bust the build cache as they can have a huge effect on the built artifacts given we use babel to build our JS. This PR ensures that changes to the babel config, correctly allow for a rebuild of the framework. --- nx.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nx.json b/nx.json index 312d661725fa..ef8bff92df4d 100644 --- a/nx.json +++ b/nx.json @@ -17,7 +17,8 @@ "{projectRoot}/**/*" ], "prod": [ - "!{projectRoot}/**/*.test.{js,jsx,ts,tsx}" + "!{projectRoot}/**/*.test.{js,jsx,ts,tsx}", + "{workspaceRoot}/babel.config.js" ] }, "targetDefaults": { From 1f6011f621faa2a2988856e5483c6da90ef62902 Mon Sep 17 00:00:00 2001 From: Daniel Choudhury Date: Tue, 27 Sep 2022 08:52:37 +0100 Subject: [PATCH 11/41] fix(deploy): Fix deploy on Fly.io (#6454) --- packages/cli/src/commands/buildHandler.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/commands/buildHandler.js b/packages/cli/src/commands/buildHandler.js index a9cdf05c436e..1e9d9220563f 100644 --- a/packages/cli/src/commands/buildHandler.js +++ b/packages/cli/src/commands/buildHandler.js @@ -50,7 +50,8 @@ export const handler = async ({ return } - const prerenderRoutes = prerender ? detectPrerenderRoutes() : [] + const prerenderRoutes = + prerender && side.includes('web') ? detectPrerenderRoutes() : [] const shouldGeneratePrismaClient = prisma && (side.includes('api') || prerenderRoutes.length > 0) From a2fd1c264f340637c069216a2b8cda87f509b1a0 Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Tue, 27 Sep 2022 01:10:31 -0700 Subject: [PATCH 12/41] chore: update yarn.lock --- yarn.lock | 88 +++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/yarn.lock b/yarn.lock index ced0e7acb7d0..eb8afa99b09d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6147,7 +6147,7 @@ __metadata: languageName: node linkType: hard -"@redwoodjs/api-server@3.0.1, @redwoodjs/api-server@workspace:packages/api-server": +"@redwoodjs/api-server@3.0.2, @redwoodjs/api-server@workspace:packages/api-server": version: 0.0.0-use.local resolution: "@redwoodjs/api-server@workspace:packages/api-server" dependencies: @@ -6186,7 +6186,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/api@3.0.1, @redwoodjs/api@workspace:packages/api": +"@redwoodjs/api@3.0.2, @redwoodjs/api@workspace:packages/api": version: 0.0.0-use.local resolution: "@redwoodjs/api@workspace:packages/api" dependencies: @@ -6195,7 +6195,7 @@ __metadata: "@babel/runtime-corejs3": 7.19.0 "@clerk/clerk-sdk-node": 3.9.2 "@prisma/client": 4.3.1 - "@redwoodjs/auth": 3.0.1 + "@redwoodjs/auth": 3.0.2 "@simplewebauthn/server": 6.2.0 "@types/aws-lambda": 8.10.101 "@types/crypto-js": 4.1.1 @@ -6242,7 +6242,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/auth@3.0.1, @redwoodjs/auth@workspace:packages/auth": +"@redwoodjs/auth@3.0.2, @redwoodjs/auth@workspace:packages/auth": version: 0.0.0-use.local resolution: "@redwoodjs/auth@workspace:packages/auth" dependencies: @@ -6276,7 +6276,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/cli@3.0.1, @redwoodjs/cli@workspace:packages/cli": +"@redwoodjs/cli@3.0.2, @redwoodjs/cli@workspace:packages/cli": version: 0.0.0-use.local resolution: "@redwoodjs/cli@workspace:packages/cli" dependencies: @@ -6284,11 +6284,11 @@ __metadata: "@babel/core": 7.19.0 "@babel/runtime-corejs3": 7.19.0 "@prisma/internals": 4.3.1 - "@redwoodjs/api-server": 3.0.1 - "@redwoodjs/internal": 3.0.1 - "@redwoodjs/prerender": 3.0.1 - "@redwoodjs/structure": 3.0.1 - "@redwoodjs/telemetry": 3.0.1 + "@redwoodjs/api-server": 3.0.2 + "@redwoodjs/internal": 3.0.2 + "@redwoodjs/prerender": 3.0.2 + "@redwoodjs/structure": 3.0.2 + "@redwoodjs/telemetry": 3.0.2 "@types/listr": 0.14.4 boxen: 5.1.2 camelcase: 6.3.0 @@ -6382,10 +6382,10 @@ __metadata: "@babel/preset-typescript": 7.18.6 "@babel/runtime-corejs3": 7.19.0 "@pmmmwh/react-refresh-webpack-plugin": 0.5.7 - "@redwoodjs/cli": 3.0.1 - "@redwoodjs/eslint-config": 3.0.1 - "@redwoodjs/internal": 3.0.1 - "@redwoodjs/testing": 3.0.1 + "@redwoodjs/cli": 3.0.2 + "@redwoodjs/eslint-config": 3.0.2 + "@redwoodjs/internal": 3.0.2 + "@redwoodjs/testing": 3.0.2 "@types/rimraf": 3.0.2 babel-loader: 8.2.5 babel-plugin-auto-import: 1.1.0 @@ -6438,7 +6438,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/eslint-config@3.0.1, @redwoodjs/eslint-config@workspace:packages/eslint-config": +"@redwoodjs/eslint-config@3.0.2, @redwoodjs/eslint-config@workspace:packages/eslint-config": version: 0.0.0-use.local resolution: "@redwoodjs/eslint-config@workspace:packages/eslint-config" dependencies: @@ -6446,7 +6446,7 @@ __metadata: "@babel/core": 7.19.0 "@babel/eslint-parser": 7.18.9 "@babel/eslint-plugin": 7.18.10 - "@redwoodjs/internal": 3.0.1 + "@redwoodjs/internal": 3.0.2 "@typescript-eslint/eslint-plugin": 5.35.1 "@typescript-eslint/parser": 5.35.1 eslint: 8.23.1 @@ -6495,7 +6495,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/graphql-server@3.0.1, @redwoodjs/graphql-server@workspace:packages/graphql-server": +"@redwoodjs/graphql-server@3.0.2, @redwoodjs/graphql-server@workspace:packages/graphql-server": version: 0.0.0-use.local resolution: "@redwoodjs/graphql-server@workspace:packages/graphql-server" dependencies: @@ -6514,8 +6514,8 @@ __metadata: "@graphql-tools/utils": 8.10.0 "@graphql-yoga/common": 2.12.12 "@prisma/client": 4.3.1 - "@redwoodjs/api": 3.0.1 - "@redwoodjs/auth": 3.0.1 + "@redwoodjs/api": 3.0.2 + "@redwoodjs/auth": 3.0.2 "@types/lodash.merge": 4.6.7 "@types/lodash.omitby": 4.6.7 "@types/uuid": 8.3.4 @@ -6533,7 +6533,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/internal@3.0.1, @redwoodjs/internal@workspace:packages/internal": +"@redwoodjs/internal@3.0.2, @redwoodjs/internal@workspace:packages/internal": version: 0.0.0-use.local resolution: "@redwoodjs/internal@workspace:packages/internal" dependencies: @@ -6552,7 +6552,7 @@ __metadata: "@graphql-codegen/typescript-operations": 2.5.3 "@graphql-codegen/typescript-react-apollo": 3.3.3 "@graphql-codegen/typescript-resolvers": 2.7.3 - "@redwoodjs/graphql-server": 3.0.1 + "@redwoodjs/graphql-server": 3.0.2 "@types/babel-plugin-tester": 9.0.5 "@types/babel__core": 7.1.19 "@types/findup-sync": 4.0.2 @@ -6585,18 +6585,18 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/prerender@3.0.1, @redwoodjs/prerender@workspace:packages/prerender": +"@redwoodjs/prerender@3.0.2, @redwoodjs/prerender@workspace:packages/prerender": version: 0.0.0-use.local resolution: "@redwoodjs/prerender@workspace:packages/prerender" dependencies: "@babel/cli": 7.18.10 "@babel/core": 7.19.0 "@babel/runtime-corejs3": 7.19.0 - "@redwoodjs/auth": 3.0.1 - "@redwoodjs/internal": 3.0.1 - "@redwoodjs/router": 3.0.1 - "@redwoodjs/structure": 3.0.1 - "@redwoodjs/web": 3.0.1 + "@redwoodjs/auth": 3.0.2 + "@redwoodjs/internal": 3.0.2 + "@redwoodjs/router": 3.0.2 + "@redwoodjs/structure": 3.0.2 + "@redwoodjs/web": 3.0.2 "@types/mime-types": 2.1.1 babel-plugin-ignore-html-and-css-imports: 0.1.0 babel-plugin-tester: 10.1.0 @@ -6628,7 +6628,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/router@3.0.1, @redwoodjs/router@workspace:packages/router": +"@redwoodjs/router@3.0.2, @redwoodjs/router@workspace:packages/router": version: 0.0.0-use.local resolution: "@redwoodjs/router@workspace:packages/router" dependencies: @@ -6636,7 +6636,7 @@ __metadata: "@babel/core": 7.19.0 "@babel/runtime-corejs3": 7.19.0 "@reach/skip-nav": 0.16.0 - "@redwoodjs/auth": 3.0.1 + "@redwoodjs/auth": 3.0.2 "@types/lodash.isequal": 4.5.6 "@types/react": 17.0.48 "@types/react-dom": 17.0.17 @@ -6650,7 +6650,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/structure@3.0.1, @redwoodjs/structure@workspace:packages/structure": +"@redwoodjs/structure@3.0.2, @redwoodjs/structure@workspace:packages/structure": version: 0.0.0-use.local resolution: "@redwoodjs/structure@workspace:packages/structure" dependencies: @@ -6658,7 +6658,7 @@ __metadata: "@babel/core": 7.19.0 "@babel/runtime-corejs3": 7.19.0 "@prisma/internals": 4.3.1 - "@redwoodjs/internal": 3.0.1 + "@redwoodjs/internal": 3.0.2 "@types/fs-extra": 9.0.13 "@types/line-column": 1.0.0 "@types/lodash": 4.14.184 @@ -6689,15 +6689,15 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/telemetry@3.0.1, @redwoodjs/telemetry@workspace:packages/telemetry": +"@redwoodjs/telemetry@3.0.2, @redwoodjs/telemetry@workspace:packages/telemetry": version: 0.0.0-use.local resolution: "@redwoodjs/telemetry@workspace:packages/telemetry" dependencies: "@babel/cli": 7.18.10 "@babel/core": 7.19.0 "@babel/runtime-corejs3": 7.19.0 - "@redwoodjs/internal": 3.0.1 - "@redwoodjs/structure": 3.0.1 + "@redwoodjs/internal": 3.0.2 + "@redwoodjs/structure": 3.0.2 "@types/envinfo": 7.8.1 "@types/uuid": 8.3.4 "@types/yargs": 17.0.11 @@ -6712,18 +6712,18 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/testing@3.0.1, @redwoodjs/testing@workspace:packages/testing": +"@redwoodjs/testing@3.0.2, @redwoodjs/testing@workspace:packages/testing": version: 0.0.0-use.local resolution: "@redwoodjs/testing@workspace:packages/testing" dependencies: "@babel/cli": 7.18.10 "@babel/core": 7.19.0 "@babel/runtime-corejs3": 7.19.0 - "@redwoodjs/auth": 3.0.1 - "@redwoodjs/graphql-server": 3.0.1 - "@redwoodjs/internal": 3.0.1 - "@redwoodjs/router": 3.0.1 - "@redwoodjs/web": 3.0.1 + "@redwoodjs/auth": 3.0.2 + "@redwoodjs/graphql-server": 3.0.2 + "@redwoodjs/internal": 3.0.2 + "@redwoodjs/router": 3.0.2 + "@redwoodjs/web": 3.0.2 "@storybook/addon-a11y": 6.5.10 "@storybook/addon-docs": 6.5.10 "@storybook/addon-essentials": 6.5.10 @@ -6755,7 +6755,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/web@3.0.1, @redwoodjs/web@workspace:packages/web": +"@redwoodjs/web@3.0.2, @redwoodjs/web@workspace:packages/web": version: 0.0.0-use.local resolution: "@redwoodjs/web@workspace:packages/web" dependencies: @@ -6763,7 +6763,7 @@ __metadata: "@babel/cli": 7.18.10 "@babel/core": 7.19.0 "@babel/runtime-corejs3": 7.19.0 - "@redwoodjs/auth": 3.0.1 + "@redwoodjs/auth": 3.0.2 "@testing-library/jest-dom": 5.16.5 "@testing-library/react": 12.1.5 "@types/prop-types": 15.7.5 @@ -13600,8 +13600,8 @@ __metadata: "@babel/core": 7.19.0 "@babel/node": 7.18.10 "@babel/runtime-corejs3": 7.19.0 - "@redwoodjs/internal": 3.0.1 - "@redwoodjs/telemetry": 3.0.1 + "@redwoodjs/internal": 3.0.2 + "@redwoodjs/telemetry": 3.0.2 "@types/prompts": 2.4.0 chalk: 4.1.2 check-node-version: 4.2.1 From 66601a59fbfc617ec5b947088bc2746c6202a91b Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Tue, 27 Sep 2022 01:16:40 -0700 Subject: [PATCH 13/41] v3.0.3 --- __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 31cacd7faa31..5cd405af984b 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": "3.0.2", - "@redwoodjs/graphql-server": "3.0.2" + "@redwoodjs/api": "3.0.3", + "@redwoodjs/graphql-server": "3.0.3" } } diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json index f294d842e343..ebcf0357f50e 100644 --- a/__fixtures__/test-project/package.json +++ b/__fixtures__/test-project/package.json @@ -8,7 +8,7 @@ ] }, "devDependencies": { - "@redwoodjs/core": "3.0.2" + "@redwoodjs/core": "3.0.3" }, "eslintConfig": { "extends": "@redwoodjs/eslint-config", diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json index 7ff3d103b462..946d23bd1ead 100644 --- a/__fixtures__/test-project/web/package.json +++ b/__fixtures__/test-project/web/package.json @@ -13,10 +13,10 @@ ] }, "dependencies": { - "@redwoodjs/auth": "3.0.2", - "@redwoodjs/forms": "3.0.2", - "@redwoodjs/router": "3.0.2", - "@redwoodjs/web": "3.0.2", + "@redwoodjs/auth": "3.0.3", + "@redwoodjs/forms": "3.0.3", + "@redwoodjs/router": "3.0.3", + "@redwoodjs/web": "3.0.3", "prop-types": "15.8.1", "react": "17.0.2", "react-dom": "17.0.2" diff --git a/lerna.json b/lerna.json index 2965beb55d01..a99973f5552f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "3.0.2", + "version": "3.0.3", "npmClient": "yarn", "useWorkspaces": true, "useNx": true, diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 1835f77537b0..5f9840903028 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/api-server", - "version": "3.0.2", + "version": "3.0.3", "description": "Redwood's HTTP server for Serverless Functions", "repository": { "type": "git", diff --git a/packages/api/package.json b/packages/api/package.json index 364af979e3c0..4f15fb660590 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/api", - "version": "3.0.2", + "version": "3.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -49,7 +49,7 @@ "@babel/cli": "7.18.10", "@babel/core": "7.19.0", "@clerk/clerk-sdk-node": "3.9.2", - "@redwoodjs/auth": "3.0.2", + "@redwoodjs/auth": "3.0.3", "@simplewebauthn/server": "6.2.0", "@types/aws-lambda": "8.10.101", "@types/crypto-js": "4.1.1", diff --git a/packages/auth/package.json b/packages/auth/package.json index 65555f2415af..a6faa22d1fd5 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/auth", - "version": "3.0.2", + "version": "3.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/cli/package.json b/packages/cli/package.json index 9eed562634dd..16a94d8c95ad 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/cli", - "version": "3.0.2", + "version": "3.0.3", "description": "The Redwood Command Line", "repository": { "type": "git", @@ -30,11 +30,11 @@ "dependencies": { "@babel/runtime-corejs3": "7.19.0", "@prisma/internals": "4.3.1", - "@redwoodjs/api-server": "3.0.2", - "@redwoodjs/internal": "3.0.2", - "@redwoodjs/prerender": "3.0.2", - "@redwoodjs/structure": "3.0.2", - "@redwoodjs/telemetry": "3.0.2", + "@redwoodjs/api-server": "3.0.3", + "@redwoodjs/internal": "3.0.3", + "@redwoodjs/prerender": "3.0.3", + "@redwoodjs/structure": "3.0.3", + "@redwoodjs/telemetry": "3.0.3", "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 161b68bb0e30..3e04d30b68c9 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/codemods", - "version": "3.0.2", + "version": "3.0.3", "description": "Codemods to ease upgrading a RedwoodJS Project", "repository": { "type": "git", diff --git a/packages/core/package.json b/packages/core/package.json index 8499281c0f21..8f4cffe710e7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/core", - "version": "3.0.2", + "version": "3.0.3", "description": "Foundational packages and config required to build RedwoodJS.", "repository": { "type": "git", @@ -48,10 +48,10 @@ "@babel/preset-typescript": "7.18.6", "@babel/runtime-corejs3": "7.19.0", "@pmmmwh/react-refresh-webpack-plugin": "0.5.7", - "@redwoodjs/cli": "3.0.2", - "@redwoodjs/eslint-config": "3.0.2", - "@redwoodjs/internal": "3.0.2", - "@redwoodjs/testing": "3.0.2", + "@redwoodjs/cli": "3.0.3", + "@redwoodjs/eslint-config": "3.0.3", + "@redwoodjs/internal": "3.0.3", + "@redwoodjs/testing": "3.0.3", "babel-loader": "8.2.5", "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 68ee106c46a4..231556089b81 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -1,6 +1,6 @@ { "name": "create-redwood-app", - "version": "3.0.2", + "version": "3.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -24,8 +24,8 @@ "@babel/core": "7.19.0", "@babel/node": "7.18.10", "@babel/runtime-corejs3": "7.19.0", - "@redwoodjs/internal": "3.0.2", - "@redwoodjs/telemetry": "3.0.2", + "@redwoodjs/internal": "3.0.3", + "@redwoodjs/telemetry": "3.0.3", "chalk": "4.1.2", "check-node-version": "4.2.1", "core-js": "3.25.1", diff --git a/packages/create-redwood-app/template/api/package.json b/packages/create-redwood-app/template/api/package.json index 31cacd7faa31..5cd405af984b 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": "3.0.2", - "@redwoodjs/graphql-server": "3.0.2" + "@redwoodjs/api": "3.0.3", + "@redwoodjs/graphql-server": "3.0.3" } } diff --git a/packages/create-redwood-app/template/package.json b/packages/create-redwood-app/template/package.json index f294d842e343..ebcf0357f50e 100644 --- a/packages/create-redwood-app/template/package.json +++ b/packages/create-redwood-app/template/package.json @@ -8,7 +8,7 @@ ] }, "devDependencies": { - "@redwoodjs/core": "3.0.2" + "@redwoodjs/core": "3.0.3" }, "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 d2ef5c1596f5..ea9657ed8137 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": "3.0.2", - "@redwoodjs/router": "3.0.2", - "@redwoodjs/web": "3.0.2", + "@redwoodjs/forms": "3.0.3", + "@redwoodjs/router": "3.0.3", + "@redwoodjs/web": "3.0.3", "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 f36b843ad5c2..b117eba37593 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/eslint-config", - "version": "3.0.2", + "version": "3.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -15,7 +15,7 @@ "@babel/core": "7.19.0", "@babel/eslint-parser": "7.18.9", "@babel/eslint-plugin": "7.18.10", - "@redwoodjs/internal": "3.0.2", + "@redwoodjs/internal": "3.0.3", "@typescript-eslint/eslint-plugin": "5.35.1", "@typescript-eslint/parser": "5.35.1", "eslint": "8.23.1", diff --git a/packages/forms/package.json b/packages/forms/package.json index 5be9f53ec8d7..3ec53af94b8e 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/forms", - "version": "3.0.2", + "version": "3.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 31a0b3af7d2b..f3a2c6be6d64 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/graphql-server", - "version": "3.0.2", + "version": "3.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -33,7 +33,7 @@ "@graphql-tools/utils": "8.10.0", "@graphql-yoga/common": "2.12.12", "@prisma/client": "4.3.1", - "@redwoodjs/api": "3.0.2", + "@redwoodjs/api": "3.0.3", "core-js": "3.25.1", "cross-undici-fetch": "0.4.14", "graphql": "16.6.0", @@ -48,7 +48,7 @@ "@babel/core": "7.19.0", "@envelop/testing": "4.4.2", "@envelop/types": "2.3.1", - "@redwoodjs/auth": "3.0.2", + "@redwoodjs/auth": "3.0.3", "@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 c6dfbdad893f..c2d374c138a8 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/internal", - "version": "3.0.2", + "version": "3.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -41,7 +41,7 @@ "@graphql-codegen/typescript-operations": "2.5.3", "@graphql-codegen/typescript-react-apollo": "3.3.3", "@graphql-codegen/typescript-resolvers": "2.7.3", - "@redwoodjs/graphql-server": "3.0.2", + "@redwoodjs/graphql-server": "3.0.3", "babel-plugin-graphql-tag": "3.3.0", "babel-plugin-polyfill-corejs3": "0.5.3", "chalk": "4.1.2", diff --git a/packages/prerender/package.json b/packages/prerender/package.json index 865c6e1ecc15..b89b6d34e767 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/prerender", - "version": "3.0.2", + "version": "3.0.3", "description": "RedwoodJS prerender", "repository": { "type": "git", @@ -25,11 +25,11 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.19.0", - "@redwoodjs/auth": "3.0.2", - "@redwoodjs/internal": "3.0.2", - "@redwoodjs/router": "3.0.2", - "@redwoodjs/structure": "3.0.2", - "@redwoodjs/web": "3.0.2", + "@redwoodjs/auth": "3.0.3", + "@redwoodjs/internal": "3.0.3", + "@redwoodjs/router": "3.0.3", + "@redwoodjs/structure": "3.0.3", + "@redwoodjs/web": "3.0.3", "babel-plugin-ignore-html-and-css-imports": "0.1.0", "cheerio": "1.0.0-rc.12", "core-js": "3.25.1", diff --git a/packages/record/package.json b/packages/record/package.json index 02edefbd88f1..4aff9e12b399 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/record", - "version": "3.0.2", + "version": "3.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", diff --git a/packages/router/package.json b/packages/router/package.json index 3bb4a49cfe27..51a53f5b353d 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/router", - "version": "3.0.2", + "version": "3.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -24,7 +24,7 @@ "dependencies": { "@babel/runtime-corejs3": "7.19.0", "@reach/skip-nav": "0.16.0", - "@redwoodjs/auth": "3.0.2", + "@redwoodjs/auth": "3.0.3", "core-js": "3.25.1", "lodash.isequal": "4.5.0" }, diff --git a/packages/structure/package.json b/packages/structure/package.json index 50e90864ecfe..06026d6df0d9 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/structure", - "version": "3.0.2", + "version": "3.0.3", "description": "noun: the arrangement of and relations between the parts or elements of something complex", "repository": { "type": "git", @@ -32,7 +32,7 @@ "dependencies": { "@babel/runtime-corejs3": "7.19.0", "@prisma/internals": "4.3.1", - "@redwoodjs/internal": "3.0.2", + "@redwoodjs/internal": "3.0.3", "@types/line-column": "1.0.0", "camelcase": "6.3.0", "core-js": "3.25.1", diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index fe70fa758481..b73c8ce91cae 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/telemetry", - "version": "3.0.2", + "version": "3.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -27,8 +27,8 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.19.0", - "@redwoodjs/internal": "3.0.2", - "@redwoodjs/structure": "3.0.2", + "@redwoodjs/internal": "3.0.3", + "@redwoodjs/structure": "3.0.3", "ci-info": "3.3.2", "core-js": "3.25.1", "cross-undici-fetch": "0.4.14", diff --git a/packages/testing/package.json b/packages/testing/package.json index 07a64107027b..d9247f01e8dc 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/testing", - "version": "3.0.2", + "version": "3.0.3", "description": "Tools, wrappers and configuration for testing a Redwood project.", "repository": { "type": "git", @@ -27,11 +27,11 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.19.0", - "@redwoodjs/auth": "3.0.2", - "@redwoodjs/graphql-server": "3.0.2", - "@redwoodjs/internal": "3.0.2", - "@redwoodjs/router": "3.0.2", - "@redwoodjs/web": "3.0.2", + "@redwoodjs/auth": "3.0.3", + "@redwoodjs/graphql-server": "3.0.3", + "@redwoodjs/internal": "3.0.3", + "@redwoodjs/router": "3.0.3", + "@redwoodjs/web": "3.0.3", "@storybook/addon-a11y": "6.5.10", "@storybook/addon-docs": "6.5.10", "@storybook/addon-essentials": "6.5.10", diff --git a/packages/web/package.json b/packages/web/package.json index 7104f557aad2..cca6210575b8 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "@redwoodjs/web", - "version": "3.0.2", + "version": "3.0.3", "repository": { "type": "git", "url": "https://github.com/redwoodjs/redwood.git", @@ -38,7 +38,7 @@ "dependencies": { "@apollo/client": "3.6.9", "@babel/runtime-corejs3": "7.19.0", - "@redwoodjs/auth": "3.0.2", + "@redwoodjs/auth": "3.0.3", "core-js": "3.25.1", "graphql": "16.6.0", "graphql-tag": "2.12.6", From 45759fe2c565fc74d0b329de8aaeae6cef4ac77f Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Tue, 27 Sep 2022 01:40:32 -0700 Subject: [PATCH 14/41] chore: update yarn.lock --- yarn.lock | 88 +++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/yarn.lock b/yarn.lock index 21f0c7c8a247..92c8ea457a9b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6107,7 +6107,7 @@ __metadata: languageName: node linkType: hard -"@redwoodjs/api-server@3.0.2, @redwoodjs/api-server@workspace:packages/api-server": +"@redwoodjs/api-server@3.0.3, @redwoodjs/api-server@workspace:packages/api-server": version: 0.0.0-use.local resolution: "@redwoodjs/api-server@workspace:packages/api-server" dependencies: @@ -6146,7 +6146,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/api@3.0.2, @redwoodjs/api@workspace:packages/api": +"@redwoodjs/api@3.0.3, @redwoodjs/api@workspace:packages/api": version: 0.0.0-use.local resolution: "@redwoodjs/api@workspace:packages/api" dependencies: @@ -6155,7 +6155,7 @@ __metadata: "@babel/runtime-corejs3": 7.19.1 "@clerk/clerk-sdk-node": 3.9.2 "@prisma/client": 4.3.1 - "@redwoodjs/auth": 3.0.2 + "@redwoodjs/auth": 3.0.3 "@simplewebauthn/server": 6.2.0 "@types/aws-lambda": 8.10.101 "@types/crypto-js": 4.1.1 @@ -6202,7 +6202,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/auth@3.0.2, @redwoodjs/auth@workspace:packages/auth": +"@redwoodjs/auth@3.0.3, @redwoodjs/auth@workspace:packages/auth": version: 0.0.0-use.local resolution: "@redwoodjs/auth@workspace:packages/auth" dependencies: @@ -6236,7 +6236,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/cli@3.0.2, @redwoodjs/cli@workspace:packages/cli": +"@redwoodjs/cli@3.0.3, @redwoodjs/cli@workspace:packages/cli": version: 0.0.0-use.local resolution: "@redwoodjs/cli@workspace:packages/cli" dependencies: @@ -6244,11 +6244,11 @@ __metadata: "@babel/core": 7.19.1 "@babel/runtime-corejs3": 7.19.1 "@prisma/internals": 4.3.1 - "@redwoodjs/api-server": 3.0.2 - "@redwoodjs/internal": 3.0.2 - "@redwoodjs/prerender": 3.0.2 - "@redwoodjs/structure": 3.0.2 - "@redwoodjs/telemetry": 3.0.2 + "@redwoodjs/api-server": 3.0.3 + "@redwoodjs/internal": 3.0.3 + "@redwoodjs/prerender": 3.0.3 + "@redwoodjs/structure": 3.0.3 + "@redwoodjs/telemetry": 3.0.3 "@types/listr": 0.14.4 boxen: 5.1.2 camelcase: 6.3.0 @@ -6341,10 +6341,10 @@ __metadata: "@babel/preset-typescript": 7.18.6 "@babel/runtime-corejs3": 7.19.1 "@pmmmwh/react-refresh-webpack-plugin": 0.5.7 - "@redwoodjs/cli": 3.0.2 - "@redwoodjs/eslint-config": 3.0.2 - "@redwoodjs/internal": 3.0.2 - "@redwoodjs/testing": 3.0.2 + "@redwoodjs/cli": 3.0.3 + "@redwoodjs/eslint-config": 3.0.3 + "@redwoodjs/internal": 3.0.3 + "@redwoodjs/testing": 3.0.3 "@types/rimraf": 3.0.2 babel-loader: 8.2.5 babel-plugin-auto-import: 1.1.0 @@ -6397,7 +6397,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/eslint-config@3.0.2, @redwoodjs/eslint-config@workspace:packages/eslint-config": +"@redwoodjs/eslint-config@3.0.3, @redwoodjs/eslint-config@workspace:packages/eslint-config": version: 0.0.0-use.local resolution: "@redwoodjs/eslint-config@workspace:packages/eslint-config" dependencies: @@ -6405,7 +6405,7 @@ __metadata: "@babel/core": 7.19.1 "@babel/eslint-parser": 7.19.1 "@babel/eslint-plugin": 7.19.1 - "@redwoodjs/internal": 3.0.2 + "@redwoodjs/internal": 3.0.3 "@typescript-eslint/eslint-plugin": 5.35.1 "@typescript-eslint/parser": 5.35.1 eslint: 8.24.0 @@ -6454,7 +6454,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/graphql-server@3.0.2, @redwoodjs/graphql-server@workspace:packages/graphql-server": +"@redwoodjs/graphql-server@3.0.3, @redwoodjs/graphql-server@workspace:packages/graphql-server": version: 0.0.0-use.local resolution: "@redwoodjs/graphql-server@workspace:packages/graphql-server" dependencies: @@ -6473,8 +6473,8 @@ __metadata: "@graphql-tools/utils": 8.10.0 "@graphql-yoga/common": 2.12.12 "@prisma/client": 4.3.1 - "@redwoodjs/api": 3.0.2 - "@redwoodjs/auth": 3.0.2 + "@redwoodjs/api": 3.0.3 + "@redwoodjs/auth": 3.0.3 "@types/lodash.merge": 4.6.7 "@types/lodash.omitby": 4.6.7 "@types/uuid": 8.3.4 @@ -6492,7 +6492,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/internal@3.0.2, @redwoodjs/internal@workspace:packages/internal": +"@redwoodjs/internal@3.0.3, @redwoodjs/internal@workspace:packages/internal": version: 0.0.0-use.local resolution: "@redwoodjs/internal@workspace:packages/internal" dependencies: @@ -6511,7 +6511,7 @@ __metadata: "@graphql-codegen/typescript-operations": 2.5.3 "@graphql-codegen/typescript-react-apollo": 3.3.3 "@graphql-codegen/typescript-resolvers": 2.7.3 - "@redwoodjs/graphql-server": 3.0.2 + "@redwoodjs/graphql-server": 3.0.3 "@types/babel-plugin-tester": 9.0.5 "@types/babel__core": 7.1.19 "@types/findup-sync": 4.0.2 @@ -6544,18 +6544,18 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/prerender@3.0.2, @redwoodjs/prerender@workspace:packages/prerender": +"@redwoodjs/prerender@3.0.3, @redwoodjs/prerender@workspace:packages/prerender": version: 0.0.0-use.local resolution: "@redwoodjs/prerender@workspace:packages/prerender" dependencies: "@babel/cli": 7.18.10 "@babel/core": 7.19.1 "@babel/runtime-corejs3": 7.19.1 - "@redwoodjs/auth": 3.0.2 - "@redwoodjs/internal": 3.0.2 - "@redwoodjs/router": 3.0.2 - "@redwoodjs/structure": 3.0.2 - "@redwoodjs/web": 3.0.2 + "@redwoodjs/auth": 3.0.3 + "@redwoodjs/internal": 3.0.3 + "@redwoodjs/router": 3.0.3 + "@redwoodjs/structure": 3.0.3 + "@redwoodjs/web": 3.0.3 "@types/mime-types": 2.1.1 babel-plugin-ignore-html-and-css-imports: 0.1.0 babel-plugin-tester: 10.1.0 @@ -6587,7 +6587,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/router@3.0.2, @redwoodjs/router@workspace:packages/router": +"@redwoodjs/router@3.0.3, @redwoodjs/router@workspace:packages/router": version: 0.0.0-use.local resolution: "@redwoodjs/router@workspace:packages/router" dependencies: @@ -6595,7 +6595,7 @@ __metadata: "@babel/core": 7.19.1 "@babel/runtime-corejs3": 7.19.1 "@reach/skip-nav": 0.16.0 - "@redwoodjs/auth": 3.0.2 + "@redwoodjs/auth": 3.0.3 "@types/lodash.isequal": 4.5.6 "@types/react": 17.0.50 "@types/react-dom": 17.0.17 @@ -6609,7 +6609,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/structure@3.0.2, @redwoodjs/structure@workspace:packages/structure": +"@redwoodjs/structure@3.0.3, @redwoodjs/structure@workspace:packages/structure": version: 0.0.0-use.local resolution: "@redwoodjs/structure@workspace:packages/structure" dependencies: @@ -6617,7 +6617,7 @@ __metadata: "@babel/core": 7.19.1 "@babel/runtime-corejs3": 7.19.1 "@prisma/internals": 4.3.1 - "@redwoodjs/internal": 3.0.2 + "@redwoodjs/internal": 3.0.3 "@types/fs-extra": 9.0.13 "@types/line-column": 1.0.0 "@types/lodash": 4.14.185 @@ -6648,15 +6648,15 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/telemetry@3.0.2, @redwoodjs/telemetry@workspace:packages/telemetry": +"@redwoodjs/telemetry@3.0.3, @redwoodjs/telemetry@workspace:packages/telemetry": version: 0.0.0-use.local resolution: "@redwoodjs/telemetry@workspace:packages/telemetry" dependencies: "@babel/cli": 7.18.10 "@babel/core": 7.19.1 "@babel/runtime-corejs3": 7.19.1 - "@redwoodjs/internal": 3.0.2 - "@redwoodjs/structure": 3.0.2 + "@redwoodjs/internal": 3.0.3 + "@redwoodjs/structure": 3.0.3 "@types/envinfo": 7.8.1 "@types/uuid": 8.3.4 "@types/yargs": 17.0.12 @@ -6671,18 +6671,18 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/testing@3.0.2, @redwoodjs/testing@workspace:packages/testing": +"@redwoodjs/testing@3.0.3, @redwoodjs/testing@workspace:packages/testing": version: 0.0.0-use.local resolution: "@redwoodjs/testing@workspace:packages/testing" dependencies: "@babel/cli": 7.18.10 "@babel/core": 7.19.1 "@babel/runtime-corejs3": 7.19.1 - "@redwoodjs/auth": 3.0.2 - "@redwoodjs/graphql-server": 3.0.2 - "@redwoodjs/internal": 3.0.2 - "@redwoodjs/router": 3.0.2 - "@redwoodjs/web": 3.0.2 + "@redwoodjs/auth": 3.0.3 + "@redwoodjs/graphql-server": 3.0.3 + "@redwoodjs/internal": 3.0.3 + "@redwoodjs/router": 3.0.3 + "@redwoodjs/web": 3.0.3 "@storybook/addon-a11y": 6.5.12 "@storybook/addon-docs": 6.5.12 "@storybook/addon-essentials": 6.5.12 @@ -6714,7 +6714,7 @@ __metadata: languageName: unknown linkType: soft -"@redwoodjs/web@3.0.2, @redwoodjs/web@workspace:packages/web": +"@redwoodjs/web@3.0.3, @redwoodjs/web@workspace:packages/web": version: 0.0.0-use.local resolution: "@redwoodjs/web@workspace:packages/web" dependencies: @@ -6722,7 +6722,7 @@ __metadata: "@babel/cli": 7.18.10 "@babel/core": 7.19.1 "@babel/runtime-corejs3": 7.19.1 - "@redwoodjs/auth": 3.0.2 + "@redwoodjs/auth": 3.0.3 "@testing-library/jest-dom": 5.16.5 "@testing-library/react": 12.1.5 "@types/prop-types": 15.7.5 @@ -13642,8 +13642,8 @@ __metadata: "@babel/core": 7.19.1 "@babel/node": 7.19.1 "@babel/runtime-corejs3": 7.19.1 - "@redwoodjs/internal": 3.0.2 - "@redwoodjs/telemetry": 3.0.2 + "@redwoodjs/internal": 3.0.3 + "@redwoodjs/telemetry": 3.0.3 "@types/prompts": 2.4.0 chalk: 4.1.2 check-node-version: 4.2.1 From fbfd467613fe28eeca429bd0f491ccf0ed80bdca Mon Sep 17 00:00:00 2001 From: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com> Date: Tue, 27 Sep 2022 12:17:17 +0100 Subject: [PATCH 15/41] Fix warnings in CLI destroy tests (#6455) Co-authored-by: Daniel Choudhury --- .../destroy/cell/__tests__/cell.test.js | 31 +++++++++---------- .../function/__tests__/function.test.js | 4 +-- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js b/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js index d14396154bed..bdf33eef1fb4 100644 --- a/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js +++ b/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js @@ -23,16 +23,13 @@ import '../../../../lib/test' import { files } from '../../../generate/cell/cell' import { tasks } from '../cell' -beforeEach(() => { - fs.__setMockFiles(files({ name: 'User' })) -}) - afterEach(() => { fs.__setMockFiles({}) jest.spyOn(fs, 'unlinkSync').mockClear() }) test('destroys cell files', async () => { + fs.__setMockFiles(await files({ name: 'User' })) const unlinkSpy = jest.spyOn(fs, 'unlinkSync') const t = tasks({ componentName: 'cell', @@ -41,15 +38,15 @@ test('destroys cell files', async () => { }) t.setRenderer('silent') - return t.run().then(() => { - const generatedFiles = Object.keys(files({ name: 'User' })) - expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length) - generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f)) - }) + await t.run() + + const generatedFiles = Object.keys(await files({ name: 'User' })) + expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length) + generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f)) }) test('destroys cell files with stories and tests', async () => { - fs.__setMockFiles(files({ name: 'User', stories: true, tests: true })) + fs.__setMockFiles(await files({ name: 'User', stories: true, tests: true })) const unlinkSpy = jest.spyOn(fs, 'unlinkSync') const t = tasks({ componentName: 'cell', @@ -60,11 +57,11 @@ test('destroys cell files with stories and tests', async () => { }) t.setRenderer('silent') - return t.run().then(() => { - const generatedFiles = Object.keys( - files({ name: 'User', stories: true, tests: true }) - ) - expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length) - generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f)) - }) + await t.run() + + const generatedFiles = Object.keys( + await files({ name: 'User', stories: true, tests: true }) + ) + expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length) + generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f)) }) diff --git a/packages/cli/src/commands/destroy/function/__tests__/function.test.js b/packages/cli/src/commands/destroy/function/__tests__/function.test.js index 16471456acfa..298ee2bb61a0 100644 --- a/packages/cli/src/commands/destroy/function/__tests__/function.test.js +++ b/packages/cli/src/commands/destroy/function/__tests__/function.test.js @@ -15,7 +15,7 @@ import { files } from '../../../generate/function/function' import { tasks } from '../function' beforeEach(async () => { - fs.__setMockFiles(await files({ name: 'sendMail' })) + fs.__setMockFiles(files({ name: 'sendMail' })) }) afterEach(() => { @@ -33,7 +33,7 @@ test('destroys service files', async () => { t.setRenderer('silent') return t.run().then(async () => { - const generatedFiles = Object.keys(await files({ name: 'sendMail' })) + const generatedFiles = Object.keys(files({ name: 'sendMail' })) expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length) generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f)) }) From f2f9b3b1db12b5d6d4cf09b8ef0393e185cef2be Mon Sep 17 00:00:00 2001 From: Rob Cameron Date: Wed, 28 Sep 2022 12:18:13 -0700 Subject: [PATCH 16/41] Update scaffolds to use a shared ScaffoldLayout (#6385) * Rename layout file to ScaffoldLayout, replace content * Updates generator to use new template * --rebuild-fixture * Update snapshots * Updates tests for new layout path * Update e2e tests for new ScaffoldLayout * Updates tutorial for single ScaffoldLayout --- __fixtures__/test-project/web/src/Routes.tsx | 7 +- .../ScaffoldLayout.tsx} | 24 ++- .../docs/tutorial/chapter2/getting-dynamic.md | 2 +- docs/docs/tutorial/chapter2/routing-params.md | 8 +- docs/docs/tutorial/chapter3/forms.md | 8 +- docs/docs/tutorial/chapter4/authentication.md | 16 +- docs/docs/tutorial/chapter7/rbac.md | 4 +- .../__snapshots__/scaffold.test.js.snap | 48 +++--- .../__snapshots__/scaffoldNoNest.test.js.snap | 48 +++--- .../scaffold/__tests__/scaffold.test.js | 4 +- .../scaffold/__tests__/scaffoldNoNest.test.js | 4 +- .../scaffold/__tests__/scaffoldPath.test.js | 4 +- .../__tests__/scaffoldPathMulti.test.js | 4 +- .../__tests__/scaffoldPathMultiNoNest.test.js | 4 +- .../__tests__/scaffoldPathMultiword.test.js | 6 +- .../scaffoldPathMultiwordNoNest.test.js | 6 +- .../__tests__/scaffoldPathNoNest.test.js | 4 +- .../commands/generate/scaffold/scaffold.js | 137 +++++++++--------- .../layouts/NamesLayout.tsx.template | 33 ----- .../layouts/ScaffoldLayout.tsx.template | 24 ++- packages/cli/src/lib/index.js | 32 +++- .../01-tutorial/codemods/Step6_1_Routes.js | 4 +- .../01-tutorial/codemods/Step7_4_Routes.js | 4 +- 23 files changed, 227 insertions(+), 208 deletions(-) rename __fixtures__/test-project/web/src/layouts/{ContactsLayout/ContactsLayout.tsx => ScaffoldLayout/ScaffoldLayout.tsx} (51%) delete mode 100644 packages/cli/src/commands/generate/scaffold/templates/layouts/NamesLayout.tsx.template rename __fixtures__/test-project/web/src/layouts/PostsLayout/PostsLayout.tsx => packages/cli/src/commands/generate/scaffold/templates/layouts/ScaffoldLayout.tsx.template (51%) diff --git a/__fixtures__/test-project/web/src/Routes.tsx b/__fixtures__/test-project/web/src/Routes.tsx index fb788c6f5fab..11d3ab1b168f 100644 --- a/__fixtures__/test-project/web/src/Routes.tsx +++ b/__fixtures__/test-project/web/src/Routes.tsx @@ -10,8 +10,7 @@ import { Router, Route, Private, Set } from '@redwoodjs/router' import BlogLayout from 'src/layouts/BlogLayout' -import ContactsLayout from 'src/layouts/ContactsLayout' -import PostsLayout from 'src/layouts/PostsLayout' +import ScaffoldLayout from 'src/layouts/ScaffoldLayout' import HomePage from 'src/pages/HomePage' const Routes = () => { @@ -21,13 +20,13 @@ const Routes = () => { - + - + diff --git a/__fixtures__/test-project/web/src/layouts/ContactsLayout/ContactsLayout.tsx b/__fixtures__/test-project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.tsx similarity index 51% rename from __fixtures__/test-project/web/src/layouts/ContactsLayout/ContactsLayout.tsx rename to __fixtures__/test-project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.tsx index a5e45b60d5b6..2912b56706d6 100644 --- a/__fixtures__/test-project/web/src/layouts/ContactsLayout/ContactsLayout.tsx +++ b/__fixtures__/test-project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.tsx @@ -1,22 +1,32 @@ import { Link, routes } from '@redwoodjs/router' import { Toaster } from '@redwoodjs/web/toast' -type ContactLayoutProps = { +type LayoutProps = { + title: string + titleTo: string + buttonLabel: string + buttonTo: string children: React.ReactNode } -const ContactsLayout = ({ children }: ContactLayoutProps) => { +const ScaffoldLayout = ({ + title, + titleTo, + buttonLabel, + buttonTo, + children, +}: LayoutProps) => { return (

- - Contacts + + {title}

- -
+
New Contact + +
+
{buttonLabel}
{children}
@@ -24,4 +34,4 @@ const ContactsLayout = ({ children }: ContactLayoutProps) => { ) } -export default ContactsLayout +export default ScaffoldLayout diff --git a/docs/docs/tutorial/chapter2/getting-dynamic.md b/docs/docs/tutorial/chapter2/getting-dynamic.md index 1b366659342f..0082b7300e42 100644 --- a/docs/docs/tutorial/chapter2/getting-dynamic.md +++ b/docs/docs/tutorial/chapter2/getting-dynamic.md @@ -151,7 +151,7 @@ Here's what happened when we ran that `yarn rw g scaffold post` command: - `NewPostPage` for creating a new post - `PostPage` for showing the detail of a post - `PostsPage` for listing all the posts -- Created a _layouts_ file in `web/src/layouts/PostsLayout/PostsLayout.{js,tsx}` that serves as a container for pages with common elements like page heading and "New Posts" button +- Created a _layout_ file in `web/src/layouts/ScaffoldLayout/ScaffoldLayout.{js,tsx}` that serves as a container for pages with common elements like page heading and "New Posts" button - Created routes wrapped in the `Set` component with the layout as `PostsLayout` for those pages in `web/src/Routes.{js,tsx}` - Created three _cells_ in `web/src/components/Post`: - `EditPostCell` gets the post to edit in the database diff --git a/docs/docs/tutorial/chapter2/routing-params.md b/docs/docs/tutorial/chapter2/routing-params.md index 2c06890652a2..43bfbc115fb7 100644 --- a/docs/docs/tutorial/chapter2/routing-params.md +++ b/docs/docs/tutorial/chapter2/routing-params.md @@ -99,13 +99,13 @@ Notice the `{id}`. Redwood calls these _route parameters_. They say "whatever va ```jsx title="web/src/Routes.js" import { Router, Route, Set } from '@redwoodjs/router' -import PostsLayout from 'src/layouts/PostsLayout' +import ScaffoldLayout from 'src/layouts/ScaffoldLayout' import BlogLayout from 'src/layouts/BlogLayout' const Routes = () => { return ( - + @@ -130,13 +130,13 @@ export default Routes ```jsx title="web/src/Routes.tsx" import { Router, Route, Set } from '@redwoodjs/router' -import PostsLayout from 'src/layouts/PostsLayout' +import ScaffoldLayout from 'src/layouts/ScaffoldLayout' import BlogLayout from 'src/layouts/BlogLayout' const Routes = () => { return ( - + diff --git a/docs/docs/tutorial/chapter3/forms.md b/docs/docs/tutorial/chapter3/forms.md index ba0701352d13..0b5c37a89cf7 100644 --- a/docs/docs/tutorial/chapter3/forms.md +++ b/docs/docs/tutorial/chapter3/forms.md @@ -110,13 +110,13 @@ And then use the `BlogLayout` for the `ContactPage` by making sure its wrapped b ```jsx title="web/src/Routes.js" import { Router, Route, Set } from '@redwoodjs/router' -import PostsLayout from 'src/layouts/PostsLayout' +import ScaffoldLayout from 'src/layouts/ScaffoldLayout' import BlogLayout from 'src/layouts/BlogLayout' const Routes = () => { return ( - + @@ -142,13 +142,13 @@ export default Routes ```tsx title="web/src/Routes.tsx" import { Router, Route, Set } from '@redwoodjs/router' -import PostsLayout from 'src/layouts/PostsLayout' +import ScaffoldLayout from 'src/layouts/ScaffoldLayout' import BlogLayout from 'src/layouts/BlogLayout' const Routes = () => { return ( - + diff --git a/docs/docs/tutorial/chapter4/authentication.md b/docs/docs/tutorial/chapter4/authentication.md index 6bf05d22a145..8f884ed5f9f0 100644 --- a/docs/docs/tutorial/chapter4/authentication.md +++ b/docs/docs/tutorial/chapter4/authentication.md @@ -9,13 +9,13 @@ Having the admin screens at `/admin` is a reasonable thing to do. Let's update t ```jsx title="web/src/Routes.js" import { Router, Route, Set } from '@redwoodjs/router' -import PostsLayout from 'src/layouts/PostsLayout' +import ScaffoldLayout from 'src/layouts/ScaffoldLayout' import BlogLayout from 'src/layouts/BlogLayout' const Routes = () => { return ( - + // highlight-start @@ -42,13 +42,13 @@ export default Routes ```jsx title="web/src/Routes.tsx" import { Router, Route, Set } from '@redwoodjs/router' -import PostsLayout from 'src/layouts/PostsLayout' +import ScaffoldLayout from 'src/layouts/ScaffoldLayout' import BlogLayout from 'src/layouts/BlogLayout' const Routes = () => { return ( - + // highlight-start @@ -209,7 +209,7 @@ Going to the admin section now prevents a non-logged in user from seeing posts, ```jsx title="web/src/Routes.js" // highlight-next-line import { Private, Router, Route, Set } from '@redwoodjs/router' -import PostsLayout from 'src/layouts/PostsLayout' +import ScaffoldLayout from 'src/layouts/ScaffoldLayout' import BlogLayout from 'src/layouts/BlogLayout' const Routes = () => { @@ -217,7 +217,7 @@ const Routes = () => { // highlight-next-line - + @@ -245,7 +245,7 @@ export default Routes ```jsx title="web/src/Routes.tsx" // highlight-next-line import { Private, Router, Route, Set } from '@redwoodjs/router' -import PostsLayout from 'src/layouts/PostsLayout' +import ScaffoldLayout from 'src/layouts/ScaffoldLayout' import BlogLayout from 'src/layouts/BlogLayout' const Routes = () => { @@ -253,7 +253,7 @@ const Routes = () => { // highlight-next-line - + diff --git a/docs/docs/tutorial/chapter7/rbac.md b/docs/docs/tutorial/chapter7/rbac.md index 24352bba12e2..bcc3e972a0d5 100644 --- a/docs/docs/tutorial/chapter7/rbac.md +++ b/docs/docs/tutorial/chapter7/rbac.md @@ -164,7 +164,7 @@ The easiest way to prevent access to an entire URL is via the Router. The ` - + @@ -179,7 +179,7 @@ The easiest way to prevent access to an entire URL is via the Router. The ` - + diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffold.test.js.snap b/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffold.test.js.snap index dd519db77e7c..7b660fcf4174 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffold.test.js.snap +++ b/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffold.test.js.snap @@ -462,18 +462,24 @@ exports[`in javascript (default) mode creates a layout 1`] = ` "import { Link, routes } from '@redwoodjs/router' import { Toaster } from '@redwoodjs/web/toast' -const PostsLayout = ({ children }) => { +const ScaffoldLayout = ({ + title, + titleTo, + buttonLabel, + buttonTo, + children, +}) => { return (

- - Posts + + {title}

- -
+
New Post + +
+
{buttonLabel}
{children}
@@ -481,7 +487,7 @@ const PostsLayout = ({ children }) => { ) } -export default PostsLayout +export default ScaffoldLayout " `; @@ -1934,28 +1940,32 @@ exports[`in typescript mode creates a layout 1`] = ` "import { Link, routes } from '@redwoodjs/router' import { Toaster } from '@redwoodjs/web/toast' -type PostLayoutProps = { +type LayoutProps = { + title: string + titleTo: string + buttonLabel: string + buttonTo: string children: React.ReactNode } -const PostsLayout = ({ children }: PostLayoutProps) => { +const ScaffoldLayout = ({ + title, + titleTo, + buttonLabel, + buttonTo, + children, +}: LayoutProps) => { return (

- - Posts + + {title}

- -
+
New Post + +
+
{buttonLabel}
{children}
@@ -1963,7 +1973,7 @@ const PostsLayout = ({ children }: PostLayoutProps) => { ) } -export default PostsLayout +export default ScaffoldLayout " `; diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffoldNoNest.test.js.snap b/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffoldNoNest.test.js.snap index 83b11cce0492..9ba7f4c4f2b2 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffoldNoNest.test.js.snap +++ b/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffoldNoNest.test.js.snap @@ -288,18 +288,24 @@ exports[`in javascript (default) mode creates a layout 1`] = ` "import { Link, routes } from '@redwoodjs/router' import { Toaster } from '@redwoodjs/web/toast' -const PostsLayout = ({ children }) => { +const ScaffoldLayout = ({ + title, + titleTo, + buttonLabel, + buttonTo, + children, +}) => { return (

- - Posts + + {title}

- -
+
New Post + +
+
{buttonLabel}
{children}
@@ -307,7 +313,7 @@ const PostsLayout = ({ children }) => { ) } -export default PostsLayout +export default ScaffoldLayout " `; @@ -1543,28 +1549,32 @@ exports[`in typescript mode creates a layout 1`] = ` "import { Link, routes } from '@redwoodjs/router' import { Toaster } from '@redwoodjs/web/toast' -type PostLayoutProps = { +type LayoutProps = { + title: string + titleTo: string + buttonLabel: string + buttonTo: string children: React.ReactNode } -const PostsLayout = ({ children }: PostLayoutProps) => { +const ScaffoldLayout = ({ + title, + titleTo, + buttonLabel, + buttonTo, + children, +}: LayoutProps) => { return (

- - Posts + + {title}

- -
+
New Post + +
+
{buttonLabel}
{children}
@@ -1572,7 +1582,7 @@ const PostsLayout = ({ children }: PostLayoutProps) => { ) } -export default PostsLayout +export default ScaffoldLayout " `; diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js index 2d4f02aae367..6db77eb3052c 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js @@ -61,7 +61,7 @@ describe('in javascript (default) mode', () => { expect( files[ path.normalize( - '/path/to/project/web/src/layouts/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ) ] ).toMatchSnapshot() @@ -463,7 +463,7 @@ describe('in typescript mode', () => { expect( tsFiles[ path.normalize( - '/path/to/project/web/src/layouts/PostsLayout/PostsLayout.tsx' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.tsx' ) ] ).toMatchSnapshot() diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldNoNest.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldNoNest.test.js index 46cf81af5c4c..274d79e95010 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldNoNest.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldNoNest.test.js @@ -61,7 +61,7 @@ describe('in javascript (default) mode', () => { expect( files[ path.normalize( - '/path/to/project/web/src/layouts/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ) ] ).toMatchSnapshot() @@ -339,7 +339,7 @@ describe('in typescript mode', () => { expect( tsFiles[ path.normalize( - '/path/to/project/web/src/layouts/PostsLayout/PostsLayout.tsx' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.tsx' ) ] ).toMatchSnapshot() diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPath.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPath.test.js index 91ee10f7b5da..14f5f08d1bfe 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPath.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPath.test.js @@ -34,7 +34,7 @@ describe('admin/post', () => { test('creates a layout', async () => { expect(filesLower).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/Admin/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) @@ -355,7 +355,7 @@ describe('Admin/Post', () => { test('creates a layout', async () => { expect(filesUpper).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/Admin/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMulti.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMulti.test.js index ffd39f0427b6..b8a80b479f37 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMulti.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMulti.test.js @@ -35,7 +35,7 @@ describe('admin/pages/post', () => { test('creates a layout', async () => { expect(filesNestedLower).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/Admin/Pages/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) @@ -365,7 +365,7 @@ describe('Admin/Pages/Post/Post', () => { test('creates a layout', async () => { expect(filesNestedLower).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/Admin/Pages/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiNoNest.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiNoNest.test.js index 6f9b0c0997b3..13de925d66ec 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiNoNest.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiNoNest.test.js @@ -35,7 +35,7 @@ describe('admin/pages/post', () => { test('creates a layout', async () => { expect(filesNestedLower).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/Admin/Pages/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) @@ -357,7 +357,7 @@ describe('Admin/Pages/Post/Post', () => { test('creates a layout', async () => { expect(filesNestedLower).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/Admin/Pages/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiword.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiword.test.js index 50fc75e00075..9c5efa18a4f2 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiword.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiword.test.js @@ -43,7 +43,7 @@ describe('AdminPages/Post', () => { test('creates a layout', async () => { expect(filesMultiwordUpper).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/AdminPages/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) @@ -373,7 +373,7 @@ describe('admin-pages/Post', () => { test('creates a layout', async () => { expect(filesMultiwordUpper).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/AdminPages/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) @@ -703,7 +703,7 @@ describe('admin_pages/Post', () => { test('creates a layout', async () => { expect(filesMultiwordUpper).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/AdminPages/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiwordNoNest.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiwordNoNest.test.js index f44a5eea6666..ef67e3121942 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiwordNoNest.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiwordNoNest.test.js @@ -43,7 +43,7 @@ describe('AdminPages/Post', () => { test('creates a layout', async () => { expect(filesMultiwordUpper).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/AdminPages/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) @@ -365,7 +365,7 @@ describe('admin-pages/Post', () => { test('creates a layout', async () => { expect(filesMultiwordUpper).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/AdminPages/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) @@ -687,7 +687,7 @@ describe('admin_pages/Post', () => { test('creates a layout', async () => { expect(filesMultiwordUpper).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/AdminPages/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathNoNest.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathNoNest.test.js index 5f19e1b188b1..18aa0b5ffb38 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathNoNest.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathNoNest.test.js @@ -34,7 +34,7 @@ describe('admin/Post', () => { test('creates a layout', async () => { expect(filesLower).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/Admin/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) @@ -353,7 +353,7 @@ describe('Admin/Post', () => { test('creates a layout', async () => { expect(filesUpper).toHaveProperty([ path.normalize( - '/path/to/project/web/src/layouts/Admin/PostsLayout/PostsLayout.js' + '/path/to/project/web/src/layouts/ScaffoldLayout/ScaffoldLayout.js' ), ]) }) diff --git a/packages/cli/src/commands/generate/scaffold/scaffold.js b/packages/cli/src/commands/generate/scaffold/scaffold.js index d42355de33ac..5d04c323e8f5 100644 --- a/packages/cli/src/commands/generate/scaffold/scaffold.js +++ b/packages/cli/src/commands/generate/scaffold/scaffold.js @@ -23,6 +23,7 @@ import { addRoutesToRouterTask, addScaffoldImport, transformTSToJS, + nameVariants, } from '../../../lib' import c from '../../../lib/colors' import { pluralize, singularize } from '../../../lib/rwPluralize' @@ -67,18 +68,15 @@ const getImportComponentNames = ( const pluralName = pascalcase(pluralize(name)) const singularName = pascalcase(singularize(name)) let componentPath - let layoutPath if (scaffoldPath === '') { componentPath = nestScaffoldByModel ? `src/components/${singularName}` : `src/components` - layoutPath = `src/layouts` } else { const sP = scaffoldPath.split('/').map(pascalcase).join('/') componentPath = nestScaffoldByModel ? `src/components/${sP}/${singularName}` : `src/components/${sP}` - layoutPath = `src/layouts/${sP}` } return { @@ -89,39 +87,35 @@ const getImportComponentNames = ( importComponentNewName: `${componentPath}/New${singularName}`, importComponentNames: `${componentPath}/${pluralName}`, importComponentNamesCell: `${componentPath}/${pluralName}Cell`, - importLayoutNames: `${layoutPath}/${pluralName}Layout`, + importLayoutNames: `src/layouts/ScaffoldLayout`, } } // Includes imports from getImportComponentNames() const getTemplateStrings = (name, scaffoldPath, nestScaffoldByModel = true) => { - const pluralPascalName = pascalcase(pluralize(name)) - const singularPascalName = pascalcase(singularize(name)) - - const pluralCamelName = camelcase(pluralPascalName) - const singularCamelName = camelcase(singularPascalName) + const nameVars = nameVariants(name) const camelScaffoldPath = camelcase(pascalcase(scaffoldPath)) return { pluralRouteName: scaffoldPath === '' - ? pluralCamelName - : `${camelScaffoldPath}${pluralPascalName}`, + ? nameVars.pluralCamelName + : `${camelScaffoldPath}${nameVars.pluralPascalName}`, editRouteName: scaffoldPath === '' - ? `edit${singularPascalName}` - : `${camelScaffoldPath}Edit${singularPascalName}`, + ? `edit${nameVars.singularPascalName}` + : `${camelScaffoldPath}Edit${nameVars.singularPascalName}`, singularRouteName: scaffoldPath === '' - ? singularCamelName - : `${camelScaffoldPath}${singularPascalName}`, + ? nameVars.singularCamelName + : `${camelScaffoldPath}${nameVars.singularPascalName}`, newRouteName: scaffoldPath === '' - ? `new${singularPascalName}` - : `${camelScaffoldPath}New${singularPascalName}`, + ? `new${nameVars.singularPascalName}` + : `${camelScaffoldPath}New${nameVars.singularPascalName}`, ...getImportComponentNames(name, scaffoldPath, nestScaffoldByModel), } } @@ -143,6 +137,7 @@ export const files = async ({ tests = true, typescript = false, tailwind = false, + force = false, nestScaffoldByModel, }) => { const model = await getSchema(name) @@ -183,7 +178,7 @@ export const files = async ({ })), ...assetFiles(name, tailwind), ...(await formatters(name, typescript)), - ...layoutFiles(name, pascalScaffoldPath, typescript, templateStrings), + ...layoutFiles(name, force, typescript, templateStrings), ...(await pageFiles( name, pascalScaffoldPath, @@ -287,14 +282,7 @@ const formatters = async (name, isTypescript) => { } } -const layoutFiles = ( - name, - pascalScaffoldPath = '', - generateTypescript, - templateStrings -) => { - const pluralName = pascalcase(pluralize(name)) - const singularName = pascalcase(singularize(name)) +const layoutFiles = (name, force, generateTypescript, templateStrings) => { let fileList = {} const layouts = fs.readdirSync( @@ -306,33 +294,36 @@ const layoutFiles = ( ) layouts.forEach((layout) => { - const outputLayoutName = layout - .replace(/Names/, pluralName) - .replace(/Name/, singularName) - .replace(/\.tsx\.template/, generateTypescript ? '.tsx' : '.js') + const outputLayoutName = layout.replace( + /\.tsx\.template/, + generateTypescript ? '.tsx' : '.js' + ) const outputPath = path.join( getPaths().web.layouts, - pascalScaffoldPath, - outputLayoutName.replace(/\.(js|tsx?)/, ''), + 'ScaffoldLayout', outputLayoutName ) - const template = generateTemplate( - customOrDefaultTemplatePath({ - side: 'web', - generator: 'scaffold', - templatePath: path.join('layouts', layout), - }), - { - name, - pascalScaffoldPath, - ...templateStrings, - } - ) - fileList[outputPath] = generateTypescript - ? template - : transformTSToJS(outputPath, template) + // Since the ScaffoldLayout is shared, don't overwrite by default + if (!fs.existsSync(outputPath) || force) { + const template = generateTemplate( + customOrDefaultTemplatePath({ + side: 'web', + generator: 'scaffold', + templatePath: path.join('layouts', layout), + }), + { + name, + pascalScaffoldPath: '', + ...templateStrings, + } + ) + + fileList[outputPath] = generateTypescript + ? template + : transformTSToJS(outputPath, template) + } }) return fileList @@ -608,10 +599,8 @@ export const routes = async ({ } const templateNames = getTemplateStrings(name, scaffoldPath) - const singularPascalName = pascalcase(singularize(name)) - const pluralPascalName = pascalcase(pluralize(name)) - const pluralParamName = paramCase(pluralPascalName) - const model = await getSchema(singularPascalName) + const nameVars = nameVariants(name) + const model = await getSchema(nameVars.singularPascalName) const idRouteParam = getIdType(model) === 'Int' ? ':Int' : '' const paramScaffoldPath = @@ -621,34 +610,23 @@ export const routes = async ({ const pascalScaffoldPath = pascalcase(scaffoldPath) const pageRoot = - pascalScaffoldPath + (nestScaffoldByModel ? singularPascalName : '') + pascalScaffoldPath + + (nestScaffoldByModel ? nameVars.singularPascalName : '') return [ // new - ``, + ``, // edit - ``, + ``, // singular - ``, + ``, // plural - ``, + ``, ] } -const addRoutesInsideSetToRouter = async (model, path) => { - const pluralPascalName = pascalcase(pluralize(model)) - const layoutName = `${pluralPascalName}Layout` - return addRoutesToRouterTask(await routes({ model, path }), layoutName) -} - -const addLayoutImport = ({ model: name, path: scaffoldPath = '' }) => { - const pluralPascalName = pascalcase(pluralize(name)) - const pascalScaffoldPath = - scaffoldPath === '' - ? scaffoldPath - : scaffoldPath.split('/').map(pascalcase).join('/') + '/' - const layoutName = `${pluralPascalName}Layout` - const importLayout = `import ${pluralPascalName}Layout from 'src/layouts/${pascalScaffoldPath}${layoutName}'` +const addLayoutImport = () => { + const importLayout = `import ScaffoldLayout from 'src/layouts/ScaffoldLayout'` const routesPath = getPaths().web.routes const routesContent = readFile(routesPath).toString() @@ -715,6 +693,20 @@ const addSetImport = (task) => { return 'Added Set import to Routes.{js,tsx}' } +const addScaffoldSetToRouter = async (model, path) => { + const nameVars = nameVariants(model) + const title = nameVars.pluralPascalName + const titleTo = nameVars.pluralCamelName + const buttonLabel = `New ${nameVars.singularPascalName}` + const buttonTo = `new${nameVars.singularPascalName}` + + return addRoutesToRouterTask( + await routes({ model, path }), + 'ScaffoldLayout', + { title, titleTo, buttonLabel, buttonTo } + ) +} + export const command = 'scaffold ' export const description = 'Generate Pages, SDL, and Services files based on a given DB schema Model. Also accepts ' @@ -774,6 +766,7 @@ export const tasks = ({ typescript, javascript, tailwind, + force, }) return writeFilesTask(f, { overwriteExisting: force }) }, @@ -784,7 +777,7 @@ export const tasks = ({ }, { title: 'Adding layout import...', - task: async () => addLayoutImport({ model, path }), + task: async () => addLayoutImport(), }, { title: 'Adding set import...', @@ -792,7 +785,7 @@ export const tasks = ({ }, { title: 'Adding scaffold routes...', - task: async () => addRoutesInsideSetToRouter(model, path), + task: async () => addScaffoldSetToRouter(model, path), }, { title: 'Adding scaffold asset imports...', diff --git a/packages/cli/src/commands/generate/scaffold/templates/layouts/NamesLayout.tsx.template b/packages/cli/src/commands/generate/scaffold/templates/layouts/NamesLayout.tsx.template deleted file mode 100644 index 716c14cc7bf0..000000000000 --- a/packages/cli/src/commands/generate/scaffold/templates/layouts/NamesLayout.tsx.template +++ /dev/null @@ -1,33 +0,0 @@ -import { Link, routes } from '@redwoodjs/router' -import { Toaster } from '@redwoodjs/web/toast' - -type ${singularPascalName}LayoutProps = { - children: React.ReactNode -} - -const ${pluralPascalName}Layout = ({ children }: ${singularPascalName}LayoutProps) => { - return ( -
- -
-

- - ${pluralPascalName} - -

- -
+
New ${singularPascalName} - -
-
{children}
-
- ) -} - -export default ${pluralPascalName}Layout diff --git a/__fixtures__/test-project/web/src/layouts/PostsLayout/PostsLayout.tsx b/packages/cli/src/commands/generate/scaffold/templates/layouts/ScaffoldLayout.tsx.template similarity index 51% rename from __fixtures__/test-project/web/src/layouts/PostsLayout/PostsLayout.tsx rename to packages/cli/src/commands/generate/scaffold/templates/layouts/ScaffoldLayout.tsx.template index 336b6166f81e..2912b56706d6 100644 --- a/__fixtures__/test-project/web/src/layouts/PostsLayout/PostsLayout.tsx +++ b/packages/cli/src/commands/generate/scaffold/templates/layouts/ScaffoldLayout.tsx.template @@ -1,22 +1,32 @@ import { Link, routes } from '@redwoodjs/router' import { Toaster } from '@redwoodjs/web/toast' -type PostLayoutProps = { +type LayoutProps = { + title: string + titleTo: string + buttonLabel: string + buttonTo: string children: React.ReactNode } -const PostsLayout = ({ children }: PostLayoutProps) => { +const ScaffoldLayout = ({ + title, + titleTo, + buttonLabel, + buttonTo, + children, +}: LayoutProps) => { return (

- - Posts + + {title}

- -
+
New Post + +
+
{buttonLabel}
{children}
@@ -24,4 +34,4 @@ const PostsLayout = ({ children }: PostLayoutProps) => { ) } -export default PostsLayout +export default ScaffoldLayout diff --git a/packages/cli/src/lib/index.js b/packages/cli/src/lib/index.js index 0e54679b6ba4..213befd6dcdd 100644 --- a/packages/cli/src/lib/index.js +++ b/packages/cli/src/lib/index.js @@ -330,21 +330,35 @@ export const cleanupEmptyDirsTask = (files) => { ) } -const wrapWithSet = (routesContent, layout, routes, newLineAndIndent) => { +const wrapWithSet = ( + routesContent, + layout, + routes, + newLineAndIndent, + props = {} +) => { const [_, indentOne, indentTwo] = routesContent.match( /([ \t]*)[^<]*[\r\n]+([ \t]+)/ ) || ['', 0, 2] const oneLevelIndent = indentTwo.slice(0, indentTwo.length - indentOne.length) const newRoutesWithExtraIndent = routes.map((route) => oneLevelIndent + route) - return [``, ...newRoutesWithExtraIndent, ``].join( - newLineAndIndent - ) + + // converts { foo: 'bar' } to `foo="bar"` + const propsString = Object.entries(props) + .map((values) => `${values[0]}="${values[1]}"`) + .join(' ') + + return [ + ``, + ...newRoutesWithExtraIndent, + ``, + ].join(newLineAndIndent) } /** * Update the project's routes file. */ -export const addRoutesToRouterTask = (routes, layout) => { +export const addRoutesToRouterTask = (routes, layout, setProps = {}) => { const redwoodPaths = getPaths() const routesContent = readFile(redwoodPaths.web.routes).toString() let newRoutes = routes.filter((route) => !routesContent.match(route)) @@ -364,7 +378,13 @@ export const addRoutesToRouterTask = (routes, layout) => { } const routesBatch = layout - ? wrapWithSet(routesContent, layout, newRoutes, newLineAndIndent) + ? wrapWithSet( + routesContent, + layout, + newRoutes, + newLineAndIndent, + setProps + ) : newRoutes.join(newLineAndIndent) const newRoutesContent = routesContent.replace( diff --git a/tasks/e2e/cypress/e2e/01-tutorial/codemods/Step6_1_Routes.js b/tasks/e2e/cypress/e2e/01-tutorial/codemods/Step6_1_Routes.js index ff8615f1a320..ae80e432d911 100644 --- a/tasks/e2e/cypress/e2e/01-tutorial/codemods/Step6_1_Routes.js +++ b/tasks/e2e/cypress/e2e/01-tutorial/codemods/Step6_1_Routes.js @@ -1,7 +1,7 @@ export default ` import { Router, Route, Set } from '@redwoodjs/router' import BlogLayout from 'src/layouts/BlogLayout' -import PostsLayout from 'src/layouts/PostsLayout' +import ScaffoldLayout from 'src/layouts/ScaffoldLayout' import HomePage from 'src/pages/HomePage' const Routes = () => { @@ -12,7 +12,7 @@ const Routes = () => { - + diff --git a/tasks/e2e/cypress/e2e/01-tutorial/codemods/Step7_4_Routes.js b/tasks/e2e/cypress/e2e/01-tutorial/codemods/Step7_4_Routes.js index 7c4ba6e8673f..8f470893992d 100644 --- a/tasks/e2e/cypress/e2e/01-tutorial/codemods/Step7_4_Routes.js +++ b/tasks/e2e/cypress/e2e/01-tutorial/codemods/Step7_4_Routes.js @@ -1,7 +1,7 @@ export default ` import { Router, Route, Set } from '@redwoodjs/router' import BlogLayout from 'src/layouts/BlogLayout' -import PostsLayout from 'src/layouts/PostsLayout' +import ScaffoldLayout from 'src/layouts/ScaffoldLayout' const Routes = () => { return ( @@ -12,7 +12,7 @@ const Routes = () => { - + From b058364379afa3dad8096e293d256d7773d9288b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Sep 2022 16:10:51 -0700 Subject: [PATCH 17/41] chore(deps): update dependency @testing-library/dom to v8.18.1 (#6464) --- packages/forms/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/forms/package.json b/packages/forms/package.json index c779cb8e7bc1..3354dcd7778f 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@babel/cli": "7.18.10", "@babel/core": "7.19.1", - "@testing-library/dom": "8.17.1", + "@testing-library/dom": "8.18.1", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "12.1.5", "@testing-library/user-event": "14.4.3", diff --git a/yarn.lock b/yarn.lock index 92c8ea457a9b..5cfe1419a4c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6431,7 +6431,7 @@ __metadata: "@babel/cli": 7.18.10 "@babel/core": 7.19.1 "@babel/runtime-corejs3": 7.19.1 - "@testing-library/dom": 8.17.1 + "@testing-library/dom": 8.18.1 "@testing-library/jest-dom": 5.16.5 "@testing-library/react": 12.1.5 "@testing-library/user-event": 14.4.3 @@ -8186,9 +8186,9 @@ __metadata: languageName: node linkType: hard -"@testing-library/dom@npm:8.17.1, @testing-library/dom@npm:^8.0.0, @testing-library/dom@npm:^8.11.1": - version: 8.17.1 - resolution: "@testing-library/dom@npm:8.17.1" +"@testing-library/dom@npm:8.18.1, @testing-library/dom@npm:^8.0.0, @testing-library/dom@npm:^8.11.1": + version: 8.18.1 + resolution: "@testing-library/dom@npm:8.18.1" dependencies: "@babel/code-frame": ^7.10.4 "@babel/runtime": ^7.12.5 @@ -8198,7 +8198,7 @@ __metadata: dom-accessibility-api: ^0.5.9 lz-string: ^1.4.4 pretty-format: ^27.0.2 - checksum: 2db3a96a7694ba06056fea41474aa47ad6e82b21d4bcb2a34c7655692dc5a51a21b0b90fe3b9d4be1aa2340e18a9911bf129e4e8a134131acbc44f4b48caa28b + checksum: f5423d18c02bba4f202f5d59c6e08d8a4a17bff79d1269a98604f5cdf80195e338b0dcbbf53eaa78ae1068ea000cec8834ce0b3e12cdbab43a9281b47f6fcba3 languageName: node linkType: hard From 101273868205b4caa71eef408fd36c91dc25ecbf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Sep 2022 16:45:21 -0700 Subject: [PATCH 18/41] chore(deps): update dependency esbuild to v0.15.9 (#6466) --- packages/core/package.json | 2 +- packages/internal/package.json | 2 +- packages/record/package.json | 2 +- yarn.lock | 194 +++++++++++++++++---------------- 4 files changed, 105 insertions(+), 95 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index a35ad09be940..74be01a99c23 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -63,7 +63,7 @@ "css-loader": "6.7.1", "css-minimizer-webpack-plugin": "4.0.0", "dotenv-webpack": "8.0.1", - "esbuild": "0.15.7", + "esbuild": "0.15.9", "fast-glob": "3.2.12", "file-loader": "6.2.0", "graphql": "16.6.0", diff --git a/packages/internal/package.json b/packages/internal/package.json index 05f018f44304..7eb09c911e52 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -47,7 +47,7 @@ "chalk": "4.1.2", "core-js": "3.25.3", "deepmerge": "4.2.2", - "esbuild": "0.15.7", + "esbuild": "0.15.9", "fast-glob": "3.2.12", "findup-sync": "5.0.0", "fs-extra": "10.1.0", diff --git a/packages/record/package.json b/packages/record/package.json index 9b97dbf8a3d3..4273b72cff0b 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -35,7 +35,7 @@ "@babel/cli": "7.18.10", "@babel/core": "7.19.1", "@prisma/internals": "4.3.1", - "esbuild": "0.15.7", + "esbuild": "0.15.9", "jest": "29.0.3" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/yarn.lock b/yarn.lock index 5cfe1419a4c6..8286ea22d410 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2183,9 +2183,16 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.15.7": - version: 0.15.7 - resolution: "@esbuild/linux-loong64@npm:0.15.7" +"@esbuild/android-arm@npm:0.15.9": + version: 0.15.9 + resolution: "@esbuild/android-arm@npm:0.15.9" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + +"@esbuild/linux-loong64@npm:0.15.9": + version: 0.15.9 + resolution: "@esbuild/linux-loong64@npm:0.15.9" conditions: os=linux & cpu=loong64 languageName: node linkType: hard @@ -6357,7 +6364,7 @@ __metadata: css-loader: 6.7.1 css-minimizer-webpack-plugin: 4.0.0 dotenv-webpack: 8.0.1 - esbuild: 0.15.7 + esbuild: 0.15.9 fast-glob: 3.2.12 file-loader: 6.2.0 graphql: 16.6.0 @@ -6523,7 +6530,7 @@ __metadata: chalk: 4.1.2 core-js: 3.25.3 deepmerge: 4.2.2 - esbuild: 0.15.7 + esbuild: 0.15.9 fast-glob: 3.2.12 findup-sync: 5.0.0 fs-extra: 10.1.0 @@ -6582,7 +6589,7 @@ __metadata: "@prisma/client": 4.3.1 "@prisma/internals": 4.3.1 core-js: 3.25.3 - esbuild: 0.15.7 + esbuild: 0.15.9 jest: 29.0.3 languageName: unknown linkType: soft @@ -15340,172 +15347,175 @@ __metadata: languageName: node linkType: hard -"esbuild-android-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-android-64@npm:0.15.7" +"esbuild-android-64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-android-64@npm:0.15.9" conditions: os=android & cpu=x64 languageName: node linkType: hard -"esbuild-android-arm64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-android-arm64@npm:0.15.7" +"esbuild-android-arm64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-android-arm64@npm:0.15.9" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"esbuild-darwin-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-darwin-64@npm:0.15.7" +"esbuild-darwin-64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-darwin-64@npm:0.15.9" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"esbuild-darwin-arm64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-darwin-arm64@npm:0.15.7" +"esbuild-darwin-arm64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-darwin-arm64@npm:0.15.9" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"esbuild-freebsd-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-freebsd-64@npm:0.15.7" +"esbuild-freebsd-64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-freebsd-64@npm:0.15.9" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"esbuild-freebsd-arm64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-freebsd-arm64@npm:0.15.7" +"esbuild-freebsd-arm64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-freebsd-arm64@npm:0.15.9" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"esbuild-linux-32@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-32@npm:0.15.7" +"esbuild-linux-32@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-linux-32@npm:0.15.9" conditions: os=linux & cpu=ia32 languageName: node linkType: hard -"esbuild-linux-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-64@npm:0.15.7" +"esbuild-linux-64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-linux-64@npm:0.15.9" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"esbuild-linux-arm64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-arm64@npm:0.15.7" +"esbuild-linux-arm64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-linux-arm64@npm:0.15.9" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"esbuild-linux-arm@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-arm@npm:0.15.7" +"esbuild-linux-arm@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-linux-arm@npm:0.15.9" conditions: os=linux & cpu=arm languageName: node linkType: hard -"esbuild-linux-mips64le@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-mips64le@npm:0.15.7" +"esbuild-linux-mips64le@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-linux-mips64le@npm:0.15.9" conditions: os=linux & cpu=mips64el languageName: node linkType: hard -"esbuild-linux-ppc64le@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-ppc64le@npm:0.15.7" +"esbuild-linux-ppc64le@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-linux-ppc64le@npm:0.15.9" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard -"esbuild-linux-riscv64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-riscv64@npm:0.15.7" +"esbuild-linux-riscv64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-linux-riscv64@npm:0.15.9" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard -"esbuild-linux-s390x@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-s390x@npm:0.15.7" +"esbuild-linux-s390x@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-linux-s390x@npm:0.15.9" conditions: os=linux & cpu=s390x languageName: node linkType: hard -"esbuild-netbsd-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-netbsd-64@npm:0.15.7" +"esbuild-netbsd-64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-netbsd-64@npm:0.15.9" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"esbuild-openbsd-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-openbsd-64@npm:0.15.7" +"esbuild-openbsd-64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-openbsd-64@npm:0.15.9" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard -"esbuild-sunos-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-sunos-64@npm:0.15.7" +"esbuild-sunos-64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-sunos-64@npm:0.15.9" conditions: os=sunos & cpu=x64 languageName: node linkType: hard -"esbuild-windows-32@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-windows-32@npm:0.15.7" +"esbuild-windows-32@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-windows-32@npm:0.15.9" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"esbuild-windows-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-windows-64@npm:0.15.7" +"esbuild-windows-64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-windows-64@npm:0.15.9" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"esbuild-windows-arm64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-windows-arm64@npm:0.15.7" +"esbuild-windows-arm64@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild-windows-arm64@npm:0.15.9" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"esbuild@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild@npm:0.15.7" - dependencies: - "@esbuild/linux-loong64": 0.15.7 - esbuild-android-64: 0.15.7 - esbuild-android-arm64: 0.15.7 - esbuild-darwin-64: 0.15.7 - esbuild-darwin-arm64: 0.15.7 - esbuild-freebsd-64: 0.15.7 - esbuild-freebsd-arm64: 0.15.7 - esbuild-linux-32: 0.15.7 - esbuild-linux-64: 0.15.7 - esbuild-linux-arm: 0.15.7 - esbuild-linux-arm64: 0.15.7 - esbuild-linux-mips64le: 0.15.7 - esbuild-linux-ppc64le: 0.15.7 - esbuild-linux-riscv64: 0.15.7 - esbuild-linux-s390x: 0.15.7 - esbuild-netbsd-64: 0.15.7 - esbuild-openbsd-64: 0.15.7 - esbuild-sunos-64: 0.15.7 - esbuild-windows-32: 0.15.7 - esbuild-windows-64: 0.15.7 - esbuild-windows-arm64: 0.15.7 +"esbuild@npm:0.15.9": + version: 0.15.9 + resolution: "esbuild@npm:0.15.9" + dependencies: + "@esbuild/android-arm": 0.15.9 + "@esbuild/linux-loong64": 0.15.9 + esbuild-android-64: 0.15.9 + esbuild-android-arm64: 0.15.9 + esbuild-darwin-64: 0.15.9 + esbuild-darwin-arm64: 0.15.9 + esbuild-freebsd-64: 0.15.9 + esbuild-freebsd-arm64: 0.15.9 + esbuild-linux-32: 0.15.9 + esbuild-linux-64: 0.15.9 + esbuild-linux-arm: 0.15.9 + esbuild-linux-arm64: 0.15.9 + esbuild-linux-mips64le: 0.15.9 + esbuild-linux-ppc64le: 0.15.9 + esbuild-linux-riscv64: 0.15.9 + esbuild-linux-s390x: 0.15.9 + esbuild-netbsd-64: 0.15.9 + esbuild-openbsd-64: 0.15.9 + esbuild-sunos-64: 0.15.9 + esbuild-windows-32: 0.15.9 + esbuild-windows-64: 0.15.9 + esbuild-windows-arm64: 0.15.9 dependenciesMeta: + "@esbuild/android-arm": + optional: true "@esbuild/linux-loong64": optional: true esbuild-android-64: @@ -15550,7 +15560,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 187a3fffc5a9fbb1c32eac98cab06d7e6c60ffc197cce59822d0667612ed578a3b59c6b2251bc2df6053af594d938e54ac87c187326cc39d1c77ad64cf4c91e2 + checksum: e87c929ebba485c0137408407a049feefdf67b059b9375dc879a53bf5b0037f19bcf3630b6fb2a2f8e96fea0049b45dbc9745e7667c5184d0a319f3638654da6 languageName: node linkType: hard From 386cba74109f45b0a9831b4e1e1f0d4f2eb1fa2b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Sep 2022 16:46:16 -0700 Subject: [PATCH 19/41] chore(deps): update dependency lerna to v5.5.4 (#6467) --- package.json | 2 +- yarn.lock | 886 +++++++++++++++++++++++++-------------------------- 2 files changed, 443 insertions(+), 445 deletions(-) diff --git a/package.json b/package.json index 7cd94a6e451b..d6d5c25ec1a7 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "jest": "29.0.3", "jest-runner-tsd": "4.0.0", "jscodeshift": "0.13.1", - "lerna": "5.5.1", + "lerna": "5.5.4", "lodash.template": "4.5.0", "make-dir-cli": "3.0.0", "msw": "0.47.3", diff --git a/yarn.lock b/yarn.lock index 8286ea22d410..d010a585d3da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4007,40 +4007,40 @@ __metadata: languageName: node linkType: hard -"@lerna/add@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/add@npm:5.5.1" - dependencies: - "@lerna/bootstrap": 5.5.1 - "@lerna/command": 5.5.1 - "@lerna/filter-options": 5.5.1 - "@lerna/npm-conf": 5.5.1 - "@lerna/validation-error": 5.5.1 +"@lerna/add@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/add@npm:5.5.4" + dependencies: + "@lerna/bootstrap": 5.5.4 + "@lerna/command": 5.5.4 + "@lerna/filter-options": 5.5.4 + "@lerna/npm-conf": 5.5.4 + "@lerna/validation-error": 5.5.4 dedent: ^0.7.0 npm-package-arg: 8.1.1 p-map: ^4.0.0 pacote: ^13.6.1 semver: ^7.3.4 - checksum: 2e97d77e5a11552db4d34c91170dcc8dc48762bad00928fd6435503b77b51c121abd3daf92a8a7932284b837df976f7f241c3ef9b0937da3f9fdd33739eafc58 - languageName: node - linkType: hard - -"@lerna/bootstrap@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/bootstrap@npm:5.5.1" - dependencies: - "@lerna/command": 5.5.1 - "@lerna/filter-options": 5.5.1 - "@lerna/has-npm-version": 5.5.1 - "@lerna/npm-install": 5.5.1 - "@lerna/package-graph": 5.5.1 - "@lerna/pulse-till-done": 5.5.1 - "@lerna/rimraf-dir": 5.5.1 - "@lerna/run-lifecycle": 5.5.1 - "@lerna/run-topologically": 5.5.1 - "@lerna/symlink-binary": 5.5.1 - "@lerna/symlink-dependencies": 5.5.1 - "@lerna/validation-error": 5.5.1 + checksum: d541825b027eb615dac1fb7c61d3efc892e25fbe25cf7faf9a69afb215310c3365718232844327b20a36c9698ce0fd26b9c28ff99bf809a317d0a5b436d2030e + languageName: node + linkType: hard + +"@lerna/bootstrap@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/bootstrap@npm:5.5.4" + dependencies: + "@lerna/command": 5.5.4 + "@lerna/filter-options": 5.5.4 + "@lerna/has-npm-version": 5.5.4 + "@lerna/npm-install": 5.5.4 + "@lerna/package-graph": 5.5.4 + "@lerna/pulse-till-done": 5.5.4 + "@lerna/rimraf-dir": 5.5.4 + "@lerna/run-lifecycle": 5.5.4 + "@lerna/run-topologically": 5.5.4 + "@lerna/symlink-binary": 5.5.4 + "@lerna/symlink-dependencies": 5.5.4 + "@lerna/validation-error": 5.5.4 "@npmcli/arborist": 5.3.0 dedent: ^0.7.0 get-port: ^5.1.1 @@ -4051,119 +4051,119 @@ __metadata: p-map-series: ^2.1.0 p-waterfall: ^2.1.1 semver: ^7.3.4 - checksum: a49cdd7975bf92572bf63c3941ad4a1479cc40bf770caa3701026a897a87dc2f64e2ba97db6f0ada3c4f1afb188549753241851bea16f42c26cec2f0f532905f + checksum: f16778bf51873021e7ee49a1c969d8fc1f07b6869053ec4caf46979f43bd3794510dbdd8c491e359ab71a2bd33c65a849cce4e94877f26cf52c363afc8d9c62f languageName: node linkType: hard -"@lerna/changed@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/changed@npm:5.5.1" +"@lerna/changed@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/changed@npm:5.5.4" dependencies: - "@lerna/collect-updates": 5.5.1 - "@lerna/command": 5.5.1 - "@lerna/listable": 5.5.1 - "@lerna/output": 5.5.1 - checksum: 8e5558bf31e63a0850bf4c097958a4a54774cebd8b06e19276555344e3e4382d62d09076871a03699747f86adee5d4224df08e4037ed2650e7023ec152a835c1 + "@lerna/collect-updates": 5.5.4 + "@lerna/command": 5.5.4 + "@lerna/listable": 5.5.4 + "@lerna/output": 5.5.4 + checksum: 5bebfd0991bd29e2ade65a45636af162ca8be8e7a24981b049001c55646289ec1fdaf40338c86a6c107c197656a9368eca3c93d11fd06564e63e5ceaf724179f languageName: node linkType: hard -"@lerna/check-working-tree@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/check-working-tree@npm:5.5.1" +"@lerna/check-working-tree@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/check-working-tree@npm:5.5.4" dependencies: - "@lerna/collect-uncommitted": 5.5.1 - "@lerna/describe-ref": 5.5.1 - "@lerna/validation-error": 5.5.1 - checksum: 9e7231abc5d903a00db5e3f799101e40ac951f7af7774c8234bad1fda86187e34502bf928a9a0140ea42948ccdcb7315f526fde0586958731973540978c27b32 + "@lerna/collect-uncommitted": 5.5.4 + "@lerna/describe-ref": 5.5.4 + "@lerna/validation-error": 5.5.4 + checksum: 127234f13c632b24fdc075a728bd8730ccd29612f245c5a7a62fcca302b645bf322aaa78d2e27213fb2c753701ad510936c31ac67f85ad1dcafcd1eabb11fc5b languageName: node linkType: hard -"@lerna/child-process@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/child-process@npm:5.5.1" +"@lerna/child-process@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/child-process@npm:5.5.4" dependencies: chalk: ^4.1.0 execa: ^5.0.0 strong-log-transformer: ^2.1.0 - checksum: 10218be4687132968a4d886ed6dac907b2d5aea6edc77352d8a16aa61d414d007521cbc9cfc91264a47d188b6ee162672191a86ed8e9decf74998672796d7cff + checksum: d7f3f18d636550b725c3720abe801e3be506d43af25ca5814958ac786f2bac8c51c7757c555b94638d4d4d537c41d42359bf78b4d6c1f778aab2f3feeca51e90 languageName: node linkType: hard -"@lerna/clean@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/clean@npm:5.5.1" +"@lerna/clean@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/clean@npm:5.5.4" dependencies: - "@lerna/command": 5.5.1 - "@lerna/filter-options": 5.5.1 - "@lerna/prompt": 5.5.1 - "@lerna/pulse-till-done": 5.5.1 - "@lerna/rimraf-dir": 5.5.1 + "@lerna/command": 5.5.4 + "@lerna/filter-options": 5.5.4 + "@lerna/prompt": 5.5.4 + "@lerna/pulse-till-done": 5.5.4 + "@lerna/rimraf-dir": 5.5.4 p-map: ^4.0.0 p-map-series: ^2.1.0 p-waterfall: ^2.1.1 - checksum: e7270f63d8b1f1e60f827517455baf09bf10b7f8bde93cf815bf9c826f2423ed9366b8a68481f7a6498862e44d00eb1793e3f439e5da849b9f21ffc2d0d23979 + checksum: 7dcebab805dda6fcc639e966635ed1a09480d04e6f9bf930b312bfc952a4665e3865b403a29a31438b41ac73251b3f86d996c71d99d2261e4e2bdedfdb233a8f languageName: node linkType: hard -"@lerna/cli@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/cli@npm:5.5.1" +"@lerna/cli@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/cli@npm:5.5.4" dependencies: - "@lerna/global-options": 5.5.1 + "@lerna/global-options": 5.5.4 dedent: ^0.7.0 npmlog: ^6.0.2 yargs: ^16.2.0 - checksum: e81e48e8f59651fae001bb77d8c0ccae3b3e5fa29039dd56ddcf8621c18cd7a4fb779089b322e21e278ee6e5eb869474b4853ced38948d67a29c8be53b115f99 + checksum: 336067242feb5be13302779a7823c20e2601e30aab2e3f878063b49357ea279ae473247e9713e5dda08415a8c004e80861ec81356206ec2138ff42cac996f2e6 languageName: node linkType: hard -"@lerna/collect-uncommitted@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/collect-uncommitted@npm:5.5.1" +"@lerna/collect-uncommitted@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/collect-uncommitted@npm:5.5.4" dependencies: - "@lerna/child-process": 5.5.1 + "@lerna/child-process": 5.5.4 chalk: ^4.1.0 npmlog: ^6.0.2 - checksum: 80e11acd1aec5d51e7148c3fda5d69dd90b9631392920f1a332f026c6883ac110734e8db19a418a3fe41e249b37620e1c942eff978edddedd2a8b5522e846b67 + checksum: 778eb9854703752c5bb6df0cf68996479c084b89776c749fd9d8e36530d45c73b6f28fd85558c97539d1204da6b9058f007832847998a4b7c26fa8139343c137 languageName: node linkType: hard -"@lerna/collect-updates@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/collect-updates@npm:5.5.1" +"@lerna/collect-updates@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/collect-updates@npm:5.5.4" dependencies: - "@lerna/child-process": 5.5.1 - "@lerna/describe-ref": 5.5.1 + "@lerna/child-process": 5.5.4 + "@lerna/describe-ref": 5.5.4 minimatch: ^3.0.4 npmlog: ^6.0.2 slash: ^3.0.0 - checksum: d79edfe3ba9a650c7b46dd81d52e6bafc49debf0f41b17cae6aa57d9a920ae40f4a560e030d640290010ea2f57c39c897c0f21d05bfaffe2b17af0d2f87e1ae3 + checksum: 4bbe59dc28e08cc3198f8785c8d35bbbe5f6715a8213049816320d1f8d0ee141b21b41f4bb6166d822bbf0c58d2ee9b70834ae3a43bf96fc315d98cfeaa83016 languageName: node linkType: hard -"@lerna/command@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/command@npm:5.5.1" +"@lerna/command@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/command@npm:5.5.4" dependencies: - "@lerna/child-process": 5.5.1 - "@lerna/package-graph": 5.5.1 - "@lerna/project": 5.5.1 - "@lerna/validation-error": 5.5.1 - "@lerna/write-log-file": 5.5.1 + "@lerna/child-process": 5.5.4 + "@lerna/package-graph": 5.5.4 + "@lerna/project": 5.5.4 + "@lerna/validation-error": 5.5.4 + "@lerna/write-log-file": 5.5.4 clone-deep: ^4.0.1 dedent: ^0.7.0 execa: ^5.0.0 is-ci: ^2.0.0 npmlog: ^6.0.2 - checksum: dfc63447cf294c2844f849db8f3f3ae608ff531212d3d7f31de6ad99eaf8b1b9d9e33fe4d2ef853149ee40c2ada4860f7b695d9a1ab5cebb3ef8c969a1727a56 + checksum: 4088a21c14daa53b69679841f899e00ab69c0186f0b90fdcfc34371ab950370d84f6df60b00993e2422122d3a60194072479f77888889ce8158f8c120f0c99a0 languageName: node linkType: hard -"@lerna/conventional-commits@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/conventional-commits@npm:5.5.1" +"@lerna/conventional-commits@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/conventional-commits@npm:5.5.4" dependencies: - "@lerna/validation-error": 5.5.1 + "@lerna/validation-error": 5.5.4 conventional-changelog-angular: ^5.0.12 conventional-changelog-core: ^4.2.4 conventional-recommended-bump: ^6.1.0 @@ -4173,29 +4173,29 @@ __metadata: npmlog: ^6.0.2 pify: ^5.0.0 semver: ^7.3.4 - checksum: 048b7aeb14100df50b5f65dfde4958be30426655f4a3e1b556cd3bd38c86e00209faf6be1296d845e6147abaf537e8be27088026e034885188a56f41e296422b + checksum: 24248b09317d6e480e0025b61c84708748896b6c472c966555fe7380032b2280d0ab6073d9628410e44af5b7ac46574c8b0bb0a5f301adac229968d66b63522b languageName: node linkType: hard -"@lerna/create-symlink@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/create-symlink@npm:5.5.1" +"@lerna/create-symlink@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/create-symlink@npm:5.5.4" dependencies: cmd-shim: ^5.0.0 fs-extra: ^9.1.0 npmlog: ^6.0.2 - checksum: af590033fb38ce7e493a7749832483d8ed97aa6688ed8db2e4b6c588b7a08c4944dba28eac424cc0f10a26c83be64f45b91cd471ddb341199fa70801c143aab4 + checksum: 970a1440aa1ea550460bbe7442fdd29532cb96a98c10567dabcae0c316d55b576a90223c9d61f8f8d4665ec2e41a18de0354d4f7c8f5e300d31269375f70baad languageName: node linkType: hard -"@lerna/create@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/create@npm:5.5.1" +"@lerna/create@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/create@npm:5.5.4" dependencies: - "@lerna/child-process": 5.5.1 - "@lerna/command": 5.5.1 - "@lerna/npm-conf": 5.5.1 - "@lerna/validation-error": 5.5.1 + "@lerna/child-process": 5.5.4 + "@lerna/command": 5.5.4 + "@lerna/npm-conf": 5.5.4 + "@lerna/validation-error": 5.5.4 dedent: ^0.7.0 fs-extra: ^9.1.0 globby: ^11.0.2 @@ -4209,367 +4209,367 @@ __metadata: validate-npm-package-license: ^3.0.4 validate-npm-package-name: ^4.0.0 yargs-parser: 20.2.4 - checksum: 4f523c7fab8dc95bd5579113bff7cff10ee4e194ab2fdaff107f24d1a85b8985641f5fb06f4c65e62d962f8e5b0292f7da55bd9a30b45377a252084c7cb1a46e + checksum: c3bcd72f6a5bf72032ff34919c6fc093baac316b7167caf967b722b544390c8ea2126227fc52313aa1fc358df609ce3e4a001f75bf29e4961f82c286a61b2df0 languageName: node linkType: hard -"@lerna/describe-ref@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/describe-ref@npm:5.5.1" +"@lerna/describe-ref@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/describe-ref@npm:5.5.4" dependencies: - "@lerna/child-process": 5.5.1 + "@lerna/child-process": 5.5.4 npmlog: ^6.0.2 - checksum: 9fe472323a7cd7806a49667134e4e1ac97414246f7f3fb4582008acfbe7db4c7c9e43f89b2dc3761f68461f5acdbb5b95997665c34efacf53cb2451f5155f5bb + checksum: bdb83c2c7fa6b280cd586d3cb428977146f973d21c2684c019308714ee953c07790a640af5bf83f8fcb9cb4b18077e7683a8e92a8b8a662b2672aa229ea084bc languageName: node linkType: hard -"@lerna/diff@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/diff@npm:5.5.1" +"@lerna/diff@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/diff@npm:5.5.4" dependencies: - "@lerna/child-process": 5.5.1 - "@lerna/command": 5.5.1 - "@lerna/validation-error": 5.5.1 + "@lerna/child-process": 5.5.4 + "@lerna/command": 5.5.4 + "@lerna/validation-error": 5.5.4 npmlog: ^6.0.2 - checksum: 37a486802885db4909f0010cff8fbda5c700cbd017e1541da9cf0c826bd2a60033a3c70aa521a7459c1f879b0c64cf8614e80c1d61e48652b646df90507d553c + checksum: 5cd557400b618095a20d6eaf2eee01a24ae1c5ddb08f2d9c81140c9c8fc117588420c97a4e41efbeb5d080c1e1980a65d95d657a953dc657456a1fdca08cecce languageName: node linkType: hard -"@lerna/exec@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/exec@npm:5.5.1" - dependencies: - "@lerna/child-process": 5.5.1 - "@lerna/command": 5.5.1 - "@lerna/filter-options": 5.5.1 - "@lerna/profiler": 5.5.1 - "@lerna/run-topologically": 5.5.1 - "@lerna/validation-error": 5.5.1 +"@lerna/exec@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/exec@npm:5.5.4" + dependencies: + "@lerna/child-process": 5.5.4 + "@lerna/command": 5.5.4 + "@lerna/filter-options": 5.5.4 + "@lerna/profiler": 5.5.4 + "@lerna/run-topologically": 5.5.4 + "@lerna/validation-error": 5.5.4 p-map: ^4.0.0 - checksum: 334414cd46b7dd6cbe5c9375ebcf88c8e31e357f289cbc138271341adf40e571610fe95f51491d8380903aaa927e1cdca3903d0c9af0fa2295f6f5083a9bf6c8 + checksum: 0014c3df7fe692af7f0c719253bf3127fb3621b889f6b4ec83d265c7a87d25b4fd698ec1216da0baa25e1081b57516b89a438297801e81db5c2382d92786d9db languageName: node linkType: hard -"@lerna/filter-options@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/filter-options@npm:5.5.1" +"@lerna/filter-options@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/filter-options@npm:5.5.4" dependencies: - "@lerna/collect-updates": 5.5.1 - "@lerna/filter-packages": 5.5.1 + "@lerna/collect-updates": 5.5.4 + "@lerna/filter-packages": 5.5.4 dedent: ^0.7.0 npmlog: ^6.0.2 - checksum: 09fbf6dac153f53cf9695403b0d0987be50b165f1f4a0b3638460eaf53de1c9fb57b552c0c0576a92373fbd10bdb160c3301ef8be9325d54497eff4029005eeb + checksum: 09db5061c39472dd9ec21adcf6a37ad34f42e3b4c92e12f505b26c7f92edc221c559c2d164e71cf2a31028382e300a8bd340280a8fc70f3f48580c748547c38d languageName: node linkType: hard -"@lerna/filter-packages@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/filter-packages@npm:5.5.1" +"@lerna/filter-packages@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/filter-packages@npm:5.5.4" dependencies: - "@lerna/validation-error": 5.5.1 + "@lerna/validation-error": 5.5.4 multimatch: ^5.0.0 npmlog: ^6.0.2 - checksum: 23876f0c6dbd5bf99829a61f27fd65377af10044f9b6453c626286da22f0d080b8e2ad95ed1b777d959c0bba36b6235a957a4ce0f59506136ca2039dd4b97d87 + checksum: 3d26ffd2b32dd1313229b2cedc2852a4f84ff42f0c17fa567ff6e9ed37cf8c85d3ebefef42145db5dd969525ec7696e4be8c118b0f9a1eeb7d9a04594cf01e2d languageName: node linkType: hard -"@lerna/get-npm-exec-opts@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/get-npm-exec-opts@npm:5.5.1" +"@lerna/get-npm-exec-opts@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/get-npm-exec-opts@npm:5.5.4" dependencies: npmlog: ^6.0.2 - checksum: 06945ce83d0130ab696920d75b370d73059278eb8ad37182e7dba9fb0a227c996047e7fdd07dcda70a3d03e24d836da009f7a1067c8d9e9c07b9d612f8e999e3 + checksum: 64915942f595009ef9438e1aa7081b808d9052f78f48e70a475dc6ca25a098111df9f87b84f1343a688ce72e09eef0d321e93512f1f526b48e5a9b618a3bdd78 languageName: node linkType: hard -"@lerna/get-packed@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/get-packed@npm:5.5.1" +"@lerna/get-packed@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/get-packed@npm:5.5.4" dependencies: fs-extra: ^9.1.0 ssri: ^9.0.1 tar: ^6.1.0 - checksum: d09b01fe521069758f5d79f3086da6d2d507f9488429cb837d11fd2c3a92e4b4babee965b0bc04d0dc348346a2447eaa27ef6879fa2908aff48a204ffb7d09c5 + checksum: 732bd3ff195628d2d00c920182df780526c44756cc60c88d767d637c0e5a95e39877b02a7dbcf95d71e6954438f0e1b0c3182995b5b3ae6e96e0147cfb06bb81 languageName: node linkType: hard -"@lerna/github-client@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/github-client@npm:5.5.1" +"@lerna/github-client@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/github-client@npm:5.5.4" dependencies: - "@lerna/child-process": 5.5.1 + "@lerna/child-process": 5.5.4 "@octokit/plugin-enterprise-rest": ^6.0.1 "@octokit/rest": ^19.0.3 - git-url-parse: ^12.0.0 + git-url-parse: ^13.1.0 npmlog: ^6.0.2 - checksum: fb0485929d75ba9c23210f1f99637ceeae093650d4a24bf06a5449d2c0a47e38d721a1d9148428a149c0ffbca996f1ac85ae58d329bdd4592c8b30331f0a14e6 + checksum: 7a8bd5f75e620b1a8c4924708682b6c745f76c84f0ed66543c504265d25274b36015a29a72c3cf30a935a8ae19f521e31391f905f52021bcd65f9c87f2750bad languageName: node linkType: hard -"@lerna/gitlab-client@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/gitlab-client@npm:5.5.1" +"@lerna/gitlab-client@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/gitlab-client@npm:5.5.4" dependencies: node-fetch: ^2.6.1 npmlog: ^6.0.2 - checksum: b77f01599aa5f0b54e322af0f1e5384858518af883824c947f641574c586844f80fa2da14e2ce70f333dad9015b117c5c84b439374de25333f16feb6d8020e5e + checksum: 5cc3c7f7f867200bbab3c1b67a6359ef4520111d4800f63cadbd53963d32f1e8f21db7176d87262bde39466261d29366e16c775301b3748baaa50b9adc942065 languageName: node linkType: hard -"@lerna/global-options@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/global-options@npm:5.5.1" - checksum: 3908d7cf9459818f8217fd8f77dabd57e88808d6346434fce6ffbbfc2df2a96e50cb90536110caf19f915086ba00a7c58a52efc4a1a2755a76685a4d9d956c4e +"@lerna/global-options@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/global-options@npm:5.5.4" + checksum: bec98daa261839eeb328a3bcc874138e9a10a4d1c0102f3160e1412407a2bf9eab2fbd4e89ecc3223715185dacb43103457404f871a1b7b15e5f8c07cc7e241b languageName: node linkType: hard -"@lerna/has-npm-version@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/has-npm-version@npm:5.5.1" +"@lerna/has-npm-version@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/has-npm-version@npm:5.5.4" dependencies: - "@lerna/child-process": 5.5.1 + "@lerna/child-process": 5.5.4 semver: ^7.3.4 - checksum: 554a0cdd623941380ff6e4a1207e2f92a22098c2d95d8a1be5deb05b52d6725d1345ece46663c25ee91dcac8280887acf72bc0aa5b4c26b0bbafb1f3793da7ca + checksum: 282f637bf1c5690a103ef6fbca4fd3b4a9f2414da3e1c0572bd5a550337ecdadca3c9a97ce6e3021a69d81d9c119a3869a8a9177ebb4a816132f61536dd909e6 languageName: node linkType: hard -"@lerna/import@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/import@npm:5.5.1" +"@lerna/import@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/import@npm:5.5.4" dependencies: - "@lerna/child-process": 5.5.1 - "@lerna/command": 5.5.1 - "@lerna/prompt": 5.5.1 - "@lerna/pulse-till-done": 5.5.1 - "@lerna/validation-error": 5.5.1 + "@lerna/child-process": 5.5.4 + "@lerna/command": 5.5.4 + "@lerna/prompt": 5.5.4 + "@lerna/pulse-till-done": 5.5.4 + "@lerna/validation-error": 5.5.4 dedent: ^0.7.0 fs-extra: ^9.1.0 p-map-series: ^2.1.0 - checksum: af941ed102b76e0a8aaebd06a59de374c5b47bead0e33a76cc29c815808e98a53c416c2e675130d1ec1c7dea40cbce37d6e18680b2e8fc21739778ade05249fd + checksum: eaba7a11abc55678cae873b352d9a4dcd74c63a77e38b83f798b9e32f13f85738b0e521520c1d183da9c60c65b32df866b03b14d3fbb9c33436740f6071baa25 languageName: node linkType: hard -"@lerna/info@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/info@npm:5.5.1" +"@lerna/info@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/info@npm:5.5.4" dependencies: - "@lerna/command": 5.5.1 - "@lerna/output": 5.5.1 + "@lerna/command": 5.5.4 + "@lerna/output": 5.5.4 envinfo: ^7.7.4 - checksum: 82b479b28439ac2c39e6bd5cbe505f11aeb16584429cc859abac72a609158f9d9324d6c680acc1ee994cd620067269ccca6cdaa061bfcbcb72cc942030c60d49 + checksum: 99a760d4db1da9c9ddc138921577fc6d48b998696c491c0528f09168be325a43a40c491fbb707425622923c816d48ddb4c26bd413b730d1305416403e5644533 languageName: node linkType: hard -"@lerna/init@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/init@npm:5.5.1" +"@lerna/init@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/init@npm:5.5.4" dependencies: - "@lerna/child-process": 5.5.1 - "@lerna/command": 5.5.1 - "@lerna/project": 5.5.1 + "@lerna/child-process": 5.5.4 + "@lerna/command": 5.5.4 + "@lerna/project": 5.5.4 fs-extra: ^9.1.0 p-map: ^4.0.0 write-json-file: ^4.3.0 - checksum: f05e79110956a1c36fcd678ea3e23fefd60b122883bb410714aef64124e95d1f83bd58f07f53a704bf16bf09eb0dafc77fe6743ce8edec4e6cadbc41299f9716 + checksum: 2028cece6f8654a4672e7c5a8f1b007a541205e5024de5d61d604c3699cb6ec5864429d0fd9b4a997d200ec1b11fb3f861149075edd4f4406c9e558fc1262f3e languageName: node linkType: hard -"@lerna/link@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/link@npm:5.5.1" +"@lerna/link@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/link@npm:5.5.4" dependencies: - "@lerna/command": 5.5.1 - "@lerna/package-graph": 5.5.1 - "@lerna/symlink-dependencies": 5.5.1 - "@lerna/validation-error": 5.5.1 + "@lerna/command": 5.5.4 + "@lerna/package-graph": 5.5.4 + "@lerna/symlink-dependencies": 5.5.4 + "@lerna/validation-error": 5.5.4 p-map: ^4.0.0 slash: ^3.0.0 - checksum: 6980fdb8f90fe52f930b8ca618a88bf170e3546456f5f368afd201d45f421836d4189379ff8018ee325abaa49719d8b7bf0666637030a97ec5b04b564da50079 + checksum: fe7214837e3d17f6df9c5399a8fa1caa8d47f9c800811ca758b0c1c41024101a1a13aacb005ac47b523a5f141bfd902b78b4d7ad639679e6791d50dfa1ab6f38 languageName: node linkType: hard -"@lerna/list@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/list@npm:5.5.1" +"@lerna/list@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/list@npm:5.5.4" dependencies: - "@lerna/command": 5.5.1 - "@lerna/filter-options": 5.5.1 - "@lerna/listable": 5.5.1 - "@lerna/output": 5.5.1 - checksum: 7bc5ad76cceb2acc351e6e9e29ea334eb58502c2bf1a0678923009e864bf5194e383b591ca6a8a8faf79c275f44c5ebdf251ff4d768fa7eb76d08eb1f59ad704 + "@lerna/command": 5.5.4 + "@lerna/filter-options": 5.5.4 + "@lerna/listable": 5.5.4 + "@lerna/output": 5.5.4 + checksum: d31d898b626d16dcb22b34d010ba455321a5228c36a17cd5550badd7b472e1ab5a744d64239750e3adc4201c9a0144c8fd07fbc71382d95e3234984cca8cf483 languageName: node linkType: hard -"@lerna/listable@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/listable@npm:5.5.1" +"@lerna/listable@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/listable@npm:5.5.4" dependencies: - "@lerna/query-graph": 5.5.1 + "@lerna/query-graph": 5.5.4 chalk: ^4.1.0 columnify: ^1.6.0 - checksum: a6879ff24039fce807f70a90c3a77f4298ec8829153cf39796a514dcb81f3e900d1cf77f1d107b45313f16876344ccd2a5d85952ebcc184b62d36fe2667b955d + checksum: 4c9ac1c3aa503f48fda26025a0df798a88563c30895ca289d891d57a8c6ba54d53952f41dfc91ec8bafc44c8afa2767e84d658fe0a9a26cd79fe72cf262f8d4c languageName: node linkType: hard -"@lerna/log-packed@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/log-packed@npm:5.5.1" +"@lerna/log-packed@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/log-packed@npm:5.5.4" dependencies: byte-size: ^7.0.0 columnify: ^1.6.0 has-unicode: ^2.0.1 npmlog: ^6.0.2 - checksum: 1f2fe96ea8090967f9b0755927bf40980e51ed1da8a92dc35d13dcc2179ce13d2f3537daf1b4b736a3301e1e0eed4ac9c1a9e3f77f41e50f1d77e5ad5401d0a7 + checksum: 2350b5090e6b0bfc58369260a35f968c205e98ecd3ca0d867baf763bd7fba3972b84d25683d0bbef40efa92e38c90a2ac5f23ffb67b7db887c15c70396ec5155 languageName: node linkType: hard -"@lerna/npm-conf@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/npm-conf@npm:5.5.1" +"@lerna/npm-conf@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/npm-conf@npm:5.5.4" dependencies: config-chain: ^1.1.12 pify: ^5.0.0 - checksum: 776eb0b4a7f7b78a1fef9da8537f800c70e1e71dae946dcfd67ea040df0516f2d476902fd02bc346060a5afb9c825a81229e81057822fd36cb82da3b5204453a + checksum: 9a174f24e6c495cc9473ee8a5e7955d3e4d86bdfcf9acc7bda16ca2e75f51cac903c2b166d96186022c790ead77ccf63f469f1acba2873a8e510a7444d06f764 languageName: node linkType: hard -"@lerna/npm-dist-tag@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/npm-dist-tag@npm:5.5.1" +"@lerna/npm-dist-tag@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/npm-dist-tag@npm:5.5.4" dependencies: - "@lerna/otplease": 5.5.1 + "@lerna/otplease": 5.5.4 npm-package-arg: 8.1.1 npm-registry-fetch: ^13.3.0 npmlog: ^6.0.2 - checksum: 7fa6353d1d4730209499f8128ca9a3b9c09a2c6433c47516fc6c99040e2eb202e58dcdbb5d06422ac808d283ab1206acb0fac796fee2519edf7173fe257abebb + checksum: c2b7f00a8e2ee1e7da059cd0f0a2cc7e709e419f8d69ca56370e05b83f137721eae376443a3fef25ad6bc371c7d65ded37097e4123d1ac381f248181c55cd0be languageName: node linkType: hard -"@lerna/npm-install@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/npm-install@npm:5.5.1" +"@lerna/npm-install@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/npm-install@npm:5.5.4" dependencies: - "@lerna/child-process": 5.5.1 - "@lerna/get-npm-exec-opts": 5.5.1 + "@lerna/child-process": 5.5.4 + "@lerna/get-npm-exec-opts": 5.5.4 fs-extra: ^9.1.0 npm-package-arg: 8.1.1 npmlog: ^6.0.2 signal-exit: ^3.0.3 write-pkg: ^4.0.0 - checksum: e109ff623e6aa0bc97835a56ddb076ecb07f4769aec670c2dbdcdda91f4f750724442e0a248cbb35904b2397a9ed471ab4264ad7535a25800731ab10d6adb273 + checksum: 8db7f21cbb7181784c2589e6dce26a32ea1915eb59abd4bd7997f82de48a5bb4dbaaac79908fc802067f1061fce1f040c3d7a01a29cb79df637b6785a6ec6384 languageName: node linkType: hard -"@lerna/npm-publish@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/npm-publish@npm:5.5.1" +"@lerna/npm-publish@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/npm-publish@npm:5.5.4" dependencies: - "@lerna/otplease": 5.5.1 - "@lerna/run-lifecycle": 5.5.1 + "@lerna/otplease": 5.5.4 + "@lerna/run-lifecycle": 5.5.4 fs-extra: ^9.1.0 libnpmpublish: ^6.0.4 npm-package-arg: 8.1.1 npmlog: ^6.0.2 pify: ^5.0.0 read-package-json: ^5.0.1 - checksum: e96a6e9d10a00e6bb3bf45cc46c5623e2ea2b5b1123d1d2439c315c4b9dde2a1aa1e368da6ba6219e61e909b1855522de15e04802c0f3c1dd688431d57989d5c + checksum: 3185befdb77511db6ebc4d00c80a1b7b56436d14b491b44edc621e1f1c6a0bee52f2e9be8ea76dd088caf4078e366431e39ad102a05981e2b11592ead43c3f78 languageName: node linkType: hard -"@lerna/npm-run-script@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/npm-run-script@npm:5.5.1" +"@lerna/npm-run-script@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/npm-run-script@npm:5.5.4" dependencies: - "@lerna/child-process": 5.5.1 - "@lerna/get-npm-exec-opts": 5.5.1 + "@lerna/child-process": 5.5.4 + "@lerna/get-npm-exec-opts": 5.5.4 npmlog: ^6.0.2 - checksum: baeb86708185f0d56763d47889aae70c47f3cdac941e35af6acd2d30ea4e9e7254ebb1d495823d250a87d187b6d957ac1b532f6f2659cd5d3e7fbcd40fa6ee8b + checksum: 994921f1ad2f7f0cccde67ea644d10e08eb05683bb0281c203f1b1d0c5e4bfa4c57e896d15d3c9911585e90d8fbedbf5a5dea883b30e17b6f13c6f6f75741f08 languageName: node linkType: hard -"@lerna/otplease@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/otplease@npm:5.5.1" +"@lerna/otplease@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/otplease@npm:5.5.4" dependencies: - "@lerna/prompt": 5.5.1 - checksum: b884cb225e278bfd566359b3a7c6af9bebc279e074f0398f66db43e8417dfd820535de65de5045c0b487e100cf9d77878ef96383ce4463bbefed89c3713f1f96 + "@lerna/prompt": 5.5.4 + checksum: f853a0661dac4c933fa24e4a6b0ca8fc6ed755b5fe102054b4d5e9f89e237520fdd92d2f5e13c34959a57501407f1688b661036eb8cc0958e7ae213d38d4d3fd languageName: node linkType: hard -"@lerna/output@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/output@npm:5.5.1" +"@lerna/output@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/output@npm:5.5.4" dependencies: npmlog: ^6.0.2 - checksum: 8a5fbb547cb96f393144e7f50add9ff089e2f21c8d8cee6f09a7bac9480c1904dcc22fd100e5b7f384c7fe4fe8bd30c1273fc945315bce3745caeacd6862385d + checksum: 1177a9fb6b9a34d74fd4e38fb03901dbdecb3ae6d8d200f8d8448df02f750615f96d473ec97e98c87b3fb12720813fe92b341cafdacc854da42b9ce26b310c59 languageName: node linkType: hard -"@lerna/pack-directory@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/pack-directory@npm:5.5.1" +"@lerna/pack-directory@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/pack-directory@npm:5.5.4" dependencies: - "@lerna/get-packed": 5.5.1 - "@lerna/package": 5.5.1 - "@lerna/run-lifecycle": 5.5.1 - "@lerna/temp-write": 5.5.1 + "@lerna/get-packed": 5.5.4 + "@lerna/package": 5.5.4 + "@lerna/run-lifecycle": 5.5.4 + "@lerna/temp-write": 5.5.4 npm-packlist: ^5.1.1 npmlog: ^6.0.2 tar: ^6.1.0 - checksum: 7c4aad050b1af48cc4b16891a0b7b218b22f080ba109475108e7317110eca5dc5dcfef31354ece5ef775f66c44b81a6c426473597a328df4e7315e4eaa001b07 + checksum: ee5764b849dbd434fbe9ee7a14767730db524b31b8a835df52252f34d2f274697b2dfd83ab41ceef759ff3372778a8648b4318487c9ecad96a3c00ba3c9df839 languageName: node linkType: hard -"@lerna/package-graph@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/package-graph@npm:5.5.1" +"@lerna/package-graph@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/package-graph@npm:5.5.4" dependencies: - "@lerna/prerelease-id-from-version": 5.5.1 - "@lerna/validation-error": 5.5.1 + "@lerna/prerelease-id-from-version": 5.5.4 + "@lerna/validation-error": 5.5.4 npm-package-arg: 8.1.1 npmlog: ^6.0.2 semver: ^7.3.4 - checksum: 450d8052342e59d4cc7e15c02617e215cb412226dcffeb03186d11772e21aa2b4fce883c57f9ec063aebceb88476f45b22e068b137681e8062b1399dee9a5b8f + checksum: 624498d1f88f20da1a9f0ffb8091790e93f4878881c6955b397a280462ce2ea750570e8b54fbbd8e80e60de9af9879d39223fa427c244cb9c4de7670fd5b34d2 languageName: node linkType: hard -"@lerna/package@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/package@npm:5.5.1" +"@lerna/package@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/package@npm:5.5.4" dependencies: load-json-file: ^6.2.0 npm-package-arg: 8.1.1 write-pkg: ^4.0.0 - checksum: 1861f69b8f44b20f037292edcb5b9a1cde946508df574254f5cfa2b7e78c8bf2cd1f2744afdd8d30267981fdc0af0e1f7f7a806979ebbd80f36590e23f110b3b + checksum: 75b5067e55624da58f834682825c7027b5195e6e43a5b52e6a150dc7f92b8e5623659d6c5132b96f0c367ba3660c23cd6a62a07d0a427d1aff61e71709761592 languageName: node linkType: hard -"@lerna/prerelease-id-from-version@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/prerelease-id-from-version@npm:5.5.1" +"@lerna/prerelease-id-from-version@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/prerelease-id-from-version@npm:5.5.4" dependencies: semver: ^7.3.4 - checksum: 9211129324dfdb39aed169652ce8478bf3dc4931078a4f0ad8266c423af20bf1dc025059bbaacdecfbb5a429e203e6d7d35370420befb9337f2862620273c8dd + checksum: 3aec7edb021e9b29916414d4372b0f13a6e1151395d2a6370d1d01dd79303deb0659348747ae345dda12677f53b212cccd8e541d4733c3fc5d098189b8585b17 languageName: node linkType: hard -"@lerna/profiler@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/profiler@npm:5.5.1" +"@lerna/profiler@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/profiler@npm:5.5.4" dependencies: fs-extra: ^9.1.0 npmlog: ^6.0.2 upath: ^2.0.1 - checksum: 233586196798ea18b645d7a2903d8492b707dadd46860fe9275e2e81e1dbdf578ea652f088a3d936592b48b62f568b86528eb704c0483a4c6b5252500d7169ce + checksum: 30d9c6a168d0d40a809dad04c8f224e1cd68eb0ce64c51e3aed6a7b367936b287ca908ae80af1f9492d10cd9c3412bd3b5f56ee6dca29ab7d3e8668f89b5aedb languageName: node linkType: hard -"@lerna/project@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/project@npm:5.5.1" +"@lerna/project@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/project@npm:5.5.4" dependencies: - "@lerna/package": 5.5.1 - "@lerna/validation-error": 5.5.1 + "@lerna/package": 5.5.4 + "@lerna/validation-error": 5.5.4 cosmiconfig: ^7.0.0 dedent: ^0.7.0 dot-prop: ^6.0.1 @@ -4581,43 +4581,43 @@ __metadata: p-map: ^4.0.0 resolve-from: ^5.0.0 write-json-file: ^4.3.0 - checksum: bfeaf8420939bbbdd92e7b9dadf5a967c74a2bef95722b678c144a7e161afb103bc896c2533aaa6e887183c3244d74042247599a1cbcabb51f10398f6b2f4cdd + checksum: c1d11de4f7bb21b76b2367cde21b0b48934a882d83feed5d13d4dea3b0b5ed98c2cc7b21d702c7a1b08f122182b87efdf9ceaaa85f5148e41393e8567cf4ecee languageName: node linkType: hard -"@lerna/prompt@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/prompt@npm:5.5.1" +"@lerna/prompt@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/prompt@npm:5.5.4" dependencies: inquirer: ^8.2.4 npmlog: ^6.0.2 - checksum: 90df57e4ff6ed7612262961b05ddf85371667aea255b4f9561f4657bea5b6ff801d456e0077f4964c3cb3fc52a381d1a900e0c67bd7bd484f96002fa45f5a0b3 - languageName: node - linkType: hard - -"@lerna/publish@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/publish@npm:5.5.1" - dependencies: - "@lerna/check-working-tree": 5.5.1 - "@lerna/child-process": 5.5.1 - "@lerna/collect-updates": 5.5.1 - "@lerna/command": 5.5.1 - "@lerna/describe-ref": 5.5.1 - "@lerna/log-packed": 5.5.1 - "@lerna/npm-conf": 5.5.1 - "@lerna/npm-dist-tag": 5.5.1 - "@lerna/npm-publish": 5.5.1 - "@lerna/otplease": 5.5.1 - "@lerna/output": 5.5.1 - "@lerna/pack-directory": 5.5.1 - "@lerna/prerelease-id-from-version": 5.5.1 - "@lerna/prompt": 5.5.1 - "@lerna/pulse-till-done": 5.5.1 - "@lerna/run-lifecycle": 5.5.1 - "@lerna/run-topologically": 5.5.1 - "@lerna/validation-error": 5.5.1 - "@lerna/version": 5.5.1 + checksum: ecd77631817dba2f121b6e11a9b2996121f4db053fd2d9e52e8779b648a9005f69fe1e050b3030e4b4a31e5da9bf2b96a3929eebec4df2349d9875ff89d56caf + languageName: node + linkType: hard + +"@lerna/publish@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/publish@npm:5.5.4" + dependencies: + "@lerna/check-working-tree": 5.5.4 + "@lerna/child-process": 5.5.4 + "@lerna/collect-updates": 5.5.4 + "@lerna/command": 5.5.4 + "@lerna/describe-ref": 5.5.4 + "@lerna/log-packed": 5.5.4 + "@lerna/npm-conf": 5.5.4 + "@lerna/npm-dist-tag": 5.5.4 + "@lerna/npm-publish": 5.5.4 + "@lerna/otplease": 5.5.4 + "@lerna/output": 5.5.4 + "@lerna/pack-directory": 5.5.4 + "@lerna/prerelease-id-from-version": 5.5.4 + "@lerna/prompt": 5.5.4 + "@lerna/pulse-till-done": 5.5.4 + "@lerna/run-lifecycle": 5.5.4 + "@lerna/run-topologically": 5.5.4 + "@lerna/validation-error": 5.5.4 + "@lerna/version": 5.5.4 fs-extra: ^9.1.0 libnpmaccess: ^6.0.3 npm-package-arg: 8.1.1 @@ -4627,163 +4627,164 @@ __metadata: p-pipe: ^3.1.0 pacote: ^13.6.1 semver: ^7.3.4 - checksum: f084959c2367f4eaa8c4d1dc4dcf1dedd5d30d730f7392c93a20bcb822b0eceef2d05d8b3d7cf80bd06af548b1d673854f5072da82379e3bdd8da133fb49090b + checksum: 05f6ecd7a83cc195f7b2a74fd80ecd1c868e2acef643fd9b619ba1c348cba4195ce874293ed1f1ae834d9957a296769bb1986726efd299ebf2043e6862f5df5a languageName: node linkType: hard -"@lerna/pulse-till-done@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/pulse-till-done@npm:5.5.1" +"@lerna/pulse-till-done@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/pulse-till-done@npm:5.5.4" dependencies: npmlog: ^6.0.2 - checksum: f350a8fef7986f968ff0921a87d04be69ed7f418d385b190edb3eda78f19564d07258efece8888cc7c3a23065ac083883f8a9ab0619ddfb0ecf7a1217dbcfb16 + checksum: a43ecd9cc323b176add7914f988f6576531e5786bbbc163b892fd33a5522f33edf44d4d413562d65105fb2caad54170722c7cd8e36c542997a9312250f548e0c languageName: node linkType: hard -"@lerna/query-graph@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/query-graph@npm:5.5.1" +"@lerna/query-graph@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/query-graph@npm:5.5.4" dependencies: - "@lerna/package-graph": 5.5.1 - checksum: f4cfd28066294fcb807d3968c0893aef0524e618dfb17a83329efe9dfcd65721f5b482021464762e851cc867f5268fd974a16d0db3c6c5a4b69ffdec5fff046e + "@lerna/package-graph": 5.5.4 + checksum: e4efe4d08b5ef6c917cb45cce4380290e19e8e969dc3c1b6143fc069d42097a8d9ab9fc24eeae7e57eb26e1a4350c28808da1ce3feded0bf37f631b215505ff7 languageName: node linkType: hard -"@lerna/resolve-symlink@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/resolve-symlink@npm:5.5.1" +"@lerna/resolve-symlink@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/resolve-symlink@npm:5.5.4" dependencies: fs-extra: ^9.1.0 npmlog: ^6.0.2 read-cmd-shim: ^3.0.0 - checksum: fff60439221afb50677595936ccf10762db0fede21013f3f95821656c3bd4addb05ab5c6d0dab98b93f30407e030c7b7014bc4ced8a419704f4178875daa1783 + checksum: 587e74b38834450915662ae4d9d855b3f3662dcc41d7f19d8328c2ce959b4d7b7785d6bf2df3765c284eb8add7fee95d340d477fe32bd2dfae53fbf107181caf languageName: node linkType: hard -"@lerna/rimraf-dir@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/rimraf-dir@npm:5.5.1" +"@lerna/rimraf-dir@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/rimraf-dir@npm:5.5.4" dependencies: - "@lerna/child-process": 5.5.1 + "@lerna/child-process": 5.5.4 npmlog: ^6.0.2 path-exists: ^4.0.0 rimraf: ^3.0.2 - checksum: 715f4b09651ef989ba174990c85523af49ded8a8d3fdc5d0a98d7326e7ab1b8b076d1209e2d579cc05c45f81a689988671ade7dd050dff649beea2cef6d3eec0 + checksum: f6e9e57e5afd3c73af3417b7d4f2582d0f6701d39a9bcd01cf01d5f19ad83aead7808b9f3abf6cd5462fea39f41b529e5d6020b720ede375c3e68654de224224 languageName: node linkType: hard -"@lerna/run-lifecycle@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/run-lifecycle@npm:5.5.1" +"@lerna/run-lifecycle@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/run-lifecycle@npm:5.5.4" dependencies: - "@lerna/npm-conf": 5.5.1 + "@lerna/npm-conf": 5.5.4 "@npmcli/run-script": ^4.1.7 npmlog: ^6.0.2 p-queue: ^6.6.2 - checksum: 64067b2371929cb43b1fb81e2753c02393065c44f5059c9f9e3838fa17eebf124df98791572d25fc29e8298c2cd893ea8542f8ffc1411c60df6370bb4216eab8 + checksum: d7fc60d1745bdbbbb35bcec1c3905f0beec374383100c551480d7922600a3e612deb5ae415ffb1ddf0c8052ebc54fbb66c5e9c308be1237b5b24500f8534a204 languageName: node linkType: hard -"@lerna/run-topologically@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/run-topologically@npm:5.5.1" +"@lerna/run-topologically@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/run-topologically@npm:5.5.4" dependencies: - "@lerna/query-graph": 5.5.1 + "@lerna/query-graph": 5.5.4 p-queue: ^6.6.2 - checksum: 66348e3469cc7af9ba01d2df6d1a9642d6ecaa6023b8c2a3c14d3ca19f413aecafc0f7ef0a83840c2547412e1ba082a043adb5b7fb6bcc5ad7aba0443c536d2a + checksum: 9b58cee31853f26c1fa80a000730cbf3a5a6bf141ee4df94dd145c109f3b9c11999944b9ebadf077ceeb4fc8cfdc721b589103092a8363dcf00093badb64d9cb languageName: node linkType: hard -"@lerna/run@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/run@npm:5.5.1" - dependencies: - "@lerna/command": 5.5.1 - "@lerna/filter-options": 5.5.1 - "@lerna/npm-run-script": 5.5.1 - "@lerna/output": 5.5.1 - "@lerna/profiler": 5.5.1 - "@lerna/run-topologically": 5.5.1 - "@lerna/timer": 5.5.1 - "@lerna/validation-error": 5.5.1 +"@lerna/run@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/run@npm:5.5.4" + dependencies: + "@lerna/command": 5.5.4 + "@lerna/filter-options": 5.5.4 + "@lerna/npm-run-script": 5.5.4 + "@lerna/output": 5.5.4 + "@lerna/profiler": 5.5.4 + "@lerna/run-topologically": 5.5.4 + "@lerna/timer": 5.5.4 + "@lerna/validation-error": 5.5.4 + fs-extra: ^9.1.0 p-map: ^4.0.0 - checksum: a1d3d535229e2222807f89d32b68c9631e9fcb5ccb9de63ce1d8b03e64ea99de92f71cafeabbff26d052d7961dd537cdbaec49d676354540e4f3e1dbeebda339 + checksum: c4767d872e36b8193a53dcaaedb5ea42109e921d82f3b7a2120e92dba077015ca61fce8f430a7c35075f04282b3936b263b8f617c1fa6b49065dfcd1949f80c9 languageName: node linkType: hard -"@lerna/symlink-binary@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/symlink-binary@npm:5.5.1" +"@lerna/symlink-binary@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/symlink-binary@npm:5.5.4" dependencies: - "@lerna/create-symlink": 5.5.1 - "@lerna/package": 5.5.1 + "@lerna/create-symlink": 5.5.4 + "@lerna/package": 5.5.4 fs-extra: ^9.1.0 p-map: ^4.0.0 - checksum: d8c5579f5dfc02d16c6cf4197294c1fcacc77884e5cc5cd6d6aa11db120ad25c0d42905f5878d4709c5f2b28b9218d499c314d51b9db12f21f00b8ea91e1461e + checksum: d04a842b0a911129d273b84f69b14e5c78ba238c32597ab60ef6a394761c9776566e5a1a1d6bbbc15c6902886803686ba5deba429373cb52fa00a3d0e18f1242 languageName: node linkType: hard -"@lerna/symlink-dependencies@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/symlink-dependencies@npm:5.5.1" +"@lerna/symlink-dependencies@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/symlink-dependencies@npm:5.5.4" dependencies: - "@lerna/create-symlink": 5.5.1 - "@lerna/resolve-symlink": 5.5.1 - "@lerna/symlink-binary": 5.5.1 + "@lerna/create-symlink": 5.5.4 + "@lerna/resolve-symlink": 5.5.4 + "@lerna/symlink-binary": 5.5.4 fs-extra: ^9.1.0 p-map: ^4.0.0 p-map-series: ^2.1.0 - checksum: a1fa65526560cb6168a5c83c8ef0141afce32ac17cbe71c080152c8f357848692a9b416ecbee6deaeff02c7771418f2e1bf59c2597fc57044371e964d3eea5eb + checksum: 9d3119325f48d78f94b28e24bc95e4ad7a3f81e02b48191e775a864de448ef2a8a5fb05ba7cbab21799bb52c9707583c0ff5b3485e727046c0f4cfd7b3755c08 languageName: node linkType: hard -"@lerna/temp-write@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/temp-write@npm:5.5.1" +"@lerna/temp-write@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/temp-write@npm:5.5.4" dependencies: graceful-fs: ^4.1.15 is-stream: ^2.0.0 make-dir: ^3.0.0 temp-dir: ^1.0.0 uuid: ^8.3.2 - checksum: b2f0b663d913425f86b8bfa832ddacb246cb570d20eca4a69be26af2ee13c0c54212815dd209318a91849ac203e92868a4a02f3d5e309e46d38f020969ca7c9c + checksum: 2910e41c3913dac6b02910039766d0043580500a6a834ae594589d5e80a08ebe800da320c34f378584177d573d75d843d3dfb0ab09da116c596380678ad723e6 languageName: node linkType: hard -"@lerna/timer@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/timer@npm:5.5.1" - checksum: d3b26838eda61356095c227e84ecc335229930c954f7217ae47766fb339e2481906c9cbec31dd91643199d1597e9be3e20120c281cb2f97e24c5c4ee9725ad3b +"@lerna/timer@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/timer@npm:5.5.4" + checksum: 6418ac38384f150ca74d8582da578cbf078ef133f5d982ea88900b68347e69ba4dbbf9569fff4898ef572e3b8848c7d2d08c1be56103dc5a86ae82fdfacdb6aa languageName: node linkType: hard -"@lerna/validation-error@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/validation-error@npm:5.5.1" +"@lerna/validation-error@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/validation-error@npm:5.5.4" dependencies: npmlog: ^6.0.2 - checksum: a7f5037516229efe4895b8710a465e41a57fd3c391396f298363e6ac92376a46433bfb31a4fb899bc796c9eae8bafc22f9aff9e24977687b05b03946f7be270b - languageName: node - linkType: hard - -"@lerna/version@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/version@npm:5.5.1" - dependencies: - "@lerna/check-working-tree": 5.5.1 - "@lerna/child-process": 5.5.1 - "@lerna/collect-updates": 5.5.1 - "@lerna/command": 5.5.1 - "@lerna/conventional-commits": 5.5.1 - "@lerna/github-client": 5.5.1 - "@lerna/gitlab-client": 5.5.1 - "@lerna/output": 5.5.1 - "@lerna/prerelease-id-from-version": 5.5.1 - "@lerna/prompt": 5.5.1 - "@lerna/run-lifecycle": 5.5.1 - "@lerna/run-topologically": 5.5.1 - "@lerna/temp-write": 5.5.1 - "@lerna/validation-error": 5.5.1 + checksum: 78e0d44669d5c321d1e668c54165e06a52f72e369f0e9fd5917f95da72e64d4eb007d2ba732bfe68ad23e942702f2265d37d6340ddce3ad38bc798773eb14d98 + languageName: node + linkType: hard + +"@lerna/version@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/version@npm:5.5.4" + dependencies: + "@lerna/check-working-tree": 5.5.4 + "@lerna/child-process": 5.5.4 + "@lerna/collect-updates": 5.5.4 + "@lerna/command": 5.5.4 + "@lerna/conventional-commits": 5.5.4 + "@lerna/github-client": 5.5.4 + "@lerna/gitlab-client": 5.5.4 + "@lerna/output": 5.5.4 + "@lerna/prerelease-id-from-version": 5.5.4 + "@lerna/prompt": 5.5.4 + "@lerna/run-lifecycle": 5.5.4 + "@lerna/run-topologically": 5.5.4 + "@lerna/temp-write": 5.5.4 + "@lerna/validation-error": 5.5.4 chalk: ^4.1.0 dedent: ^0.7.0 load-json-file: ^6.2.0 @@ -4796,17 +4797,17 @@ __metadata: semver: ^7.3.4 slash: ^3.0.0 write-json-file: ^4.3.0 - checksum: 673b0e40ef75b4d0e790dc535f4485990cc1a509e8cc727a2c7df9e0aae65ff9513f692f60f318174ca4a95ba369a9e21a2259d1bda3c4da2dfe59136b155c0c + checksum: dfb53b3172cda7342c11ec63df4cb53dfc409ace246ae02881aeca9c0257b8513297219716a928869d0e386827835ec9f897a553703b554dd5b78a8802131bad languageName: node linkType: hard -"@lerna/write-log-file@npm:5.5.1": - version: 5.5.1 - resolution: "@lerna/write-log-file@npm:5.5.1" +"@lerna/write-log-file@npm:5.5.4": + version: 5.5.4 + resolution: "@lerna/write-log-file@npm:5.5.4" dependencies: npmlog: ^6.0.2 write-file-atomic: ^4.0.1 - checksum: 84d7c9e905254e0db6fa932d18c8abd4b7ac6660bf8112a73902ef7c1dfe4e8e6459505b822b276ab178068b6d66600cf6ee8f2a884542c2213a44147d041362 + checksum: e37c5791565c67faca08265be01e9299cae58c58e4fb06a5d07c10d124e04ecab8e4fd082d35bce64358a458bf5e0dc255eeb51ad7722f41ce5ee593b58bfdcf languageName: node linkType: hard @@ -17564,22 +17565,22 @@ __metadata: languageName: node linkType: hard -"git-up@npm:^6.0.0": - version: 6.0.0 - resolution: "git-up@npm:6.0.0" +"git-up@npm:^7.0.0": + version: 7.0.0 + resolution: "git-up@npm:7.0.0" dependencies: is-ssh: ^1.4.0 - parse-url: ^7.0.2 - checksum: a3e7f336358c8c206eecb8b70cb3db740bfe7c23468006debc18dace78852234c23fb622e678e0c3c84ac5f591d927bbe0d47f81e83f0ebe315be66e7d1c4bde + parse-url: ^8.1.0 + checksum: a3fa02e1a63c7c824b5ebbf23f4a9a6b34dd80031114c5dd8adb7ef53493642e39d3d80dfef4025a452128400c35c2c138d20a0f6ae5d7d7ef70d9ba13083d34 languageName: node linkType: hard -"git-url-parse@npm:^12.0.0": - version: 12.0.0 - resolution: "git-url-parse@npm:12.0.0" +"git-url-parse@npm:^13.1.0": + version: 13.1.0 + resolution: "git-url-parse@npm:13.1.0" dependencies: - git-up: ^6.0.0 - checksum: 34e7bb26dacead6e4e38a4de2e6c77a61f795ad62f8b572c421876c4aacfd4e7f8159a0ec99a62b2f68890d562b95e8c147892a29dd66b9db9ff111d7d2776ab + git-up: ^7.0.0 + checksum: 2ef6126c42d999e240dbcdf1e96172cf7a2044ffa1ef78a518acf823df9bbe2a1ea9e6b443d42948e3c581e4d899559afc4c1de024b3eaa8eb6a4229f73285aa languageName: node linkType: hard @@ -21208,33 +21209,33 @@ __metadata: languageName: node linkType: hard -"lerna@npm:5.5.1": - version: 5.5.1 - resolution: "lerna@npm:5.5.1" - dependencies: - "@lerna/add": 5.5.1 - "@lerna/bootstrap": 5.5.1 - "@lerna/changed": 5.5.1 - "@lerna/clean": 5.5.1 - "@lerna/cli": 5.5.1 - "@lerna/create": 5.5.1 - "@lerna/diff": 5.5.1 - "@lerna/exec": 5.5.1 - "@lerna/import": 5.5.1 - "@lerna/info": 5.5.1 - "@lerna/init": 5.5.1 - "@lerna/link": 5.5.1 - "@lerna/list": 5.5.1 - "@lerna/publish": 5.5.1 - "@lerna/run": 5.5.1 - "@lerna/version": 5.5.1 +"lerna@npm:5.5.4": + version: 5.5.4 + resolution: "lerna@npm:5.5.4" + dependencies: + "@lerna/add": 5.5.4 + "@lerna/bootstrap": 5.5.4 + "@lerna/changed": 5.5.4 + "@lerna/clean": 5.5.4 + "@lerna/cli": 5.5.4 + "@lerna/create": 5.5.4 + "@lerna/diff": 5.5.4 + "@lerna/exec": 5.5.4 + "@lerna/import": 5.5.4 + "@lerna/info": 5.5.4 + "@lerna/init": 5.5.4 + "@lerna/link": 5.5.4 + "@lerna/list": 5.5.4 + "@lerna/publish": 5.5.4 + "@lerna/run": 5.5.4 + "@lerna/version": 5.5.4 import-local: ^3.0.2 npmlog: ^6.0.2 nx: ">=14.6.1 < 16" typescript: ^3 || ^4 bin: lerna: cli.js - checksum: bb068949de29e444f8fec1d5c02c303f2691b13ff4dd809700a9888fe1e2aaf14e721f62a0afeea68b4ac4a4f133a5c232b3326ee8b36c2f485a769e4c7f7cf4 + checksum: bbd0594f996dbfc9cb1efe393cbe9c4f74336b7fce283d13172cb931ba83e09eefc76d485d5afafe2fdef65eb7e893b0cedbb7ae87af98e02250062a475fffbf languageName: node linkType: hard @@ -23392,7 +23393,7 @@ __metadata: languageName: node linkType: hard -"normalize-url@npm:^6.0.1, normalize-url@npm:^6.1.0": +"normalize-url@npm:^6.0.1": version: 6.1.0 resolution: "normalize-url@npm:6.1.0" checksum: 95d948f9bdd2cfde91aa786d1816ae40f8262946e13700bf6628105994fe0ff361662c20af3961161c38a119dc977adeb41fc0b41b1745eb77edaaf9cb22db23 @@ -24389,24 +24390,21 @@ __metadata: languageName: node linkType: hard -"parse-path@npm:^5.0.0": - version: 5.0.0 - resolution: "parse-path@npm:5.0.0" +"parse-path@npm:^7.0.0": + version: 7.0.0 + resolution: "parse-path@npm:7.0.0" dependencies: protocols: ^2.0.0 - checksum: 82efbec77ae276bf93d85a66164d27da0c6a17d71bd45c0162698a0c9efa1d8548e09e581014e7cb175de4de8ee4905b71f005aafc436b47790e8aefd5fd2673 + checksum: e7646f6b998b083bbd40102643d803557ce4ae18ae1704e6cc7ae2525ea7c5400f4a3635aca3244cfe65ce4dd0ff77db1142dde4d080e8a80c364c4b3e8fe8d2 languageName: node linkType: hard -"parse-url@npm:^7.0.2": - version: 7.0.2 - resolution: "parse-url@npm:7.0.2" +"parse-url@npm:^8.1.0": + version: 8.1.0 + resolution: "parse-url@npm:8.1.0" dependencies: - is-ssh: ^1.4.0 - normalize-url: ^6.1.0 - parse-path: ^5.0.0 - protocols: ^2.0.1 - checksum: 31dbf2f92b2befb808d3f724e9c7e25de5525199bfbeab7da8d3f55988865a0e0bac0d3c2a3cb9497e266e45306186799b9f8eb3e2727467b7e5990ad5ab894f + parse-path: ^7.0.0 + checksum: 68b95afdf4bbf72e57c7ab66f8757c935fff888f7e2b0f1e06098b4faa19e06b6b743bddaed5bc8df4f0c2de6fc475355d787373b2fdd40092be9e4e4b996648 languageName: node linkType: hard @@ -27182,7 +27180,7 @@ __metadata: jest: 29.0.3 jest-runner-tsd: 4.0.0 jscodeshift: 0.13.1 - lerna: 5.5.1 + lerna: 5.5.4 lodash.template: 4.5.0 make-dir-cli: 3.0.0 msw: 0.47.3 From 7976e238e494c804068d91504da3056987e1ac9a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 04:43:05 +0000 Subject: [PATCH 20/41] chore(deps): update dependency @replayio/playwright to v0.2.27 (#6468) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index d6d5c25ec1a7..e9593e79f362 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@babel/runtime-corejs3": "7.19.1", "@nrwl/nx-cloud": "14.3.0", "@playwright/test": "1.25.2", - "@replayio/playwright": "0.2.26", + "@replayio/playwright": "0.2.27", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "12.1.5", "@testing-library/react-hooks": "8.0.1", diff --git a/yarn.lock b/yarn.lock index d010a585d3da..61a99a601efa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6774,27 +6774,28 @@ __metadata: languageName: node linkType: hard -"@replayio/playwright@npm:0.2.26": - version: 0.2.26 - resolution: "@replayio/playwright@npm:0.2.26" +"@replayio/playwright@npm:0.2.27": + version: 0.2.27 + resolution: "@replayio/playwright@npm:0.2.27" dependencies: - "@replayio/replay": ^0.9.5 - "@replayio/test-utils": ^0.1.2 + "@replayio/replay": ^0.9.6 + "@replayio/test-utils": ^0.1.3 uuid: ^8.3.2 peerDependencies: "@playwright/test": 1.19.x bin: replayio-playwright: bin/replayio-playwright.js - checksum: 24e5529d84105cc8c047ab1ad4ecdea9ff68ab8e69a067e08232256426e8cc8f6f8df90bb3d1646f7215a9febd18a154fda0d73bca53d5e582c7d1c70b92857f + checksum: 1ce5571ee8861d8542ac8abc9febc52077c96d056f7761ecaf4e489e2a14f4a6e234839ee66bc27e00aa330820064087896d8ef1948d551ad39c4acf4ba8421f languageName: node linkType: hard -"@replayio/replay@npm:^0.9.5": - version: 0.9.5 - resolution: "@replayio/replay@npm:0.9.5" +"@replayio/replay@npm:^0.9.6": + version: 0.9.6 + resolution: "@replayio/replay@npm:0.9.6" dependencies: "@replayio/sourcemap-upload": ^1.0.3 commander: ^7.2.0 + debug: ^4.3.4 is-uuid: ^1.0.2 jsonata: ^1.8.6 superstruct: ^0.15.4 @@ -6802,7 +6803,7 @@ __metadata: ws: ^7.5.0 bin: replay: bin/replay.js - checksum: aa2a7ec8fd149fb42ab8c5bd6a7d6a7b75f683e6db9bdbc5a4e9b968f5924108b5ea0f51fb2c990cbbfc415b87926a317925cf19811922e33d1f53cfee7e2098 + checksum: 442e12e28d135880e319d99679148fde1ccd2d584af0ac5bc89cbc769bdf45638487828cc5723accb09d09861085324bcd5360a12c03102e1cf45d91091ce258 languageName: node linkType: hard @@ -6819,14 +6820,14 @@ __metadata: languageName: node linkType: hard -"@replayio/test-utils@npm:^0.1.2": - version: 0.1.2 - resolution: "@replayio/test-utils@npm:0.1.2" +"@replayio/test-utils@npm:^0.1.3": + version: 0.1.3 + resolution: "@replayio/test-utils@npm:0.1.3" dependencies: - "@replayio/replay": ^0.9.5 + "@replayio/replay": ^0.9.6 node-fetch: ^2.6.7 uuid: ^8.3.2 - checksum: 372abec60189491a197aac3c71310508438ef674cd7396b2ff318f83e70d91910c4599e089ce32842b8d9689c5c04eec414957e251e108b31a40fd61f1909266 + checksum: 45d6f30aad0ee8616468a02b44fef13684667d1896b47fdc843a99b9443002dec01d4218d505cb90f4ebb133df186c1bc141396eefa989f7ec7dd5ac8f24519a languageName: node linkType: hard @@ -27151,7 +27152,7 @@ __metadata: "@babel/runtime-corejs3": 7.19.1 "@nrwl/nx-cloud": 14.3.0 "@playwright/test": 1.25.2 - "@replayio/playwright": 0.2.26 + "@replayio/playwright": 0.2.27 "@testing-library/jest-dom": 5.16.5 "@testing-library/react": 12.1.5 "@testing-library/react-hooks": 8.0.1 From f1c431f9d4ccbef9a5a07ea6e3a2fbdfeef0ab46 Mon Sep 17 00:00:00 2001 From: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com> Date: Thu, 29 Sep 2022 09:49:45 +0100 Subject: [PATCH 21/41] [Docs]: CLI Cell query flag added (#6470) --- docs/docs/cli-commands.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/docs/cli-commands.md b/docs/docs/cli-commands.md index 8acd1cc3a961..07f88ec0805e 100644 --- a/docs/docs/cli-commands.md +++ b/docs/docs/cli-commands.md @@ -447,6 +447,7 @@ Cells are signature to Redwood. We think they provide a simpler and more declara | `name` | Name of the cell | | `--force, -f` | Overwrite existing files | | `--typescript, --ts` | Generate TypeScript files Enabled by default if we detect your project is TypeScript | +| `--query` | Use this flag to specify a specific name for the GraphQL query. The query name must be unique | | `--list` | Use this flag to generate a list cell. This flag is needed when dealing with irregular words whose plural and singular is identical such as equipment or pokemon | | `--tests` | Generate test files [default: true] | | `--stories` | Generate Storybook files [default: true] | From 874bb7199da6ed0e26b4c387a1818b4988554f6c Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Thu, 29 Sep 2022 20:27:22 -0700 Subject: [PATCH 22/41] feat: use fast forward in cherry pick CI If the release branch can be fast forwarded to the main branch, it will be to preserver history equivalence. --- .../workflows/cherry-pick-into-release-pr.yml | 44 +++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cherry-pick-into-release-pr.yml b/.github/workflows/cherry-pick-into-release-pr.yml index 705a4c49c3b4..2ad35b7ef21f 100644 --- a/.github/workflows/cherry-pick-into-release-pr.yml +++ b/.github/workflows/cherry-pick-into-release-pr.yml @@ -1,7 +1,8 @@ -# When a PR is merged into the main branch, this workflow opens a PR against the release branch -# with the squashed commit that went into main. +# When a PR is merged into the main branch, this workflow tries to cherry pick the squashed commit into the release branch +# by fast forwarding the release branch via the `--ff` option. +# If that's not an option (i.e. main and release have diverged), it'll open a PR against release with the squashed commit. -name: 🍒 Cherry pick into release PR +name: 🍒 Cherry pick into release branch on: pull_request: @@ -9,11 +10,40 @@ on: types: [closed] jobs: - cherry-pick-into-release-pr: - name: 🍒 Cherry pick into release PR + cherry-pick-fast-forward: + name: ⏩ Cherry pick fast forward runs-on: ubuntu-latest - # Don't cherry pick things that are breaking. + + # Don't cherry pick commits with breaking changes. if: ${{ !contains(github.event.pull_request.labels.*.name, 'release:feature-breaking') }} + + steps: + - uses: actions/checkout@v3 + with: + ref: release + # Git isn't able to work with the $GITHUB_SHA if we don't checkout everything. + fetch-depth: 0 + # Since release is a protected branch, we need a token to run git push later. + token: ${{ secrets.JTOAR_TOKEN }} + + - name: ⏩ Cherry pick fast forward + run: | + git cherry-pick --ff $GITHUB_SHA + + # If the HEAD of main and release point to the same commit, then the fast forward worked. + if [[ "$(git rev-parse origin/main)" = "$(git rev-parse release)" ]]; then + git push + else + exit 1 + fi + + cherry-pick-into-release-pr: + name: Cherry pick PR + runs-on: ubuntu-latest + + needs: cherry-pick-fast-forward + if: ${{ failure() }} + steps: - uses: actions/checkout@v2 with: @@ -27,5 +57,3 @@ jobs: token: ${{ secrets.JTOAR_TOKEN }} branch: release labels: cherry-pick - author: Tobbe Lundberg - committer: Tobbe Lundberg From 6e2cd52bbc2b371da47c9b5585768856478cbcba Mon Sep 17 00:00:00 2001 From: esteban <14810250+esteban-url@users.noreply.github.com> Date: Fri, 30 Sep 2022 04:35:38 -0700 Subject: [PATCH 23/41] fix(cli) Generated services use Date objects for DateTime types in the tests (#6394) * fix(cli) generate Date objects for DateTime types * use Date object for update test * added the missing millisecond to the comment * undo changes to service scenarios generator * return stringified scenario directly * make DateTime types test simpler * test the validity od the date * use new date(...) only in the assertions * refactor template * better documentation on extractExpectedValue * add tests for scalar types * change documentation * update documentation tests * use a static date so that snapshots don't change * service test: Mock timers * Update test project fixture * Revert changes to testing.md * Date default constructor Co-authored-by: Tobbe Lundberg --- .../migration.sql | 0 .../migration.sql | 0 .../src/services/contacts/contacts.test.ts | 2 +- .../api/src/services/posts/posts.scenarios.ts | 4 +- .../api/src/services/posts/posts.test.ts | 2 +- .../api/src/services/users/users.scenarios.ts | 4 +- docs/docs/testing.md | 1 + .../__tests__/__snapshots__/sdl.test.js.snap | 8 +- .../__snapshots__/service.test.js.snap | 160 +++++++++++++++++- .../service/__tests__/fixtures/schema.prisma | 9 + .../service/__tests__/scenario.test.js | 7 +- .../service/__tests__/service.test.js | 54 +++++- .../src/commands/generate/service/service.js | 22 ++- .../service/templates/test.ts.template | 69 +++++--- 14 files changed, 292 insertions(+), 50 deletions(-) rename __fixtures__/test-project/api/db/migrations/{20220926103708_create_post_user => 20220930080940_create_post_user}/migration.sql (100%) rename __fixtures__/test-project/api/db/migrations/{20220926103723_create_contact => 20220930081046_create_contact}/migration.sql (100%) diff --git a/__fixtures__/test-project/api/db/migrations/20220926103708_create_post_user/migration.sql b/__fixtures__/test-project/api/db/migrations/20220930080940_create_post_user/migration.sql similarity index 100% rename from __fixtures__/test-project/api/db/migrations/20220926103708_create_post_user/migration.sql rename to __fixtures__/test-project/api/db/migrations/20220930080940_create_post_user/migration.sql diff --git a/__fixtures__/test-project/api/db/migrations/20220926103723_create_contact/migration.sql b/__fixtures__/test-project/api/db/migrations/20220930081046_create_contact/migration.sql similarity index 100% rename from __fixtures__/test-project/api/db/migrations/20220926103723_create_contact/migration.sql rename to __fixtures__/test-project/api/db/migrations/20220930081046_create_contact/migration.sql diff --git a/__fixtures__/test-project/api/src/services/contacts/contacts.test.ts b/__fixtures__/test-project/api/src/services/contacts/contacts.test.ts index bca8d9f6fe41..8bb328e175e9 100644 --- a/__fixtures__/test-project/api/src/services/contacts/contacts.test.ts +++ b/__fixtures__/test-project/api/src/services/contacts/contacts.test.ts @@ -10,7 +10,7 @@ import { import type { StandardScenario } from './contacts.scenarios' // Generated boilerplate tests do not account for all circumstances -// and can fail without adjustments, e.g. Float and DateTime types. +// and can fail without adjustments, e.g. Float. // Please refer to the RedwoodJS Testing Docs: // https://redwoodjs.com/docs/testing#testing-services // https://redwoodjs.com/docs/testing#jest-expect-type-considerations diff --git a/__fixtures__/test-project/api/src/services/posts/posts.scenarios.ts b/__fixtures__/test-project/api/src/services/posts/posts.scenarios.ts index 6f23115cdf32..869afa80771b 100644 --- a/__fixtures__/test-project/api/src/services/posts/posts.scenarios.ts +++ b/__fixtures__/test-project/api/src/services/posts/posts.scenarios.ts @@ -10,7 +10,7 @@ export const standard = defineScenario({ body: 'String', author: { create: { - email: 'String7848705', + email: 'String9043010', hashedPassword: 'String', fullName: 'String', salt: 'String', @@ -24,7 +24,7 @@ export const standard = defineScenario({ body: 'String', author: { create: { - email: 'String1920513', + email: 'String3280784', hashedPassword: 'String', fullName: 'String', salt: 'String', diff --git a/__fixtures__/test-project/api/src/services/posts/posts.test.ts b/__fixtures__/test-project/api/src/services/posts/posts.test.ts index b27a33a7bd9a..fc316574f5ab 100644 --- a/__fixtures__/test-project/api/src/services/posts/posts.test.ts +++ b/__fixtures__/test-project/api/src/services/posts/posts.test.ts @@ -4,7 +4,7 @@ import { posts, post, createPost, updatePost, deletePost } from './posts' import type { StandardScenario } from './posts.scenarios' // Generated boilerplate tests do not account for all circumstances -// and can fail without adjustments, e.g. Float and DateTime types. +// and can fail without adjustments, e.g. Float. // Please refer to the RedwoodJS Testing Docs: // https://redwoodjs.com/docs/testing#testing-services // https://redwoodjs.com/docs/testing#jest-expect-type-considerations diff --git a/__fixtures__/test-project/api/src/services/users/users.scenarios.ts b/__fixtures__/test-project/api/src/services/users/users.scenarios.ts index e029dff0c869..25c7a596eeed 100644 --- a/__fixtures__/test-project/api/src/services/users/users.scenarios.ts +++ b/__fixtures__/test-project/api/src/services/users/users.scenarios.ts @@ -6,7 +6,7 @@ export const standard = defineScenario({ user: { one: { data: { - email: 'String7590248', + email: 'String4277909', hashedPassword: 'String', fullName: 'String', salt: 'String', @@ -14,7 +14,7 @@ export const standard = defineScenario({ }, two: { data: { - email: 'String2966925', + email: 'String493680', hashedPassword: 'String', fullName: 'String', salt: 'String', diff --git a/docs/docs/testing.md b/docs/docs/testing.md index 9493ffc63774..d6b6875a73ae 100644 --- a/docs/docs/testing.md +++ b/docs/docs/testing.md @@ -530,6 +530,7 @@ In the above examples, we can see expect doesn't preserve the floating numbers. > For cases where using decimal is not optimal, see the [Jest Expect documentation](https://jestjs.io/docs/expect) for other options and methods. #### DateTime + Prisma returns [DateTime](https://www.prisma.io/docs/reference/api-reference/prisma-schema-reference#datetime) as ISO 8601-formatted strings. So, you can convert the date to ISO String in JavaScript: ```jsx {1} diff --git a/packages/cli/src/commands/generate/sdl/__tests__/__snapshots__/sdl.test.js.snap b/packages/cli/src/commands/generate/sdl/__tests__/__snapshots__/sdl.test.js.snap index d81119a264d4..3bc47bb28039 100644 --- a/packages/cli/src/commands/generate/sdl/__tests__/__snapshots__/sdl.test.js.snap +++ b/packages/cli/src/commands/generate/sdl/__tests__/__snapshots__/sdl.test.js.snap @@ -57,7 +57,7 @@ exports[`handler can be called with PascalCase model name 3`] = ` "fileContent": "import { users, user, createUser, updateUser, deleteUser } from './users' // Generated boilerplate tests do not account for all circumstances -// and can fail without adjustments, e.g. Float and DateTime types. +// and can fail without adjustments, e.g. Float. // Please refer to the RedwoodJS Testing Docs: // https://redwoodjs.com/docs/testing#testing-services // https://redwoodjs.com/docs/testing#jest-expect-type-considerations @@ -205,7 +205,7 @@ exports[`handler can be called with PascalCase model name 7`] = ` } from './customDatums' // Generated boilerplate tests do not account for all circumstances -// and can fail without adjustments, e.g. Float and DateTime types. +// and can fail without adjustments, e.g. Float. // Please refer to the RedwoodJS Testing Docs: // https://redwoodjs.com/docs/testing#testing-services // https://redwoodjs.com/docs/testing#jest-expect-type-considerations @@ -353,7 +353,7 @@ exports[`handler can be called with camelCase model name 3`] = ` "fileContent": "import { users, user, createUser, updateUser, deleteUser } from './users' // Generated boilerplate tests do not account for all circumstances -// and can fail without adjustments, e.g. Float and DateTime types. +// and can fail without adjustments, e.g. Float. // Please refer to the RedwoodJS Testing Docs: // https://redwoodjs.com/docs/testing#testing-services // https://redwoodjs.com/docs/testing#jest-expect-type-considerations @@ -501,7 +501,7 @@ exports[`handler can be called with camelCase model name 7`] = ` } from './customDatums' // Generated boilerplate tests do not account for all circumstances -// and can fail without adjustments, e.g. Float and DateTime types. +// and can fail without adjustments, e.g. Float. // Please refer to the RedwoodJS Testing Docs: // https://redwoodjs.com/docs/testing#testing-services // https://redwoodjs.com/docs/testing#jest-expect-type-considerations diff --git a/packages/cli/src/commands/generate/service/__tests__/__snapshots__/service.test.js.snap b/packages/cli/src/commands/generate/service/__tests__/__snapshots__/service.test.js.snap index 6e116eb0254f..c2f350512205 100644 --- a/packages/cli/src/commands/generate/service/__tests__/__snapshots__/service.test.js.snap +++ b/packages/cli/src/commands/generate/service/__tests__/__snapshots__/service.test.js.snap @@ -13,7 +13,7 @@ exports[`in javascript mode creates a multi word service test file 1`] = ` "import { userProfiles } from './userProfiles' // Generated boilerplate tests do not account for all circumstances -// and can fail without adjustments, e.g. Float and DateTime types. +// and can fail without adjustments, e.g. Float. // Please refer to the RedwoodJS Testing Docs: // https://redwoodjs.com/docs/testing#testing-services // https://redwoodjs.com/docs/testing#jest-expect-type-considerations @@ -38,7 +38,7 @@ exports[`in javascript mode creates a multi word service test file with crud act } from './transactions' // Generated boilerplate tests do not account for all circumstances -// and can fail without adjustments, e.g. Float and DateTime types. +// and can fail without adjustments, e.g. Float. // Please refer to the RedwoodJS Testing Docs: // https://redwoodjs.com/docs/testing#testing-services // https://redwoodjs.com/docs/testing#jest-expect-type-considerations @@ -90,6 +90,78 @@ describe('transactions', () => { " `; +exports[`in javascript mode creates a multi word service test file with multiple scalar types 1`] = ` +"import { + scalarTypes, + scalarType, + createScalarType, + updateScalarType, + deleteScalarType, +} from './scalarTypes' + +// Generated boilerplate tests do not account for all circumstances +// and can fail without adjustments, e.g. Float. +// Please refer to the RedwoodJS Testing Docs: +// https://redwoodjs.com/docs/testing#testing-services +// https://redwoodjs.com/docs/testing#jest-expect-type-considerations + +describe('scalarTypes', () => { + scenario('returns all scalarTypes', async (scenario) => { + const result = await scalarTypes() + + expect(result.length).toEqual(Object.keys(scenario.scalarType).length) + }) + + scenario('returns a single scalarType', async (scenario) => { + const result = await scalarType({ id: scenario.scalarType.one.id }) + + expect(result).toEqual(scenario.scalarType.one) + }) + + scenario('creates a scalarType', async () => { + const result = await createScalarType({ + input: { + email: 'String', + date: '2022-09-30T09:50:00.000Z', + bigInt: 1234567n, + integer: 1234567, + boolean: true, + }, + }) + + expect(result.email).toEqual('String') + expect(result.date).toEqual(new Date('2022-09-30T09:50:00.000Z')) + expect(result.bigInt).toEqual(1234567n) + expect(result.integer).toEqual(1234567) + expect(result.boolean).toEqual(true) + }) + + scenario('updates a scalarType', async (scenario) => { + const original = await scalarType({ + id: scenario.scalarType.one.id, + }) + + const result = await updateScalarType({ + id: original.id, + input: { email: 'String2' }, + }) + + expect(result.email).toEqual('String2') + }) + + scenario('deletes a scalarType', async (scenario) => { + const original = await deleteScalarType({ + id: scenario.scalarType.one.id, + }) + + const result = await scalarType({ id: original.id }) + + expect(result).toEqual(null) + }) +}) +" +`; + exports[`in javascript mode creates a single word service file 1`] = ` "import { db } from 'src/lib/db' @@ -238,7 +310,7 @@ exports[`in javascript mode creates a single word service test file 1`] = ` "import { users, user, createUser, updateUser, deleteUser } from './users' // Generated boilerplate tests do not account for all circumstances -// and can fail without adjustments, e.g. Float and DateTime types. +// and can fail without adjustments, e.g. Float. // Please refer to the RedwoodJS Testing Docs: // https://redwoodjs.com/docs/testing#testing-services // https://redwoodjs.com/docs/testing#jest-expect-type-considerations @@ -302,7 +374,7 @@ import { userProfiles } from './userProfiles' import type { StandardScenario } from './userProfiles.scenarios' // Generated boilerplate tests do not account for all circumstances -// and can fail without adjustments, e.g. Float and DateTime types. +// and can fail without adjustments, e.g. Float. // Please refer to the RedwoodJS Testing Docs: // https://redwoodjs.com/docs/testing#testing-services // https://redwoodjs.com/docs/testing#jest-expect-type-considerations @@ -330,7 +402,7 @@ import { import type { StandardScenario } from './transactions.scenarios' // Generated boilerplate tests do not account for all circumstances -// and can fail without adjustments, e.g. Float and DateTime types. +// and can fail without adjustments, e.g. Float. // Please refer to the RedwoodJS Testing Docs: // https://redwoodjs.com/docs/testing#testing-services // https://redwoodjs.com/docs/testing#jest-expect-type-considerations @@ -383,6 +455,82 @@ describe('transactions', () => { " `; +exports[`in typescript mode creates a multi word service test file with multiple scalar types 1`] = ` +"import type { ScalarType } from '@prisma/client' + +import { + scalarTypes, + scalarType, + createScalarType, + updateScalarType, + deleteScalarType, +} from './scalarTypes' +import type { StandardScenario } from './scalarTypes.scenarios' + +// Generated boilerplate tests do not account for all circumstances +// and can fail without adjustments, e.g. Float. +// Please refer to the RedwoodJS Testing Docs: +// https://redwoodjs.com/docs/testing#testing-services +// https://redwoodjs.com/docs/testing#jest-expect-type-considerations + +describe('scalarTypes', () => { + scenario('returns all scalarTypes', async (scenario: StandardScenario) => { + const result = await scalarTypes() + + expect(result.length).toEqual(Object.keys(scenario.scalarType).length) + }) + + scenario( + 'returns a single scalarType', + async (scenario: StandardScenario) => { + const result = await scalarType({ id: scenario.scalarType.one.id }) + + expect(result).toEqual(scenario.scalarType.one) + } + ) + + scenario('creates a scalarType', async () => { + const result = await createScalarType({ + input: { + email: 'String', + date: '2022-09-30T09:50:00.000Z', + bigInt: 1234567n, + integer: 1234567, + boolean: true, + }, + }) + + expect(result.email).toEqual('String') + expect(result.date).toEqual(new Date('2022-09-30T09:50:00.000Z')) + expect(result.bigInt).toEqual(1234567n) + expect(result.integer).toEqual(1234567) + expect(result.boolean).toEqual(true) + }) + + scenario('updates a scalarType', async (scenario: StandardScenario) => { + const original = (await scalarType({ + id: scenario.scalarType.one.id, + })) as ScalarType + const result = await updateScalarType({ + id: original.id, + input: { email: 'String2' }, + }) + + expect(result.email).toEqual('String2') + }) + + scenario('deletes a scalarType', async (scenario: StandardScenario) => { + const original = (await deleteScalarType({ + id: scenario.scalarType.one.id, + })) as ScalarType + const result = await scalarType({ id: original.id }) + + expect(result).toEqual(null) + }) +}) +" +`; + exports[`in typescript mode creates a single word service file 1`] = ` "import type { QueryResolvers, MutationResolvers } from 'types/graphql' @@ -549,7 +697,7 @@ import { users, user, createUser, updateUser, deleteUser } from './users' import type { StandardScenario } from './users.scenarios' // Generated boilerplate tests do not account for all circumstances -// and can fail without adjustments, e.g. Float and DateTime types. +// and can fail without adjustments, e.g. Float. // Please refer to the RedwoodJS Testing Docs: // https://redwoodjs.com/docs/testing#testing-services // https://redwoodjs.com/docs/testing#jest-expect-type-considerations diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/schema.prisma b/packages/cli/src/commands/generate/service/__tests__/fixtures/schema.prisma index 603564af0680..f162c0ada1dc 100644 --- a/packages/cli/src/commands/generate/service/__tests__/fixtures/schema.prisma +++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/schema.prisma @@ -80,3 +80,12 @@ model Favorite { post Post @relation(fields: [postId], references: [id]) likes BigInt } + +model ScalarType{ + id Int @id @default(autoincrement()) + email String + date DateTime + bigInt BigInt + integer Int + boolean Boolean +} diff --git a/packages/cli/src/commands/generate/service/__tests__/scenario.test.js b/packages/cli/src/commands/generate/service/__tests__/scenario.test.js index fd2b4b1b4790..997caf1cd1ec 100644 --- a/packages/cli/src/commands/generate/service/__tests__/scenario.test.js +++ b/packages/cli/src/commands/generate/service/__tests__/scenario.test.js @@ -149,11 +149,12 @@ describe('the scenario generator', () => { expect(typeof value).toBe('number') }) - test('scenarioFieldValue returns an ISO8601 timestamp string for DateTime types', () => { + test('scenarioFieldValue returns a valid Date for DateTime types', () => { const field = { type: 'DateTime' } - const iso8601Regex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/ + const value = service.scenarioFieldValue(field) - expect(service.scenarioFieldValue(field)).toMatch(iso8601Regex) + expect(value instanceof Date).toBe(true) + expect(!isNaN(value)).toBe(true) }) test('scenarioFieldValue returns JSON for Json types', () => { diff --git a/packages/cli/src/commands/generate/service/__tests__/service.test.js b/packages/cli/src/commands/generate/service/__tests__/service.test.js index 59181de1ead9..650661a776ce 100644 --- a/packages/cli/src/commands/generate/service/__tests__/service.test.js +++ b/packages/cli/src/commands/generate/service/__tests__/service.test.js @@ -9,6 +9,15 @@ import '../../../../lib/test' import { getDefaultArgs } from '../../../../lib' import * as service from '../service' +beforeAll(() => { + jest.useFakeTimers() + jest.setSystemTime(new Date('2022-09-30T09:50:00.000Z')) +}) + +afterAll(() => { + jest.useRealTimers() +}) + const extensionForBaseArgs = (baseArgs) => baseArgs && baseArgs.typescript ? 'ts' : 'js' @@ -181,6 +190,27 @@ const itCreatesAMultiWordServiceTestFileWithCRUDActions = (baseArgs) => { }) } +const itCreatesAMultiWordServiceTestFileWithMultipleScalarTypes = ( + baseArgs +) => { + test('creates a multi word service test file with multiple scalar types', async () => { + const files = await service.files({ + ...baseArgs, + name: 'ScalarType', + crud: true, + }) + const extension = extensionForBaseArgs(baseArgs) + + expect( + files[ + path.normalize( + `/path/to/project/api/src/services/scalarTypes/scalarTypes.test.${extension}` + ) + ] + ).toMatchSnapshot() + }) +} + const itCreatesASingleWordServiceFileWithAHasManyRelation = (baseArgs) => { test('creates a single word service file with a hasMany relation', async () => { const files = await service.files({ @@ -281,6 +311,7 @@ describe('in javascript mode', () => { itCreatesAMultiWordServiceTestFile(baseArgs) itCreatesASingleWordServiceFileWithCRUDActions(baseArgs) itCreatesASingleWordServiceTestFileWithCRUDActions(baseArgs) + itCreatesAMultiWordServiceTestFileWithMultipleScalarTypes(baseArgs) itCreatesAMultiWordServiceFileWithCRUDActions(baseArgs) itCreatesAMultiWordServiceTestFileWithCRUDActions(baseArgs) itCreatesASingleWordServiceFileWithAHasManyRelation(baseArgs) @@ -303,6 +334,7 @@ describe('in typescript mode', () => { itCreatesAMultiWordServiceFile(baseArgs) itCreatesAMultiWordServiceTestFile(baseArgs) itCreatesASingleWordServiceFileWithCRUDActions(baseArgs) + itCreatesAMultiWordServiceTestFileWithMultipleScalarTypes(baseArgs) itCreatesASingleWordServiceTestFileWithCRUDActions(baseArgs) itCreatesAMultiWordServiceFileWithCRUDActions(baseArgs) itCreatesAMultiWordServiceTestFileWithCRUDActions(baseArgs) @@ -402,12 +434,30 @@ describe('parseSchema', () => { describe('fieldsToScenario', () => { it('includes scalar fields', async () => { const output = await service.fieldsToScenario( - [{ name: 'email', type: 'String' }], + [ + { name: 'email', type: 'String' }, + { name: 'date', type: 'DateTime' }, + { name: 'bigInt', type: 'BigInt' }, + { name: 'integer', type: 'Int' }, + { name: 'boolean', type: 'Boolean' }, + ], {}, [] ) - expect(output).toEqual({ email: 'String' }) + expect(output.email).toEqual('String') + + expect(output.date instanceof Date).toBe(true) + expect(!isNaN(output.date)).toBe(true) + + expect(output.integer).toEqual(parseInt(output.integer)) + expect(typeof output.integer).toBe('number') + + expect(output.boolean).toEqual(true) + expect(typeof output.boolean).toBe('boolean') + + expect(output.bigInt).toMatch(/^\d+n$/) + expect(typeof output.bigInt).toBe('string') // pseudo-bigint }) it('includes dependent relationships', async () => { diff --git a/packages/cli/src/commands/generate/service/service.js b/packages/cli/src/commands/generate/service/service.js index 4cc916b62154..205f9dac6c74 100644 --- a/packages/cli/src/commands/generate/service/service.js +++ b/packages/cli/src/commands/generate/service/service.js @@ -52,7 +52,7 @@ export const scenarioFieldValue = (field) => { case 'Boolean': return true case 'DateTime': - return new Date().toISOString().replace(/\.\d{3}/, '') + return new Date() case 'Decimal': case 'Float': return randFloat @@ -142,13 +142,17 @@ export const buildScenario = async (model) => { export const buildStringifiedScenario = async (model) => { const scenario = await buildScenario(model) - return JSON.stringify(scenario, (key, value) => - typeof value === 'bigint' - ? value.toString() - : typeof value === 'string' && value.match(/^\d+n$/) - ? Number(value.substr(0, value.length - 1)) - : value - ) + return JSON.stringify(scenario, (key, value) => { + if (typeof value === 'bigint') { + return value.toString() + } + + if (typeof value === 'string' && value.match(/^\d+n$/)) { + return Number(value.substr(0, value.length - 1)) + } + + return value + }) } // outputs fields necessary to create an object in the test file @@ -216,7 +220,7 @@ export const fieldsToUpdate = async (model) => { case 'DateTime': { let date = new Date() date.setDate(date.getDate() + 1) - newValue = date.toISOString().replace(/\.\d{3}/, '') + newValue = date break } case 'Decimal': diff --git a/packages/cli/src/commands/generate/service/templates/test.ts.template b/packages/cli/src/commands/generate/service/templates/test.ts.template index 3a7d413477e8..d8f757306eaa 100644 --- a/packages/cli/src/commands/generate/service/templates/test.ts.template +++ b/packages/cli/src/commands/generate/service/templates/test.ts.template @@ -1,24 +1,53 @@ -<% // To JSON stringify and remove quotes around `scenario` variables -const stringifyButNotScenario = (obj) => { - return JSON.stringify(obj).replace(/['"].*?['"]/g, (string) => { - if (string.match(/scenario\./)) { - return string.replace(/['"]/g, '') - } - - if (string.match(/^\"\d+n\"$/)) { - return string.substr(1, string.length - 2) - } - - return string - }) -} %> +<% // Extracts the values of an object by converting the JSON into a string. + // Looks for quoted strings, either by single (') ro double (") quotes. + // When found + // - Removes the quotes around `scenario` variables. + // - Removes the quotes around `BigInt` fields. + // It can also return object instances via the `options` parameter + // - `options.useDateObjects` default value: `false` + // - false: will return date values as a string. ex: "2022-09-01T00:21:58.876Z" + // - true: will return date values as a date. ex: `new Date("2022-09-01T00:21:58.876Z")` + const extractValues = (obj, options={ useDateObjects: false }) => { + return JSON.stringify(obj).replace(/['"].*?['"]/g, (string) => { + if (string.match(/scenario\./)) { + return string.replace(/['"]/g, '') + } + + // BigInt + if (string.match(/^\"\d+n\"$/)) { + return string.substr(1, string.length - 2) + } + + if (options.useDateObjects) { + // Creates a new Date declaration if the string matches this ISO8601 date format. + // ex: "2022-09-01T00:21:58.876Z" will return `new Date("2022-09-01T00:21:58.876Z")` + if (string.match(/^\"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z\"$/)) { + return `new Date(${string})` + } + } + + return string + }) + } + + // This is a thin wrapper that allows us to call the main function (extractValues) + // with an options parameter. We need this wrapper because object parameters {...} + // are not supported in template evaluations such as: + // - ${extractExpectedValue(value, {useDateObjects:true})} + // If we add a closing curly bracket they will be interpreted as the closing + // bracket of the evaluation and throw an error when generating the service: `Unexpected token ')'` + // ex: `${extractExpectedValue(value, { useDateObjects: true } )}`. + // ^---> Opening bracket Closing bracket <---^ ^---> Unexpected token ')' + const extractExpectedValue = (obj) => { + return extractValues(obj, { useDateObjects: true }) + } %> import type { ${prismaModel} } from '@prisma/client' import { ${pluralCamelName}<% if (crud) { %>,${singularCamelName}, create${singularPascalName}, update${singularPascalName}, delete${singularPascalName}<% } %> } from './${pluralCamelName}' import type { StandardScenario } from './${pluralCamelName}.scenarios' // Generated boilerplate tests do not account for all circumstances -// and can fail without adjustments, e.g. Float and DateTime types. +// and can fail without adjustments, e.g. Float. // Please refer to the RedwoodJS Testing Docs: // https://redwoodjs.com/docs/testing#testing-services // https://redwoodjs.com/docs/testing#jest-expect-type-considerations @@ -36,24 +65,24 @@ describe('${pluralCamelName}', () => { expect(result).toEqual(scenario.${singularCamelName}.one) }) - <% if (create) { %>scenario('creates a ${singularCamelName}', async (${stringifyButNotScenario(create).includes('scenario.') ? 'scenario: StandardScenario' : ''}) => { + <% if (create) { %>scenario('creates a ${singularCamelName}', async (${extractValues(create).includes('scenario.') ? 'scenario: StandardScenario' : ''}) => { const result = await create${singularPascalName}({ - input: ${stringifyButNotScenario(create)}, + input: ${extractValues(create)}, }) <% for (const [name, value] of Object.entries(create)) { %> - expect(result.${name}).toEqual(${stringifyButNotScenario(value)})<% } %> + expect(result.${name}).toEqual(${extractExpectedValue(value)})<% } %> })<% } %> <% if (update) { %>scenario('updates a ${singularCamelName}', async (scenario: StandardScenario) => {<% rand = parseInt(Math.random() * 10000000) %> const original = await (${singularCamelName}({ id: scenario.${singularCamelName}.one.id })) as ${prismaModel} const result = await update${singularPascalName}({ id: original.id, - input: ${stringifyButNotScenario(update)}, + input: ${extractValues(update)}, }) <% for (const [name, value] of Object.entries(update)) { %> - expect(result.${name}).toEqual(${stringifyButNotScenario(value)})<% } %> + expect(result.${name}).toEqual(${extractExpectedValue(value)})<% } %> })<% } %> scenario('deletes a ${singularCamelName}', async (scenario: StandardScenario) => { From 5c022a986c4f9950a430cee00d53429fd44fdb6c Mon Sep 17 00:00:00 2001 From: psirus0588 Date: Fri, 30 Sep 2022 20:48:52 +0300 Subject: [PATCH 24/41] fix command to check github credentials (#6473) --- docs/docs/intro-to-servers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/intro-to-servers.md b/docs/docs/intro-to-servers.md index 9fa0b637ed59..16fd6c284551 100644 --- a/docs/docs/intro-to-servers.md +++ b/docs/docs/intro-to-servers.md @@ -364,7 +364,7 @@ Luckly SSH has a mechanism that supports this: SSH Agent Forwarding. This is most useful when trying to deploy a codebase from GitHub to your remote server: you're already connected to the remote server as you, and you're already authorized to connect to GitHub, so just use those credentials. You can verify if this is already working for you: ``` -git -T git@github.com +ssh -T git@github.com ``` If you get a message like this: From d8c112a10e39ac1cb48e828fb4247ec98109cfbc Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Thu, 29 Sep 2022 23:43:53 -0700 Subject: [PATCH 25/41] feat: add cherry pick step to ci.yml --- ...ml => cherry-pick-into-release-branch.yml} | 37 ++++++++++++------- .github/workflows/ci.yml | 35 ++++++++++++++++++ .github/workflows/enable-auto-merge.yml | 20 ---------- 3 files changed, 59 insertions(+), 33 deletions(-) rename .github/workflows/{cherry-pick-into-release-pr.yml => cherry-pick-into-release-branch.yml} (55%) delete mode 100644 .github/workflows/enable-auto-merge.yml diff --git a/.github/workflows/cherry-pick-into-release-pr.yml b/.github/workflows/cherry-pick-into-release-branch.yml similarity index 55% rename from .github/workflows/cherry-pick-into-release-pr.yml rename to .github/workflows/cherry-pick-into-release-branch.yml index 2ad35b7ef21f..7e5b5386fab0 100644 --- a/.github/workflows/cherry-pick-into-release-pr.yml +++ b/.github/workflows/cherry-pick-into-release-branch.yml @@ -1,6 +1,6 @@ # When a PR is merged into the main branch, this workflow tries to cherry pick the squashed commit into the release branch # by fast forwarding the release branch via the `--ff` option. -# If that's not an option (i.e. main and release have diverged), it'll open a PR against release with the squashed commit. +# If that doesn't work (i.e. main and release have diverged), it'll open a PR against the release branch with the squashed commit. name: 🍒 Cherry pick into release branch @@ -11,26 +11,31 @@ on: jobs: cherry-pick-fast-forward: + # Don't cherry pick commits with breaking changes. + # The quotes prevent yaml from interpreting the `!` as a "non-specific tag". + if: ${{ github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'release:feature-breaking') }} name: ⏩ Cherry pick fast forward runs-on: ubuntu-latest - # Don't cherry pick commits with breaking changes. - if: ${{ !contains(github.event.pull_request.labels.*.name, 'release:feature-breaking') }} - steps: - uses: actions/checkout@v3 with: ref: release - # Git isn't able to work with the $GITHUB_SHA if we don't checkout everything. + # git isn't able to work with $GITHUB_SHA if we don't checkout everything. fetch-depth: 0 - # Since release is a protected branch, we need a token to run git push later. + # Since release is a protected branch, we need a token to run `git push` later. token: ${{ secrets.JTOAR_TOKEN }} - name: ⏩ Cherry pick fast forward run: | + # Here, $GITHUB_SHA is the last merge commit on the $GITHUB_REF branch. + # That merge commit is already in the main branch at this point (this action runs on "pull_request closed" events). + # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request. + git cherry-pick --ff $GITHUB_SHA - # If the HEAD of main and release point to the same commit, then the fast forward worked. + # If the HEAD of main and release point to the same commit, then the fast forward worked and we can go ahead and push. + if [[ "$(git rev-parse origin/main)" = "$(git rev-parse release)" ]]; then git push else @@ -38,14 +43,20 @@ jobs: fi cherry-pick-into-release-pr: - name: Cherry pick PR - runs-on: ubuntu-latest - needs: cherry-pick-fast-forward - if: ${{ failure() }} + if: failure() + name: Cherry pick into release PR + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: 🔑 Generate token + id: generate_token + uses: tibdex/github-app-token@v1 + with: + app_id: ${{ secrets.APP_ID }} + private_key: ${{ secrets.PRIVATE_KEY }} + + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -54,6 +65,6 @@ jobs: with: # We specify a token because we want other workflows (like CI) to run on this PR. # If we omit this, it uses the default token (GITHUB_TOKEN) which doesn't trigger other workflows. - token: ${{ secrets.JTOAR_TOKEN }} + token: ${{ steps.generate_token.outputs.token }} branch: release labels: cherry-pick diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7e3f809597d..5a5ac83d5883 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -315,3 +315,38 @@ jobs: runs-on: ${{ matrix.os }} steps: - run: echo "Only doc changes" + + cherry-pick: + needs: [build-lint-test, tutorial-e2e, smoke-test] + if: github.event.pull_request.user.login == 'redwoodjs-bot[bot]' && github.base_ref == 'release' && !contains(join(needs.*.result, ','), 'failure') + name: cherry-pick + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + with: + ref: release + fetch-depth: 0 + token: ${{ secrets.JTOAR_TOKEN }} + + - name: 🍒 Cherry pick + run: | + git config user.name github-actions + git config user.email github-actions@github.com + + git cherry-pick ${{ github.event.pull_request.head.sha }} + git push + + - name: Close PR + env: + GH_TOKEN: ${{ secrets.JTOAR_TOKEN }} + run: | + gh api graphql -F id=${{ github.event.pull_request.node_id }} -f query=' + mutation($id: ID!) { + closePullRequest(input: { + pullRequestId: $id + }) { + clientMutationId + } + } + ' diff --git a/.github/workflows/enable-auto-merge.yml b/.github/workflows/enable-auto-merge.yml deleted file mode 100644 index 08c4305c97eb..000000000000 --- a/.github/workflows/enable-auto-merge.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: 🤖 Enable auto merge - -on: - pull_request_target: - branches: [release] - # We're using labeled here because we don't want to enable auto merge for every PR against release. - # Just the ones created by the cherry pick action. - types: [labeled] - -jobs: - enable-auto-merge: - name: 🤖 Auto merge release PR - runs-on: ubuntu-latest - if: contains(github.event.pull_request.labels.*.name, 'cherry-pick') - steps: - - name: Enable auto-merge - uses: reitermarkus/automerge@v2.1.2 - with: - token: ${{ secrets.JTOAR_TOKEN }} - merge-method: squash From 6859bbb49fe1203c5403361ec15c8faaf54c6a4f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 00:37:08 +0000 Subject: [PATCH 26/41] chore(deps): update dependency @simplewebauthn/server to v6.2.1 (#6478) --- packages/api/package.json | 2 +- yarn.lock | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 9786266104ee..c7e07975e8a7 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -50,7 +50,7 @@ "@babel/core": "7.19.1", "@clerk/clerk-sdk-node": "3.9.2", "@redwoodjs/auth": "3.0.3", - "@simplewebauthn/server": "6.2.0", + "@simplewebauthn/server": "6.2.1", "@types/aws-lambda": "8.10.101", "@types/crypto-js": "4.1.1", "@types/jsonwebtoken": "8.5.9", diff --git a/yarn.lock b/yarn.lock index 61a99a601efa..7040dd7f28a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6164,7 +6164,7 @@ __metadata: "@clerk/clerk-sdk-node": 3.9.2 "@prisma/client": 4.3.1 "@redwoodjs/auth": 3.0.3 - "@simplewebauthn/server": 6.2.0 + "@simplewebauthn/server": 6.2.1 "@types/aws-lambda": 8.10.101 "@types/crypto-js": 4.1.1 "@types/jsonwebtoken": 8.5.9 @@ -6852,32 +6852,39 @@ __metadata: languageName: node linkType: hard -"@simplewebauthn/server@npm:6.2.0": - version: 6.2.0 - resolution: "@simplewebauthn/server@npm:6.2.0" +"@simplewebauthn/server@npm:6.2.1": + version: 6.2.1 + resolution: "@simplewebauthn/server@npm:6.2.1" dependencies: "@noble/ed25519": ^1.6.1 "@peculiar/asn1-android": ^2.1.7 "@peculiar/asn1-schema": ^2.1.7 "@peculiar/asn1-x509": ^2.1.7 - "@simplewebauthn/typescript-types": ^6.0.0 + "@simplewebauthn/typescript-types": ^6.2.1 base64url: ^3.0.1 cbor: ^5.1.0 debug: ^4.3.2 jsrsasign: ^10.4.0 jwk-to-pem: ^2.0.4 node-fetch: ^2.6.0 - checksum: f5ae66e51ab5567c9ae4ec104f905a539394594bd2ee1d721715fd4460f583af818afb06d8a41218a04f03209596183b5f84a74f92b4f762860fe5b7b59b2cdb + checksum: 3d07fc7592683c4364a1f346bc457af5a06a43169859a0832a97e4f784c672430a0b4aeacc5648579f946372c4725263a485570b67fc82b1c88682e477ac322a languageName: node linkType: hard -"@simplewebauthn/typescript-types@npm:6.0.0, @simplewebauthn/typescript-types@npm:^6.0.0": +"@simplewebauthn/typescript-types@npm:6.0.0": version: 6.0.0 resolution: "@simplewebauthn/typescript-types@npm:6.0.0" checksum: f70c983ddb4613ff234be6ce689ebb500a246de57c1a892de8016e4e858ba81c663bcaee81cf942e1a398485fa23c10527511b733373f20a937c047a017584b0 languageName: node linkType: hard +"@simplewebauthn/typescript-types@npm:^6.2.1": + version: 6.2.1 + resolution: "@simplewebauthn/typescript-types@npm:6.2.1" + checksum: fda36ec34391a696586a89ef0efea3cfd49b42d606285b4db3e8d3dce3b36c5f831ec7682dd87784a26fa713ad8fdac91ea2a2fe62c2773dddffaa5cf24945ce + languageName: node + linkType: hard + "@sinclair/typebox@npm:^0.24.1": version: 0.24.27 resolution: "@sinclair/typebox@npm:0.24.27" From 1608ab25af47b0b447d80f60082d5ba484d005de Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 04:19:30 +0000 Subject: [PATCH 27/41] chore(deps): update dependency cypress to v10.9.0 (#6482) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e9593e79f362..9103e942b29c 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "babel-plugin-remove-code": "0.0.6", "boxen": "5.1.2", "core-js": "3.25.3", - "cypress": "10.8.0", + "cypress": "10.9.0", "cypress-wait-until": "1.7.2", "eslint": "8.24.0", "fast-glob": "3.2.12", diff --git a/yarn.lock b/yarn.lock index 7040dd7f28a2..ea66bc6f489a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14108,9 +14108,9 @@ __metadata: languageName: node linkType: hard -"cypress@npm:10.8.0": - version: 10.8.0 - resolution: "cypress@npm:10.8.0" +"cypress@npm:10.9.0": + version: 10.9.0 + resolution: "cypress@npm:10.9.0" dependencies: "@cypress/request": ^2.88.10 "@cypress/xvfb": ^1.2.4 @@ -14156,7 +14156,7 @@ __metadata: yauzl: ^2.10.0 bin: cypress: bin/cypress - checksum: ff554512f66715c2a33ab964697d9b682bd3559dd785b68b1563fbae173abaed8228e18254d47f614e21e43764e1aff07fb3ea48d786e96b1941b6b0e31e2918 + checksum: 0d16ca0e3b20cdd9b84651ae9a8549d211c916642c8b4537087f65e6607a70a9b3c0f92f9ec45813c918f047e1e32623449a78d8923a5cc245130b6f7da1c626 languageName: node linkType: hard @@ -27179,7 +27179,7 @@ __metadata: babel-plugin-remove-code: 0.0.6 boxen: 5.1.2 core-js: 3.25.3 - cypress: 10.8.0 + cypress: 10.9.0 cypress-wait-until: 1.7.2 eslint: 8.24.0 fast-glob: 3.2.12 From b55277ef37731426a337ccb7d0f64387dffdc250 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 07:18:15 +0000 Subject: [PATCH 28/41] chore(deps): update dependency esbuild to v0.15.10 (#6480) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/core/package.json | 2 +- packages/internal/package.json | 2 +- packages/record/package.json | 2 +- yarn.lock | 192 ++++++++++++++++----------------- 4 files changed, 99 insertions(+), 99 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 74be01a99c23..2ee0a6c5ddb4 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -63,7 +63,7 @@ "css-loader": "6.7.1", "css-minimizer-webpack-plugin": "4.0.0", "dotenv-webpack": "8.0.1", - "esbuild": "0.15.9", + "esbuild": "0.15.10", "fast-glob": "3.2.12", "file-loader": "6.2.0", "graphql": "16.6.0", diff --git a/packages/internal/package.json b/packages/internal/package.json index 7eb09c911e52..f00f486192ad 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -47,7 +47,7 @@ "chalk": "4.1.2", "core-js": "3.25.3", "deepmerge": "4.2.2", - "esbuild": "0.15.9", + "esbuild": "0.15.10", "fast-glob": "3.2.12", "findup-sync": "5.0.0", "fs-extra": "10.1.0", diff --git a/packages/record/package.json b/packages/record/package.json index 4273b72cff0b..9de2ece61ef5 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -35,7 +35,7 @@ "@babel/cli": "7.18.10", "@babel/core": "7.19.1", "@prisma/internals": "4.3.1", - "esbuild": "0.15.9", + "esbuild": "0.15.10", "jest": "29.0.3" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/yarn.lock b/yarn.lock index ea66bc6f489a..c1ef6959a29f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2183,16 +2183,16 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.15.9": - version: 0.15.9 - resolution: "@esbuild/android-arm@npm:0.15.9" +"@esbuild/android-arm@npm:0.15.10": + version: 0.15.10 + resolution: "@esbuild/android-arm@npm:0.15.10" conditions: os=android & cpu=arm languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.15.9": - version: 0.15.9 - resolution: "@esbuild/linux-loong64@npm:0.15.9" +"@esbuild/linux-loong64@npm:0.15.10": + version: 0.15.10 + resolution: "@esbuild/linux-loong64@npm:0.15.10" conditions: os=linux & cpu=loong64 languageName: node linkType: hard @@ -6365,7 +6365,7 @@ __metadata: css-loader: 6.7.1 css-minimizer-webpack-plugin: 4.0.0 dotenv-webpack: 8.0.1 - esbuild: 0.15.9 + esbuild: 0.15.10 fast-glob: 3.2.12 file-loader: 6.2.0 graphql: 16.6.0 @@ -6531,7 +6531,7 @@ __metadata: chalk: 4.1.2 core-js: 3.25.3 deepmerge: 4.2.2 - esbuild: 0.15.9 + esbuild: 0.15.10 fast-glob: 3.2.12 findup-sync: 5.0.0 fs-extra: 10.1.0 @@ -6590,7 +6590,7 @@ __metadata: "@prisma/client": 4.3.1 "@prisma/internals": 4.3.1 core-js: 3.25.3 - esbuild: 0.15.9 + esbuild: 0.15.10 jest: 29.0.3 languageName: unknown linkType: soft @@ -15356,172 +15356,172 @@ __metadata: languageName: node linkType: hard -"esbuild-android-64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-android-64@npm:0.15.9" +"esbuild-android-64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-android-64@npm:0.15.10" conditions: os=android & cpu=x64 languageName: node linkType: hard -"esbuild-android-arm64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-android-arm64@npm:0.15.9" +"esbuild-android-arm64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-android-arm64@npm:0.15.10" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"esbuild-darwin-64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-darwin-64@npm:0.15.9" +"esbuild-darwin-64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-darwin-64@npm:0.15.10" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"esbuild-darwin-arm64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-darwin-arm64@npm:0.15.9" +"esbuild-darwin-arm64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-darwin-arm64@npm:0.15.10" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"esbuild-freebsd-64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-freebsd-64@npm:0.15.9" +"esbuild-freebsd-64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-freebsd-64@npm:0.15.10" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"esbuild-freebsd-arm64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-freebsd-arm64@npm:0.15.9" +"esbuild-freebsd-arm64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-freebsd-arm64@npm:0.15.10" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"esbuild-linux-32@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-linux-32@npm:0.15.9" +"esbuild-linux-32@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-linux-32@npm:0.15.10" conditions: os=linux & cpu=ia32 languageName: node linkType: hard -"esbuild-linux-64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-linux-64@npm:0.15.9" +"esbuild-linux-64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-linux-64@npm:0.15.10" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"esbuild-linux-arm64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-linux-arm64@npm:0.15.9" +"esbuild-linux-arm64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-linux-arm64@npm:0.15.10" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"esbuild-linux-arm@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-linux-arm@npm:0.15.9" +"esbuild-linux-arm@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-linux-arm@npm:0.15.10" conditions: os=linux & cpu=arm languageName: node linkType: hard -"esbuild-linux-mips64le@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-linux-mips64le@npm:0.15.9" +"esbuild-linux-mips64le@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-linux-mips64le@npm:0.15.10" conditions: os=linux & cpu=mips64el languageName: node linkType: hard -"esbuild-linux-ppc64le@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-linux-ppc64le@npm:0.15.9" +"esbuild-linux-ppc64le@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-linux-ppc64le@npm:0.15.10" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard -"esbuild-linux-riscv64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-linux-riscv64@npm:0.15.9" +"esbuild-linux-riscv64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-linux-riscv64@npm:0.15.10" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard -"esbuild-linux-s390x@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-linux-s390x@npm:0.15.9" +"esbuild-linux-s390x@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-linux-s390x@npm:0.15.10" conditions: os=linux & cpu=s390x languageName: node linkType: hard -"esbuild-netbsd-64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-netbsd-64@npm:0.15.9" +"esbuild-netbsd-64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-netbsd-64@npm:0.15.10" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"esbuild-openbsd-64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-openbsd-64@npm:0.15.9" +"esbuild-openbsd-64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-openbsd-64@npm:0.15.10" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard -"esbuild-sunos-64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-sunos-64@npm:0.15.9" +"esbuild-sunos-64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-sunos-64@npm:0.15.10" conditions: os=sunos & cpu=x64 languageName: node linkType: hard -"esbuild-windows-32@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-windows-32@npm:0.15.9" +"esbuild-windows-32@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-windows-32@npm:0.15.10" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"esbuild-windows-64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-windows-64@npm:0.15.9" +"esbuild-windows-64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-windows-64@npm:0.15.10" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"esbuild-windows-arm64@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild-windows-arm64@npm:0.15.9" +"esbuild-windows-arm64@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild-windows-arm64@npm:0.15.10" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"esbuild@npm:0.15.9": - version: 0.15.9 - resolution: "esbuild@npm:0.15.9" - dependencies: - "@esbuild/android-arm": 0.15.9 - "@esbuild/linux-loong64": 0.15.9 - esbuild-android-64: 0.15.9 - esbuild-android-arm64: 0.15.9 - esbuild-darwin-64: 0.15.9 - esbuild-darwin-arm64: 0.15.9 - esbuild-freebsd-64: 0.15.9 - esbuild-freebsd-arm64: 0.15.9 - esbuild-linux-32: 0.15.9 - esbuild-linux-64: 0.15.9 - esbuild-linux-arm: 0.15.9 - esbuild-linux-arm64: 0.15.9 - esbuild-linux-mips64le: 0.15.9 - esbuild-linux-ppc64le: 0.15.9 - esbuild-linux-riscv64: 0.15.9 - esbuild-linux-s390x: 0.15.9 - esbuild-netbsd-64: 0.15.9 - esbuild-openbsd-64: 0.15.9 - esbuild-sunos-64: 0.15.9 - esbuild-windows-32: 0.15.9 - esbuild-windows-64: 0.15.9 - esbuild-windows-arm64: 0.15.9 +"esbuild@npm:0.15.10": + version: 0.15.10 + resolution: "esbuild@npm:0.15.10" + dependencies: + "@esbuild/android-arm": 0.15.10 + "@esbuild/linux-loong64": 0.15.10 + esbuild-android-64: 0.15.10 + esbuild-android-arm64: 0.15.10 + esbuild-darwin-64: 0.15.10 + esbuild-darwin-arm64: 0.15.10 + esbuild-freebsd-64: 0.15.10 + esbuild-freebsd-arm64: 0.15.10 + esbuild-linux-32: 0.15.10 + esbuild-linux-64: 0.15.10 + esbuild-linux-arm: 0.15.10 + esbuild-linux-arm64: 0.15.10 + esbuild-linux-mips64le: 0.15.10 + esbuild-linux-ppc64le: 0.15.10 + esbuild-linux-riscv64: 0.15.10 + esbuild-linux-s390x: 0.15.10 + esbuild-netbsd-64: 0.15.10 + esbuild-openbsd-64: 0.15.10 + esbuild-sunos-64: 0.15.10 + esbuild-windows-32: 0.15.10 + esbuild-windows-64: 0.15.10 + esbuild-windows-arm64: 0.15.10 dependenciesMeta: "@esbuild/android-arm": optional: true @@ -15569,7 +15569,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: e87c929ebba485c0137408407a049feefdf67b059b9375dc879a53bf5b0037f19bcf3630b6fb2a2f8e96fea0049b45dbc9745e7667c5184d0a319f3638654da6 + checksum: 972e54d9ba7d20fd38506ec2c9723804140d9adc1e87d73e46e64da61e9120e6b4e82d601c318452e76f656f4377189d34ce5e653ab421c58c3258102b2fb818 languageName: node linkType: hard From ef9d0fd5514f86e1ee02b9481501754bb858ea8b Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sat, 1 Oct 2022 12:52:29 +0200 Subject: [PATCH 29/41] Align comment with code (#6487) --- babel.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babel.config.js b/babel.config.js index bcc349c2b72a..6dd5234ba90d 100644 --- a/babel.config.js +++ b/babel.config.js @@ -2,7 +2,7 @@ const path = require('path') const packageJSON = require(path.join(__dirname, 'package.json')) -// RedwoodJS targets Node.js 12.x because this is the default version +// RedwoodJS targets Node.js 14.x because this is the default version // for Netlify's functions. const TARGETS_NODE = '14.20' From bf3c94d4bcf207e1a6b96f5e47a44c66531d8a44 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 13:59:59 +0000 Subject: [PATCH 30/41] chore(deps): update babel monorepo to v7.19.3 (#6481) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 10 +- packages/api-server/package.json | 4 +- packages/api/package.json | 4 +- packages/auth/package.json | 4 +- packages/cli/package.json | 4 +- packages/codemods/package.json | 6 +- packages/core/package.json | 8 +- packages/create-redwood-app/package.json | 4 +- packages/eslint-config/package.json | 4 +- packages/forms/package.json | 4 +- packages/graphql-server/package.json | 4 +- packages/internal/package.json | 10 +- packages/prerender/package.json | 4 +- packages/record/package.json | 4 +- packages/router/package.json | 4 +- packages/structure/package.json | 4 +- packages/telemetry/package.json | 4 +- packages/testing/package.json | 4 +- packages/web/package.json | 4 +- yarn.lock | 218 +++++++++++------------ 20 files changed, 156 insertions(+), 156 deletions(-) diff --git a/package.json b/package.json index 9103e942b29c..7404521bdfe6 100644 --- a/package.json +++ b/package.json @@ -40,17 +40,17 @@ "devDependencies": { "@actions/core": "1.9.1", "@actions/exec": "1.1.1", - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", - "@babel/generator": "7.19.0", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", + "@babel/generator": "7.19.3", "@babel/node": "7.19.1", "@babel/plugin-proposal-class-properties": "7.18.6", - "@babel/plugin-proposal-decorators": "7.19.1", + "@babel/plugin-proposal-decorators": "7.19.3", "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6", "@babel/plugin-proposal-private-methods": "7.18.6", "@babel/plugin-proposal-private-property-in-object": "7.18.6", "@babel/plugin-transform-runtime": "7.19.1", - "@babel/preset-env": "7.19.1", + "@babel/preset-env": "7.19.3", "@babel/preset-react": "7.18.6", "@babel/preset-typescript": "7.18.6", "@babel/runtime-corejs3": "7.19.1", diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 4c51a067e648..83066d22945c 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -48,8 +48,8 @@ "yargs": "17.5.1" }, "devDependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@types/aws-lambda": "8.10.101", "@types/lodash.escape": "4.0.7", "@types/qs": "6.9.7", diff --git a/packages/api/package.json b/packages/api/package.json index c7e07975e8a7..1e4d40634dc6 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -46,8 +46,8 @@ "uuid": "9.0.0" }, "devDependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@clerk/clerk-sdk-node": "3.9.2", "@redwoodjs/auth": "3.0.3", "@simplewebauthn/server": "6.2.1", diff --git a/packages/auth/package.json b/packages/auth/package.json index 42d6fa058759..45bb320b8b9d 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -29,8 +29,8 @@ "devDependencies": { "@auth0/auth0-spa-js": "1.22.4", "@azure/msal-browser": "2.28.3", - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@clerk/clerk-js": "3.17.0", "@clerk/clerk-react": "3.5.1", "@clerk/clerk-sdk-node": "3.9.2", diff --git a/packages/cli/package.json b/packages/cli/package.json index c034e6b083ba..31e1bb759278 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -65,8 +65,8 @@ "yargs": "17.5.1" }, "devDependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@types/listr": "0.14.4", "jest": "29.0.3", "typescript": "4.7.4" diff --git a/packages/codemods/package.json b/packages/codemods/package.json index 68008c99c56e..3a203321e1e6 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -22,9 +22,9 @@ "test:watch": "yarn test --watch" }, "dependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", - "@babel/plugin-transform-typescript": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", + "@babel/plugin-transform-typescript": "7.19.3", "@babel/runtime-corejs3": "7.19.1", "@vscode/ripgrep": "1.14.2", "core-js": "3.25.3", diff --git a/packages/core/package.json b/packages/core/package.json index 2ee0a6c5ddb4..cc255deca388 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -34,16 +34,16 @@ "test:watch": "yarn test --watch" }, "dependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@babel/eslint-plugin": "7.19.1", "@babel/node": "7.19.1", "@babel/plugin-proposal-class-properties": "7.18.6", - "@babel/plugin-proposal-decorators": "7.19.1", + "@babel/plugin-proposal-decorators": "7.19.3", "@babel/plugin-proposal-private-methods": "7.18.6", "@babel/plugin-proposal-private-property-in-object": "7.18.6", "@babel/plugin-transform-runtime": "7.19.1", - "@babel/preset-env": "7.19.1", + "@babel/preset-env": "7.19.3", "@babel/preset-react": "7.18.6", "@babel/preset-typescript": "7.18.6", "@babel/runtime-corejs3": "7.19.1", diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index da6ef258a920..b83b50a9b6e5 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -21,7 +21,7 @@ "test:watch": "yarn test --watch" }, "dependencies": { - "@babel/core": "7.19.1", + "@babel/core": "7.19.3", "@babel/node": "7.19.1", "@babel/runtime-corejs3": "7.19.1", "@redwoodjs/internal": "3.0.3", @@ -36,7 +36,7 @@ "yargs": "17.5.1" }, "devDependencies": { - "@babel/cli": "7.18.10", + "@babel/cli": "7.19.3", "@types/prompts": "2.4.0", "jest": "29.0.3", "typescript": "4.7.4" diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index ed66b31a4f0e..bd9dbff673b6 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -12,7 +12,7 @@ "build": "echo 'Nothing to build..'" }, "dependencies": { - "@babel/core": "7.19.1", + "@babel/core": "7.19.3", "@babel/eslint-parser": "7.19.1", "@babel/eslint-plugin": "7.19.1", "@redwoodjs/internal": "3.0.3", @@ -31,7 +31,7 @@ "prettier": "2.7.1" }, "devDependencies": { - "@babel/cli": "7.18.10", + "@babel/cli": "7.19.3", "jest": "29.0.3", "typescript": "4.7.4" }, diff --git a/packages/forms/package.json b/packages/forms/package.json index 3354dcd7778f..fd76c39ac3c4 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -28,8 +28,8 @@ "react-hook-form": "7.36.1" }, "devDependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@testing-library/dom": "8.18.1", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "12.1.5", diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 85a09c0ed8e2..699fcb1971d2 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -44,8 +44,8 @@ "uuid": "9.0.0" }, "devDependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@envelop/testing": "4.4.2", "@envelop/types": "2.3.1", "@redwoodjs/auth": "3.0.3", diff --git a/packages/internal/package.json b/packages/internal/package.json index f00f486192ad..8f0baf62c10f 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -28,11 +28,11 @@ "test:watch": "yarn test --watch" }, "dependencies": { - "@babel/parser": "7.19.1", - "@babel/plugin-transform-typescript": "7.19.1", + "@babel/parser": "7.19.3", + "@babel/plugin-transform-typescript": "7.19.3", "@babel/register": "7.18.9", "@babel/runtime-corejs3": "7.19.1", - "@babel/traverse": "7.19.1", + "@babel/traverse": "7.19.3", "@graphql-codegen/add": "3.2.1", "@graphql-codegen/cli": "2.11.7", "@graphql-codegen/core": "2.6.2", @@ -62,8 +62,8 @@ "typescript": "4.7.4" }, "devDependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@types/babel-plugin-tester": "9.0.5", "@types/babel__core": "7.1.19", "@types/findup-sync": "4.0.2", diff --git a/packages/prerender/package.json b/packages/prerender/package.json index 6fda25d5fd71..f856b3be50dd 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -38,8 +38,8 @@ "mime-types": "2.1.35" }, "devDependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@types/mime-types": "2.1.1", "babel-plugin-tester": "10.1.0", "jest": "29.0.3", diff --git a/packages/record/package.json b/packages/record/package.json index 9de2ece61ef5..fda6ce16a504 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -32,8 +32,8 @@ "core-js": "3.25.3" }, "devDependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@prisma/internals": "4.3.1", "esbuild": "0.15.10", "jest": "29.0.3" diff --git a/packages/router/package.json b/packages/router/package.json index d3a9032bfa5f..ce9109824ee9 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -29,8 +29,8 @@ "lodash.isequal": "4.5.0" }, "devDependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@types/lodash.isequal": "4.5.6", "@types/react": "17.0.50", "@types/react-dom": "17.0.17", diff --git a/packages/structure/package.json b/packages/structure/package.json index 7048d673fa55..921fbd77fa56 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -55,8 +55,8 @@ "yargs-parser": "21.1.1" }, "devDependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@types/fs-extra": "9.0.13", "@types/lodash": "4.14.185", "@types/lru-cache": "5.1.1", diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 02a6b92915fd..745f270261bb 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -38,8 +38,8 @@ "yargs": "17.5.1" }, "devDependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@types/envinfo": "7.8.1", "@types/uuid": "8.3.4", "@types/yargs": "17.0.12", diff --git a/packages/testing/package.json b/packages/testing/package.json index 5939d0dfe8a6..5f18380b72eb 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -61,8 +61,8 @@ "whatwg-fetch": "3.6.2" }, "devDependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "typescript": "4.7.4" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/web/package.json b/packages/web/package.json index c5e4d4e76a4c..20951b00e607 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -48,8 +48,8 @@ "ts-toolbelt": "9.6.0" }, "devDependencies": { - "@babel/cli": "7.18.10", - "@babel/core": "7.19.1", + "@babel/cli": "7.19.3", + "@babel/core": "7.19.3", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "12.1.5", "@types/prop-types": "15.7.5", diff --git a/yarn.lock b/yarn.lock index c1ef6959a29f..6da7f2ffe56a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -157,9 +157,9 @@ __metadata: languageName: node linkType: hard -"@babel/cli@npm:7.18.10": - version: 7.18.10 - resolution: "@babel/cli@npm:7.18.10" +"@babel/cli@npm:7.19.3": + version: 7.19.3 + resolution: "@babel/cli@npm:7.19.3" dependencies: "@jridgewell/trace-mapping": ^0.3.8 "@nicolo-ribaudo/chokidar-2": 2.1.8-no-fsevents.3 @@ -180,7 +180,7 @@ __metadata: bin: babel: ./bin/babel.js babel-external-helpers: ./bin/babel-external-helpers.js - checksum: f1abd28e271e7047653253383cb898d0c09b7a7d012efe057328a6b70808aefcce79ee76a21373a1d86c0211261100299c83ba55cea36f9fbd6efc27490761c9 + checksum: e996aa6a1cde07555ef83782d5809049e6ebecb16884e94acad6eea9a7f6323f6303ee74004a31b29b5ead257ad697f33650b6983e4e9fb14ef1f2908ea5c0a1 languageName: node linkType: hard @@ -193,10 +193,10 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.18.8, @babel/compat-data@npm:^7.19.1": - version: 7.19.1 - resolution: "@babel/compat-data@npm:7.19.1" - checksum: 4195f3feb661dd3b497fb840242390bec265ef04cea86e428a7f4386532cd7571530d3b001154b62e067328abf3b16618519d93010cd1c9ff5a82bb3f3f7341a +"@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.18.8, @babel/compat-data@npm:^7.19.3": + version: 7.19.3 + resolution: "@babel/compat-data@npm:7.19.3" + checksum: c23150ca0d39071dd35f1c0c380454c72c6518ae75e1095028a7a68cd5cc49d9061d8d58356cde8431dade28f594f5261777d2b6d8869ed794169a6971ca0098 languageName: node linkType: hard @@ -224,26 +224,26 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.19.1, @babel/core@npm:^7.1.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @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.7.5": - version: 7.19.1 - resolution: "@babel/core@npm:7.19.1" +"@babel/core@npm:7.19.3, @babel/core@npm:^7.1.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @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.7.5": + version: 7.19.3 + resolution: "@babel/core@npm:7.19.3" dependencies: "@ampproject/remapping": ^2.1.0 "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.19.0 - "@babel/helper-compilation-targets": ^7.19.1 + "@babel/generator": ^7.19.3 + "@babel/helper-compilation-targets": ^7.19.3 "@babel/helper-module-transforms": ^7.19.0 "@babel/helpers": ^7.19.0 - "@babel/parser": ^7.19.1 + "@babel/parser": ^7.19.3 "@babel/template": ^7.18.10 - "@babel/traverse": ^7.19.1 - "@babel/types": ^7.19.0 + "@babel/traverse": ^7.19.3 + "@babel/types": ^7.19.3 convert-source-map: ^1.7.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.2.1 semver: ^6.3.0 - checksum: 4c41fe49451fec105fdb50fb435a6b29a5aee39db780d3944d38be26eb915b0bd5c14efaae6e93c10c0a3b592c6de8e6f6b3f2ab3ea7542ac4041d9478d0a5ed + checksum: 2ef6bc3c407f5aa868a3fdc5ec58bcaf98d073de5fff65c1b16b1133cd232f43b5a413a1356c4cdd37f477fb006ac9fc0d5fce8a0f2f4f5d881de0dd1f6b0b06 languageName: node linkType: hard @@ -273,14 +273,14 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:7.19.0, @babel/generator@npm:^7.12.11, @babel/generator@npm:^7.12.5, @babel/generator@npm:^7.14.0, @babel/generator@npm:^7.19.0, @babel/generator@npm:^7.7.2": - version: 7.19.0 - resolution: "@babel/generator@npm:7.19.0" +"@babel/generator@npm:7.19.3, @babel/generator@npm:^7.12.11, @babel/generator@npm:^7.12.5, @babel/generator@npm:^7.14.0, @babel/generator@npm:^7.19.3, @babel/generator@npm:^7.7.2": + version: 7.19.3 + resolution: "@babel/generator@npm:7.19.3" dependencies: - "@babel/types": ^7.19.0 + "@babel/types": ^7.19.3 "@jridgewell/gen-mapping": ^0.3.2 jsesc: ^2.5.1 - checksum: 84308049e15851ef33d361a6d4e4847b169d9cf490633e5820adbcba95dc9b837afc7aeee5ccac6f0bf883a88cb5a84b64c45a68d07c24da8f47b1ddd5d1652e + checksum: a9ef340a17eee394f9f7a79aaee1ee2a5db2f54414ccccb29fe1c889d9811b04547921235ff91ee0191fa215f63a3a86e6b267e2aa988f04776f07e134bf86d2 languageName: node linkType: hard @@ -303,17 +303,17 @@ __metadata: languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.19.0, @babel/helper-compilation-targets@npm:^7.19.1": - version: 7.19.1 - resolution: "@babel/helper-compilation-targets@npm:7.19.1" +"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.19.0, @babel/helper-compilation-targets@npm:^7.19.3": + version: 7.19.3 + resolution: "@babel/helper-compilation-targets@npm:7.19.3" dependencies: - "@babel/compat-data": ^7.19.1 + "@babel/compat-data": ^7.19.3 "@babel/helper-validator-option": ^7.18.6 browserslist: ^4.21.3 semver: ^6.3.0 peerDependencies: "@babel/core": ^7.0.0 - checksum: 74dfebf6d918112b75c1fd096cde30fa68e35940105b8eb7c630b1d3c7f86c61e2eab7f2f9e2bf36ef7b241045cb6bfa46215c070e26714d0bd2cedfa16498e2 + checksum: 05f5ea8c9310f6064d508e06c5523e3e7dee988056be7505fbdecdc9564027946d3163405b49c8f3dd27c819280c34fb99ab810e181de572c77e79c9ae303201 languageName: node linkType: hard @@ -533,10 +533,10 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-validator-identifier@npm:7.18.6" - checksum: 101b283b3c2feebea135ef75008aaef95d042a1e3204be64112654390d7f95f1d2898d816582a82df0feed5df16778146bbdf5c82e744dc7bf018c3c8d0919e9 +"@babel/helper-validator-identifier@npm:^7.18.6, @babel/helper-validator-identifier@npm:^7.19.1": + version: 7.19.1 + resolution: "@babel/helper-validator-identifier@npm:7.19.1" + checksum: f978ecfea840f65b64ab9e17fac380625a45f4fe1361eeb29867fcfd1c9eaa72abd7023f2f40ac3168587d7e5153660d16cfccb352a557be2efd347a051b4b20 languageName: node linkType: hard @@ -599,12 +599,12 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:7.19.1, @babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.1.6, @babel/parser@npm:^7.12.11, @babel/parser@npm:^7.12.7, @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.18.10, @babel/parser@npm:^7.19.1, @babel/parser@npm:^7.3.2": - version: 7.19.1 - resolution: "@babel/parser@npm:7.19.1" +"@babel/parser@npm:7.19.3, @babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.1.6, @babel/parser@npm:^7.12.11, @babel/parser@npm:^7.12.7, @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.18.10, @babel/parser@npm:^7.19.3, @babel/parser@npm:^7.3.2": + version: 7.19.3 + resolution: "@babel/parser@npm:7.19.3" bin: parser: ./bin/babel-parser.js - checksum: 558c698586e53e73b4c9f0ab53d70b35755c04513569371fa97b813661fef5b00c00d27fca5975416e72bc689be44ba1c11a04741dc2f0f4e8bc7676340d8b89 + checksum: 38f5869733576c55364eb926d81d5efd9cc604d9464f32beada4229af33f1a48e53bb167ad978f7565a9eed31a622c2ff85da891fe0083203d793a1d414f1e3b languageName: node linkType: hard @@ -671,9 +671,9 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-decorators@npm:7.19.1, @babel/plugin-proposal-decorators@npm:^7.12.12": - version: 7.19.1 - resolution: "@babel/plugin-proposal-decorators@npm:7.19.1" +"@babel/plugin-proposal-decorators@npm:7.19.3, @babel/plugin-proposal-decorators@npm:^7.12.12": + version: 7.19.3 + resolution: "@babel/plugin-proposal-decorators@npm:7.19.3" dependencies: "@babel/helper-create-class-features-plugin": ^7.19.0 "@babel/helper-plugin-utils": ^7.19.0 @@ -682,7 +682,7 @@ __metadata: "@babel/plugin-syntax-decorators": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: dc0448a173d2817d70b847d6af84b6e3621ad7a306e44795b87099942be55843a5d013cad71176f4698a32fe4a0d857ee2237d1a4eeef67c79fd60b3572e7d81 + checksum: b51493858cf9be2a39fc9e680c058e1cc1c02962f454cbeb9ac371265bed899d09edfa967ffdefb19c57b83b69c5650d5367ff4dc284cb2f9cbf0a0fb9a257fc languageName: node linkType: hard @@ -1549,16 +1549,16 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-typescript@npm:7.19.1, @babel/plugin-transform-typescript@npm:^7.18.6": - version: 7.19.1 - resolution: "@babel/plugin-transform-typescript@npm:7.19.1" +"@babel/plugin-transform-typescript@npm:7.19.3, @babel/plugin-transform-typescript@npm:^7.18.6": + version: 7.19.3 + resolution: "@babel/plugin-transform-typescript@npm:7.19.3" dependencies: "@babel/helper-create-class-features-plugin": ^7.19.0 "@babel/helper-plugin-utils": ^7.19.0 "@babel/plugin-syntax-typescript": ^7.18.6 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: d6881fd81f3cc33173e8f2d3adb299d7e1ab74e7cede5153afb40fd18a8fc10036d22f0e0105e150545a8218c068ffa0b9371852799eece9d2fd211b9eef4cea + checksum: 4933ff4ab278c3777c2cb382df96784ba2de4ef305a785a4bd7c600df0befd73826b34fb330c96706c0a720788721c35cb139c635f6963aa8778ab9bda6856f4 languageName: node linkType: hard @@ -1585,12 +1585,12 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:7.19.1, @babel/preset-env@npm:^7.12.11": - version: 7.19.1 - resolution: "@babel/preset-env@npm:7.19.1" +"@babel/preset-env@npm:7.19.3, @babel/preset-env@npm:^7.12.11": + version: 7.19.3 + resolution: "@babel/preset-env@npm:7.19.3" dependencies: - "@babel/compat-data": ^7.19.1 - "@babel/helper-compilation-targets": ^7.19.1 + "@babel/compat-data": ^7.19.3 + "@babel/helper-compilation-targets": ^7.19.3 "@babel/helper-plugin-utils": ^7.19.0 "@babel/helper-validator-option": ^7.18.6 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.18.6 @@ -1658,7 +1658,7 @@ __metadata: "@babel/plugin-transform-unicode-escapes": ^7.18.10 "@babel/plugin-transform-unicode-regex": ^7.18.6 "@babel/preset-modules": ^0.1.5 - "@babel/types": ^7.19.0 + "@babel/types": ^7.19.3 babel-plugin-polyfill-corejs2: ^0.3.3 babel-plugin-polyfill-corejs3: ^0.6.0 babel-plugin-polyfill-regenerator: ^0.4.1 @@ -1666,7 +1666,7 @@ __metadata: semver: ^6.3.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 31ed483c9561845d4eac3478e640b5a32033f01d30afd6212e4498c7896e6333c3002275b0bfa3a0c3f54dedf8e6cf07e37dfd754464e9dab813cbb3eeba51d6 + checksum: de30eb89873974f36721a22e4c1b9f7cc48931e607eabc00ef43b4c39f5459b6fdc55206bd1d2ad78db313b6543bfc81c6bbf0f6928861af4dfddb04c7476f6f languageName: node linkType: hard @@ -1772,32 +1772,32 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:7.19.1, @babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.18.11, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.7.2": - version: 7.19.1 - resolution: "@babel/traverse@npm:7.19.1" +"@babel/traverse@npm:7.19.3, @babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.18.11, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.19.3, @babel/traverse@npm:^7.7.2": + version: 7.19.3 + resolution: "@babel/traverse@npm:7.19.3" dependencies: "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.19.0 + "@babel/generator": ^7.19.3 "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-function-name": ^7.19.0 "@babel/helper-hoist-variables": ^7.18.6 "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/parser": ^7.19.1 - "@babel/types": ^7.19.0 + "@babel/parser": ^7.19.3 + "@babel/types": ^7.19.3 debug: ^4.1.0 globals: ^11.1.0 - checksum: 29289e05a7f215d46ad06b476be1c4e529f7b100fa26f36894e1521ec50d31837a2d1b98bad094812be26d641d3a63dab8517f423304aae00c1ba93e994ed96c + checksum: fd0669353ea6346f77060ed8a49987e6747ce7f0b61581d110e6c5ed3cc3dd86032d7ff9e379b658131b2d421355d454a37c4222a620d221ada2b1196f95e74d languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.1.6, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.7, @babel/types@npm:^7.16.8, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.2.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": - version: 7.19.0 - resolution: "@babel/types@npm:7.19.0" +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.1.6, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.7, @babel/types@npm:^7.16.8, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.19.3, @babel/types@npm:^7.2.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": + version: 7.19.3 + resolution: "@babel/types@npm:7.19.3" dependencies: "@babel/helper-string-parser": ^7.18.10 - "@babel/helper-validator-identifier": ^7.18.6 + "@babel/helper-validator-identifier": ^7.19.1 to-fast-properties: ^2.0.0 - checksum: 36b9360aa2d29fe515963b7c7014de3d66eb8c17315d00c65d82ab46b44482d5ba898aa3b5bc84887e6304b5456f2dbfe46e21851ca514f98106d8d47fbc3a0f + checksum: a31e612300c6f7e6bd79e19553c03da1f33ea01a3d08fb91f76b2f55422b5ebf9f30a5b8c5eedc80d27fe7812c43fa9f9ff01289a09751a64b800b89dd4ca6dc languageName: node linkType: hard @@ -6119,8 +6119,8 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/api-server@workspace:packages/api-server" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/plugin-transform-runtime": 7.19.1 "@babel/runtime-corejs3": 7.19.1 "@fastify/http-proxy": 8.2.2 @@ -6158,8 +6158,8 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/api@workspace:packages/api" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/runtime-corejs3": 7.19.1 "@clerk/clerk-sdk-node": 3.9.2 "@prisma/client": 4.3.1 @@ -6216,8 +6216,8 @@ __metadata: dependencies: "@auth0/auth0-spa-js": 1.22.4 "@azure/msal-browser": 2.28.3 - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/runtime-corejs3": 7.19.1 "@clerk/clerk-js": 3.17.0 "@clerk/clerk-react": 3.5.1 @@ -6248,8 +6248,8 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/cli@workspace:packages/cli" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/runtime-corejs3": 7.19.1 "@prisma/internals": 4.3.1 "@redwoodjs/api-server": 3.0.3 @@ -6299,9 +6299,9 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/codemods@workspace:packages/codemods" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 - "@babel/plugin-transform-typescript": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 + "@babel/plugin-transform-typescript": 7.19.3 "@babel/runtime-corejs3": 7.19.1 "@types/babel__core": 7.1.19 "@types/findup-sync": 4.0.2 @@ -6335,16 +6335,16 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/core@workspace:packages/core" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/eslint-plugin": 7.19.1 "@babel/node": 7.19.1 "@babel/plugin-proposal-class-properties": 7.18.6 - "@babel/plugin-proposal-decorators": 7.19.1 + "@babel/plugin-proposal-decorators": 7.19.3 "@babel/plugin-proposal-private-methods": 7.18.6 "@babel/plugin-proposal-private-property-in-object": 7.18.6 "@babel/plugin-transform-runtime": 7.19.1 - "@babel/preset-env": 7.19.1 + "@babel/preset-env": 7.19.3 "@babel/preset-react": 7.18.6 "@babel/preset-typescript": 7.18.6 "@babel/runtime-corejs3": 7.19.1 @@ -6409,8 +6409,8 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/eslint-config@workspace:packages/eslint-config" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/eslint-parser": 7.19.1 "@babel/eslint-plugin": 7.19.1 "@redwoodjs/internal": 3.0.3 @@ -6436,8 +6436,8 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/forms@workspace:packages/forms" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/runtime-corejs3": 7.19.1 "@testing-library/dom": 8.18.1 "@testing-library/jest-dom": 5.16.5 @@ -6466,8 +6466,8 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/graphql-server@workspace:packages/graphql-server" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/runtime-corejs3": 7.19.1 "@envelop/depth-limit": 1.6.2 "@envelop/disable-introspection": 3.4.2 @@ -6504,13 +6504,13 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/internal@workspace:packages/internal" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 - "@babel/parser": 7.19.1 - "@babel/plugin-transform-typescript": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 + "@babel/parser": 7.19.3 + "@babel/plugin-transform-typescript": 7.19.3 "@babel/register": 7.18.9 "@babel/runtime-corejs3": 7.19.1 - "@babel/traverse": 7.19.1 + "@babel/traverse": 7.19.3 "@graphql-codegen/add": 3.2.1 "@graphql-codegen/cli": 2.11.7 "@graphql-codegen/core": 2.6.2 @@ -6556,8 +6556,8 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/prerender@workspace:packages/prerender" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/runtime-corejs3": 7.19.1 "@redwoodjs/auth": 3.0.3 "@redwoodjs/internal": 3.0.3 @@ -6584,8 +6584,8 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/record@workspace:packages/record" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/runtime-corejs3": 7.19.1 "@prisma/client": 4.3.1 "@prisma/internals": 4.3.1 @@ -6599,8 +6599,8 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/router@workspace:packages/router" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/runtime-corejs3": 7.19.1 "@reach/skip-nav": 0.16.0 "@redwoodjs/auth": 3.0.3 @@ -6621,8 +6621,8 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/structure@workspace:packages/structure" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/runtime-corejs3": 7.19.1 "@prisma/internals": 4.3.1 "@redwoodjs/internal": 3.0.3 @@ -6660,8 +6660,8 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/telemetry@workspace:packages/telemetry" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/runtime-corejs3": 7.19.1 "@redwoodjs/internal": 3.0.3 "@redwoodjs/structure": 3.0.3 @@ -6683,8 +6683,8 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/testing@workspace:packages/testing" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/runtime-corejs3": 7.19.1 "@redwoodjs/auth": 3.0.3 "@redwoodjs/graphql-server": 3.0.3 @@ -6727,8 +6727,8 @@ __metadata: resolution: "@redwoodjs/web@workspace:packages/web" dependencies: "@apollo/client": 3.6.9 - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/runtime-corejs3": 7.19.1 "@redwoodjs/auth": 3.0.3 "@testing-library/jest-dom": 5.16.5 @@ -13654,8 +13654,8 @@ __metadata: version: 0.0.0-use.local resolution: "create-redwood-app@workspace:packages/create-redwood-app" dependencies: - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 "@babel/node": 7.19.1 "@babel/runtime-corejs3": 7.19.1 "@redwoodjs/internal": 3.0.3 @@ -27143,17 +27143,17 @@ __metadata: dependencies: "@actions/core": 1.9.1 "@actions/exec": 1.1.1 - "@babel/cli": 7.18.10 - "@babel/core": 7.19.1 - "@babel/generator": 7.19.0 + "@babel/cli": 7.19.3 + "@babel/core": 7.19.3 + "@babel/generator": 7.19.3 "@babel/node": 7.19.1 "@babel/plugin-proposal-class-properties": 7.18.6 - "@babel/plugin-proposal-decorators": 7.19.1 + "@babel/plugin-proposal-decorators": 7.19.3 "@babel/plugin-proposal-nullish-coalescing-operator": 7.18.6 "@babel/plugin-proposal-private-methods": 7.18.6 "@babel/plugin-proposal-private-property-in-object": 7.18.6 "@babel/plugin-transform-runtime": 7.19.1 - "@babel/preset-env": 7.19.1 + "@babel/preset-env": 7.19.3 "@babel/preset-react": 7.18.6 "@babel/preset-typescript": 7.18.6 "@babel/runtime-corejs3": 7.19.1 From 1f1a21a7045c9221001510185f357139fe047bca Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sat, 1 Oct 2022 17:35:13 +0200 Subject: [PATCH 31/41] Add docs for dbauth generator (#6486) * Add docs for dbauth generator * Update docs/docs/cli-commands.md Co-authored-by: Rob Cameron Co-authored-by: Rob Cameron --- docs/docs/cli-commands.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docs/docs/cli-commands.md b/docs/docs/cli-commands.md index 07f88ec0805e..73d9dad72599 100644 --- a/docs/docs/cli-commands.md +++ b/docs/docs/cli-commands.md @@ -413,6 +413,7 @@ Some generators require that their argument be a model in your `schema.prisma`. | `cell ` | Generate a cell component | | `component ` | Generate a component component | | `dataMigration ` | Generate a data migration component | +| `dbAuth` | Generate sign in, sign up and password reset pages for dbAuth | | `deploy ` | Generate a deployment configuration | | `function ` | Generate a Function | | `layout ` | Generate a layout component | @@ -575,6 +576,28 @@ See the [Data Migration](data-migrations.md) docs. See the [Deploy](/docs/deploy/introduction) docs. +### generate dbAuth + +Generate log in, sign up, forgot password and password reset pages for dbAuth + +``` +yarn redwood generate dbAuth +``` + +| Arguments & Options | Description | +| -------------------- | ------------------------------------------------------------------------------------------------ | +| `--webAuthn` | Whether or not to add webAuthn support to the log in page. If not specified you will be prompted | + +If you don't want to create your own log in, sign up, forgot password and +password reset pages from scratch you can use this generator. The pages will be +available at /login, /signup, /forgot-password, and /reset-password. Check the +post-install instructions for one change you need to make to those pages: where +to redirect the user to once their log in/sign up is successful. + +If you'd rather create your own, you might want to start from the generated +pages anyway as they'll contain the other code you need to actually submit the +log in credentials or sign up fields to the server for processing. + ### generate directive Generate a directive. From 95d58a6bde76b9d6c21dd4744158c662a702b5cb Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Fri, 30 Sep 2022 17:24:31 -0700 Subject: [PATCH 32/41] fix(cherry pick): use pull_request_target, handle docs --- .../cherry-pick-into-release-branch.yml | 2 +- .github/workflows/ci.yml | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cherry-pick-into-release-branch.yml b/.github/workflows/cherry-pick-into-release-branch.yml index 7e5b5386fab0..a7db1a4995a5 100644 --- a/.github/workflows/cherry-pick-into-release-branch.yml +++ b/.github/workflows/cherry-pick-into-release-branch.yml @@ -5,7 +5,7 @@ name: 🍒 Cherry pick into release branch on: - pull_request: + pull_request_target: branches: [main] types: [closed] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a5ac83d5883..e81190ebbc49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -350,3 +350,38 @@ jobs: } } ' + + cherry-pick-docs: + needs: [build-lint-test-docs, tutorial-e2e-docs, smoke-test-docs] + if: github.event.pull_request.user.login == 'redwoodjs-bot[bot]' && github.base_ref == 'release' && !contains(join(needs.*.result, ','), 'failure') + name: cherry-pick-docs + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + with: + ref: release + fetch-depth: 0 + token: ${{ secrets.JTOAR_TOKEN }} + + - name: 🍒 Cherry pick + run: | + git config user.name github-actions + git config user.email github-actions@github.com + + git cherry-pick ${{ github.event.pull_request.head.sha }} + git push + + - name: Close PR + env: + GH_TOKEN: ${{ secrets.JTOAR_TOKEN }} + run: | + gh api graphql -F id=${{ github.event.pull_request.node_id }} -f query=' + mutation($id: ID!) { + closePullRequest(input: { + pullRequestId: $id + }) { + clientMutationId + } + } + ' From 5d2b99b29a148c8ba03edb7ff76af904e917e715 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 12:54:44 -0700 Subject: [PATCH 33/41] fix(deps): update jest monorepo (#6484) --- package.json | 6 +- packages/api-server/package.json | 2 +- packages/api/package.json | 2 +- packages/auth/package.json | 2 +- packages/cli/package.json | 2 +- packages/codemods/package.json | 4 +- packages/core/package.json | 2 +- packages/create-redwood-app/package.json | 2 +- packages/eslint-config/package.json | 2 +- packages/forms/package.json | 2 +- packages/graphql-server/package.json | 2 +- packages/internal/package.json | 2 +- packages/prerender/package.json | 2 +- packages/record/package.json | 2 +- packages/router/package.json | 2 +- packages/structure/package.json | 2 +- packages/telemetry/package.json | 2 +- packages/testing/package.json | 8 +- packages/web/package.json | 2 +- yarn.lock | 658 ++++++++++++----------- 20 files changed, 355 insertions(+), 353 deletions(-) diff --git a/package.json b/package.json index 7404521bdfe6..6563b916739d 100644 --- a/package.json +++ b/package.json @@ -64,14 +64,14 @@ "@tsd/typescript": "4.8.3", "@types/babel__generator": "7.6.4", "@types/fs-extra": "9.0.13", - "@types/jest": "29.0.1", + "@types/jest": "29.1.1", "@types/jscodeshift": "0.11.5", "@types/lodash.template": "4.5.1", "@types/ncp": "2.0.5", "@types/prompts": "2.4.0", "all-contributors-cli": "6.20.0", "ansi-colors": "4.1.3", - "babel-jest": "29.0.3", + "babel-jest": "29.1.2", "babel-plugin-auto-import": "1.1.0", "babel-plugin-remove-code": "0.0.6", "boxen": "5.1.2", @@ -82,7 +82,7 @@ "fast-glob": "3.2.12", "fs-extra": "10.1.0", "is-port-reachable": "3.1.0", - "jest": "29.0.3", + "jest": "29.1.2", "jest-runner-tsd": "4.0.0", "jscodeshift": "0.13.1", "lerna": "5.5.4", diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 83066d22945c..cc39625cee87 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -56,7 +56,7 @@ "@types/split2": "3.2.1", "@types/yargs": "17.0.12", "aws-lambda": "1.0.7", - "jest": "29.0.3", + "jest": "29.1.2", "typescript": "4.7.4" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/api/package.json b/packages/api/package.json index 1e4d40634dc6..949046ef0a18 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -59,7 +59,7 @@ "@types/split2": "3.2.1", "@types/uuid": "8.3.4", "aws-lambda": "1.0.7", - "jest": "29.0.3", + "jest": "29.1.2", "split2": "4.1.0", "typescript": "4.7.4" }, diff --git a/packages/auth/package.json b/packages/auth/package.json index 45bb320b8b9d..d4f26b3f5099 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -46,7 +46,7 @@ "firebase": "9.9.3", "firebase-admin": "10.3.0", "gotrue-js": "0.9.29", - "jest": "29.0.3", + "jest": "29.1.2", "magic-sdk": "9.0.0", "netlify-identity-widget": "1.9.2", "react": "17.0.2", diff --git a/packages/cli/package.json b/packages/cli/package.json index 31e1bb759278..675f526b0abf 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -68,7 +68,7 @@ "@babel/cli": "7.19.3", "@babel/core": "7.19.3", "@types/listr": "0.14.4", - "jest": "29.0.3", + "jest": "29.1.2", "typescript": "4.7.4" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/codemods/package.json b/packages/codemods/package.json index 3a203321e1e6..4bf7d85d3636 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -33,7 +33,7 @@ "execa": "5.1.1", "fast-glob": "3.2.12", "findup-sync": "5.0.0", - "jest": "29.0.3", + "jest": "29.1.2", "jscodeshift": "0.13.1", "prettier": "2.7.1", "tasuku": "2.0.0", @@ -45,7 +45,7 @@ "@types/babel__core": "7.1.19", "@types/findup-sync": "4.0.2", "@types/fs-extra": "9.0.13", - "@types/jest": "29.0.1", + "@types/jest": "29.1.1", "@types/jscodeshift": "0.11.5", "@types/prettier": "2.7.0", "@types/yargs": "17.0.12", diff --git a/packages/core/package.json b/packages/core/package.json index cc255deca388..5bbdb86e763b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -89,7 +89,7 @@ }, "devDependencies": { "@types/rimraf": "3.0.2", - "jest": "29.0.3" + "jest": "29.1.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/create-redwood-app/package.json b/packages/create-redwood-app/package.json index b83b50a9b6e5..1754e8814a8d 100644 --- a/packages/create-redwood-app/package.json +++ b/packages/create-redwood-app/package.json @@ -38,7 +38,7 @@ "devDependencies": { "@babel/cli": "7.19.3", "@types/prompts": "2.4.0", - "jest": "29.0.3", + "jest": "29.1.2", "typescript": "4.7.4" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index bd9dbff673b6..f2d9230f40a0 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@babel/cli": "7.19.3", - "jest": "29.0.3", + "jest": "29.1.2", "typescript": "4.7.4" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/forms/package.json b/packages/forms/package.json index fd76c39ac3c4..3f9abdfab423 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -39,7 +39,7 @@ "@types/react-dom": "17.0.17", "@types/testing-library__jest-dom": "5.14.5", "graphql": "16.6.0", - "jest": "29.0.3", + "jest": "29.1.2", "nodemon": "2.0.20", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 699fcb1971d2..a0ce3129ac79 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -53,7 +53,7 @@ "@types/lodash.omitby": "4.6.7", "@types/uuid": "8.3.4", "aws-lambda": "1.0.7", - "jest": "29.0.3", + "jest": "29.1.2", "typescript": "4.7.4" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/internal/package.json b/packages/internal/package.json index 8f0baf62c10f..03ab815ae444 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -71,7 +71,7 @@ "@types/rimraf": "3.0.2", "babel-plugin-tester": "10.1.0", "graphql-tag": "2.12.6", - "jest": "29.0.3" + "jest": "29.1.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/prerender/package.json b/packages/prerender/package.json index f856b3be50dd..5ace43e36154 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -42,7 +42,7 @@ "@babel/core": "7.19.3", "@types/mime-types": "2.1.1", "babel-plugin-tester": "10.1.0", - "jest": "29.0.3", + "jest": "29.1.2", "typescript": "4.7.4" }, "peerDependencies": { diff --git a/packages/record/package.json b/packages/record/package.json index fda6ce16a504..df27332b2b35 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -36,7 +36,7 @@ "@babel/core": "7.19.3", "@prisma/internals": "4.3.1", "esbuild": "0.15.10", - "jest": "29.0.3" + "jest": "29.1.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/router/package.json b/packages/router/package.json index ce9109824ee9..4eb404ddfd55 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -34,7 +34,7 @@ "@types/lodash.isequal": "4.5.6", "@types/react": "17.0.50", "@types/react-dom": "17.0.17", - "jest": "29.0.3", + "jest": "29.1.2", "prop-types": "15.8.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/packages/structure/package.json b/packages/structure/package.json index 921fbd77fa56..d864ae0c156b 100644 --- a/packages/structure/package.json +++ b/packages/structure/package.json @@ -62,7 +62,7 @@ "@types/lru-cache": "5.1.1", "@types/node": "16.11.47", "@types/vscode": "1.70.0", - "jest": "29.0.3", + "jest": "29.1.2", "typescript": "4.7.4" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 745f270261bb..a5fd33d15433 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -43,7 +43,7 @@ "@types/envinfo": "7.8.1", "@types/uuid": "8.3.4", "@types/yargs": "17.0.12", - "jest": "29.0.3" + "jest": "29.1.2" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/testing/package.json b/packages/testing/package.json index 5f18380b72eb..304a0cb7a294 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -44,17 +44,17 @@ "@testing-library/user-event": "14.4.3", "@types/aws-lambda": "8.10.101", "@types/babel-core": "6.25.7", - "@types/jest": "29.0.1", + "@types/jest": "29.1.1", "@types/node": "16.11.47", "@types/react": "17.0.50", "@types/react-dom": "17.0.17", "@types/webpack": "5.28.0", - "babel-jest": "29.0.3", + "babel-jest": "29.1.2", "babel-plugin-inline-react-svg": "2.0.1", "core-js": "3.25.3", "fast-glob": "3.2.12", - "jest": "29.0.3", - "jest-environment-jsdom": "29.0.3", + "jest": "29.1.2", + "jest-environment-jsdom": "29.1.2", "jest-watch-typeahead": "2.2.0", "msw": "0.47.3", "ts-toolbelt": "9.6.0", diff --git a/packages/web/package.json b/packages/web/package.json index 20951b00e607..b32f2389acad 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -56,7 +56,7 @@ "@types/react": "17.0.50", "@types/react-dom": "17.0.17", "@types/testing-library__jest-dom": "5.14.5", - "jest": "29.0.3", + "jest": "29.1.2", "nodemon": "2.0.20", "prop-types": "15.8.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 6da7f2ffe56a..8f64e6150fff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3691,29 +3691,29 @@ __metadata: languageName: node linkType: hard -"@jest/console@npm:^29.0.3": - version: 29.0.3 - resolution: "@jest/console@npm:29.0.3" +"@jest/console@npm:^29.1.2": + version: 29.1.2 + resolution: "@jest/console@npm:29.1.2" dependencies: - "@jest/types": ^29.0.3 + "@jest/types": ^29.1.2 "@types/node": "*" chalk: ^4.0.0 - jest-message-util: ^29.0.3 - jest-util: ^29.0.3 + jest-message-util: ^29.1.2 + jest-util: ^29.1.2 slash: ^3.0.0 - checksum: 0b72ecedf90a21bca876b68bce1d296a15eaa09ff483d564741984ed04542388c43c2e734221d9ccbb81c223fda349f767bc665c8c49de6067f107575a2d1041 + checksum: aff46ba460fb236b2e753bda473db67fc04c5232eaaadaa6f49de9f883f48c624a14ec274e7acbef3d2fdc13437033bd74579858088e604e81d0e0d2c2fe9f4f languageName: node linkType: hard -"@jest/core@npm:^29.0.3": - version: 29.0.3 - resolution: "@jest/core@npm:29.0.3" +"@jest/core@npm:^29.1.2": + version: 29.1.2 + resolution: "@jest/core@npm:29.1.2" dependencies: - "@jest/console": ^29.0.3 - "@jest/reporters": ^29.0.3 - "@jest/test-result": ^29.0.3 - "@jest/transform": ^29.0.3 - "@jest/types": ^29.0.3 + "@jest/console": ^29.1.2 + "@jest/reporters": ^29.1.2 + "@jest/test-result": ^29.1.2 + "@jest/transform": ^29.1.2 + "@jest/types": ^29.1.2 "@types/node": "*" ansi-escapes: ^4.2.1 chalk: ^4.0.0 @@ -3721,20 +3721,20 @@ __metadata: exit: ^0.1.2 graceful-fs: ^4.2.9 jest-changed-files: ^29.0.0 - jest-config: ^29.0.3 - jest-haste-map: ^29.0.3 - jest-message-util: ^29.0.3 + jest-config: ^29.1.2 + jest-haste-map: ^29.1.2 + jest-message-util: ^29.1.2 jest-regex-util: ^29.0.0 - jest-resolve: ^29.0.3 - jest-resolve-dependencies: ^29.0.3 - jest-runner: ^29.0.3 - jest-runtime: ^29.0.3 - jest-snapshot: ^29.0.3 - jest-util: ^29.0.3 - jest-validate: ^29.0.3 - jest-watcher: ^29.0.3 + jest-resolve: ^29.1.2 + jest-resolve-dependencies: ^29.1.2 + jest-runner: ^29.1.2 + jest-runtime: ^29.1.2 + jest-snapshot: ^29.1.2 + jest-util: ^29.1.2 + jest-validate: ^29.1.2 + jest-watcher: ^29.1.2 micromatch: ^4.0.4 - pretty-format: ^29.0.3 + pretty-format: ^29.1.2 slash: ^3.0.0 strip-ansi: ^6.0.0 peerDependencies: @@ -3742,76 +3742,76 @@ __metadata: peerDependenciesMeta: node-notifier: optional: true - checksum: c9592afe68fb929087b28199f15cedd0c1dc7f445365cb8c1098b087fd2a539505c8e5c6329c62c932401bf24f1f9b1a184cbe83a2c998ae67110418a1c2096f + checksum: 4372ef9055cd5f0303fb057a8e6fd7a00e7abca1f8e3dde582108e0c4af98f168690b80e0f89dc5c5d7e77d667ebdff76202faf195a302c5320f6060c4086eca languageName: node linkType: hard -"@jest/environment@npm:^29.0.3": - version: 29.0.3 - resolution: "@jest/environment@npm:29.0.3" +"@jest/environment@npm:^29.1.2": + version: 29.1.2 + resolution: "@jest/environment@npm:29.1.2" dependencies: - "@jest/fake-timers": ^29.0.3 - "@jest/types": ^29.0.3 + "@jest/fake-timers": ^29.1.2 + "@jest/types": ^29.1.2 "@types/node": "*" - jest-mock: ^29.0.3 - checksum: 1a90851361aed936fbef7877930ddbd1b4f4ae5196161d2105253cce3b929fcd7fad3e13c2171bd35470766132af2126417ac06e5eb06ee9acedfe70c4c4392a + jest-mock: ^29.1.2 + checksum: 272ca67bd0b7ade24481c01d799f239a07857a8ce2a9ae0a3b5dcdae4ff38ed1c4a475d6a5941ad34ec6d527612bf1619ee695b42c24b7bc672c8891fd08c208 languageName: node linkType: hard -"@jest/expect-utils@npm:^29.0.3": - version: 29.0.3 - resolution: "@jest/expect-utils@npm:29.0.3" +"@jest/expect-utils@npm:^29.1.2": + version: 29.1.2 + resolution: "@jest/expect-utils@npm:29.1.2" dependencies: jest-get-type: ^29.0.0 - checksum: 2c70535f6696c17f85362566d120caae484be6783ede8c3380090b198ad830cb06afca0e5356cb486134c2566ea76210579c3fedcd6118f655b2545867d260e3 + checksum: b37a164336bf60fc02ed08c8ae34a62b3a171132dfe5e259ccc6a967360abeb783f830973560e11fde240e2a68f3f692b8f6114bb0e35a33ca4674ea6ec32420 languageName: node linkType: hard -"@jest/expect@npm:^29.0.3": - version: 29.0.3 - resolution: "@jest/expect@npm:29.0.3" +"@jest/expect@npm:^29.1.2": + version: 29.1.2 + resolution: "@jest/expect@npm:29.1.2" dependencies: - expect: ^29.0.3 - jest-snapshot: ^29.0.3 - checksum: ee2c11223661595d86a747beb6ea622a54d57011bf876d43e7c8de7985882246c67b3f37cf9ea048840be1b25ed9f87a40cb27d102f467767f40684332b6ee4f + expect: ^29.1.2 + jest-snapshot: ^29.1.2 + checksum: 60931a2da3c3367d185b0bdaf9727981927027abe58e7592aca52914917d420b293238e393e7d36dbbe1e3b66c0df522e6f496686d89989afa925d8a2acb74ff languageName: node linkType: hard -"@jest/fake-timers@npm:^29.0.3": - version: 29.0.3 - resolution: "@jest/fake-timers@npm:29.0.3" +"@jest/fake-timers@npm:^29.1.2": + version: 29.1.2 + resolution: "@jest/fake-timers@npm:29.1.2" dependencies: - "@jest/types": ^29.0.3 + "@jest/types": ^29.1.2 "@sinonjs/fake-timers": ^9.1.2 "@types/node": "*" - jest-message-util: ^29.0.3 - jest-mock: ^29.0.3 - jest-util: ^29.0.3 - checksum: 1266f2e38867db56d947e3e51279cc8951bd338a2977ec8e1e491e7687f7c821eeec5cb230f83b0eb95d1540db38581b45693612b5aff25c88d1aa9e11cf29a5 + jest-message-util: ^29.1.2 + jest-mock: ^29.1.2 + jest-util: ^29.1.2 + checksum: f0575c24ca4992bb5da8fca547e29c4d20e9c31cff65b5740eadb5e9546dd41ad5ca86e8cd81b07c6f0ab796fc5c886c4da0cd01536dc581c16fb1c466281b05 languageName: node linkType: hard -"@jest/globals@npm:^29.0.3": - version: 29.0.3 - resolution: "@jest/globals@npm:29.0.3" +"@jest/globals@npm:^29.1.2": + version: 29.1.2 + resolution: "@jest/globals@npm:29.1.2" dependencies: - "@jest/environment": ^29.0.3 - "@jest/expect": ^29.0.3 - "@jest/types": ^29.0.3 - jest-mock: ^29.0.3 - checksum: eefa117b77e850f2c9ee02235fabca6537ea53a2ebc079277e32a20b5078ccf5f5074c4855cafb13f75742078caa1d28ca901b42d8b356e1d835b630403d156a + "@jest/environment": ^29.1.2 + "@jest/expect": ^29.1.2 + "@jest/types": ^29.1.2 + jest-mock: ^29.1.2 + checksum: f0a5de1b0423cd8d9e304d50fe3d5945dd6b960528c23f22dccd536eb8dfaea767bfdd861dc9d0e1e7908de103c1be59e83840c20b13403b0114074d59527975 languageName: node linkType: hard -"@jest/reporters@npm:^29.0.3": - version: 29.0.3 - resolution: "@jest/reporters@npm:29.0.3" +"@jest/reporters@npm:^29.1.2": + version: 29.1.2 + resolution: "@jest/reporters@npm:29.1.2" dependencies: "@bcoe/v8-coverage": ^0.2.3 - "@jest/console": ^29.0.3 - "@jest/test-result": ^29.0.3 - "@jest/transform": ^29.0.3 - "@jest/types": ^29.0.3 + "@jest/console": ^29.1.2 + "@jest/test-result": ^29.1.2 + "@jest/transform": ^29.1.2 + "@jest/types": ^29.1.2 "@jridgewell/trace-mapping": ^0.3.15 "@types/node": "*" chalk: ^4.0.0 @@ -3824,9 +3824,9 @@ __metadata: istanbul-lib-report: ^3.0.0 istanbul-lib-source-maps: ^4.0.0 istanbul-reports: ^3.1.3 - jest-message-util: ^29.0.3 - jest-util: ^29.0.3 - jest-worker: ^29.0.3 + jest-message-util: ^29.1.2 + jest-util: ^29.1.2 + jest-worker: ^29.1.2 slash: ^3.0.0 string-length: ^4.0.1 strip-ansi: ^6.0.0 @@ -3837,7 +3837,7 @@ __metadata: peerDependenciesMeta: node-notifier: optional: true - checksum: c650943e581b3e4381a5fd499d90b11737f08e6f627fbc75f02e30ed4d67e2bc46ce9209bb1bece8fb485e5e0228ec1a54a7454ee5945dc0dca79f77ce7182e0 + checksum: 7eef7acc21b48d4ae00c2380886acc100a3107c7c47a26d58d0bf7fad3674657dd9ec56cbae76ed01d08ad4e0b97ead0a94a65d1f915f56baaf5feeef8b742ec languageName: node linkType: hard @@ -3861,27 +3861,27 @@ __metadata: languageName: node linkType: hard -"@jest/test-result@npm:^29.0.3": - version: 29.0.3 - resolution: "@jest/test-result@npm:29.0.3" +"@jest/test-result@npm:^29.1.2": + version: 29.1.2 + resolution: "@jest/test-result@npm:29.1.2" dependencies: - "@jest/console": ^29.0.3 - "@jest/types": ^29.0.3 + "@jest/console": ^29.1.2 + "@jest/types": ^29.1.2 "@types/istanbul-lib-coverage": ^2.0.0 collect-v8-coverage: ^1.0.0 - checksum: 72a81912bf12ea75ef73046c30ecc6cf329364997f5e8f7ca1a88fcd062db00fabade9e60551c320ebebea4ae5615aebe905f9c230a77eb1d6e096cb619b6ade + checksum: c6462aaa9d6cd54ece64f244745bb247041ed6facccd9ebe15be74c3cb302b188f298b550f33de70a869fd495d1d51c9f5b4c029c4bc18701cc6a8c3663d88ef languageName: node linkType: hard -"@jest/test-sequencer@npm:^29.0.3": - version: 29.0.3 - resolution: "@jest/test-sequencer@npm:29.0.3" +"@jest/test-sequencer@npm:^29.1.2": + version: 29.1.2 + resolution: "@jest/test-sequencer@npm:29.1.2" dependencies: - "@jest/test-result": ^29.0.3 + "@jest/test-result": ^29.1.2 graceful-fs: ^4.2.9 - jest-haste-map: ^29.0.3 + jest-haste-map: ^29.1.2 slash: ^3.0.0 - checksum: 41cd0fa9babaa7b3f09f64fa0946b68f2d3dc76c852d411bbf8a7df08da1c7eb66d373d1700904249b28bd3d3ba3c25acc0b3c20c6100cf334e62e671f05d5e0 + checksum: fbca61ab6e4b14dd8e69da6563979c6fe741937e1ec7f40b610252224ba1fbbe070898cbcee5126c0ff2a5b11aeb16d1d019cf37cfe561bd9437f3d1b2df1513 languageName: node linkType: hard @@ -3908,26 +3908,26 @@ __metadata: languageName: node linkType: hard -"@jest/transform@npm:^29.0.3": - version: 29.0.3 - resolution: "@jest/transform@npm:29.0.3" +"@jest/transform@npm:^29.1.2": + version: 29.1.2 + resolution: "@jest/transform@npm:29.1.2" dependencies: "@babel/core": ^7.11.6 - "@jest/types": ^29.0.3 + "@jest/types": ^29.1.2 "@jridgewell/trace-mapping": ^0.3.15 babel-plugin-istanbul: ^6.1.1 chalk: ^4.0.0 convert-source-map: ^1.4.0 fast-json-stable-stringify: ^2.1.0 graceful-fs: ^4.2.9 - jest-haste-map: ^29.0.3 + jest-haste-map: ^29.1.2 jest-regex-util: ^29.0.0 - jest-util: ^29.0.3 + jest-util: ^29.1.2 micromatch: ^4.0.4 pirates: ^4.0.4 slash: ^3.0.0 write-file-atomic: ^4.0.1 - checksum: 399dc416c210cd44d19c4f9aa52afa079247f5135793a344d409ca3b58eab7153f2f25d5a42d406b50960e619b8e9648d75ebd1f96e2028eece5aa1c59259b98 + checksum: f01bd4ee84b6f3f8a1b7b03c1bc838ef8949954c88b19dfa003c983dbe99ee55ae0a3014eef17cc502b6660c25628e5c2ed9cafa5a1cce4de2dc7613c26aeb4d languageName: node linkType: hard @@ -3944,9 +3944,9 @@ __metadata: languageName: node linkType: hard -"@jest/types@npm:^29.0.3": - version: 29.0.3 - resolution: "@jest/types@npm:29.0.3" +"@jest/types@npm:^29.1.2": + version: 29.1.2 + resolution: "@jest/types@npm:29.1.2" dependencies: "@jest/schemas": ^29.0.0 "@types/istanbul-lib-coverage": ^2.0.0 @@ -3954,7 +3954,7 @@ __metadata: "@types/node": "*" "@types/yargs": ^17.0.8 chalk: ^4.0.0 - checksum: 3dfcf19631d6143382f3bd367f0120c2c271a37535e5f6de2532e5c2e83198bd8403a75901920f84e14cb886976c76892eb99c915d494c7e627649e72ba95107 + checksum: 931b864bca5e7f99f86de02d6efc0ee1a86eef7fc2b6db7103f84cf8dd73278122855b0e5b964087f391169c73887a6c069aa8dbc8a722c00c5cb0f33cc42b63 languageName: node linkType: hard @@ -6139,7 +6139,7 @@ __metadata: fast-json-parse: 1.0.3 fastify: 4.6.0 fastify-raw-body: 4.1.0 - jest: 29.0.3 + jest: 29.1.2 lodash.escape: 4.0.1 pretty-bytes: 5.6.0 pretty-ms: 7.0.1 @@ -6178,7 +6178,7 @@ __metadata: cross-undici-fetch: 0.4.14 crypto-js: 4.1.1 humanize-string: 2.1.0 - jest: 29.0.3 + jest: 29.1.2 jsonwebtoken: 8.5.1 jwks-rsa: 2.0.5 md5: 2.3.0 @@ -6235,7 +6235,7 @@ __metadata: firebase: 9.9.3 firebase-admin: 10.3.0 gotrue-js: 0.9.29 - jest: 29.0.3 + jest: 29.1.2 magic-sdk: 9.0.0 netlify-identity-widget: 1.9.2 react: 17.0.2 @@ -6271,7 +6271,7 @@ __metadata: execa: 5.1.1 fast-glob: 3.2.12 fs-extra: 10.1.0 - jest: 29.0.3 + jest: 29.1.2 latest-version: 5.1.0 listr: 0.14.3 listr-verbose-renderer: 0.6.0 @@ -6306,7 +6306,7 @@ __metadata: "@types/babel__core": 7.1.19 "@types/findup-sync": 4.0.2 "@types/fs-extra": 9.0.13 - "@types/jest": 29.0.1 + "@types/jest": 29.1.1 "@types/jscodeshift": 0.11.5 "@types/prettier": 2.7.0 "@types/yargs": 17.0.12 @@ -6318,7 +6318,7 @@ __metadata: fast-glob: 3.2.12 findup-sync: 5.0.0 fs-extra: 10.1.0 - jest: 29.0.3 + jest: 29.1.2 jscodeshift: 0.13.1 prettier: 2.7.1 tasuku: 2.0.0 @@ -6371,7 +6371,7 @@ __metadata: graphql: 16.6.0 graphql-tag: 2.12.6 html-webpack-plugin: 5.5.0 - jest: 29.0.3 + jest: 29.1.2 lodash.escaperegexp: 4.1.2 mini-css-extract-plugin: 2.6.1 nodemon: 2.0.20 @@ -6426,7 +6426,7 @@ __metadata: eslint-plugin-prettier: 4.2.1 eslint-plugin-react: 7.31.0 eslint-plugin-react-hooks: 4.6.0 - jest: 29.0.3 + jest: 29.1.2 prettier: 2.7.1 typescript: 4.7.4 languageName: unknown @@ -6449,7 +6449,7 @@ __metadata: "@types/testing-library__jest-dom": 5.14.5 core-js: 3.25.3 graphql: 16.6.0 - jest: 29.0.3 + jest: 29.1.2 nodemon: 2.0.20 pascalcase: 1.0.0 react: 17.0.2 @@ -6492,7 +6492,7 @@ __metadata: graphql: 16.6.0 graphql-scalars: 1.17.0 graphql-tag: 2.12.6 - jest: 29.0.3 + jest: 29.1.2 lodash.merge: 4.6.2 lodash.omitby: 4.6.0 typescript: 4.7.4 @@ -6537,7 +6537,7 @@ __metadata: fs-extra: 10.1.0 graphql: 16.6.0 graphql-tag: 2.12.6 - jest: 29.0.3 + jest: 29.1.2 kill-port: 1.6.1 prettier: 2.7.1 rimraf: 3.0.2 @@ -6571,7 +6571,7 @@ __metadata: core-js: 3.25.3 cross-undici-fetch: 0.4.14 graphql: 16.6.0 - jest: 29.0.3 + jest: 29.1.2 mime-types: 2.1.35 typescript: 4.7.4 peerDependencies: @@ -6591,7 +6591,7 @@ __metadata: "@prisma/internals": 4.3.1 core-js: 3.25.3 esbuild: 0.15.10 - jest: 29.0.3 + jest: 29.1.2 languageName: unknown linkType: soft @@ -6608,7 +6608,7 @@ __metadata: "@types/react": 17.0.50 "@types/react-dom": 17.0.17 core-js: 3.25.3 - jest: 29.0.3 + jest: 29.1.2 lodash.isequal: 4.5.0 prop-types: 15.8.1 react: 17.0.2 @@ -6639,7 +6639,7 @@ __metadata: enquirer: 2.3.6 findup-sync: 5.0.0 graphql: 16.6.0 - jest: 29.0.3 + jest: 29.1.2 lazy-get-decorator: 2.2.0 line-column: 1.0.2 lodash: 4.17.21 @@ -6672,7 +6672,7 @@ __metadata: core-js: 3.25.3 cross-undici-fetch: 0.4.14 envinfo: 7.8.1 - jest: 29.0.3 + jest: 29.1.2 systeminformation: 5.12.4 uuid: 9.0.0 yargs: 17.5.1 @@ -6703,17 +6703,17 @@ __metadata: "@testing-library/user-event": 14.4.3 "@types/aws-lambda": 8.10.101 "@types/babel-core": 6.25.7 - "@types/jest": 29.0.1 + "@types/jest": 29.1.1 "@types/node": 16.11.47 "@types/react": 17.0.50 "@types/react-dom": 17.0.17 "@types/webpack": 5.28.0 - babel-jest: 29.0.3 + babel-jest: 29.1.2 babel-plugin-inline-react-svg: 2.0.1 core-js: 3.25.3 fast-glob: 3.2.12 - jest: 29.0.3 - jest-environment-jsdom: 29.0.3 + jest: 29.1.2 + jest-environment-jsdom: 29.1.2 jest-watch-typeahead: 2.2.0 msw: 0.47.3 ts-toolbelt: 9.6.0 @@ -6740,7 +6740,7 @@ __metadata: core-js: 3.25.3 graphql: 16.6.0 graphql-tag: 2.12.6 - jest: 29.0.3 + jest: 29.1.2 nodemon: 2.0.20 prop-types: 15.8.1 react: 17.0.2 @@ -8721,13 +8721,13 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:*, @types/jest@npm:29.0.1": - version: 29.0.1 - resolution: "@types/jest@npm:29.0.1" +"@types/jest@npm:*, @types/jest@npm:29.1.1": + version: 29.1.1 + resolution: "@types/jest@npm:29.1.1" dependencies: expect: ^29.0.0 pretty-format: ^29.0.0 - checksum: 3b98024aa2a9e3e289cc05f549975ba25b22833a2655c0fd561bec3485df385fb2ee9a3d1de6ad9366781114106ad2c31f331951c8745a531899d91bcc45e94b + checksum: 2b7e492704f5df42209427edd5ee51fda2b86e4ccd0d692742984c871595d94012432467baf363e481ebda68d5dac532cbb831edf8a6cbf7010e30648283aadf languageName: node linkType: hard @@ -11035,11 +11035,11 @@ __metadata: languageName: node linkType: hard -"babel-jest@npm:29.0.3, babel-jest@npm:^29.0.3": - version: 29.0.3 - resolution: "babel-jest@npm:29.0.3" +"babel-jest@npm:29.1.2, babel-jest@npm:^29.1.2": + version: 29.1.2 + resolution: "babel-jest@npm:29.1.2" dependencies: - "@jest/transform": ^29.0.3 + "@jest/transform": ^29.1.2 "@types/babel__core": ^7.1.14 babel-plugin-istanbul: ^6.1.1 babel-preset-jest: ^29.0.2 @@ -11048,7 +11048,7 @@ __metadata: slash: ^3.0.0 peerDependencies: "@babel/core": ^7.8.0 - checksum: 5cf90b1b7c74a2f29f42ebb273138e6fe4b24865d9f9945807b624e23020028137ad508c39e02baf4e92b836e752d1ec3015e027909e725fbe66b64ea6739238 + checksum: 2510afe5b887f7c7765293c4448af0e234e8ba42392d954a21d7c2c3fb4b2d94994417676e2450c0bf3f7bea693b05624f3e57a02f8ec566061d24eba612a069 languageName: node linkType: hard @@ -13666,7 +13666,7 @@ __metadata: core-js: 3.25.3 execa: 5.1.1 fs-extra: 10.1.0 - jest: 29.0.3 + jest: 29.1.2 listr: 0.14.3 prompts: 2.4.2 typescript: 4.7.4 @@ -16222,16 +16222,16 @@ __metadata: languageName: node linkType: hard -"expect@npm:^29.0.0, expect@npm:^29.0.3": - version: 29.0.3 - resolution: "expect@npm:29.0.3" +"expect@npm:^29.0.0, expect@npm:^29.1.2": + version: 29.1.2 + resolution: "expect@npm:29.1.2" dependencies: - "@jest/expect-utils": ^29.0.3 + "@jest/expect-utils": ^29.1.2 jest-get-type: ^29.0.0 - jest-matcher-utils: ^29.0.3 - jest-message-util: ^29.0.3 - jest-util: ^29.0.3 - checksum: fc9bc01ee80dfd63416ef1090cb26b736e2da8930988365e33fa9245a6d53fa0436254da9d6c1f2aabfb361d2fb6332d23d00a39d75aae6e23b5f633b48b5b04 + jest-matcher-utils: ^29.1.2 + jest-message-util: ^29.1.2 + jest-util: ^29.1.2 + checksum: fc5110b470e1a87e8ebcd869f8b68e1feca9b5f7b20949fe1c75c5d7f833b435808dcd4db597b2af32ce232b3b9328be498b3ed30756cebcefb2f095b1d62c32 languageName: node linkType: hard @@ -19973,47 +19973,47 @@ __metadata: languageName: node linkType: hard -"jest-circus@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-circus@npm:29.0.3" +"jest-circus@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-circus@npm:29.1.2" dependencies: - "@jest/environment": ^29.0.3 - "@jest/expect": ^29.0.3 - "@jest/test-result": ^29.0.3 - "@jest/types": ^29.0.3 + "@jest/environment": ^29.1.2 + "@jest/expect": ^29.1.2 + "@jest/test-result": ^29.1.2 + "@jest/types": ^29.1.2 "@types/node": "*" chalk: ^4.0.0 co: ^4.6.0 dedent: ^0.7.0 is-generator-fn: ^2.0.0 - jest-each: ^29.0.3 - jest-matcher-utils: ^29.0.3 - jest-message-util: ^29.0.3 - jest-runtime: ^29.0.3 - jest-snapshot: ^29.0.3 - jest-util: ^29.0.3 + jest-each: ^29.1.2 + jest-matcher-utils: ^29.1.2 + jest-message-util: ^29.1.2 + jest-runtime: ^29.1.2 + jest-snapshot: ^29.1.2 + jest-util: ^29.1.2 p-limit: ^3.1.0 - pretty-format: ^29.0.3 + pretty-format: ^29.1.2 slash: ^3.0.0 stack-utils: ^2.0.3 - checksum: c0b40d4f0991ad131486cc75258734256f439eca6c9c28efa8b4bc13cfdeea0b274d73dcdb11497ee0294593e4846c6356cb3e9fe64349ab9a310956bd704f48 + checksum: e93128f4e8d3392065b8e817d0db996c78c3ec8579452b155b1ebf7475497757f5a68e9e943ea37385e802790cc4eb759a8556eee8428e75f27cbc590655b3e3 languageName: node linkType: hard -"jest-cli@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-cli@npm:29.0.3" +"jest-cli@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-cli@npm:29.1.2" dependencies: - "@jest/core": ^29.0.3 - "@jest/test-result": ^29.0.3 - "@jest/types": ^29.0.3 + "@jest/core": ^29.1.2 + "@jest/test-result": ^29.1.2 + "@jest/types": ^29.1.2 chalk: ^4.0.0 exit: ^0.1.2 graceful-fs: ^4.2.9 import-local: ^3.0.2 - jest-config: ^29.0.3 - jest-util: ^29.0.3 - jest-validate: ^29.0.3 + jest-config: ^29.1.2 + jest-util: ^29.1.2 + jest-validate: ^29.1.2 prompts: ^2.0.1 yargs: ^17.3.1 peerDependencies: @@ -20023,34 +20023,34 @@ __metadata: optional: true bin: jest: bin/jest.js - checksum: c2977022b474bbccb5d9f905c99b5f1dc8cc3fd1ee4ca71bd4a7c4c5326283a790e01d41f92ee7032435416ffde2ed55d24957c5ca2c026a31ef11619ec18cf6 + checksum: 43ea5a7b5abad42812d6576f4560953cdec7596224362b3d8ec38c990d65375b383895bf19229496793ef9c1d8df38f45fbc78b99bd5007ab02de99642aa3e30 languageName: node linkType: hard -"jest-config@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-config@npm:29.0.3" +"jest-config@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-config@npm:29.1.2" dependencies: "@babel/core": ^7.11.6 - "@jest/test-sequencer": ^29.0.3 - "@jest/types": ^29.0.3 - babel-jest: ^29.0.3 + "@jest/test-sequencer": ^29.1.2 + "@jest/types": ^29.1.2 + babel-jest: ^29.1.2 chalk: ^4.0.0 ci-info: ^3.2.0 deepmerge: ^4.2.2 glob: ^7.1.3 graceful-fs: ^4.2.9 - jest-circus: ^29.0.3 - jest-environment-node: ^29.0.3 + jest-circus: ^29.1.2 + jest-environment-node: ^29.1.2 jest-get-type: ^29.0.0 jest-regex-util: ^29.0.0 - jest-resolve: ^29.0.3 - jest-runner: ^29.0.3 - jest-util: ^29.0.3 - jest-validate: ^29.0.3 + jest-resolve: ^29.1.2 + jest-runner: ^29.1.2 + jest-util: ^29.1.2 + jest-validate: ^29.1.2 micromatch: ^4.0.4 parse-json: ^5.2.0 - pretty-format: ^29.0.3 + pretty-format: ^29.1.2 slash: ^3.0.0 strip-json-comments: ^3.1.1 peerDependencies: @@ -20061,19 +20061,19 @@ __metadata: optional: true ts-node: optional: true - checksum: dbb7e231324e19056c5e5eb05be5c41186bb7550188c05ec68f963b83993af930164d1be0ac4b906843ebf5e061bd37fe6e4f531859f6db8a376c44d5a6da905 + checksum: 8b6c79b79f5028f3dadd847cac9f9a7829f5eb537de80d0b010c87caed2f34d67a2c15266fb51512b76c1fc9f4526d8291de1944d6d7f976409c6af75cc6d6c3 languageName: node linkType: hard -"jest-diff@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-diff@npm:29.0.3" +"jest-diff@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-diff@npm:29.1.2" dependencies: chalk: ^4.0.0 diff-sequences: ^29.0.0 jest-get-type: ^29.0.0 - pretty-format: ^29.0.3 - checksum: cd7bfb55c0c4a8dbead1d24ef04be4ef8a466edff912b6bbd028481f06a343d195140f3b9d1aa51a36632233f2929d8fffd530b6ed64bb553587b2bff8f20fb5 + pretty-format: ^29.1.2 + checksum: 3cdde0e29bc902b977a0a176a9488d2cdb6f561c1b6011495376527cbc436510816f94986cdaeecbee4b4b20e2977f88b440897a95b418e8b027942423387956 languageName: node linkType: hard @@ -20086,46 +20086,46 @@ __metadata: languageName: node linkType: hard -"jest-each@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-each@npm:29.0.3" +"jest-each@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-each@npm:29.1.2" dependencies: - "@jest/types": ^29.0.3 + "@jest/types": ^29.1.2 chalk: ^4.0.0 jest-get-type: ^29.0.0 - jest-util: ^29.0.3 - pretty-format: ^29.0.3 - checksum: ae375ebea06c8fd441f5dd7df1039a1181e768c02292a52f7e367f508ddf12325e80ef3f1a2eabdece7f775a47148288662ac65488b8d14226eebd346e2810f8 + jest-util: ^29.1.2 + pretty-format: ^29.1.2 + checksum: e1900b8d489088470fba306f59a07cdb66a08bcb68d52da97d787ee76dd85244bcd16bfb75b35d4beb99e803aca3e410009dd26fec22204e3f63c9366d3f8040 languageName: node linkType: hard -"jest-environment-jsdom@npm:29.0.3": - version: 29.0.3 - resolution: "jest-environment-jsdom@npm:29.0.3" +"jest-environment-jsdom@npm:29.1.2": + version: 29.1.2 + resolution: "jest-environment-jsdom@npm:29.1.2" dependencies: - "@jest/environment": ^29.0.3 - "@jest/fake-timers": ^29.0.3 - "@jest/types": ^29.0.3 + "@jest/environment": ^29.1.2 + "@jest/fake-timers": ^29.1.2 + "@jest/types": ^29.1.2 "@types/jsdom": ^20.0.0 "@types/node": "*" - jest-mock: ^29.0.3 - jest-util: ^29.0.3 + jest-mock: ^29.1.2 + jest-util: ^29.1.2 jsdom: ^20.0.0 - checksum: 7020de71cf6a6bd5a33deebf7ea362709bfa636a636b55074e7fbe18e092ad1f7ba5b996939c85c30a8150df6b87ba1a11fa780de766429ff1ff451456cf083a + checksum: 25d1e9f3881928357ef75c26422e14e9e4006a4f91e2c416736fb72a513a93d19fdeb4a445a0bad053a3514bc8e266ffc025c9267fccdbd76c4719e4ee2824d6 languageName: node linkType: hard -"jest-environment-node@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-environment-node@npm:29.0.3" +"jest-environment-node@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-environment-node@npm:29.1.2" dependencies: - "@jest/environment": ^29.0.3 - "@jest/fake-timers": ^29.0.3 - "@jest/types": ^29.0.3 + "@jest/environment": ^29.1.2 + "@jest/fake-timers": ^29.1.2 + "@jest/types": ^29.1.2 "@types/node": "*" - jest-mock: ^29.0.3 - jest-util: ^29.0.3 - checksum: 4190385ede07d595afa4906ea93bb15b7974c65463123bb26af48a01ce0440ae7e6d640351335bf0bf19065c771fd2ecfedfea0625b71db28af2f97124c1c590 + jest-mock: ^29.1.2 + jest-util: ^29.1.2 + checksum: 4d0669ed8a19a55b392b5bf68deb4a6192a397bf6b5054e41ca7d7bdcb17241bc6b4bf0fcef66bfdf23b1e56fc88078f158ef8fba5ce595b3117333106246c48 languageName: node linkType: hard @@ -20161,11 +20161,11 @@ __metadata: languageName: node linkType: hard -"jest-haste-map@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-haste-map@npm:29.0.3" +"jest-haste-map@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-haste-map@npm:29.1.2" dependencies: - "@jest/types": ^29.0.3 + "@jest/types": ^29.1.2 "@types/graceful-fs": ^4.1.3 "@types/node": "*" anymatch: ^3.0.3 @@ -20173,63 +20173,64 @@ __metadata: fsevents: ^2.3.2 graceful-fs: ^4.2.9 jest-regex-util: ^29.0.0 - jest-util: ^29.0.3 - jest-worker: ^29.0.3 + jest-util: ^29.1.2 + jest-worker: ^29.1.2 micromatch: ^4.0.4 walker: ^1.0.8 dependenciesMeta: fsevents: optional: true - checksum: fccfd27c39d886e1d50cc1d809c86b2024522547b6e50a3d56f7ffc6f2dd7d852b07af7b4bb3fef965d20dd11a4ecffc76a03d3ee113f377814c679b12a2e1a5 + checksum: 20e993e8c122dd14812a0ed583c85cce863c0badf4083171f823864829e77960d8c8e8835c7ca485d7da5736478db034e1087682d2b0f4da9927714a680d4561 languageName: node linkType: hard -"jest-leak-detector@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-leak-detector@npm:29.0.3" +"jest-leak-detector@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-leak-detector@npm:29.1.2" dependencies: jest-get-type: ^29.0.0 - pretty-format: ^29.0.3 - checksum: 8447820b9418843d0aff07bba2b972be2f34c4399d3e820df6bf57446400fe81752654cf90dc34c407a0f93d880ec8a1cc04a62683a5409608962129de9274ab + pretty-format: ^29.1.2 + checksum: 6fc5df7b309e435c2259c441eca7fa3621983a28f586d6cf70d55acb9960d6889cfd89f829ad6008660620638ad5433014cc6e5a0ad738429963b84d0ec169bc languageName: node linkType: hard -"jest-matcher-utils@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-matcher-utils@npm:29.0.3" +"jest-matcher-utils@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-matcher-utils@npm:29.1.2" dependencies: chalk: ^4.0.0 - jest-diff: ^29.0.3 + jest-diff: ^29.1.2 jest-get-type: ^29.0.0 - pretty-format: ^29.0.3 - checksum: 1216dd4da6773a746eda7bbcbdac90ae6c895b054830555b853413064d8a158574f64c6b7a6de50f61f339b545690aa5ae43bccbad76137acd2c26055b50c26e + pretty-format: ^29.1.2 + checksum: 10ed0b787b1664a3d2f760a65beedf9f23993bfddac64b3b86e41515059f329c97396e7f4273e6c341f850d840671d89dfc976ef05cd5e91ba77f3521ab48c48 languageName: node linkType: hard -"jest-message-util@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-message-util@npm:29.0.3" +"jest-message-util@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-message-util@npm:29.1.2" dependencies: "@babel/code-frame": ^7.12.13 - "@jest/types": ^29.0.3 + "@jest/types": ^29.1.2 "@types/stack-utils": ^2.0.0 chalk: ^4.0.0 graceful-fs: ^4.2.9 micromatch: ^4.0.4 - pretty-format: ^29.0.3 + pretty-format: ^29.1.2 slash: ^3.0.0 stack-utils: ^2.0.3 - checksum: 49d521a31de3dbc795ccfcd689cf45401eeadf58198649a018db05928beb5f4ca99f4d3a772e8843de8f4788937c2338cd19b80ddcd0b08089c1c6df718cf1a3 + checksum: 38219d23ddef7b22fabef79aa07dd97eebaba7ca1985323c03ba2ad2d97705aea8b6046304efa85605a6e2dd42a6d8cc0faaebc304c49f491918c59cfe52d153 languageName: node linkType: hard -"jest-mock@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-mock@npm:29.0.3" +"jest-mock@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-mock@npm:29.1.2" dependencies: - "@jest/types": ^29.0.3 + "@jest/types": ^29.1.2 "@types/node": "*" - checksum: 217313f94b88002d1255c877e4c18d3e166de00832e9da8547788723e37fec6e6a6bafb167ebe0a4e29713f00ab21f88f476dd7521e55f750debff328a07894f + jest-util: ^29.1.2 + checksum: 6ad42b50f0fb8da096885071cf7735083ad28dd05c8b310bcc9aa0d238397724c8ecc7d740a63b2a618af69573d3f25c729f778330daba6254f877fda476e185 languageName: node linkType: hard @@ -20259,30 +20260,30 @@ __metadata: languageName: node linkType: hard -"jest-resolve-dependencies@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-resolve-dependencies@npm:29.0.3" +"jest-resolve-dependencies@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-resolve-dependencies@npm:29.1.2" dependencies: jest-regex-util: ^29.0.0 - jest-snapshot: ^29.0.3 - checksum: 848b738c2c7aa9c5f78bdb3b83c6d59215f874d7718dc864cff19a3181234c5f20581d4f0896e8f8feb189c40263027de1e503e86e47f0d8ec37a40a3e7b3835 + jest-snapshot: ^29.1.2 + checksum: 0d9a63896804537d0022982f352ae68fcd4acea596296247ff2db43469d4e0649f0b0a08295d557d65ae9f3e235802a3436343f3470e3614a3ad2e1a69590622 languageName: node linkType: hard -"jest-resolve@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-resolve@npm:29.0.3" +"jest-resolve@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-resolve@npm:29.1.2" dependencies: chalk: ^4.0.0 graceful-fs: ^4.2.9 - jest-haste-map: ^29.0.3 + jest-haste-map: ^29.1.2 jest-pnp-resolver: ^1.2.2 - jest-util: ^29.0.3 - jest-validate: ^29.0.3 + jest-util: ^29.1.2 + jest-validate: ^29.1.2 resolve: ^1.20.0 resolve.exports: ^1.1.0 slash: ^3.0.0 - checksum: 10730d3a9415517595d0a9b96ff3ef10b2477f436056cef2f8859e32f428ccba40cb5c44ceec42c0b3530afd73aba37d1e6a50a72ad1328438b0ae1139825c90 + checksum: 6b1a7d2ee1fb8564b99dc80b2431a1941856046c4d38178c34165128685b8f4178f98c702ec6dbc7072f6dbeffdb6a65dd52d7035ec9388be85a1ee46f9770c1 languageName: node linkType: hard @@ -20300,62 +20301,62 @@ __metadata: languageName: node linkType: hard -"jest-runner@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-runner@npm:29.0.3" +"jest-runner@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-runner@npm:29.1.2" dependencies: - "@jest/console": ^29.0.3 - "@jest/environment": ^29.0.3 - "@jest/test-result": ^29.0.3 - "@jest/transform": ^29.0.3 - "@jest/types": ^29.0.3 + "@jest/console": ^29.1.2 + "@jest/environment": ^29.1.2 + "@jest/test-result": ^29.1.2 + "@jest/transform": ^29.1.2 + "@jest/types": ^29.1.2 "@types/node": "*" chalk: ^4.0.0 emittery: ^0.10.2 graceful-fs: ^4.2.9 jest-docblock: ^29.0.0 - jest-environment-node: ^29.0.3 - jest-haste-map: ^29.0.3 - jest-leak-detector: ^29.0.3 - jest-message-util: ^29.0.3 - jest-resolve: ^29.0.3 - jest-runtime: ^29.0.3 - jest-util: ^29.0.3 - jest-watcher: ^29.0.3 - jest-worker: ^29.0.3 + jest-environment-node: ^29.1.2 + jest-haste-map: ^29.1.2 + jest-leak-detector: ^29.1.2 + jest-message-util: ^29.1.2 + jest-resolve: ^29.1.2 + jest-runtime: ^29.1.2 + jest-util: ^29.1.2 + jest-watcher: ^29.1.2 + jest-worker: ^29.1.2 p-limit: ^3.1.0 source-map-support: 0.5.13 - checksum: 90eee5ad0ea022416548b67d0983982d3c482e55229f5773f9c75f69ed365a45de298af5661d91bf39fa6c56dd6525a0e6efa7fe5562730a742a49d1cfaf07e8 + checksum: 4a784ebedfc88e15eaec9ffa7cb0ec1bcc4f1ccfaf1683800aa006853b4fa591416430c541967eaf6b628f96589ade45b2febc1fb3521eff9294f5d5f178429b languageName: node linkType: hard -"jest-runtime@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-runtime@npm:29.0.3" +"jest-runtime@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-runtime@npm:29.1.2" dependencies: - "@jest/environment": ^29.0.3 - "@jest/fake-timers": ^29.0.3 - "@jest/globals": ^29.0.3 + "@jest/environment": ^29.1.2 + "@jest/fake-timers": ^29.1.2 + "@jest/globals": ^29.1.2 "@jest/source-map": ^29.0.0 - "@jest/test-result": ^29.0.3 - "@jest/transform": ^29.0.3 - "@jest/types": ^29.0.3 + "@jest/test-result": ^29.1.2 + "@jest/transform": ^29.1.2 + "@jest/types": ^29.1.2 "@types/node": "*" chalk: ^4.0.0 cjs-module-lexer: ^1.0.0 collect-v8-coverage: ^1.0.0 glob: ^7.1.3 graceful-fs: ^4.2.9 - jest-haste-map: ^29.0.3 - jest-message-util: ^29.0.3 - jest-mock: ^29.0.3 + jest-haste-map: ^29.1.2 + jest-message-util: ^29.1.2 + jest-mock: ^29.1.2 jest-regex-util: ^29.0.0 - jest-resolve: ^29.0.3 - jest-snapshot: ^29.0.3 - jest-util: ^29.0.3 + jest-resolve: ^29.1.2 + jest-snapshot: ^29.1.2 + jest-util: ^29.1.2 slash: ^3.0.0 strip-bom: ^4.0.0 - checksum: 48f24eb06a81b6a19ba3ab6e64e85d35b33f516030550f1ea1e7bf615e3d627e0447631f8d1d91513253a365952e81ca60c1849e8c961f335b8a3a3d16347861 + checksum: 6cd587e9df170c058fdd9b95b07006b505b8ae1a431b854d53ae480c110615bb1bd02a7619081a09b7cd507f2ff24fd93dae4b16f9376c6b428c2341512e291d languageName: node linkType: hard @@ -20369,9 +20370,9 @@ __metadata: languageName: node linkType: hard -"jest-snapshot@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-snapshot@npm:29.0.3" +"jest-snapshot@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-snapshot@npm:29.1.2" dependencies: "@babel/core": ^7.11.6 "@babel/generator": ^7.7.2 @@ -20379,25 +20380,25 @@ __metadata: "@babel/plugin-syntax-typescript": ^7.7.2 "@babel/traverse": ^7.7.2 "@babel/types": ^7.3.3 - "@jest/expect-utils": ^29.0.3 - "@jest/transform": ^29.0.3 - "@jest/types": ^29.0.3 + "@jest/expect-utils": ^29.1.2 + "@jest/transform": ^29.1.2 + "@jest/types": ^29.1.2 "@types/babel__traverse": ^7.0.6 "@types/prettier": ^2.1.5 babel-preset-current-node-syntax: ^1.0.0 chalk: ^4.0.0 - expect: ^29.0.3 + expect: ^29.1.2 graceful-fs: ^4.2.9 - jest-diff: ^29.0.3 + jest-diff: ^29.1.2 jest-get-type: ^29.0.0 - jest-haste-map: ^29.0.3 - jest-matcher-utils: ^29.0.3 - jest-message-util: ^29.0.3 - jest-util: ^29.0.3 + jest-haste-map: ^29.1.2 + jest-matcher-utils: ^29.1.2 + jest-message-util: ^29.1.2 + jest-util: ^29.1.2 natural-compare: ^1.4.0 - pretty-format: ^29.0.3 + pretty-format: ^29.1.2 semver: ^7.3.5 - checksum: 6ecae4b493eecb9df0cb81dbe89d10834beb54ccd86b4c2ee9ba09e75a4a8e3c4e0fdc2028aea3b50ec0429b890cae9bb65f4541b082077e47c5d6e028c391bf + checksum: 2947b13804eefeb98621b6e12e9a60c70ed2aaaf3ac1432f9b6c224ca870a4541df94d15c5090c544e5ec60086882ca91a221c1c0d6c18e5d55b8bfe02aab1e6 languageName: node linkType: hard @@ -20415,31 +20416,31 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-util@npm:29.0.3" +"jest-util@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-util@npm:29.1.2" dependencies: - "@jest/types": ^29.0.3 + "@jest/types": ^29.1.2 "@types/node": "*" chalk: ^4.0.0 ci-info: ^3.2.0 graceful-fs: ^4.2.9 picomatch: ^2.2.3 - checksum: cbcfb2a327354450498505f0d09c58077c168ec1baa3bdf09eb51e1e34b2653d7a9ff0cda2ee92041d5367f56445afe305874fe607eb83c32538e62b631a8581 + checksum: 59e1c7bd99684e9be39a789f05f34e7c00309d7d18ea7fa52f3405b2df1a74dae7ae32293d8548ed15b4c9231a1dbd48a03cbbca56b1b71bbabcc3390fe522ff languageName: node linkType: hard -"jest-validate@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-validate@npm:29.0.3" +"jest-validate@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-validate@npm:29.1.2" dependencies: - "@jest/types": ^29.0.3 + "@jest/types": ^29.1.2 camelcase: ^6.2.0 chalk: ^4.0.0 jest-get-type: ^29.0.0 leven: ^3.1.0 - pretty-format: ^29.0.3 - checksum: 29831dee59fa56c5d6eb75a15bc1691f49e8eea5cbfc4079dcdf900bca8efc3c9a84e055bcb68146afbb8b74c4da3168ee23e4b0a70b461a68cba9f56f5f5efa + pretty-format: ^29.1.2 + checksum: 831e81ca282184b84b903ff1ca61303478ee66b8f210fd4f9eeb2d7894ee36ad372d9cdf4b654d52f26c3b6d93f886741a4d35265e441ec65069792eb943c208 languageName: node linkType: hard @@ -20460,19 +20461,19 @@ __metadata: languageName: node linkType: hard -"jest-watcher@npm:^29.0.0, jest-watcher@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-watcher@npm:29.0.3" +"jest-watcher@npm:^29.0.0, jest-watcher@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-watcher@npm:29.1.2" dependencies: - "@jest/test-result": ^29.0.3 - "@jest/types": ^29.0.3 + "@jest/test-result": ^29.1.2 + "@jest/types": ^29.1.2 "@types/node": "*" ansi-escapes: ^4.2.1 chalk: ^4.0.0 emittery: ^0.10.2 - jest-util: ^29.0.3 + jest-util: ^29.1.2 string-length: ^4.0.1 - checksum: 7d1a7c8cc364ef4d8f0d47474e51dc217efe62fbd069487338fb8e023a3fe97be3e0361c4f7c8201443dbe1a94630e246422c4c67e2d8d909c37812858ffe9b8 + checksum: 9de35973a73c52bb332e7b31e5653f1168000f2d3a654f2ad0682ee9aa0ed7897982facdf595d474b0fd19e26f4848871cb5444184ee83e1cb7ac005dffb0712 languageName: node linkType: hard @@ -20498,25 +20499,26 @@ __metadata: languageName: node linkType: hard -"jest-worker@npm:^29.0.0, jest-worker@npm:^29.0.3": - version: 29.0.3 - resolution: "jest-worker@npm:29.0.3" +"jest-worker@npm:^29.0.0, jest-worker@npm:^29.1.2": + version: 29.1.2 + resolution: "jest-worker@npm:29.1.2" dependencies: "@types/node": "*" + jest-util: ^29.1.2 merge-stream: ^2.0.0 supports-color: ^8.0.0 - checksum: b52be00ce523b8b4cdbe07bcbafaa9ec941f7b2e096dc8510fff63775090cde9ef2a5b80cfbac647bc4e563fc4b734e99fa789f463b18be34af3878ec634f704 + checksum: 0aae865e51b4e217264032ea14570d88768cdec60d39e6ae628a1f2d8e6837f59e34bdb09608d0082aaff1238411af10828687f5e0ca4cd97745b46d1f586176 languageName: node linkType: hard -"jest@npm:29.0.3": - version: 29.0.3 - resolution: "jest@npm:29.0.3" +"jest@npm:29.1.2": + version: 29.1.2 + resolution: "jest@npm:29.1.2" dependencies: - "@jest/core": ^29.0.3 - "@jest/types": ^29.0.3 + "@jest/core": ^29.1.2 + "@jest/types": ^29.1.2 import-local: ^3.0.2 - jest-cli: ^29.0.3 + jest-cli: ^29.1.2 peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 peerDependenciesMeta: @@ -20524,7 +20526,7 @@ __metadata: optional: true bin: jest: bin/jest.js - checksum: e2a278f75814ccf86e3b0a037c4fcc27ff43710e94304a24fa608f3a68ac78ca1963cc69e0a54578677959dc74ca7d42c97d73f926c97c1e8e802db449f6face + checksum: 2c76f7660e6f553d60561e578649aabe773e4e6e7ff7d193c7e7836154850a4731f1dfcb56484b54bbea9026b1bff19899a362c1f2c512097d9cb3e9b306703b languageName: node linkType: hard @@ -25383,14 +25385,14 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^29.0.0, pretty-format@npm:^29.0.3": - version: 29.0.3 - resolution: "pretty-format@npm:29.0.3" +"pretty-format@npm:^29.0.0, pretty-format@npm:^29.1.2": + version: 29.1.2 + resolution: "pretty-format@npm:29.1.2" dependencies: "@jest/schemas": ^29.0.0 ansi-styles: ^5.0.0 react-is: ^18.0.0 - checksum: f9614758d58838ab24d53b546ccdf0db525652ecfd97d6b5e5345f6a773eb3a99bf57a59981ece4116e49e4de6c8afec142b960a0638288c2559082598873690 + checksum: 7b9b37ca8412aa05a5db359f88b0497174c8520c687e6ee06b2f16b7369161cb11469f9ae9ff5bf6bf0ced95f86752b8a0fa796476fe3b2da7596ea02e8f77a0 languageName: node linkType: hard @@ -27167,14 +27169,14 @@ __metadata: "@tsd/typescript": 4.8.3 "@types/babel__generator": 7.6.4 "@types/fs-extra": 9.0.13 - "@types/jest": 29.0.1 + "@types/jest": 29.1.1 "@types/jscodeshift": 0.11.5 "@types/lodash.template": 4.5.1 "@types/ncp": 2.0.5 "@types/prompts": 2.4.0 all-contributors-cli: 6.20.0 ansi-colors: 4.1.3 - babel-jest: 29.0.3 + babel-jest: 29.1.2 babel-plugin-auto-import: 1.1.0 babel-plugin-remove-code: 0.0.6 boxen: 5.1.2 @@ -27185,7 +27187,7 @@ __metadata: fast-glob: 3.2.12 fs-extra: 10.1.0 is-port-reachable: 3.1.0 - jest: 29.0.3 + jest: 29.1.2 jest-runner-tsd: 4.0.0 jscodeshift: 0.13.1 lerna: 5.5.4 From ede8782a0f530b2664acc9df2ec8698040e3103d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 13:46:19 -0700 Subject: [PATCH 34/41] chore(deps): update dependency @supabase/supabase-js to v1.35.7 (#6479) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/auth/package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/auth/package.json b/packages/auth/package.json index d4f26b3f5099..ec60e035d57c 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -40,7 +40,7 @@ "@okta/okta-auth-js": "6.7.6", "@simplewebauthn/browser": "6.0.0", "@simplewebauthn/typescript-types": "6.0.0", - "@supabase/supabase-js": "1.35.6", + "@supabase/supabase-js": "1.35.7", "@types/netlify-identity-widget": "1.9.3", "@types/react": "17.0.50", "firebase": "9.9.3", diff --git a/yarn.lock b/yarn.lock index 8f64e6150fff..8f42396f085d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6228,7 +6228,7 @@ __metadata: "@okta/okta-auth-js": 6.7.6 "@simplewebauthn/browser": 6.0.0 "@simplewebauthn/typescript-types": 6.0.0 - "@supabase/supabase-js": 1.35.6 + "@supabase/supabase-js": 1.35.7 "@types/netlify-identity-widget": 1.9.3 "@types/react": 17.0.50 core-js: 3.25.3 @@ -8161,13 +8161,13 @@ __metadata: languageName: node linkType: hard -"@supabase/realtime-js@npm:^1.7.4": - version: 1.7.4 - resolution: "@supabase/realtime-js@npm:1.7.4" +"@supabase/realtime-js@npm:^1.7.5": + version: 1.7.5 + resolution: "@supabase/realtime-js@npm:1.7.5" dependencies: "@types/phoenix": ^1.5.4 websocket: ^1.0.34 - checksum: d8d2026aa630a5e9d55c93a740d31a5fa9bbfd89e960af54c8a3380d17cb57c531937eef56e9746ad95b1a54186a7a3e108e52011834d96c2f4e7f7be1a77d52 + checksum: a9be4e73df7eff9e5928cba2b8bac4849a2f61d9f82cbbdefc6e767cbf6ed4326a3e0f477b21bb7716c3707cae3acf3182912e4c3a2a00790fb78b78d1c20b49 languageName: node linkType: hard @@ -8180,16 +8180,16 @@ __metadata: languageName: node linkType: hard -"@supabase/supabase-js@npm:1.35.6": - version: 1.35.6 - resolution: "@supabase/supabase-js@npm:1.35.6" +"@supabase/supabase-js@npm:1.35.7": + version: 1.35.7 + resolution: "@supabase/supabase-js@npm:1.35.7" dependencies: "@supabase/functions-js": ^1.3.4 "@supabase/gotrue-js": ^1.22.21 "@supabase/postgrest-js": ^0.37.4 - "@supabase/realtime-js": ^1.7.4 + "@supabase/realtime-js": ^1.7.5 "@supabase/storage-js": ^1.7.2 - checksum: f4cb1cedb0e793a57e8188579a2c1d4bfda55f7430032c57f1c66bfd092d59e68fd017d9062d73d99db546092cecf0bffc3be8550dcf62600bcc7bf750b8a1f7 + checksum: a0574c6c4795adb8bc0908dc6a00e127c118b7eb5d916516863de0d2c3cd8eb5a4d5401791d968e61c131217674f8063436508e1de44fbfaad08180010491ce5 languageName: node linkType: hard From 07eea015dd203de1dad8324dc4dbc50490d8f7b3 Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Sat, 1 Oct 2022 14:18:42 -0700 Subject: [PATCH 35/41] Improve copy for docs on registering fastify plugins (#6463) * working edits * more edits * revert change to header --- docs/docs/app-configuration-redwood-toml.md | 89 ++++++++------------- 1 file changed, 35 insertions(+), 54 deletions(-) diff --git a/docs/docs/app-configuration-redwood-toml.md b/docs/docs/app-configuration-redwood-toml.md index 9d8db6d2c748..38055b2fc38b 100644 --- a/docs/docs/app-configuration-redwood-toml.md +++ b/docs/docs/app-configuration-redwood-toml.md @@ -111,38 +111,38 @@ Instead of including them in `includeEnvironmentVariables`, you can also prefix ### Configure Fastify -You can configure the Fastify Server used by Redwood, in `api/server.config.js`. +You can configure the Fastify server instance in `api/server.config.js`. +For all the configuration options, see [Fastify's docs](https://www.fastify.io/docs/latest/Reference/Server/#factory). -For all the configuration options, see the [Fastify Server docs](https://www.fastify.io/docs/latest/Reference/Server/#factory). +:::info Where does this configuration apply? +This configuration does **not** apply in a serverless deploy. +Typically when you deploy to a serverless provider like Netlify or Vercel, your project's web side is served from a CDN, and functions are invoked directly. +But this configuration does apply when running: -:::info Where do these configurations apply? - This configuration does **not** apply in a serverless deploy. Typically when you deploy to serverless providers like Netlify or Vercel, your web side is served from a CDN - and your functions are invoked directly - so none of these settings will be applied. +| Command | api | web | +| :-------------- | :--- | :--- | +| `yarn rw dev` | ✅ | ❌ | +| `yarn rw serve` | ✅ | ✅ | - But they do, when you run: - - `yarn rw dev` (the dev server) - the configuration will be picked up and used for the API side. Note that the web side is served by the Webpack dev server, in development. - - `yarn rw serve` (serving api and web sides in production mode) - the configuration will be applied to the Fastify instance serving static files from `./web/dist` and your api functions in `./api/dist/functions` - - Or if you're running them separately: - - `yarn rw serve api` (serving just the api side) - configuration will only apply to the Fastify instance serving your api side - - `yarn rw serve web` (serving just the web side) - configuration will only apply to the Fastify instance that serves your static files in `./web/dist/` ::: -Using [redwood.toml's env var interpolation](#using-environment-variables-in-redwoodtoml), you can configure a different `server.config.js` based on your deployment environment: +Using redwood.toml's [env var interpolation](#using-environment-variables-in-redwoodtoml), you can change the server config used based on your deployment environment: ```toml title="redwood.toml" [api] serverConfig = "./api/${DEPLOY_ENVIRONMENT}-server.config.js" ``` -### Register Custom Fastify Plug-ins - -You can also register Fastify plugins for the API and Web sides in the `configureFastify` function. +### Register Custom Fastify Plugins -This function has access to the Fastify instance and options, such as the side (web or api) that is being configured and other settings like the `apiRootPath` of the functions endpoint. +You can register Fastify plugins for the api and web sides using the `configureFastify` function. +This function has access to the Fastify server instance and options, such as the side that's being configured. :::warning Reminder - This configuration does not apply in a serverless deploy. + +This configuration does **not** apply in a serverless deploy. + ::: ```js @@ -160,26 +160,22 @@ const configureFastify = async (fastify, options) => { } ``` -##### How to Configure a Fastify Plug-in for the API Side +#### How to configure a Fastify plugin for the api side -Suppose you want to compress payloads and also rate limit your RedwoodJS api. +Let's say that you want to compress payloads and rate limit your API. +You can leverage two Fastify ecosystem plugins, [@fastify/compress](https://github.com/fastify/fastify-compress) and [@fastify/rate-limit](https://github.com/fastify/fastify-rate-limit) respectively. -You can leverage the Fastify ecosystem plug-ins: +Here, we configure compression so that it handles all requests, compresses responses only if they're larger than 1K, and to prefer the `deflate` method over `gzip`. +Using @fastify/rate-limit, we allow an IP address to only make 100 requests in a five minute window. -* [@fastify/compress](https://github.com/fastify/fastify-compress) -* [@fastify/rate-limit](https://github.com/fastify/fastify-rate-limit) +:::important Plugins need to be installed -And then configure them in your API side. +You'll need to install plugin packages in your project's `api` workspace: -Here, we setup compression to handle all requests (global), compress responses only if larger than 1K, and to prefer the `deflate` method over `gzip`. -only allow one IP address to make 100 requests in a five minute window. - -Of course, these are just examples and please see the plugin documentation for the settings that best meet your needs. - -:::important -You will need to install any custom plug-in packages to your project's `api` workspace. +``` +yarn workspace api add @fastify/rate-limit @fastify/compress +``` -To do this you run `yarn workspace api add @fastify/rate-limit @fastify/compress` ::: ```js @@ -200,23 +196,19 @@ const configureFastify = async (fastify, options) => { }) } - return fastify } ``` -:::important -You will need to install any custom plug-in packages to your project's `api` workspace. -::: +#### How to Configure a Fastify plugin for the web side -##### How to Configure a Fastify Plug-in for the Web Side +If you're running the web side using `yarn rw serve`, you can configure plugins like [@fastify/etag](https://github.com/fastify/fastify-etag) to register HTTP Etags. -If you are running your web side using `yarn rw serve` and not as part of a serverless deployment, you can configure plug-ins such ones to register HTTP Etags using the Fastify plug-in: +:::important Plugins need to be installed -* [@fastify/etag](https://github.com/fastify/fastify-etag) +You'll need to install plugin packages in your project's `api` workspace. +This may seem counter-intuitive, since you're configuring the `web` side, but the `api-server` gets configured in your project's `api` side and that's what's serving web assets. -:::note -If you run `yarn rw serve` because the same Fastify instance handles the api and web side, this plugin will apply to the API side as well. ::: ```js @@ -232,25 +224,14 @@ const configureFastify = async (fastify, options) => { } ``` -:::important -You will need to install any custom plug-in packages to your project's `api` workspace. - -This may seem counter-intuitive, since you are configuring the `web` side, but the `api-server` gets configured in your project's `api` and that is what server web assets. -::: - - #### Troubleshooting Custom Fastify Configuration -There are a few important considerations to be made when configuring Fastify. +There are a few important things to consider when configuring Fastify. -:::important Troubleshooting +If running via `yarn rw serve`, only register a plugin once either in `api` or in `web`. Registering the same plugin in both sides will error saying that it has already been registered. - * If running `yarn rw serve`, only register the plugin once either in `web` or in `api`. Registering the same pugin in both side will raise an error saying that it has already been registered. +Running via `yarn rw serve` uses a single Fastify instance to serve both api functions and web assets, so registering the plugin in a single side applies it to that instance. - Remember that `yarn rw serve` is single Fastify instance that server both functions and web assets, so registering the plugin in a single side applies it to that instance. - - * TODO log level -::: ## [browser] ```toml title="redwood.toml" From 40f62df0d7b82b8a905eed250276f6d02875f7d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 14:26:15 -0700 Subject: [PATCH 36/41] fix(deps): update dependency fastify to v4.7.0 (#6483) --- packages/api-server/package.json | 2 +- yarn.lock | 119 +++++++++++++++++++++---------- 2 files changed, 83 insertions(+), 38 deletions(-) diff --git a/packages/api-server/package.json b/packages/api-server/package.json index cc39625cee87..70996ddc3f6e 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -38,7 +38,7 @@ "chokidar": "3.5.3", "core-js": "3.25.3", "fast-json-parse": "1.0.3", - "fastify": "4.6.0", + "fastify": "4.7.0", "fastify-raw-body": "4.1.0", "lodash.escape": "4.0.1", "pretty-bytes": "5.6.0", diff --git a/yarn.lock b/yarn.lock index 8f42396f085d..94fb9a323c77 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2340,14 +2340,14 @@ __metadata: languageName: node linkType: hard -"@fastify/ajv-compiler@npm:^3.1.1": - version: 3.1.2 - resolution: "@fastify/ajv-compiler@npm:3.1.2" +"@fastify/ajv-compiler@npm:^3.3.1": + version: 3.3.1 + resolution: "@fastify/ajv-compiler@npm:3.3.1" dependencies: - ajv: ^8.10.0 + ajv: ^8.11.0 ajv-formats: ^2.1.1 fast-uri: ^2.0.0 - checksum: 0bc0f60eae316bd8beba06efbd150872b006f6e992a81af59e878bd3cb75d9b1270d0ccd9eae65984ca9eed204017482645ee4172f5c6265a287c0cc2bb6d243 + checksum: 67bcac52ea56c8f89c20c12523cd1556c994c7b1bdc817fa7479f8711f684766c8d8b992398521a11e09e026564046f860cdb3fbb4163840caf79450889b1e40 languageName: node linkType: hard @@ -2374,12 +2374,12 @@ __metadata: languageName: node linkType: hard -"@fastify/fast-json-stringify-compiler@npm:^4.0.0": - version: 4.0.0 - resolution: "@fastify/fast-json-stringify-compiler@npm:4.0.0" +"@fastify/fast-json-stringify-compiler@npm:^4.1.0": + version: 4.1.0 + resolution: "@fastify/fast-json-stringify-compiler@npm:4.1.0" dependencies: fast-json-stringify: ^5.0.0 - checksum: 9a54631a0191f1f0ec7b094ddd673e86f8f712261995d99ec31b9f9b6b9bff5b92c82b027d69228abef1873ac003e1327435c1ac2afbf8bb82c82dcc50e4d03c + checksum: ad42482a58f6f438e335067e8d36a3b498b84945a3d2a8820b3ec7be67e31da3686278c566f8fb5d88d19b7672ab1f166001890a72bb4baf9819aec9f3ff113d languageName: node linkType: hard @@ -6137,7 +6137,7 @@ __metadata: chokidar: 3.5.3 core-js: 3.25.3 fast-json-parse: 1.0.3 - fastify: 4.6.0 + fastify: 4.7.0 fastify-raw-body: 4.1.0 jest: 29.1.2 lodash.escape: 4.0.1 @@ -10254,7 +10254,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^8.0.0, ajv@npm:^8.10.0, ajv@npm:^8.8.0": +"ajv@npm:^8.0.0, ajv@npm:^8.10.0, ajv@npm:^8.11.0, ajv@npm:^8.8.0": version: 8.11.0 resolution: "ajv@npm:8.11.0" dependencies: @@ -10937,7 +10937,7 @@ __metadata: languageName: node linkType: hard -"avvio@npm:^8.1.3": +"avvio@npm:^8.2.0": version: 8.2.0 resolution: "avvio@npm:8.2.0" dependencies: @@ -16380,6 +16380,13 @@ __metadata: languageName: node linkType: hard +"fast-decode-uri-component@npm:^1.0.1": + version: 1.0.1 + resolution: "fast-decode-uri-component@npm:1.0.1" + checksum: 039d50c2e99d64f999c3f2126c23fbf75a04a4117e218a149ca0b1d2aeb8c834b7b19d643b9d35d4eabce357189a6a94085f78cf48869e6e26cc59b036284bc3 + languageName: node + linkType: hard + "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": version: 3.1.3 resolution: "fast-deep-equal@npm:3.1.3" @@ -16468,6 +16475,15 @@ __metadata: languageName: node linkType: hard +"fast-querystring@npm:^1.0.0": + version: 1.0.0 + resolution: "fast-querystring@npm:1.0.0" + dependencies: + fast-decode-uri-component: ^1.0.1 + checksum: fba19c93a6bcaf5991c985e087f980f1f16874a9878e5772a98c27bc1e61185b5014c87e83e681588a7d3cd4bba29cd3051e98e8e485d4b23cdcf38ae566dafc + languageName: node + linkType: hard + "fast-redact@npm:^3.1.1": version: 3.1.1 resolution: "fast-redact@npm:3.1.1" @@ -16542,25 +16558,25 @@ __metadata: languageName: node linkType: hard -"fastify@npm:4.6.0": - version: 4.6.0 - resolution: "fastify@npm:4.6.0" +"fastify@npm:4.7.0": + version: 4.7.0 + resolution: "fastify@npm:4.7.0" dependencies: - "@fastify/ajv-compiler": ^3.1.1 + "@fastify/ajv-compiler": ^3.3.1 "@fastify/error": ^3.0.0 - "@fastify/fast-json-stringify-compiler": ^4.0.0 + "@fastify/fast-json-stringify-compiler": ^4.1.0 abstract-logging: ^2.0.1 - avvio: ^8.1.3 - find-my-way: ^7.0.0 - light-my-request: ^5.5.1 - pino: ^8.0.0 + avvio: ^8.2.0 + find-my-way: ^7.2.0 + light-my-request: ^5.6.1 + pino: ^8.5.0 process-warning: ^2.0.0 proxy-addr: ^2.0.7 rfdc: ^1.3.0 - secure-json-parse: ^2.4.0 + secure-json-parse: ^2.5.0 semver: ^7.3.7 - tiny-lru: ^8.0.2 - checksum: 6c332f1783904f018bd0088dd03d3ec83d9a3a9d6b3485b3b9c49982f3a2cfed336dd332c9194ec4e8a7b0f3693a76f9babc6ae50c8d75e723d2f87cc7e5bef1 + tiny-lru: ^9.0.2 + checksum: cfe76bccb5e0c553ca078c717a0eabbf3c3848713bcd5d4385e8191a088ab9b34190cd23e95b31f0202f617fc4be26f035a0d5ce322a60d627c8f2dc9db0a6de languageName: node linkType: hard @@ -16798,13 +16814,14 @@ __metadata: languageName: node linkType: hard -"find-my-way@npm:^7.0.0": - version: 7.0.0 - resolution: "find-my-way@npm:7.0.0" +"find-my-way@npm:^7.2.0": + version: 7.2.0 + resolution: "find-my-way@npm:7.2.0" dependencies: fast-deep-equal: ^3.1.3 + fast-querystring: ^1.0.0 safe-regex2: ^2.0.0 - checksum: 0f24fc4f8bc1d3f15f3e88a45566d8adc11d2510b1c3a8c1d0fe7a83752395e6f1e066d895a68d9809b3a577646ce7b0914d07c3d9fed3a166e010845e9f0a18 + checksum: f0c205e7cfa92641500bbcfd2c3375640b4bbe469e2f379d3fe2d3d756b2a2ef68d0ed552517d4afd45bf415e063b1ea8d7267f9af437142c10f8a35bcb78916 languageName: node linkType: hard @@ -21333,14 +21350,14 @@ __metadata: languageName: node linkType: hard -"light-my-request@npm:^5.5.1": - version: 5.5.1 - resolution: "light-my-request@npm:5.5.1" +"light-my-request@npm:^5.6.1": + version: 5.6.1 + resolution: "light-my-request@npm:5.6.1" dependencies: cookie: ^0.5.0 process-warning: ^2.0.0 set-cookie-parser: ^2.4.1 - checksum: 6f45a39c648f406b7f8aaf90f79d19ac5db53d46a70b8d308fa5d6f3b87ad04d38aef46c8a5cb7f5c7e065c7478d92b61aecf09b6aa23003c885d165dc1e36ec + checksum: 5e8476228960d5c67f8a32ee0b47b3c60742823c8f46d45e455c84a76606beb0ce7950706fcf8e114f6473690cbaadb1769c6f7ddfc8282ba721f1c66ac85b8a languageName: node linkType: hard @@ -24741,7 +24758,7 @@ __metadata: languageName: node linkType: hard -"pino@npm:8.5.0, pino@npm:^8.0.0": +"pino@npm:8.5.0": version: 8.5.0 resolution: "pino@npm:8.5.0" dependencies: @@ -24762,6 +24779,27 @@ __metadata: languageName: node linkType: hard +"pino@npm:^8.5.0": + version: 8.6.1 + resolution: "pino@npm:8.6.1" + dependencies: + atomic-sleep: ^1.0.0 + fast-redact: ^3.1.1 + on-exit-leak-free: ^2.1.0 + pino-abstract-transport: v1.0.0 + pino-std-serializers: ^6.0.0 + process-warning: ^2.0.0 + quick-format-unescaped: ^4.0.3 + real-require: ^0.2.0 + safe-stable-stringify: ^2.3.1 + sonic-boom: ^3.1.0 + thread-stream: ^2.0.0 + bin: + pino: bin.js + checksum: 4cf2f6871c40965fa6e4c3cc5be458aa449fbdfd866b3de3c3214d859a0d84d1193a1ed01d3b9549138fd0bdcc7c651f1e1a5be3c8c43c093b528ef44d0c478b + languageName: node + linkType: hard + "pirates@npm:^4.0.1, pirates@npm:^4.0.4, pirates@npm:^4.0.5": version: 4.0.5 resolution: "pirates@npm:4.0.5" @@ -27470,10 +27508,10 @@ __metadata: languageName: node linkType: hard -"secure-json-parse@npm:^2.4.0": - version: 2.4.0 - resolution: "secure-json-parse@npm:2.4.0" - checksum: c6a5dd90aa41c6110ac7c6e67c12e9a5cdd4465263a012ac6682460a1f9ce907b867c1829e3948a4e2771fa3b08dbfbd9b507c6524a61b5225e6b32dc7e6b830 +"secure-json-parse@npm:^2.4.0, secure-json-parse@npm:^2.5.0": + version: 2.5.0 + resolution: "secure-json-parse@npm:2.5.0" + checksum: 6fccd4130bc45bfbf4ac83be3a7fa7112a51147837159782c6c95138d7cdf3e15255227a3f335274da279de2ea914a852eca2d638238c5b52f0db6b501bbf52a languageName: node linkType: hard @@ -29483,6 +29521,13 @@ __metadata: languageName: node linkType: hard +"tiny-lru@npm:^9.0.2": + version: 9.0.2 + resolution: "tiny-lru@npm:9.0.2" + checksum: 48aa41c07070dab66069b91e1811f75953233daa31880ec33d545a685c1acac1f5640559eac4e0ccb6c0fe3c84f8b25ef5a1b768d698f90d9f291fce556ca672 + languageName: node + linkType: hard + "tiny-warning@npm:^1.0.3": version: 1.0.3 resolution: "tiny-warning@npm:1.0.3" From e302b2e3aa65b711f72b2a6a905c10f3f788a730 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Sat, 1 Oct 2022 23:58:02 +0200 Subject: [PATCH 37/41] awsLambdaFastify test: Hide scary looking red error text (#6488) * Hide scary looking red error text * Limit console.error mocking --- .../requestHandlers/awsLambdaFastify.test.ts | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/packages/api-server/src/__tests__/requestHandlers/awsLambdaFastify.test.ts b/packages/api-server/src/__tests__/requestHandlers/awsLambdaFastify.test.ts index 854ff19e686f..4d4782a8c435 100644 --- a/packages/api-server/src/__tests__/requestHandlers/awsLambdaFastify.test.ts +++ b/packages/api-server/src/__tests__/requestHandlers/awsLambdaFastify.test.ts @@ -62,16 +62,29 @@ describe('Tests AWS Lambda to Fastify request transformation and handling', () = expect(mockedReply.status).toHaveBeenCalledWith(200) }) - test('requestHandler returns an error status if handler throws an error', async () => { - jest.spyOn(mockedReply, 'status') + describe('error handling', () => { + let consoleError - const handler = async () => { - throw new Error('error') - } + beforeEach(() => { + consoleError = console.error + console.error = () => {} + }) - await requestHandler(request, mockedReply, handler) + afterEach(() => { + console.error = consoleError + }) - expect(mockedReply.status).toHaveBeenCalledWith(500) + test('requestHandler returns an error status if handler throws an error', async () => { + jest.spyOn(mockedReply, 'status') + + const handler = async () => { + throw new Error('error') + } + + await requestHandler(request, mockedReply, handler) + + expect(mockedReply.status).toHaveBeenCalledWith(500) + }) }) test('requestHandler replies with headers', async () => { From 89ef5210da915c92c4951dc10d6f5d85c09151ce Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Mon, 3 Oct 2022 20:50:20 +0200 Subject: [PATCH 38/41] Try fixing flaky test on Windows (#6493) * Try fixing flaky test on Windows * Keep tweaking timings --- packages/router/src/__tests__/router.test.tsx | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/packages/router/src/__tests__/router.test.tsx b/packages/router/src/__tests__/router.test.tsx index 248d18e5e78f..1914344275a7 100644 --- a/packages/router/src/__tests__/router.test.tsx +++ b/packages/router/src/__tests__/router.test.tsx @@ -194,7 +194,7 @@ describe('slow imports', () => { }) => ( { ) beforeAll(() => { - mockDelay = 200 + mockDelay = 400 }) afterAll(() => { @@ -436,15 +436,35 @@ describe('slow imports', () => { }) test('usePageLoadingContext', async () => { + // We want to show a loading indicator if loading pages is taking a long + // time. But at the same time we don't want to show it right away, because + // then there'll be a flash of the loading indicator on every page load. + // So we have a `pageLoadingDelay` delay to control how long it waits + // before showing the loading state (default is 1000 ms). + // + // RW lazy loads pages by default, that's why it could potentially take a + // while to load a page. But during tests we don't do that. So we have to + // fake a delay. That's what `mockDelay` is for. `mockDelay` has to be + // longer than `pageLoadingDelay`, but not too long so the test takes + // longer than it has to, and also not too long so the entire test times + // out. + // Had to increase this to make the test pass on Windows - mockDelay = 500 + mockDelay = 700 + // sets pageLoadingDelay={200}. (Default is 1000.) const screen = render() act(() => navigate('/page-loading-context')) + // 'Page Loading Context Layout' should always be shown await waitFor(() => screen.getByText('Page Loading Context Layout')) + + // 'loading in layout...' should only be shown while the page is loading. + // So in this case, for the first 700ms await waitFor(() => screen.getByText('loading in layout...')) + + // After 700ms 'Page Loading Context Page' should be rendered await waitFor(() => screen.getByText('Page Loading Context Page')) // This shouldn't show up, because the page shouldn't render before it's From 2ce1f04141bc739f355785f11d4da9d291eff9cc Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Mon, 3 Oct 2022 21:20:36 +0200 Subject: [PATCH 39/41] Configure eslint to support es2022 (#6489) * Configure eslint to support es2019 * es2019 everywhere * es2022 + latest * eslint env comment --- .eslintrc.js | 9 ++++++--- packages/cli/src/commands/generate/service/service.js | 2 -- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 6616d5b53e6f..818b0756798e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -15,6 +15,7 @@ const findBabelConfig = (cwd = process.cwd()) => { module.exports = { extends: path.join(__dirname, 'packages/eslint-config/shared.js'), parserOptions: { + ecmaVersion: 'latest', babelOptions: { configFile: findBabelConfig(), }, @@ -31,6 +32,11 @@ module.exports = { '@typescript-eslint/no-explicit-any': 'off', curly: 'error', }, + env: { + // We use the most modern environment available. Then we rely on Babel to + // transpile it to something that can run on all node versions we support + es2022: true, + }, overrides: [ { files: ['packages/structure/src/**'], @@ -56,7 +62,6 @@ module.exports = { 'packages/web/src/**', ], env: { - es6: true, browser: true, }, globals: { @@ -100,7 +105,6 @@ module.exports = { { files: ['packages/web/src/entry/index.js'], env: { - es6: true, browser: true, }, globals: { @@ -125,7 +129,6 @@ module.exports = { 'packages/telemetry/src/**', ], env: { - es6: true, node: true, }, }, diff --git a/packages/cli/src/commands/generate/service/service.js b/packages/cli/src/commands/generate/service/service.js index 205f9dac6c74..1844174e8af4 100644 --- a/packages/cli/src/commands/generate/service/service.js +++ b/packages/cli/src/commands/generate/service/service.js @@ -47,7 +47,6 @@ export const scenarioFieldValue = (field) => { switch (field.type) { case 'BigInt': - // eslint-disable-next-line no-undef return `${BigInt(randInt)}n` case 'Boolean': return true @@ -210,7 +209,6 @@ export const fieldsToUpdate = async (model) => { // depending on the field type, append/update the value to something different switch (field.type) { case 'BigInt': - // eslint-disable-next-line no-undef newValue = `${newValue + 1n}` break case 'Boolean': { From 6e77af7dc5d52c83a23c4bf7d68881620ff70da5 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Tue, 4 Oct 2022 02:34:25 +0700 Subject: [PATCH 40/41] update flightcontrol deploy config (#6494) * update flightcontrol deploy config * Fix quote style --- .../src/commands/setup/deploy/templates/flightcontrol.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/cli/src/commands/setup/deploy/templates/flightcontrol.js b/packages/cli/src/commands/setup/deploy/templates/flightcontrol.js index 2696ec8d34d2..bcdda2a6cede 100644 --- a/packages/cli/src/commands/setup/deploy/templates/flightcontrol.js +++ b/packages/cli/src/commands/setup/deploy/templates/flightcontrol.js @@ -1,4 +1,5 @@ export const flightcontrolConfig = { + $schema: 'https://app.flightcontrol.dev/schema.json', environments: [ { id: 'development', @@ -12,10 +13,9 @@ export const flightcontrolConfig = { id: 'redwood-api', name: 'Redwood API', type: 'fargate', + buildType: 'nixpacks', cpu: 0.25, memory: 0.5, - installCommand: - 'yarn set version stable && NODE_ENV=development yarn install --immutable', buildCommand: 'yarn rw deploy flightcontrol api', startCommand: 'yarn rw deploy flightcontrol api --serve', postBuildCommand: 'echo 0', @@ -31,9 +31,8 @@ export const flightcontrolConfig = { id: 'redwood-web', name: 'Redwood Web', type: 'static', + buildType: 'nixpacks', singlePageApp: true, - installCommand: - 'yarn set version stable && NODE_ENV=development yarn install --immutable', buildCommand: 'yarn rw deploy flightcontrol web', outputDirectory: 'web/dist', envVariables: { From fc8ee9598227edcc75854b29fc8d67c9cb56a77e Mon Sep 17 00:00:00 2001 From: "noire.munich" <10271407+noire-munich@users.noreply.github.com> Date: Mon, 3 Oct 2022 21:39:58 +0200 Subject: [PATCH 41/41] Update validations.ts (#6387) Change type of validateUniqueness to match type declaration and fix error on optional fourth argument. --- packages/api/src/validations/validations.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/src/validations/validations.ts b/packages/api/src/validations/validations.ts index 7c5c8685076c..175006138b9a 100644 --- a/packages/api/src/validations/validations.ts +++ b/packages/api/src/validations/validations.ts @@ -636,7 +636,7 @@ export async function validateUniqueness( model: string, fields: Record, optionsOrCallback: UniquenessValidatorOptions, - callback: (tx: PrismaClient) => Promise + callback?: (tx: PrismaClient) => Promise ): Promise export async function validateUniqueness( model: string,