Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update dependency listr2 to v6 #8105

Merged
merged 6 commits into from
Apr 26, 2023
Merged

fix(deps): update dependency listr2 to v6 #8105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
447f0fa
fix(deps): update dependency listr2 to v6
renovate[bot] Apr 25, 2023
d9acd57
migrate breaking changes
jtoar Apr 25, 2023
688f1a0
continued
jtoar Apr 25, 2023
9daefde
Merge branch 'main' into renovate/listr2-6.x
jtoar Apr 25, 2023
ea059f6
fix rollback test
jtoar Apr 26, 2023
be1d24b
Merge branch 'main' into renovate/listr2-6.x
jtoar Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-helpers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-helpers/src/auth/setupHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export const standardAuthHandler = async ({
},
].filter(truthy),
{
rendererOptions: { collapse: false },
rendererOptions: { collapseSubtasks: false },
renderer: verbose ? 'verbose' : 'default',
ctx: {
setupMode: 'UNKNOWN',
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/dataMigrate/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export const handler = async () => {
},
},
],
{ rendererOptions: { collapse: false }, exitOnError: true }
{ rendererOptions: { collapseSubtasks: false }, exitOnError: true }
)

try {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/dataMigrate/up.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ export const handler = async () => {
})

const tasks = new Listr(migrationTasks, {
rendererOptions: { collapse: false },
rendererOptions: { collapseSubtasks: false },
renderer: 'verbose',
})

Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/destroy/graphiql/graphiql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const handler = () => {
task: removeGraphiqlFromGraphqlHandler,
},
],
{ rendererOptions: { collapse: false }, exitOnError: true }
{ rendererOptions: { collapseSubtasks: false }, exitOnError: true }
)
try {
tasks.run()
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/destroy/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const tasks = ({ componentName, filesFn, name }) =>
},
},
],
{ rendererOptions: { collapse: false }, exitOnError: true }
{ rendererOptions: { collapseSubtasks: false }, exitOnError: true }
)

export const createYargsForComponentDestroy = ({
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/destroy/page/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/destroy/scaffold/scaffold.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/destroy/sdl/sdl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const tasks = ({ model }) =>
},
},
],
{ rendererOptions: { collapse: false }, exitOnError: true }
{ rendererOptions: { collapseSubtasks: false }, exitOnError: true }
)

export const handler = async ({ model }) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/execHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export const handler = async (args) => {
]

const tasks = new Listr(scriptTasks, {
rendererOptions: { collapse: false },
rendererOptions: { collapseSubtasks: false },
renderer: 'verbose',
})

Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/experimental/setup/opentelemetry/opentelemetryHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export const handler = async ({ force, verbose }) => {
},
],
{
rendererOptions: { collapse: false, persistentOutput: true },
rendererOptions: { collapseSubtasks: false, persistentOutput: true },
renderer: verbose ? 'verbose' : 'default',
}
)
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/generate/dataMigration/dataMigration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const handler = async (args) => {
},
},
].filter(Boolean),
{ rendererOptions: { collapse: false } }
{ rendererOptions: { collapseSubtasks: false } }
)

try {
Expand Down
32 changes: 16 additions & 16 deletions packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -118,7 +118,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
})
expect(correctPrompt).toBe(true)
})
Expand All @@ -136,7 +136,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
usernameLabel: 'email',
})
expect(correctPrompt).toBe(false)
Expand All @@ -155,7 +155,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
})
expect(correctPrompt).toBe(true)
})
Expand All @@ -173,7 +173,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
passwordLabel: 'secret',
})
expect(correctPrompt).toBe(false)
Expand All @@ -192,7 +192,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
})
expect(correctPrompt).toBe(true)
})
Expand All @@ -210,7 +210,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
webauthn: false,
})
expect(correctPrompt).toBe(false)
Expand All @@ -224,7 +224,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
})

const forgotPasswordPage = fs
Expand Down Expand Up @@ -272,7 +272,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
usernameLabel: 'Email',
})

Expand Down Expand Up @@ -324,7 +324,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
})

