From 447f0fafeaecc014c3bfd41360b4efc57181eac6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 15:07:45 +0000 Subject: [PATCH 1/4] fix(deps): update dependency listr2 to v6 --- package.json | 2 +- packages/cli-helpers/package.json | 2 +- packages/cli/package.json | 2 +- yarn.lock | 137 +++++++++++++++++++++++++++--- 4 files changed, 126 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 81723273fce6..c079ba4a5886 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "jest-runner-tsd": "5.0.0", "jscodeshift": "0.14.0", "lerna": "6.6.1", - "listr2": "5.0.8", + "listr2": "6.3.1", "lodash.template": "4.5.0", "make-dir-cli": "3.0.0", "msw": "1.2.1", diff --git a/packages/cli-helpers/package.json b/packages/cli-helpers/package.json index 2ebfc4095672..8ee4eb82f525 100644 --- a/packages/cli-helpers/package.json +++ b/packages/cli-helpers/package.json @@ -29,7 +29,7 @@ "chalk": "4.1.2", "core-js": "3.30.1", "execa": "5.1.1", - "listr2": "5.0.8", + "listr2": "6.3.1", "lodash.memoize": "4.1.2", "pascalcase": "1.0.0", "prettier": "2.8.8", diff --git a/packages/cli/package.json b/packages/cli/package.json index e9b653a92f6d..331a934b37cb 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -54,7 +54,7 @@ "findup-sync": "5.0.0", "fs-extra": "11.1.1", "latest-version": "5.1.0", - "listr2": "5.0.8", + "listr2": "6.3.1", "lodash": "4.17.21", "param-case": "3.0.4", "pascalcase": "1.0.0", diff --git a/yarn.lock b/yarn.lock index 5d1641ba896d..20cc16c145ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6748,7 +6748,7 @@ __metadata: core-js: 3.30.1 execa: 5.1.1 jest: 29.5.0 - listr2: 5.0.8 + listr2: 6.3.1 lodash.memoize: 4.1.2 pascalcase: 1.0.0 prettier: 2.8.8 @@ -6792,7 +6792,7 @@ __metadata: fs-extra: 11.1.1 jest: 29.5.0 latest-version: 5.1.0 - listr2: 5.0.8 + listr2: 6.3.1 lodash: 4.17.21 param-case: 3.0.4 pascalcase: 1.0.0 @@ -11109,6 +11109,15 @@ __metadata: languageName: node linkType: hard +"ansi-escapes@npm:^5.0.0": + version: 5.0.0 + resolution: "ansi-escapes@npm:5.0.0" + dependencies: + type-fest: ^1.0.2 + checksum: f705cc7fbabb981ddf51562cd950792807bccd7260cc3d9478a619dda62bff6634c87ca100f2545ac7aade9b72652c4edad8c7f0d31a0b949b5fa58f33eaf0d0 + languageName: node + linkType: hard + "ansi-escapes@npm:^6.0.0": version: 6.0.0 resolution: "ansi-escapes@npm:6.0.0" @@ -11173,6 +11182,13 @@ __metadata: languageName: node linkType: hard +"ansi-styles@npm:^6.0.0, ansi-styles@npm:^6.1.0": + version: 6.2.1 + resolution: "ansi-styles@npm:6.2.1" + checksum: 5d1ec38c123984bcedd996eac680d548f31828bd679a66db2bdf11844634dde55fec3efa9c6bb1d89056a5e79c1ac540c4c784d592ea1d25028a92227d2f2d5c + languageName: node + linkType: hard + "ansi-to-html@npm:^0.6.11": version: 0.6.15 resolution: "ansi-to-html@npm:0.6.15" @@ -13503,6 +13519,15 @@ __metadata: languageName: node linkType: hard +"cli-cursor@npm:^4.0.0": + version: 4.0.0 + resolution: "cli-cursor@npm:4.0.0" + dependencies: + restore-cursor: ^4.0.0 + checksum: e776e8c3c6727300d0539b0d25160b2bb56aed1a63942753ba1826b012f337a6f4b7ace3548402e4f2f13b5e16bfd751be672c44b203205e7eca8be94afec42c + languageName: node + linkType: hard + "cli-spinners@npm:2.6.1": version: 2.6.1 resolution: "cli-spinners@npm:2.6.1" @@ -13540,6 +13565,16 @@ __metadata: languageName: node linkType: hard +"cli-truncate@npm:^3.1.0": + version: 3.1.0 + resolution: "cli-truncate@npm:3.1.0" + dependencies: + slice-ansi: ^5.0.0 + string-width: ^5.0.0 + checksum: a19088878409ec0e5dc2659a5166929629d93cfba6d68afc9cde2282fd4c751af5b555bf197047e31c87c574396348d011b7aa806fec29c4139ea4f7f00b324c + languageName: node + linkType: hard + "cli-width@npm:^3.0.0": version: 3.0.0 resolution: "cli-width@npm:3.0.0" @@ -15772,6 +15807,13 @@ __metadata: languageName: node linkType: hard +"eastasianwidth@npm:^0.2.0": + version: 0.2.0 + resolution: "eastasianwidth@npm:0.2.0" + checksum: 26f364ebcdb6395f95124fda411f63137a4bfb5d3a06453f7f23dfe52502905bd84e0488172e0f9ec295fdc45f05c23d5d91baf16bd26f0fe9acd777a188dc39 + languageName: node + linkType: hard + "ecc-jsbn@npm:~0.1.1": version: 0.1.2 resolution: "ecc-jsbn@npm:0.1.2" @@ -16706,6 +16748,13 @@ __metadata: languageName: node linkType: hard +"eventemitter3@npm:^5.0.0": + version: 5.0.0 + resolution: "eventemitter3@npm:5.0.0" + checksum: 5ed89fec1c52b56576d765ef0c14bc157599c4cb936d6df97c1b17e096bb7d70647569d4ecf5f0a36016dc304ac1e36c7c7c85c66d8ae64c044a1e4e7da4ed12 + languageName: node + linkType: hard + "events@npm:1.1.1": version: 1.1.1 resolution: "events@npm:1.1.1" @@ -20039,6 +20088,13 @@ __metadata: languageName: node linkType: hard +"is-fullwidth-code-point@npm:^4.0.0": + version: 4.0.0 + resolution: "is-fullwidth-code-point@npm:4.0.0" + checksum: df2a717e813567db0f659c306d61f2f804d480752526886954a2a3e2246c7745fd07a52b5fecf2b68caf0a6c79dcdace6166fdf29cc76ed9975cc334f0a018b8 + languageName: node + linkType: hard + "is-function@npm:^1.0.2": version: 1.0.2 resolution: "is-function@npm:1.0.2" @@ -22060,24 +22116,22 @@ __metadata: languageName: node linkType: hard -"listr2@npm:5.0.8": - version: 5.0.8 - resolution: "listr2@npm:5.0.8" +"listr2@npm:6.3.1": + version: 6.3.1 + resolution: "listr2@npm:6.3.1" dependencies: - cli-truncate: ^2.1.0 + cli-truncate: ^3.1.0 colorette: ^2.0.19 - log-update: ^4.0.0 - p-map: ^4.0.0 + eventemitter3: ^5.0.0 + log-update: ^5.0.1 rfdc: ^1.3.0 - rxjs: ^7.8.0 - through: ^2.3.8 - wrap-ansi: ^7.0.0 + wrap-ansi: ^8.1.0 peerDependencies: enquirer: ">= 2.3.0 < 3" peerDependenciesMeta: enquirer: optional: true - checksum: 00f00ad18262909bafff21b42d2d94faa9ed3911d70094a12a1182e773533f9b3cfd78d83a81fdbfb7dbc42e3e3252093f504c822de152100a953a91f3adf7cb + checksum: 838420220398956f2e799ea644adfe68a69e1eb02a66070e8ae5ae5074f7b7108b0bca55797e1811b8a7a8c71f32cd35407bad3f085830cd93e41532b2eb7050 languageName: node linkType: hard @@ -22433,6 +22487,19 @@ __metadata: languageName: node linkType: hard +"log-update@npm:^5.0.1": + version: 5.0.1 + resolution: "log-update@npm:5.0.1" + dependencies: + ansi-escapes: ^5.0.0 + cli-cursor: ^4.0.0 + slice-ansi: ^5.0.0 + strip-ansi: ^7.0.1 + wrap-ansi: ^8.0.1 + checksum: 1050ea2027e80f32e132aace909987cb00c2719368c78b82ffca681a5b3f4020eeb5f4b4e310c47c35c6c36aff258c1d1bc51485ac44d6fdac9eb0a4275c539f + languageName: node + linkType: hard + "logical-not@npm:^1.0.1": version: 1.0.9 resolution: "logical-not@npm:1.0.9" @@ -27779,6 +27846,16 @@ __metadata: languageName: node linkType: hard +"restore-cursor@npm:^4.0.0": + version: 4.0.0 + resolution: "restore-cursor@npm:4.0.0" + dependencies: + onetime: ^5.1.0 + signal-exit: ^3.0.2 + checksum: 6f7da8c5e422ac26aa38354870b1afac09963572cf2879443540449068cb43476e9cbccf6f8de3e0171e0d6f7f533c2bc1a0a008003c9a525bbc098e89041318 + languageName: node + linkType: hard + "ret@npm:~0.1.10": version: 0.1.15 resolution: "ret@npm:0.1.15" @@ -27951,7 +28028,7 @@ __metadata: jest-runner-tsd: 5.0.0 jscodeshift: 0.14.0 lerna: 6.6.1 - listr2: 5.0.8 + listr2: 6.3.1 lodash.template: 4.5.0 make-dir-cli: 3.0.0 msw: 1.2.1 @@ -28644,6 +28721,16 @@ __metadata: languageName: node linkType: hard +"slice-ansi@npm:^5.0.0": + version: 5.0.0 + resolution: "slice-ansi@npm:5.0.0" + dependencies: + ansi-styles: ^6.0.0 + is-fullwidth-code-point: ^4.0.0 + checksum: 2d4d40b2a9d5cf4e8caae3f698fe24ae31a4d778701724f578e984dcb485ec8c49f0c04dab59c401821e80fcdfe89cace9c66693b0244e40ec485d72e543914f + languageName: node + linkType: hard + "smart-buffer@npm:^4.2.0": version: 4.2.0 resolution: "smart-buffer@npm:4.2.0" @@ -29283,6 +29370,17 @@ __metadata: languageName: node linkType: hard +"string-width@npm:^5.0.0, string-width@npm:^5.0.1": + version: 5.1.2 + resolution: "string-width@npm:5.1.2" + dependencies: + eastasianwidth: ^0.2.0 + emoji-regex: ^9.2.2 + strip-ansi: ^7.0.1 + checksum: ab9c4264443d35b8b923cbdd513a089a60de339216d3b0ed3be3ba57d6880e1a192b70ae17225f764d7adbf5994e9bb8df253a944736c15a0240eff553c678ca + languageName: node + linkType: hard + "string.prototype.matchall@npm:^4.0.0 || ^3.0.1, string.prototype.matchall@npm:^4.0.5, string.prototype.matchall@npm:^4.0.8": version: 4.0.8 resolution: "string.prototype.matchall@npm:4.0.8" @@ -30597,7 +30695,7 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^1.0.1, type-fest@npm:^1.2.1, type-fest@npm:^1.2.2": +"type-fest@npm:^1.0.1, type-fest@npm:^1.0.2, type-fest@npm:^1.2.1, type-fest@npm:^1.2.2": version: 1.4.0 resolution: "type-fest@npm:1.4.0" checksum: a3c0f4ee28ff6ddf800d769eafafcdeab32efa38763c1a1b8daeae681920f6e345d7920bf277245235561d8117dab765cb5f829c76b713b4c9de0998a5397141 @@ -32287,6 +32385,17 @@ __metadata: languageName: node linkType: hard +"wrap-ansi@npm:^8.0.1, wrap-ansi@npm:^8.1.0": + version: 8.1.0 + resolution: "wrap-ansi@npm:8.1.0" + dependencies: + ansi-styles: ^6.1.0 + string-width: ^5.0.1 + strip-ansi: ^7.0.1 + checksum: 138ff58a41d2f877eae87e3282c0630fc2789012fc1af4d6bd626eeb9a2f9a65ca92005e6e69a75c7b85a68479fe7443c7dbe1eb8fbaa681a4491364b7c55c60 + languageName: node + linkType: hard + "wrappy@npm:1": version: 1.0.2 resolution: "wrappy@npm:1.0.2" From d9acd578613da7781e82b80b5a9535042203e06e Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Tue, 25 Apr 2023 08:20:34 -0700 Subject: [PATCH 2/4] migrate breaking changes --- packages/cli-helpers/src/auth/setupHelpers.ts | 2 +- .../cli/src/commands/dataMigrate/install.js | 2 +- packages/cli/src/commands/dataMigrate/up.js | 2 +- .../src/commands/destroy/graphiql/graphiql.js | 2 +- packages/cli/src/commands/destroy/helpers.js | 2 +- .../cli/src/commands/destroy/page/page.js | 2 +- .../src/commands/destroy/scaffold/scaffold.js | 2 +- packages/cli/src/commands/destroy/sdl/sdl.js | 2 +- packages/cli/src/commands/execHandler.js | 2 +- .../opentelemetry/opentelemetryHandler.js | 2 +- .../generate/dataMigration/dataMigration.js | 2 +- .../generate/dbAuth/__tests__/dbAuth.test.js | 32 +++++++++---------- .../src/commands/generate/dbAuth/dbAuth.js | 2 +- .../commands/generate/directive/directive.js | 2 +- .../commands/generate/function/function.js | 2 +- packages/cli/src/commands/generate/helpers.js | 2 +- .../cli/src/commands/generate/model/model.js | 2 +- .../cli/src/commands/generate/page/page.js | 2 +- .../commands/generate/scaffold/scaffold.js | 2 +- .../src/commands/generate/script/script.js | 2 +- packages/cli/src/commands/generate/sdl/sdl.js | 2 +- packages/cli/src/commands/prerenderHandler.js | 2 +- .../custom-web-index-handler.js | 2 +- .../setup/deploy/providers/baremetal.js | 2 +- .../commands/setup/deploy/providers/edgio.js | 2 +- .../setup/deploy/providers/flightcontrol.js | 2 +- .../setup/deploy/providers/netlify.js | 2 +- .../commands/setup/deploy/providers/render.js | 2 +- .../setup/deploy/providers/serverless.js | 2 +- .../commands/setup/deploy/providers/vercel.js | 2 +- .../setup/generator/generatorHandler.js | 2 +- .../setup/graphiql/graphiqlHandler.js | 2 +- .../src/commands/setup/i18n/i18nHandler.js | 4 +-- .../setup/tsconfig/tsconfigHandler.js | 2 +- .../commands/setup/ui/libraries/chakra-ui.js | 4 +-- .../commands/setup/ui/libraries/mantine.js | 4 +-- .../setup/ui/libraries/tailwindcss.js | 6 ++-- .../commands/setup/ui/libraries/windicss.js | 6 ++-- .../src/commands/setup/vite/viteHandler.js | 2 +- .../commands/setup/webpack/webpackHandler.js | 2 +- .../cli/src/commands/type-checkHandler.js | 5 ++- packages/cli/src/commands/upgrade.js | 5 ++- .../cli/src/lib/__tests__/rollback.test.js | 2 +- packages/cli/src/lib/index.js | 2 +- tasks/test-project/tasks.js | 2 +- tasks/test-project/test-project | 2 +- 46 files changed, 74 insertions(+), 68 deletions(-) diff --git a/packages/cli-helpers/src/auth/setupHelpers.ts b/packages/cli-helpers/src/auth/setupHelpers.ts index 52b14ed399b9..67d477b9350e 100644 --- a/packages/cli-helpers/src/auth/setupHelpers.ts +++ b/packages/cli-helpers/src/auth/setupHelpers.ts @@ -132,7 +132,7 @@ export const standardAuthHandler = async ({ }, ].filter(truthy), { - rendererOptions: { collapse: false }, + rendererOptions: { collapseSubtasks: false }, renderer: verbose ? 'verbose' : 'default', ctx: { setupMode: 'UNKNOWN', diff --git a/packages/cli/src/commands/dataMigrate/install.js b/packages/cli/src/commands/dataMigrate/install.js index 93ce796c9b8a..87845786e8d3 100644 --- a/packages/cli/src/commands/dataMigrate/install.js +++ b/packages/cli/src/commands/dataMigrate/install.js @@ -86,7 +86,7 @@ export const handler = async () => { }, }, ], - { rendererOptions: { collapse: false }, exitOnError: true } + { rendererOptions: { collapseSubtasks: false }, exitOnError: true } ) try { diff --git a/packages/cli/src/commands/dataMigrate/up.js b/packages/cli/src/commands/dataMigrate/up.js index 05b1d0f7c9b4..fe58eb795048 100644 --- a/packages/cli/src/commands/dataMigrate/up.js +++ b/packages/cli/src/commands/dataMigrate/up.js @@ -159,7 +159,7 @@ export const handler = async () => { }) const tasks = new Listr(migrationTasks, { - rendererOptions: { collapse: false }, + rendererOptions: { collapseSubtasks: false }, renderer: 'verbose', }) diff --git a/packages/cli/src/commands/destroy/graphiql/graphiql.js b/packages/cli/src/commands/destroy/graphiql/graphiql.js index 997bfa40f69c..7e6b7d90c6f6 100644 --- a/packages/cli/src/commands/destroy/graphiql/graphiql.js +++ b/packages/cli/src/commands/destroy/graphiql/graphiql.js @@ -46,7 +46,7 @@ export const handler = () => { task: removeGraphiqlFromGraphqlHandler, }, ], - { rendererOptions: { collapse: false }, exitOnError: true } + { rendererOptions: { collapseSubtasks: false }, exitOnError: true } ) try { tasks.run() diff --git a/packages/cli/src/commands/destroy/helpers.js b/packages/cli/src/commands/destroy/helpers.js index f7c4f128a937..7d7040d4cbc0 100644 --- a/packages/cli/src/commands/destroy/helpers.js +++ b/packages/cli/src/commands/destroy/helpers.js @@ -14,7 +14,7 @@ const tasks = ({ componentName, filesFn, name }) => }, }, ], - { rendererOptions: { collapse: false }, exitOnError: true } + { rendererOptions: { collapseSubtasks: false }, exitOnError: true } ) export const createYargsForComponentDestroy = ({ diff --git a/packages/cli/src/commands/destroy/page/page.js b/packages/cli/src/commands/destroy/page/page.js index 1701fd404999..404ca245e9ce 100644 --- a/packages/cli/src/commands/destroy/page/page.js +++ b/packages/cli/src/commands/destroy/page/page.js @@ -44,7 +44,7 @@ export const tasks = ({ name, path }) => task: async () => removeRoutesFromRouterTask([camelcase(name)]), }, ], - { rendererOptions: { collapse: false }, exitOnError: true } + { rendererOptions: { collapseSubtasks: false }, exitOnError: true } ) export const handler = async ({ name, path }) => { diff --git a/packages/cli/src/commands/destroy/scaffold/scaffold.js b/packages/cli/src/commands/destroy/scaffold/scaffold.js index 83c4b7e38a80..21f9cd0d686f 100644 --- a/packages/cli/src/commands/destroy/scaffold/scaffold.js +++ b/packages/cli/src/commands/destroy/scaffold/scaffold.js @@ -106,7 +106,7 @@ export const tasks = ({ model, path, tests, nestScaffoldByModel }) => task: () => removeLayoutImport({ model, path }), }, ], - { rendererOptions: { collapse: false }, exitOnError: true } + { rendererOptions: { collapseSubtasks: false }, exitOnError: true } ) export const handler = async ({ model: modelArg }) => { diff --git a/packages/cli/src/commands/destroy/sdl/sdl.js b/packages/cli/src/commands/destroy/sdl/sdl.js index f4755737948e..cc4215ae48ad 100644 --- a/packages/cli/src/commands/destroy/sdl/sdl.js +++ b/packages/cli/src/commands/destroy/sdl/sdl.js @@ -27,7 +27,7 @@ export const tasks = ({ model }) => }, }, ], - { rendererOptions: { collapse: false }, exitOnError: true } + { rendererOptions: { collapseSubtasks: false }, exitOnError: true } ) export const handler = async ({ model }) => { diff --git a/packages/cli/src/commands/execHandler.js b/packages/cli/src/commands/execHandler.js index 4a6f0936e487..9c17decf202c 100644 --- a/packages/cli/src/commands/execHandler.js +++ b/packages/cli/src/commands/execHandler.js @@ -123,7 +123,7 @@ export const handler = async (args) => { ] const tasks = new Listr(scriptTasks, { - rendererOptions: { collapse: false }, + rendererOptions: { collapseSubtasks: false }, renderer: 'verbose', }) diff --git a/packages/cli/src/commands/experimental/setup/opentelemetry/opentelemetryHandler.js b/packages/cli/src/commands/experimental/setup/opentelemetry/opentelemetryHandler.js index 0bb9a3203142..0e7a4c8a5433 100644 --- a/packages/cli/src/commands/experimental/setup/opentelemetry/opentelemetryHandler.js +++ b/packages/cli/src/commands/experimental/setup/opentelemetry/opentelemetryHandler.js @@ -185,7 +185,7 @@ export const handler = async ({ force, verbose }) => { }, ], { - rendererOptions: { collapse: false, persistentOutput: true }, + rendererOptions: { collapseSubtasks: false, persistentOutput: true }, renderer: verbose ? 'verbose' : 'default', } ) diff --git a/packages/cli/src/commands/generate/dataMigration/dataMigration.js b/packages/cli/src/commands/generate/dataMigration/dataMigration.js index 93078ae67331..0e878727bb1d 100644 --- a/packages/cli/src/commands/generate/dataMigration/dataMigration.js +++ b/packages/cli/src/commands/generate/dataMigration/dataMigration.js @@ -79,7 +79,7 @@ export const handler = async (args) => { }, }, ].filter(Boolean), - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js index aaf0737b8508..073fe46ef360 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js @@ -88,7 +88,7 @@ describe('dbAuth', () => { const mockConsoleInfo = jest.spyOn(console, 'info').mockImplementation() await dbAuth.handler({ - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, usernameLabel: 'email', passwordLabel: 'password', webauthn: false, @@ -118,7 +118,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, }) expect(correctPrompt).toBe(true) }) @@ -136,7 +136,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, usernameLabel: 'email', }) expect(correctPrompt).toBe(false) @@ -155,7 +155,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, }) expect(correctPrompt).toBe(true) }) @@ -173,7 +173,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, passwordLabel: 'secret', }) expect(correctPrompt).toBe(false) @@ -192,7 +192,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, }) expect(correctPrompt).toBe(true) }) @@ -210,7 +210,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, webauthn: false, }) expect(correctPrompt).toBe(false) @@ -224,7 +224,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, }) const forgotPasswordPage = fs @@ -272,7 +272,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, usernameLabel: 'Email', }) @@ -324,7 +324,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, }) const forgotPasswordPage = fs @@ -372,7 +372,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, passwordLabel: 'Secret', }) @@ -424,7 +424,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, }) const forgotPasswordPage = fs @@ -472,7 +472,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, usernameLabel: 'Email', passwordLabel: 'Secret', }) @@ -528,7 +528,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, }) const forgotPasswordPage = fs @@ -582,7 +582,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, webauthn: true, }) @@ -640,7 +640,7 @@ describe('dbAuth', () => { await dbAuth.handler({ enquirer: customEnquirer, - listr2: { rendererSilent: true }, + listr2: { silentRendererCondition: true }, }) const forgotPasswordPage = fs diff --git a/packages/cli/src/commands/generate/dbAuth/dbAuth.js b/packages/cli/src/commands/generate/dbAuth/dbAuth.js index fae08c309db6..da322c10c7de 100644 --- a/packages/cli/src/commands/generate/dbAuth/dbAuth.js +++ b/packages/cli/src/commands/generate/dbAuth/dbAuth.js @@ -364,7 +364,7 @@ const tasks = ({ ], { rendererSilent: () => listr2?.rendererSilent, - rendererOptions: { collapse: false }, + rendererOptions: { collapseSubtasks: false }, injectWrapper: { enquirer: enquirer || new Enquirer() }, exitOnError: true, } diff --git a/packages/cli/src/commands/generate/directive/directive.js b/packages/cli/src/commands/generate/directive/directive.js index 722f6ff8f042..f05631817e6e 100644 --- a/packages/cli/src/commands/generate/directive/directive.js +++ b/packages/cli/src/commands/generate/directive/directive.js @@ -179,7 +179,7 @@ export const handler = async (args) => { }, }, ].filter(Boolean), - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/generate/function/function.js b/packages/cli/src/commands/generate/function/function.js index 07e26da31b38..9fe09488dfcb 100644 --- a/packages/cli/src/commands/generate/function/function.js +++ b/packages/cli/src/commands/generate/function/function.js @@ -135,7 +135,7 @@ export const handler = async ({ name, force, ...rest }) => { }, }, ], - { rendererOptions: { collapse: false }, exitOnError: true } + { rendererOptions: { collapseSubtasks: false }, exitOnError: true } ) try { diff --git a/packages/cli/src/commands/generate/helpers.js b/packages/cli/src/commands/generate/helpers.js index d29c94aa499a..7687404f43a5 100644 --- a/packages/cli/src/commands/generate/helpers.js +++ b/packages/cli/src/commands/generate/helpers.js @@ -229,7 +229,7 @@ export const createYargsForComponentGeneration = ({ ...includeAdditionalTasks(options), ], { - rendererOptions: { collapse: false }, + rendererOptions: { collapseSubtasks: false }, exitOnError: true, renderer: options.verbose && 'verbose', } diff --git a/packages/cli/src/commands/generate/model/model.js b/packages/cli/src/commands/generate/model/model.js index c19593ba1c2d..df18bab1cac3 100644 --- a/packages/cli/src/commands/generate/model/model.js +++ b/packages/cli/src/commands/generate/model/model.js @@ -63,7 +63,7 @@ export const handler = async ({ force, ...args }) => { }, }, ].filter(Boolean), - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/generate/page/page.js b/packages/cli/src/commands/generate/page/page.js index 4cfc9b5df5e3..190104286647 100644 --- a/packages/cli/src/commands/generate/page/page.js +++ b/packages/cli/src/commands/generate/page/page.js @@ -253,7 +253,7 @@ export const handler = async ({ }, }, ].filter(Boolean), - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/generate/scaffold/scaffold.js b/packages/cli/src/commands/generate/scaffold/scaffold.js index 14f357e9910b..773586dbe5c2 100644 --- a/packages/cli/src/commands/generate/scaffold/scaffold.js +++ b/packages/cli/src/commands/generate/scaffold/scaffold.js @@ -828,7 +828,7 @@ export const tasks = ({ }, }, ], - { rendererOptions: { collapse: false }, exitOnError: true } + { rendererOptions: { collapseSubtasks: false }, exitOnError: true } ) } diff --git a/packages/cli/src/commands/generate/script/script.js b/packages/cli/src/commands/generate/script/script.js index 89f7156115dc..1b337c68e8ce 100644 --- a/packages/cli/src/commands/generate/script/script.js +++ b/packages/cli/src/commands/generate/script/script.js @@ -87,7 +87,7 @@ export const handler = async ({ force, ...args }) => { }, }, ].filter(Boolean), - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/generate/sdl/sdl.js b/packages/cli/src/commands/generate/sdl/sdl.js index e911ae184f17..b8e632a13721 100644 --- a/packages/cli/src/commands/generate/sdl/sdl.js +++ b/packages/cli/src/commands/generate/sdl/sdl.js @@ -304,7 +304,7 @@ export const handler = async ({ }, }, ].filter(Boolean), - { rendererOptions: { collapse: false }, exitOnError: true } + { rendererOptions: { collapseSubtasks: false }, exitOnError: true } ) if (rollback && !force) { diff --git a/packages/cli/src/commands/prerenderHandler.js b/packages/cli/src/commands/prerenderHandler.js index 4a280233a7dd..e955752f89dc 100644 --- a/packages/cli/src/commands/prerenderHandler.js +++ b/packages/cli/src/commands/prerenderHandler.js @@ -278,7 +278,7 @@ export const handler = async ({ path: routerPath, dryRun, verbose }) => { const tasks = new Listr(listrTasks, { renderer: verbose ? 'verbose' : 'default', - rendererOptions: { collapse: false }, + rendererOptions: { collapseSubtasks: false }, concurrent: false, }) diff --git a/packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js b/packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js index 7c78a2c4dad2..4dfc85b05beb 100644 --- a/packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js +++ b/packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js @@ -49,7 +49,7 @@ export const handler = async ({ force }) => { }, }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/setup/deploy/providers/baremetal.js b/packages/cli/src/commands/setup/deploy/providers/baremetal.js index d6e64ca53a0c..c26f92cb510d 100644 --- a/packages/cli/src/commands/setup/deploy/providers/baremetal.js +++ b/packages/cli/src/commands/setup/deploy/providers/baremetal.js @@ -49,7 +49,7 @@ export const handler = async ({ force }) => { }), printSetupNotes(notes), ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { await tasks.run() diff --git a/packages/cli/src/commands/setup/deploy/providers/edgio.js b/packages/cli/src/commands/setup/deploy/providers/edgio.js index c2bff4117f67..f915c4f48ac0 100644 --- a/packages/cli/src/commands/setup/deploy/providers/edgio.js +++ b/packages/cli/src/commands/setup/deploy/providers/edgio.js @@ -60,7 +60,7 @@ export const handler = async () => { }, printSetupNotes(notes), ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { await tasks.run() diff --git a/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js b/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js index 58235874504f..9654658e04f4 100644 --- a/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js +++ b/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js @@ -320,7 +320,7 @@ export const handler = async ({ force, database }) => { addToDotEnvDefaultTask(), printSetupNotes(notes), ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/setup/deploy/providers/netlify.js b/packages/cli/src/commands/setup/deploy/providers/netlify.js index bc57120127c9..502857f2cece 100644 --- a/packages/cli/src/commands/setup/deploy/providers/netlify.js +++ b/packages/cli/src/commands/setup/deploy/providers/netlify.js @@ -32,7 +32,7 @@ export const handler = async ({ force }) => { addFilesTask({ files, force }), printSetupNotes(notes), ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { await tasks.run() diff --git a/packages/cli/src/commands/setup/deploy/providers/render.js b/packages/cli/src/commands/setup/deploy/providers/render.js index 9449307f03c5..7c677a317ab9 100644 --- a/packages/cli/src/commands/setup/deploy/providers/render.js +++ b/packages/cli/src/commands/setup/deploy/providers/render.js @@ -108,7 +108,7 @@ export const handler = async ({ force, database }) => { }), printSetupNotes(notes), ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/setup/deploy/providers/serverless.js b/packages/cli/src/commands/setup/deploy/providers/serverless.js index 8a7a73f37fdf..3487efa9e413 100644 --- a/packages/cli/src/commands/setup/deploy/providers/serverless.js +++ b/packages/cli/src/commands/setup/deploy/providers/serverless.js @@ -140,7 +140,7 @@ export const handler = async ({ force }) => { ], { exitOnError: true, - rendererOptions: { collapse: false }, + rendererOptions: { collapseSubtasks: false }, } ) try { diff --git a/packages/cli/src/commands/setup/deploy/providers/vercel.js b/packages/cli/src/commands/setup/deploy/providers/vercel.js index 4e135ee8b9cd..b037a4e837d6 100644 --- a/packages/cli/src/commands/setup/deploy/providers/vercel.js +++ b/packages/cli/src/commands/setup/deploy/providers/vercel.js @@ -16,7 +16,7 @@ const notes = [ export const handler = async () => { const tasks = new Listr([updateApiURLTask('/api'), printSetupNotes(notes)], { - rendererOptions: { collapse: false }, + rendererOptions: { collapseSubtasks: false }, }) try { await tasks.run() diff --git a/packages/cli/src/commands/setup/generator/generatorHandler.js b/packages/cli/src/commands/setup/generator/generatorHandler.js index 3a660706f62e..79b17554ca2a 100644 --- a/packages/cli/src/commands/setup/generator/generatorHandler.js +++ b/packages/cli/src/commands/setup/generator/generatorHandler.js @@ -43,7 +43,7 @@ const tasks = ({ name, force }) => { }, }, ], - { rendererOptions: { collapse: false }, errorOnExist: true } + { rendererOptions: { collapseSubtasks: false }, errorOnExist: true } ) } diff --git a/packages/cli/src/commands/setup/graphiql/graphiqlHandler.js b/packages/cli/src/commands/setup/graphiql/graphiqlHandler.js index cd3d854ad0f9..143548730711 100644 --- a/packages/cli/src/commands/setup/graphiql/graphiqlHandler.js +++ b/packages/cli/src/commands/setup/graphiql/graphiqlHandler.js @@ -124,7 +124,7 @@ export const handler = async ({ provider, id, token, expiry, view }) => { }, }, ].filter(Boolean), - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/setup/i18n/i18nHandler.js b/packages/cli/src/commands/setup/i18n/i18nHandler.js index f6bdc13c2aba..5114755bc0e7 100644 --- a/packages/cli/src/commands/setup/i18n/i18nHandler.js +++ b/packages/cli/src/commands/setup/i18n/i18nHandler.js @@ -63,7 +63,7 @@ export const handler = async ({ force }) => { }, }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) }, }, @@ -186,7 +186,7 @@ export const handler = async ({ force }) => { }, }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/setup/tsconfig/tsconfigHandler.js b/packages/cli/src/commands/setup/tsconfig/tsconfigHandler.js index c7881d495473..4fc7e43aa67f 100644 --- a/packages/cli/src/commands/setup/tsconfig/tsconfigHandler.js +++ b/packages/cli/src/commands/setup/tsconfig/tsconfigHandler.js @@ -56,7 +56,7 @@ export const handler = async ({ force }) => { }, }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js b/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js index 972516f55f1c..ddcbe9af4c72 100644 --- a/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js +++ b/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js @@ -57,7 +57,7 @@ export async function handler({ force, install }) { }, }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) }, }, @@ -104,7 +104,7 @@ export async function handler({ force, install }) { ), }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/setup/ui/libraries/mantine.js b/packages/cli/src/commands/setup/ui/libraries/mantine.js index 6b7166d88c65..ee5265137109 100644 --- a/packages/cli/src/commands/setup/ui/libraries/mantine.js +++ b/packages/cli/src/commands/setup/ui/libraries/mantine.js @@ -82,7 +82,7 @@ export async function handler({ force, install, packages }) { }, }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) }, }, @@ -124,7 +124,7 @@ export async function handler({ force, install, packages }) { ), }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js b/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js index 2a359275be7e..bae076e3d4b0 100644 --- a/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js +++ b/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js @@ -95,7 +95,7 @@ export const handler = async ({ force, install }) => { }, }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) }, }, @@ -118,7 +118,7 @@ export const handler = async ({ force, install }) => { }, }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) }, }, @@ -305,7 +305,7 @@ export const handler = async ({ force, install }) => { }, }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/setup/ui/libraries/windicss.js b/packages/cli/src/commands/setup/ui/libraries/windicss.js index 0af8611881e5..c5264e1dd9a9 100644 --- a/packages/cli/src/commands/setup/ui/libraries/windicss.js +++ b/packages/cli/src/commands/setup/ui/libraries/windicss.js @@ -56,7 +56,7 @@ export const handler = async ({ force, install }) => { }, }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) }, }, @@ -88,7 +88,7 @@ export const handler = async ({ force, install }) => { }, }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) }, }, @@ -141,7 +141,7 @@ export const handler = async ({ force, install }) => { }, }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/setup/vite/viteHandler.js b/packages/cli/src/commands/setup/vite/viteHandler.js index a77a5a881bc7..a03e3f18d186 100644 --- a/packages/cli/src/commands/setup/vite/viteHandler.js +++ b/packages/cli/src/commands/setup/vite/viteHandler.js @@ -121,7 +121,7 @@ export const handler = async ({ force, verbose, addPackage }) => { }, ], { - rendererOptions: { collapse: false }, + rendererOptions: { collapseSubtasks: false }, renderer: verbose ? 'verbose' : 'default', } ) diff --git a/packages/cli/src/commands/setup/webpack/webpackHandler.js b/packages/cli/src/commands/setup/webpack/webpackHandler.js index e5d5009467f9..6c10cdb83a93 100644 --- a/packages/cli/src/commands/setup/webpack/webpackHandler.js +++ b/packages/cli/src/commands/setup/webpack/webpackHandler.js @@ -46,7 +46,7 @@ export const handler = async ({ force }) => { }, }, ], - { rendererOptions: { collapse: false } } + { rendererOptions: { collapseSubtasks: false } } ) try { diff --git a/packages/cli/src/commands/type-checkHandler.js b/packages/cli/src/commands/type-checkHandler.js index 09d815cf33c6..3ce634673a85 100644 --- a/packages/cli/src/commands/type-checkHandler.js +++ b/packages/cli/src/commands/type-checkHandler.js @@ -69,7 +69,10 @@ export const handler = async ({ sides, verbose, prisma, generate }) => { }), }, ], - { renderer: verbose && 'verbose', rendererOptions: { collapse: false } } + { + renderer: verbose && 'verbose', + rendererOptions: { collapseSubtasks: false }, + } ).run() } diff --git a/packages/cli/src/commands/upgrade.js b/packages/cli/src/commands/upgrade.js index 5649fa92ee94..2cd3d0722cc8 100644 --- a/packages/cli/src/commands/upgrade.js +++ b/packages/cli/src/commands/upgrade.js @@ -161,7 +161,10 @@ export const handler = async ({ dryRun, tag, verbose, dedupe }) => { }, }, ], - { renderer: verbose && 'verbose', rendererOptions: { collapse: false } } + { + renderer: verbose && 'verbose', + rendererOptions: { collapseSubtasks: false }, + } ) try { diff --git a/packages/cli/src/lib/__tests__/rollback.test.js b/packages/cli/src/lib/__tests__/rollback.test.js index 1fc52af24c51..c57e6ffbb0dc 100644 --- a/packages/cli/src/lib/__tests__/rollback.test.js +++ b/packages/cli/src/lib/__tests__/rollback.test.js @@ -181,7 +181,7 @@ it('prepare sets listr2 rollback functions and rollback executes correctly', asy }, }, ], - { rendererSilent: true } + { silentRendererCondition: true } ) rollback.prepareForRollback(tasks) diff --git a/packages/cli/src/lib/index.js b/packages/cli/src/lib/index.js index 0327cca5794d..2095ccc5180e 100644 --- a/packages/cli/src/lib/index.js +++ b/packages/cli/src/lib/index.js @@ -542,7 +542,7 @@ export const runCommandTask = async (commands, { verbose }) => { })), { renderer: verbose && 'verbose', - rendererOptions: { collapse: false, dateFormat: false }, + rendererOptions: { collapseSubtasks: false, dateFormat: false }, } ) diff --git a/tasks/test-project/tasks.js b/tasks/test-project/tasks.js index 128f49377dd7..a78911eda0ef 100644 --- a/tasks/test-project/tasks.js +++ b/tasks/test-project/tasks.js @@ -684,7 +684,7 @@ async function apiTasks(outputPath, { verbose, linkWithLatestFwBuild }) { { exitOnError: true, renderer: verbose && 'verbose', - renderOptions: { collapse: false }, + renderOptions: { collapseSubtasks: false }, } ) } diff --git a/tasks/test-project/test-project b/tasks/test-project/test-project index 14464ba8a52f..0dac093f6612 100755 --- a/tasks/test-project/test-project +++ b/tasks/test-project/test-project @@ -433,7 +433,7 @@ const globalTasks = () => { exitOnError: true, renderer: verbose && 'verbose', - renderOptions: { collapse: false }, + renderOptions: { collapseSubtasks: false }, } ) From 688f1a03ba355ad633fa7d14d1f488b50c00f946 Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Tue, 25 Apr 2023 08:24:49 -0700 Subject: [PATCH 3/4] continued --- packages/cli/src/commands/generate/dbAuth/dbAuth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/commands/generate/dbAuth/dbAuth.js b/packages/cli/src/commands/generate/dbAuth/dbAuth.js index da322c10c7de..f12cb3b38d22 100644 --- a/packages/cli/src/commands/generate/dbAuth/dbAuth.js +++ b/packages/cli/src/commands/generate/dbAuth/dbAuth.js @@ -363,7 +363,7 @@ const tasks = ({ }, ], { - rendererSilent: () => listr2?.rendererSilent, + silentRendererCondition: () => listr2?.silentRendererCondition, rendererOptions: { collapseSubtasks: false }, injectWrapper: { enquirer: enquirer || new Enquirer() }, exitOnError: true, From ea059f68409c6edf5f83c4d0c5cd7daa725b9ff7 Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Tue, 25 Apr 2023 18:20:43 -0700 Subject: [PATCH 4/4] fix rollback test --- packages/cli/src/lib/__tests__/rollback.test.js | 2 +- packages/cli/src/lib/rollback.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/lib/__tests__/rollback.test.js b/packages/cli/src/lib/__tests__/rollback.test.js index c57e6ffbb0dc..830103d4d85e 100644 --- a/packages/cli/src/lib/__tests__/rollback.test.js +++ b/packages/cli/src/lib/__tests__/rollback.test.js @@ -187,7 +187,7 @@ it('prepare sets listr2 rollback functions and rollback executes correctly', asy rollback.prepareForRollback(tasks) tasks.tasks.forEach((task) => { - expect(task.tasks.rollback).toBe(rollback.executeRollback) + expect(task.task.rollback).toBe(rollback.executeRollback) }) try { diff --git a/packages/cli/src/lib/rollback.js b/packages/cli/src/lib/rollback.js index bc9e68c894ea..62107d60311e 100644 --- a/packages/cli/src/lib/rollback.js +++ b/packages/cli/src/lib/rollback.js @@ -93,6 +93,6 @@ export function resetRollback() { export function prepareForRollback(tasks) { resetRollback() tasks.tasks?.forEach((task) => { - task.tasks.rollback = executeRollback + task.task.rollback = executeRollback }) }