Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
feat: improve CLI init commands (#3457)
Bogdan Chadkinb5e15eafee7e
diff --git a/fixtures/webstudio-remix-vercel/.webstudio/data.json b/fixtures/webstudio-remix-vercel/.webstudio/data.jsonindex 44b60d4a47..4c5a2740fb 100644--- a/fixtures/webstudio-remix-vercel/.webstudio/data.json+++ b/fixtures/webstudio-remix-vercel/.webstudio/data.json@@ -1,10 +1,10 @@{"build": {- "id": "ef8d4686-96a0-4f84-84e7-3e9e63cd593f",+ "id": "3dce3f4f-3c20-46e5-a885-d1b543db6237","projectId": "cddc1d44-af37-4cb6-a430-d300cf6f932d",- "version": 247,- "createdAt": "2024-02-01T08:34:52.398Z",- "updatedAt": "2024-02-01T08:34:52.398Z",+ "version": 257,+ "createdAt": "2024-05-30T16:07:53.141Z",+ "updatedAt": "2024-05-30T16:07:53.141Z","pages": {"meta": {"siteName": "KittyGuardedZone",@@ -30,7 +30,7 @@},"rootInstanceId": "On9cvWCxr5rdZtY9O1Bv0","path": "",- "systemDataSourceId": "ram6PSGTMg41lcfdoUGrV"+ "systemDataSourceId": "u9wtUkt2-E0RDaljl_I6E"},"pages": [{@@ -44,7 +44,7 @@},"rootInstanceId": "uKWGyE9JY3cPwY-xI9vk6","path": "/radix",- "systemDataSourceId": "WihU_iOb3p4rS3nJD6NvB"+ "systemDataSourceId": "GqDH_PSDF_8QXqPW2A0un"},{"id": "szYLvBduHPmbtqQKCDY0b",@@ -55,7 +55,7 @@},"rootInstanceId": "EDEfpMPRqDejthtwkH7ws","path": "/_route_with_symbols_",- "systemDataSourceId": "_8Ok9oPHB3wlwjhX7Mlai"+ "systemDataSourceId": "UiZtSC5BK8Ub-Ow7-XOdW"},{"id": "U1tRJl2ERr8_OFe0g9cN_",@@ -66,7 +66,7 @@},"rootInstanceId": "a-4nDFkaWy4px1fn38XWJ","path": "/form",- "systemDataSourceId": "FNmfYcbf2VF3yudEbZwzx"+ "systemDataSourceId": "-CX9SNsPSue42RkfxjL8_"},{"id": "-J9I4Oo6mONfQlf_3-OqG",@@ -77,7 +77,7 @@},"rootInstanceId": "O-ljaGZQ0iRNTlEshMkgE","path": "/heading-with-id",- "systemDataSourceId": "YR7MLRg2bNHQqYgUhm27J"+ "systemDataSourceId": "Q6XrK4-ZZUdXsocdiWqVk"},{"id": "TS39WeBd0Qr3QgbSlzdf2",@@ -96,7 +96,7 @@},"rootInstanceId": "AWY2qZfpbykoiWELeJhse","path": "/resources",- "systemDataSourceId": "wTJbVXFa4Mul6Qg5ZcooO"+ "systemDataSourceId": "keP0A66msOpEL6HbrC9OJ"},{"id": "Pnz-BxUm6XmvFygk_XdEy",@@ -115,7 +115,7 @@},"rootInstanceId": "L0ZXd5F9xk9Rsl9ORzIkJ","path": "/nested-page",- "systemDataSourceId": "X05l8b5NS4KvFRiiloGqF"+ "systemDataSourceId": "8qqAbq6TEA3ccoCagjlZL"}],"folders": [@@ -150,27 +150,19 @@}],[- "jnlRbFOGvyVBkD8nD2tmp",+ "ZMaWCtWpH-ao0e_kgIHqR",{- "id": "jnlRbFOGvyVBkD8nD2tmp",- "label": "Tablet",- "maxWidth": 991- }- ],- [- "MzzTm3ImEoIPYnDNKIxdq",- {- "id": "MzzTm3ImEoIPYnDNKIxdq",- "label": "Mobile landscape",- "maxWidth": 767+ "id": "ZMaWCtWpH-ao0e_kgIHqR",+ "label": "mobile",+ "minWidth": 372}],[- "e0fdu38A26zqOx-ZyQMP9",+ "Z8WjyXWkCrr35PXgjHdpY",{- "id": "e0fdu38A26zqOx-ZyQMP9",- "label": "Mobile portrait",- "maxWidth": 479+ "id": "Z8WjyXWkCrr35PXgjHdpY",+ "label": "Tablet",+ "minWidth": 472}]],@@ -2233,63 +2225,63 @@}],[- "ram6PSGTMg41lcfdoUGrV",+ "u9wtUkt2-E0RDaljl_I6E",{- "id": "ram6PSGTMg41lcfdoUGrV",+ "id": "u9wtUkt2-E0RDaljl_I6E","scopeInstanceId": "On9cvWCxr5rdZtY9O1Bv0","name": "system","type": "parameter"}],[- "WihU_iOb3p4rS3nJD6NvB",+ "GqDH_PSDF_8QXqPW2A0un",{- "id": "WihU_iOb3p4rS3nJD6NvB",+ "id": "GqDH_PSDF_8QXqPW2A0un","scopeInstanceId": "uKWGyE9JY3cPwY-xI9vk6","name": "system","type": "parameter"}],[- "_8Ok9oPHB3wlwjhX7Mlai",+ "UiZtSC5BK8Ub-Ow7-XOdW",{- "id": "_8Ok9oPHB3wlwjhX7Mlai",+ "id": "UiZtSC5BK8Ub-Ow7-XOdW","scopeInstanceId": "EDEfpMPRqDejthtwkH7ws","name": "system","type": "parameter"}],[- "FNmfYcbf2VF3yudEbZwzx",+ "-CX9SNsPSue42RkfxjL8_",{- "id": "FNmfYcbf2VF3yudEbZwzx",+ "id": "-CX9SNsPSue42RkfxjL8_","scopeInstanceId": "a-4nDFkaWy4px1fn38XWJ","name": "system","type": "parameter"}],[- "YR7MLRg2bNHQqYgUhm27J",+ "Q6XrK4-ZZUdXsocdiWqVk",{- "id": "YR7MLRg2bNHQqYgUhm27J",+ "id": "Q6XrK4-ZZUdXsocdiWqVk","scopeInstanceId": "O-ljaGZQ0iRNTlEshMkgE","name": "system","type": "parameter"}],[- "wTJbVXFa4Mul6Qg5ZcooO",+ "keP0A66msOpEL6HbrC9OJ",{- "id": "wTJbVXFa4Mul6Qg5ZcooO",+ "id": "keP0A66msOpEL6HbrC9OJ","scopeInstanceId": "AWY2qZfpbykoiWELeJhse","name": "system","type": "parameter"}],[- "X05l8b5NS4KvFRiiloGqF",+ "8qqAbq6TEA3ccoCagjlZL",{- "id": "X05l8b5NS4KvFRiiloGqF",+ "id": "8qqAbq6TEA3ccoCagjlZL","scopeInstanceId": "L0ZXd5F9xk9Rsl9ORzIkJ","name": "system","type": "parameter"@@ -3373,7 +3365,7 @@},"rootInstanceId": "On9cvWCxr5rdZtY9O1Bv0","path": "",- "systemDataSourceId": "ram6PSGTMg41lcfdoUGrV"+ "systemDataSourceId": "u9wtUkt2-E0RDaljl_I6E"},"pages": [{@@ -3392,7 +3384,7 @@},"rootInstanceId": "On9cvWCxr5rdZtY9O1Bv0","path": "",- "systemDataSourceId": "ram6PSGTMg41lcfdoUGrV"+ "systemDataSourceId": "u9wtUkt2-E0RDaljl_I6E"},{"id": "xfvB4UThQXmQ_OubPYrkg",@@ -3405,7 +3397,7 @@},"rootInstanceId": "uKWGyE9JY3cPwY-xI9vk6","path": "/radix",- "systemDataSourceId": "WihU_iOb3p4rS3nJD6NvB"+ "systemDataSourceId": "GqDH_PSDF_8QXqPW2A0un"},{"id": "szYLvBduHPmbtqQKCDY0b",@@ -3416,7 +3408,7 @@},"rootInstanceId": "EDEfpMPRqDejthtwkH7ws","path": "/_route_with_symbols_",- "systemDataSourceId": "_8Ok9oPHB3wlwjhX7Mlai"+ "systemDataSourceId": "UiZtSC5BK8Ub-Ow7-XOdW"},{"id": "U1tRJl2ERr8_OFe0g9cN_",@@ -3427,7 +3419,7 @@},"rootInstanceId": "a-4nDFkaWy4px1fn38XWJ","path": "/form",- "systemDataSourceId": "FNmfYcbf2VF3yudEbZwzx"+ "systemDataSourceId": "-CX9SNsPSue42RkfxjL8_"},{"id": "-J9I4Oo6mONfQlf_3-OqG",@@ -3438,7 +3430,7 @@},"rootInstanceId": "O-ljaGZQ0iRNTlEshMkgE","path": "/heading-with-id",- "systemDataSourceId": "YR7MLRg2bNHQqYgUhm27J"+ "systemDataSourceId": "Q6XrK4-ZZUdXsocdiWqVk"},{"id": "TS39WeBd0Qr3QgbSlzdf2",@@ -3457,7 +3449,7 @@},"rootInstanceId": "AWY2qZfpbykoiWELeJhse","path": "/resources",- "systemDataSourceId": "wTJbVXFa4Mul6Qg5ZcooO"+ "systemDataSourceId": "keP0A66msOpEL6HbrC9OJ"},{"id": "Pnz-BxUm6XmvFygk_XdEy",@@ -3476,7 +3468,7 @@},"rootInstanceId": "L0ZXd5F9xk9Rsl9ORzIkJ","path": "/nested-page",- "systemDataSourceId": "X05l8b5NS4KvFRiiloGqF"+ "systemDataSourceId": "8qqAbq6TEA3ccoCagjlZL"}],"assets": [diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/$resources.sitemap.xml.ts b/fixtures/webstudio-remix-vercel/app/__generated__/$resources.sitemap.xml.tsindex abd0a898d7..e0e783ef5f 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/$resources.sitemap.xml.ts+++ b/fixtures/webstudio-remix-vercel/app/__generated__/$resources.sitemap.xml.ts@@ -1,26 +1,26 @@export const sitemap = [{path: "/",- lastModified: "2024-02-01",+ lastModified: "2024-05-30",},{path: "/_route_with_symbols_",- lastModified: "2024-02-01",+ lastModified: "2024-05-30",},{path: "/form",- lastModified: "2024-02-01",+ lastModified: "2024-05-30",},{path: "/heading-with-id",- lastModified: "2024-02-01",+ lastModified: "2024-05-30",},{path: "/resources",- lastModified: "2024-02-01",+ lastModified: "2024-05-30",},{path: "/nested/nested-page",- lastModified: "2024-02-01",+ lastModified: "2024-05-30",},];diff --git a/packages/cli/package.json b/packages/cli/package.jsonindex 1b0bfc9907..620320140f 100644--- a/packages/cli/package.json+++ b/packages/cli/package.json@@ -35,10 +35,8 @@"deepmerge": "^4.3.1","env-paths": "^3.0.0","execa": "^7.2.0",- "ora": "^7.0.1","p-limit": "^4.0.0","picocolors": "^1.0.1",- "prompts": "^2.4.2","strip-indent": "^4.0.0","title-case": "^4.1.0","yargs": "^17.7.2",@@ -54,7 +52,6 @@"@remix-run/react": "^2.9.1","@remix-run/server-runtime": "^2.9.1","@types/node": "^20.12.7",- "@types/prompts": "^2.4.5","@types/react": "^18.2.70","@types/react-dom": "^18.2.25","@types/yargs": "^17.0.32",diff --git a/packages/cli/src/commands/init-flow.ts b/packages/cli/src/commands/init-flow.tsindex 420c78e71b..2728157fa0 100644--- a/packages/cli/src/commands/init-flow.ts+++ b/packages/cli/src/commands/init-flow.ts@@ -1,121 +1,128 @@-import { createFolderIfNotExists, isFileExists } from "../fs-utils";import { chdir, cwd } from "node:process";import { join } from "node:path";-import ora from "ora";-import { link } from "./link";-import { sync } from "./sync";-import { build, buildOptions } from "./build";-import { prompt } from "../prompts";-import type { StrictYargsOptionsToInterface } from "./yargs-types";import pc from "picocolors";+import {+ cancel,+ confirm,+ isCancel,+ log,+ select,+ spinner,+ text,+} from "@clack/prompts";import { $ } from "execa";-import { PROJECT_TEMPALTES } from "../config";import { titleCase } from "title-case";+import { createFolderIfNotExists, isFileExists } from "../fs-utils";+import { PROJECT_TEMPALTES } from "../config";+import { link, validateShareLink } from "./link";+import { sync } from "./sync";+import { build, buildOptions } from "./build";+import type { StrictYargsOptionsToInterface } from "./yargs-types";type ProjectTemplates = (typeof PROJECT_TEMPALTES)[number];+const exitIfCancelled = <Value>(value: Value | symbol): Value => {+ if (isCancel(value)) {+ cancel("Project initialization is cancelled");+ process.exit(0);+ }+ return value;+};+export const initFlow = async (options: StrictYargsOptionsToInterface<typeof buildOptions>) => {const isProjectConfigured = await isFileExists(".webstudio/config.json");let shouldInstallDeps = false;- let folderName;+ let folderName: undefined | string;let projectTemplate: ProjectTemplates | undefined = undefined;if (isProjectConfigured === false) {- const { shouldCreateFolder } = await prompt({- type: "confirm",- name: "shouldCreateFolder",- message:- "Would you like to create a project folder? (no to use current folder)",- initial: true,- });+ const shouldCreateFolder = exitIfCancelled(+ await confirm({+ message:+ "Would you like to create a project folder? (no to use current folder)",+ initialValue: true,+ })+ );if (shouldCreateFolder === true) {- folderName = (- await prompt({- type: "text",- name: "folderName",+ folderName = exitIfCancelled(+ await text({message: "Please enter a project name",+ validate(value) {+ if (value.length === 0) {+ return "Folder name is required";+ }+ },})- ).folderName;+ );- if (folderName === undefined) {- throw new Error("Folder name is required");- }await createFolderIfNotExists(join(cwd(), folderName));chdir(join(cwd(), folderName));}- const { projectLink } = await prompt({- type: "text",- name: "projectLink",- message: "Please paste a link from the Share dialog in the builder",- });+ const shareLink = exitIfCancelled(+ await text({+ message: "Please paste a link from the Share Dialog in the builder",+ validate: validateShareLink,+ })+ );- if (projectLink === undefined) {- throw new Error(`Project Link is required`);- }- await link({ link: projectLink });-- const { deployTarget } = await prompt({- type: "select",- name: "deployTarget",- message: "Where would you like to deploy your project?",- choices: PROJECT_TEMPALTES.map((template) => {- return {- title: titleCase(template),+ await link({ link: shareLink });++ projectTemplate = exitIfCancelled(+ await select({+ message: "Where would you like to deploy your project?",+ options: PROJECT_TEMPALTES.map((template) => ({value: template,- };- }),- });- projectTemplate = deployTarget;-- const { installDeps } = await prompt({- type: "confirm",- name: "installDeps",- message: "Would you like to install dependencies? (recommended)",- initial: true,- });- shouldInstallDeps = installDeps;+ label: titleCase(template),+ })),+ })+ );++ shouldInstallDeps = exitIfCancelled(+ await confirm({+ message: "Would you like to install dependencies? (recommended)",+ initialValue: true,+ })+ );}- await sync({ buildId: undefined, origin: undefined, authToken: undefined });-/*If a project is already linked, we sync direclty without asking for deploy target.We need to request for deploy target here as the current flow is running in a existing project.*/if (projectTemplate === undefined) {- const { deployTarget } = await prompt({- type: "select",- name: "deployTarget",- message: "Where would you like to deploy your project?",- choices: PROJECT_TEMPALTES.map((template) => {- return {- title: titleCase(template),+ projectTemplate = exitIfCancelled(+ await select({+ message: "Where would you like to deploy your project?",+ options: PROJECT_TEMPALTES.map((template) => ({value: template,- };- }),- });- projectTemplate = deployTarget;+ label: titleCase(template),+ })),+ })+ );}+ await sync({ buildId: undefined, origin: undefined, authToken: undefined });+await build({...options,...(projectTemplate && { template: [projectTemplate] }),});if (shouldInstallDeps === true) {- const spinner = ora().start();- spinner.text = "Installing dependencies";+ const install = spinner();+ install.start("Installing dependencies");await $`npm install`;- spinner.succeed("Installed dependencies");+ install.stop("Installed dependencies");}- console.info(pc.bold(pc.green(`\nYour project was successfully synced 🎉`)));- console.info(+ log.message();+ log.message(pc.green(pc.bold(`Your project was successfully synced 🎉`)));+ log.message(["Now you can:",folderName && `Go to your project: ${pc.dim(`cd ${folderName}`)}`,diff --git a/packages/cli/src/prompts.ts b/packages/cli/src/prompts.tsdeleted file mode 100644index ef9a8005ad..0000000000--- a/packages/cli/src/prompts.ts+++ /dev/null@@ -1,16 +0,0 @@-import prompts, { type PromptObject } from "prompts";--export const prompt = (prompt: PromptObject) => {- return prompts([- {- ...prompt,- onState: (state) => {- if (state.aborted) {- process.nextTick(() => {- process.exit(0);- });- }- },- },- ]);-};diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 8c5ad0c840..fafd0220c9 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -969,18 +969,12 @@ importers:execa:specifier: ^7.2.0version: 7.2.0- ora:- specifier: ^7.0.1- version: 7.0.1p-limit:specifier: ^4.0.0version: 4.0.0picocolors:specifier: ^1.0.1version: 1.0.1- prompts:- specifier: ^2.4.2- version: 2.4.2strip-indent:specifier: ^4.0.0version: 4.0.0@@ -1021,9 +1015,6 @@ importers:'@types/node':specifier: ^20.12.7version: 20.12.7- '@types/prompts':- specifier: ^2.4.5- version: 2.4.5'@types/react':specifier: ^18.2.70version: 18.2.79@@ -4768,9 +4759,6 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ==}- '@types/[email protected]':- resolution: {integrity: sha512-TvrzGMCwARi2qqXcD7VmvMvfMP3F7JRQpeEHECK0oufRNZInoBqzd8v/1zksKFE5XW8OOGto/5FsDT8lnpvGRA==}-'@types/[email protected]':resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}@@ -5261,9 +5249,6 @@ packages:resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}- resolution: {integrity: sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==}-resolution: {integrity: sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==}@@ -5316,9 +5301,6 @@ packages:resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}- resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}-resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}engines: {node: '>=6'}@@ -5393,10 +5375,6 @@ packages:resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}engines: {node: '>=10'}- resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}- engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}-resolution: {integrity: sha512-tH6YZXViaeC2/Mnt8m4gSmbZfNorC2rhwCX2bXw8SYZWr8ljCPB7iA+1TLG9t7yroWBFauc63LlOZ1gucMVCWw==}@@ -5449,10 +5427,6 @@ packages:resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}engines: {node: '>=8'}- resolution: {integrity: sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==}- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}-resolution: {integrity: sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==}engines: {node: '>=6'}@@ -5883,9 +5857,6 @@ packages:resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}engines: {node: '>=12'}- resolution: {integrity: sha512-97g6QgOk8zlDRdgq1WxwgTMgEWGVAQvB5Fdpgc1MkNy56la5SKP9GsMXKDOdqwn90/41a8yPwIGk1Y6WVbeMQA==}-resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}@@ -6663,10 +6634,6 @@ packages:resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}engines: {node: '>=8'}- resolution: {integrity: sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==}- engines: {node: '>=12'}-resolution: {integrity: sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==}@@ -6746,10 +6713,6 @@ packages:resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}engines: {node: '>=10'}- resolution: {integrity: sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==}- engines: {node: '>=12'}-resolution: {integrity: sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==}@@ -7116,10 +7079,6 @@ packages:resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}engines: {node: '>=10'}- resolution: {integrity: sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==}- engines: {node: '>=12'}-resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==}@@ -7780,10 +7739,6 @@ packages:resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}engines: {node: '>=10'}- resolution: {integrity: sha512-0TUxTiFJWv+JnjWm4o9yvuskpEJLXTcng8MJuKd+SzAzp2o+OP3HWqNhB4OdJRt1Vsd9/mR0oyaEYlOnL7XIRw==}- engines: {node: '>=16'}-resolution: {integrity: sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==}@@ -8481,10 +8436,6 @@ packages:resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}engines: {node: '>=8'}- resolution: {integrity: sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==}- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}-resolution: {integrity: sha512-Xj8/MEIhhfj9X2rmD9iJ4Gga9EFqVlpMj3vfLnV2r/Mh5jRMryNV+6lWh9GdJtDBcBSPIqzRdfBQ3wDtNFv/uw==}@@ -8722,10 +8673,6 @@ packages:resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}engines: {node: '>= 0.8'}- resolution: {integrity: sha512-xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==}- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}-resolution: {integrity: sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==}engines: {node: '>= 0.4'}@@ -8766,10 +8713,6 @@ packages:resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}engines: {node: '>=12'}- resolution: {integrity: sha512-k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ==}- engines: {node: '>=16'}-resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}@@ -13284,11 +13227,6 @@ snapshots:'@types/[email protected]': {}- '@types/[email protected]':- dependencies:- '@types/node': 20.12.7- kleur: 3.0.3-'@types/[email protected]': {}'@types/[email protected]': {}@@ -13921,12 +13859,6 @@ snapshots:inherits: 2.0.4readable-stream: 3.6.2- dependencies:- buffer: 6.0.3- inherits: 2.0.4- readable-stream: 3.6.2-@@ -14000,11 +13932,6 @@ snapshots:base64-js: 1.5.1ieee754: 1.2.1- dependencies:- base64-js: 1.5.1- ieee754: 1.2.1-@@ -14084,8 +14011,6 @@ snapshots:ansi-styles: 4.3.0supports-color: 7.2.0- [email protected]: {}-@@ -14130,10 +14055,6 @@ snapshots:dependencies:restore-cursor: 3.1.0- dependencies:- restore-cursor: 4.0.0-@@ -14535,8 +14456,6 @@ snapshots:- [email protected]: {}-@@ -15461,8 +15380,6 @@ snapshots:- [email protected]: {}-@@ -15529,8 +15446,6 @@ snapshots:- [email protected]: {}-@@ -16110,11 +16025,6 @@ snapshots:chalk: 4.1.2is-unicode-supported: 0.1.0- dependencies:- chalk: 5.3.0- is-unicode-supported: 1.3.0-@@ -17135,18 +17045,6 @@ snapshots:strip-ansi: 6.0.1wcwidth: 1.0.1- dependencies:- chalk: 5.3.0- cli-cursor: 4.0.0- cli-spinners: 2.9.0- is-interactive: 2.0.0- is-unicode-supported: 1.3.0- log-symbols: 5.1.0- stdin-discarder: 0.1.0- string-width: 6.1.0- strip-ansi: 7.1.0-@@ -17861,11 +17759,6 @@ snapshots:onetime: 5.1.2signal-exit: 3.0.7- dependencies:- onetime: 5.1.2- signal-exit: 3.0.7-@@ -18117,10 +18010,6 @@ snapshots:- dependencies:- bl: 5.1.0-dependencies:internal-slot: 1.0.5@@ -18166,12 +18055,6 @@ snapshots:emoji-regex: 9.2.2strip-ansi: 7.1.0- dependencies:- eastasianwidth: 0.2.0- emoji-regex: 10.2.1- strip-ansi: 7.1.0-dependencies:safe-buffer: 5.1.2