const forgotPasswordPage = fs
Expand Down Expand Up @@ -372,7 +372,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
passwordLabel: 'Secret',
})

Expand Down Expand Up @@ -424,7 +424,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
})

const forgotPasswordPage = fs
Expand Down Expand Up @@ -472,7 +472,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
usernameLabel: 'Email',
passwordLabel: 'Secret',
})
Expand Down Expand Up @@ -528,7 +528,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
})

const forgotPasswordPage = fs
Expand Down Expand Up @@ -582,7 +582,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
webauthn: true,
})

Expand Down Expand Up @@ -640,7 +640,7 @@ describe('dbAuth', () => {

await dbAuth.handler({
enquirer: customEnquirer,
listr2: { rendererSilent: true },
listr2: { silentRendererCondition: true },
})

const forgotPasswordPage = fs
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/commands/generate/dbAuth/dbAuth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,8 @@ const tasks = ({
},
],
{
rendererSilent: () => listr2?.rendererSilent,
rendererOptions: { collapse: false },
silentRendererCondition: () => listr2?.silentRendererCondition,
rendererOptions: { collapseSubtasks: false },
injectWrapper: { enquirer: enquirer || new Enquirer() },
exitOnError: true,
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/generate/directive/directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ export const handler = async (args) => {
},
},
].filter(Boolean),
{ rendererOptions: { collapse: false } }
{ rendererOptions: { collapseSubtasks: false } }
)

try {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/generate/function/function.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export const handler = async ({ name, force, ...rest }) => {
},
},
],
{ rendererOptions: { collapse: false }, exitOnError: true }
{ rendererOptions: { collapseSubtasks: false }, exitOnError: true }
)

try {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/generate/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export const createYargsForComponentGeneration = ({
...includeAdditionalTasks(options),
],
{
rendererOptions: { collapse: false },
rendererOptions: { collapseSubtasks: false },
exitOnError: true,
renderer: options.verbose && 'verbose',
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/generate/model/model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const handler = async ({ force, ...args }) => {
},
},
].filter(Boolean),
{ rendererOptions: { collapse: false } }
{ rendererOptions: { collapseSubtasks: false } }
)

try {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/generate/page/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ export const handler = async ({
},
},
].filter(Boolean),
{ rendererOptions: { collapse: false } }
{ rendererOptions: { collapseSubtasks: false } }
)

try {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/generate/scaffold/scaffold.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ export const tasks = ({
},
},
],
{ rendererOptions: { collapse: false }, exitOnError: true }
{ rendererOptions: { collapseSubtasks: false }, exitOnError: true }
)
}

Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/generate/script/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export const handler = async ({ force, ...args }) => {
},
},
].filter(Boolean),
{ rendererOptions: { collapse: false } }
{ rendererOptions: { collapseSubtasks: false } }
)

try {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/generate/sdl/sdl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ export const handler = async ({
},
},
].filter(Boolean),
{ rendererOptions: { collapse: false }, exitOnError: true }
{ rendererOptions: { collapseSubtasks: false }, exitOnError: true }
)

if (rollback && !force) {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/prerenderHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})

Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const handler = async ({ force }) => {
},
},
],
{ rendererOptions: { collapse: false } }
{ rendererOptions: { collapseSubtasks: false } }
)

try {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/setup/deploy/providers/baremetal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const handler = async ({ force }) => {
}),
printSetupNotes(notes),
],
{ rendererOptions: { collapse: false } }
{ rendererOptions: { collapseSubtasks: false } }
)
try {
await tasks.run()
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/setup/deploy/providers/edgio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const handler = async () => {
},
printSetupNotes(notes),
],
{ rendererOptions: { collapse: false } }
{ rendererOptions: { collapseSubtasks: false } }
)
try {
await tasks.run()
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/setup/deploy/providers/flightcontrol.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ export const handler = async ({ force, database }) => {
addToDotEnvDefaultTask(),
printSetupNotes(notes),
],
{ rendererOptions: { collapse: false } }
{ rendererOptions: { collapseSubtasks: false } }
)

try {
Expand Down
Loading