From 29d83095b273114bd084188563734be7b768266a Mon Sep 17 00:00:00 2001 From: mshanemc Date: Tue, 13 Aug 2024 12:30:27 -0500 Subject: [PATCH 01/11] feat: confirmation and warnings for convert behavior --- messages/convert.source-behavior.md | 10 +- package.json | 14 +- .../project/convert/source-behavior.ts | 23 +- src/utils/convertBehavior.ts | 29 +- yarn.lock | 345 +++--------------- 5 files changed, 99 insertions(+), 322 deletions(-) diff --git a/messages/convert.source-behavior.md b/messages/convert.source-behavior.md index eca4154b..a2cbded0 100644 --- a/messages/convert.source-behavior.md +++ b/messages/convert.source-behavior.md @@ -51,15 +51,13 @@ Your project has a default org (target-org) that uses source tracking. This oper - Run this command again. - Create a new org ("sf org create scratch" or "sf org create sandbox") and deploy the modified source. -# error.packageDirectoryNeedsMainDefault +# mainDefaultConfirmation -The package directory %s doesn't have a main/default structure. -This command moves metadata into a main/default structure, but your package directories aren't ready for it. +- This command will put components in a newly created `main/default` folder in each package directory. You might need to re-organize them into your preferred structure. -# error.packageDirectoryNeedsMainDefault.actions +# basicConfirmation -- Update %s to have all its metadata inside a main/default directory structure. -- Run the command again. +- This command will make changes to your project. Be sure you've committed any source changes before continuing so you can easily revert if necessary. # success.dryRun diff --git a/package.json b/package.json index 8bbaba30..6b8ac850 100644 --- a/package.json +++ b/package.json @@ -5,14 +5,14 @@ "author": "Salesforce", "bugs": "https://github.com/forcedotcom/cli/issues", "dependencies": { - "@oclif/core": "^4.0.12", - "@salesforce/apex-node": "^8.1.1", - "@salesforce/core": "^8.2.8", - "@salesforce/kit": "^3.1.6", + "@oclif/core": "^4.0.17", + "@salesforce/apex-node": "^8.1.3", + "@salesforce/core": "^8.3.0", + "@salesforce/kit": "^3.2.1", "@salesforce/plugin-info": "^3.3.24", - "@salesforce/sf-plugins-core": "^11.3.0", - "@salesforce/source-deploy-retrieve": "^12.1.11", - "@salesforce/source-tracking": "^7.1.2", + "@salesforce/sf-plugins-core": "^11.3.2", + "@salesforce/source-deploy-retrieve": "^12.2.1", + "@salesforce/source-tracking": "^7.1.5", "@salesforce/ts-types": "^2.0.12", "ansis": "^3.3.2" }, diff --git a/src/commands/project/convert/source-behavior.ts b/src/commands/project/convert/source-behavior.ts index 3874ec80..1ed47151 100644 --- a/src/commands/project/convert/source-behavior.ts +++ b/src/commands/project/convert/source-behavior.ts @@ -6,8 +6,10 @@ */ import { rm, readFile, writeFile } from 'node:fs/promises'; +import { join } from 'node:path'; +import { existsSync } from 'node:fs'; import { SfCommand, Flags } from '@salesforce/sf-plugins-core'; -import { Messages } from '@salesforce/core'; +import { Messages, SfProject } from '@salesforce/core'; import { getValidatedProjectJson, TMP_DIR, @@ -17,6 +19,7 @@ import { PRESET_CHOICES, getPackageDirectoriesForPreset, convertBackToSource, + ComponentSetAndPackageDirPath, } from '../../../utils/convertBehavior.js'; Messages.importMessagesDirectoryFromMetaUrl(import.meta.url); @@ -61,6 +64,13 @@ export default class ConvertSourceBehavior extends SfCommand rm(f))); + // @ts-expect-error there's publicly accessible way to clear a project's instance + // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access + SfProject.instances.clear(); + const createdFiles = await convertBackToSource({ packageDirsWithPreset: packageDirsWithDecomposable, projectDir: this.project!.getPath(), @@ -103,3 +117,10 @@ export default class ConvertSourceBehavior extends SfCommand + (i: ComponentSetAndPackageDirPath): boolean => + existsSync(join(projectDir, i.packageDirPath, 'main', 'default')); diff --git a/src/utils/convertBehavior.ts b/src/utils/convertBehavior.ts index 5f2ffa33..565ba5ae 100644 --- a/src/utils/convertBehavior.ts +++ b/src/utils/convertBehavior.ts @@ -4,7 +4,7 @@ * Licensed under the BSD 3-Clause license. * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ -import { existsSync, readdirSync } from 'node:fs'; +import { readdirSync } from 'node:fs'; import { readFile } from 'node:fs/promises'; import { join, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; @@ -15,7 +15,6 @@ import { ConvertResult, MetadataConverter, MetadataRegistry, - RegistryAccess, SourceComponent, presetMap, } from '@salesforce/source-deploy-retrieve'; @@ -38,6 +37,7 @@ export const getPackageDirectoriesForPreset = async ( preset: string ): Promise => { const projectDir = project.getPath(); + const messages = loadMessages(); const output = ( await Promise.all( project @@ -45,13 +45,11 @@ export const getPackageDirectoriesForPreset = async ( .map((pd) => pd.path) .map(componentSetFromPackageDirectory(projectDir)(await getTypesFromPreset(preset))) ) - ) - .filter(componentSetIsNonEmpty) - // we do this after filtering componentSets to reduce false positives (ex: dir does not have main/default but also has nothing to decompose) - .map(validateMainDefault(projectDir)); + ).filter(componentSetIsNonEmpty); if (output.length === 0) { - loadMessages().createError('error.noTargetTypes', [preset]); + messages.createError('error.noTargetTypes', [preset]); } + return output; }; @@ -144,7 +142,7 @@ const convertToSource = async ({ }): Promise => { // mdapi=>source convert the target dir back to the project // it's a new converter because the project has changed and it should reload the project's registry. - const converter = new MetadataConverter(new RegistryAccess(undefined, projectDir)); + const converter = new MetadataConverter(); return Promise.all( packageDirsWithPreset.map(async (pd) => converter.convert( @@ -179,21 +177,6 @@ export const getTypesFromPreset = async (preset: string): Promise => (JSON.parse(await readFile(join(PRESET_DIR, `${preset}.json`), 'utf-8')) as MetadataRegistry).types ).map((t) => t.name); -/** convert will put things in /main/default. If the packageDirs aren't configured that way, we don't want to make a mess. - * See https://salesforce.quip.com/va5IAgXmTMWF for details on that issue */ -const validateMainDefault = - (projectDir: string) => - (i: ComponentSetAndPackageDirPath): ComponentSetAndPackageDirPath => { - if (!existsSync(join(projectDir, i.packageDirPath, 'main', 'default'))) { - throw loadMessages().createError( - 'error.packageDirectoryNeedsMainDefault', - [i.packageDirPath], - [i.packageDirPath] - ); - } - return i; - }; - const getComponentSetFiles = (cs: ComponentSet): string[] => cs .getSourceComponents() diff --git a/yarn.lock b/yarn.lock index cfd3a53e..9c4879d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1312,7 +1312,7 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3" integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA== -"@inquirer/confirm@^3.1.14", "@inquirer/confirm@^3.1.16", "@inquirer/confirm@^3.1.20": +"@inquirer/confirm@^3.1.14", "@inquirer/confirm@^3.1.16", "@inquirer/confirm@^3.1.22": version "3.1.22" resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-3.1.22.tgz#23990624c11f60c6f7a5b0558c7505c35076a037" integrity sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg== @@ -1320,7 +1320,7 @@ "@inquirer/core" "^9.0.10" "@inquirer/type" "^1.5.2" -"@inquirer/core@^9.0.10": +"@inquirer/core@^9.0.10", "@inquirer/core@^9.0.4", "@inquirer/core@^9.0.8": version "9.0.10" resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-9.0.10.tgz#4270191e2ad3bea6223530a093dd9479bcbc7dd0" integrity sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA== @@ -1339,25 +1339,6 @@ wrap-ansi "^6.2.0" yoctocolors-cjs "^2.1.2" -"@inquirer/core@^9.0.4", "@inquirer/core@^9.0.8": - version "9.0.8" - resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-9.0.8.tgz#18458c637879f1ea0c7919b7e9a8786fa2082db9" - integrity sha512-ttnI/BGlP9SxjbQnv1nssv7dPAwiR82KmjJZx2SxSZyi2mGbaEvh4jg0I4yU/4mVQf7QvCVGGr/hGuJFEYhwnw== - dependencies: - "@inquirer/figures" "^1.0.5" - "@inquirer/type" "^1.5.1" - "@types/mute-stream" "^0.0.4" - "@types/node" "^22.0.0" - "@types/wrap-ansi" "^3.0.0" - ansi-escapes "^4.3.2" - cli-spinners "^2.9.2" - cli-width "^4.1.0" - mute-stream "^1.0.0" - signal-exit "^4.1.0" - strip-ansi "^6.0.1" - wrap-ansi "^6.2.0" - yoctocolors-cjs "^2.1.2" - "@inquirer/figures@^1.0.4", "@inquirer/figures@^1.0.5": version "1.0.5" resolved "https://registry.yarnpkg.com/@inquirer/figures/-/figures-1.0.5.tgz#57f9a996d64d3e3345d2a3ca04d36912e94f8790" @@ -1371,7 +1352,7 @@ "@inquirer/core" "^9.0.8" "@inquirer/type" "^1.5.1" -"@inquirer/password@^2.1.20": +"@inquirer/password@^2.1.22": version "2.1.22" resolved "https://registry.yarnpkg.com/@inquirer/password/-/password-2.1.22.tgz#ec7ee5709923cf285b3e0ae53eed4fdc3c05b422" integrity sha512-5Fxt1L9vh3rAKqjYwqsjU4DZsEvY/2Gll+QkqR4yEpy6wvzLxdSgFhUcxfDAOtO4BEoTreWoznC0phagwLU5Kw== @@ -1391,14 +1372,7 @@ ansi-escapes "^4.3.2" yoctocolors-cjs "^2.1.2" -"@inquirer/type@^1.5.0", "@inquirer/type@^1.5.1": - version "1.5.1" - resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-1.5.1.tgz#cdd36732e38ea5d2b1a4336aada65ebe7d2765e0" - integrity sha512-m3YgGQlKNS0BM+8AFiJkCsTqHEFCWn6s/Rqye3mYwvqY6LdfUv12eSwbsgNzrYyrLXiy7IrrjDLPysaSBwEfhw== - dependencies: - mute-stream "^1.0.0" - -"@inquirer/type@^1.5.2": +"@inquirer/type@^1.5.0", "@inquirer/type@^1.5.1", "@inquirer/type@^1.5.2": version "1.5.2" resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-1.5.2.tgz#15f5e4a4dae02c4203650cb07c8a000cdd423939" integrity sha512-w9qFkumYDCNyDZmNQjf/n6qQuvQ4dMC3BJesY4oF+yr0CxR5vxujflAVeIcS6U336uzi9GM0kAfZlLrZ9UTkpA== @@ -1473,10 +1447,10 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@jsforce/jsforce-node@^3.2.2", "@jsforce/jsforce-node@^3.4.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.4.0.tgz#d7e4ee0895b4258c5b82fce0489a4569efa70a7b" - integrity sha512-2PZh7s0KQM8C5+lLuuBXpjYqWpgux9LKy5OfH4EzMmr6D+Yg7wQftSmIG1SiD1jyapOj66TmD7yn3n3tWGbAag== +"@jsforce/jsforce-node@^3.2.2", "@jsforce/jsforce-node@^3.4.0", "@jsforce/jsforce-node@^3.4.1": + version "3.4.1" + resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.4.1.tgz#36f5cba775b395eeedba676a78eafe447c3f4b28" + integrity sha512-PsBKfglH0/8W/Srr4LsxEFsVmjmZjEj/T4XLGpbBoK8yVObwbiMk4VqwA6XwiA6SHqnEqqQbHZxk2rr7dZC+4A== dependencies: "@sindresorhus/is" "^4" abort-controller "^3.0.0" @@ -1512,7 +1486,7 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@oclif/core@^4", "@oclif/core@^4.0.0-beat.13", "@oclif/core@^4.0.12", "@oclif/core@^4.0.15", "@oclif/core@^4.0.17": +"@oclif/core@^4", "@oclif/core@^4.0.0-beat.13", "@oclif/core@^4.0.15", "@oclif/core@^4.0.17": version "4.0.17" resolved "https://registry.yarnpkg.com/@oclif/core/-/core-4.0.17.tgz#2c934dd2b3789fe5e6cc9e2558a08007ba18cb03" integrity sha512-zfdSRip9DVMOklMojWCLZEB4iOzy7LDTABCDzCXqmpZGS+o1e1xts4jGhnte3mi0WV0YthNfYqF16tqk6CWITA== @@ -1583,14 +1557,14 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@salesforce/apex-node@^8.1.1": - version "8.1.1" - resolved "https://registry.yarnpkg.com/@salesforce/apex-node/-/apex-node-8.1.1.tgz#405af1be5dfbd7b10105e8c70502696f28705092" - integrity sha512-OrbvIIf/H497+zll5unSi+jNBt1D71Oh91s5qMLI+cleoAdyZSLk6+CDVkeDOeSezzoA4kZ9zChi7mILj62T5w== +"@salesforce/apex-node@^8.1.3": + version "8.1.3" + resolved "https://registry.yarnpkg.com/@salesforce/apex-node/-/apex-node-8.1.3.tgz#cb4dc8335a1aa2d0b85f944cd0778ba299294f3f" + integrity sha512-fADSmOfJuPwOFEb3zmVjgpgtgd/pjcCGMccT28NdIKbfWKMRH0wwUeEW5U0tOn/m+Y4moShp6Vn1f+wihG/CZQ== dependencies: - "@jsforce/jsforce-node" "^3.4.0" + "@jsforce/jsforce-node" "^3.4.1" "@salesforce/core" "^8.2.8" - "@salesforce/kit" "^3.1.6" + "@salesforce/kit" "^3.2.1" "@types/istanbul-reports" "^3.0.4" bfj "8.0.0" fast-glob "^3.3.2" @@ -1615,10 +1589,10 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8": - version "8.2.8" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.2.8.tgz#1e93ddd8b9f348f1e20547de4cdff30062520fd9" - integrity sha512-Fyy1TG9cUtQV+YAjyYCHerZ0K/t9fuB6dU9HrXFvcjMKorMS5JaI1wkZh8w1+zfvu6GY/MOzeqVZCq2W+9ShLA== +"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0": + version "8.3.0" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.3.0.tgz#b61fb6c0c0dec5664ce12ba62ebe35136ae33878" + integrity sha512-HZchC42oGJ5RQsG9HpAb1bT7ohjB31ATDz46ryMvLngMmrfHnyzv2mlIi6UdYkJ/2meH2BJkibHi8paPrtF+/A== dependencies: "@jsforce/jsforce-node" "^3.4.0" "@salesforce/kit" "^3.1.6" @@ -1725,13 +1699,13 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.9.0.tgz#ba477a112653a20b4edcf989c61c57bdff9aa3ca" integrity sha512-LiN37zG5ODT6z70sL1fxF7BQwtCX9JOWofSU8iliSNIM+WDEeinnoFtVqPInRSNt8I0RiJxIKCrqstsmQRBNvA== -"@salesforce/sf-plugins-core@^11.1.2", "@salesforce/sf-plugins-core@^11.2.0", "@salesforce/sf-plugins-core@^11.3.0": - version "11.3.0" - resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-11.3.0.tgz#7bf0466f65761dc6fdfdf78f79cc705dd74b6d87" - integrity sha512-kY+y8dxItkMCa52TCOxvu8nAPr2RyLf03pk+HVFMoHkVdumrbDdxmjYFNxAtYmDISQFx1W0SSoIeK2sboziDNw== +"@salesforce/sf-plugins-core@^11.1.2", "@salesforce/sf-plugins-core@^11.2.0", "@salesforce/sf-plugins-core@^11.3.2": + version "11.3.2" + resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-11.3.2.tgz#8a4ffde0bbef88fe4d669844a119e8f436d6b0ab" + integrity sha512-QyFX/PBzw/hkBUJFl1HH+g7ghRSIwWy9Y0NZgCQgWQQJtV6Sfi4fyeaUafsiOjVnyCqa+r+tWHV/JgRr2yK9NA== dependencies: - "@inquirer/confirm" "^3.1.20" - "@inquirer/password" "^2.1.20" + "@inquirer/confirm" "^3.1.22" + "@inquirer/password" "^2.1.22" "@oclif/core" "^4.0.15" "@salesforce/core" "^8.2.7" "@salesforce/kit" "^3.2.1" @@ -1743,16 +1717,16 @@ string-width "^7.2.0" terminal-link "^3.0.0" -"@salesforce/source-deploy-retrieve@^12.1.11", "@salesforce/source-deploy-retrieve@^12.1.5", "@salesforce/source-deploy-retrieve@^12.1.8": - version "12.1.11" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.1.11.tgz#ad3c390c7df37241eb7c62fc342db7e83305a41b" - integrity sha512-dtd6WWfb5LKrJeWSwkPedOnIbvJwSum31PkMSu/foqXGGBQowXBhK7RXL5L3YxlOev4di2TmL5pVh9QLycYH9A== +"@salesforce/source-deploy-retrieve@^12.1.11", "@salesforce/source-deploy-retrieve@^12.1.5", "@salesforce/source-deploy-retrieve@^12.2.1": + version "12.2.1" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.2.1.tgz#532219fc25f9cea7b7c74c0927e32984275112f5" + integrity sha512-Ke8hO0mCezy3RZ+rQfMzNfmzu5FEpONRM24NY/BYn9f/jZCGX1lnsiWt9j+332CfthZkCK8H5DqWtG/KZJEXcg== dependencies: - "@salesforce/core" "^8.2.8" + "@salesforce/core" "^8.3.0" "@salesforce/kit" "^3.1.6" "@salesforce/ts-types" "^2.0.12" fast-levenshtein "^3.0.0" - fast-xml-parser "^4.3.6" + fast-xml-parser "^4.4.1" got "^11.8.6" graceful-fs "^4.2.11" ignore "^5.3.1" @@ -1777,17 +1751,17 @@ shelljs "^0.8.4" sinon "^10.0.0" -"@salesforce/source-tracking@^7.1.2": - version "7.1.2" - resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.1.2.tgz#98d4e4b8012cd6d479532dbcb2d39479713e25b8" - integrity sha512-ArrASJc2C6YPQmXig+vziUeafTVwsM7dYTBnfXbOUBUZ0F2bhI9R0OredBTn3vsDfT9r1CMzGyRXxrBXjiXBow== +"@salesforce/source-tracking@^7.1.5": + version "7.1.5" + resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.1.5.tgz#1decd07570f9d2d395358afa06830ff82d7b5ffe" + integrity sha512-l6QU/4u3A3cl4QofNC8IsNgnmcwDNb/3LJVMNYxKHBtF2d97Gnl4qrKRt6b+laO+Ny+2Shhjjvh+BP7IkCwiHA== dependencies: "@oclif/core" "^4.0.17" "@salesforce/core" "^8.2.7" - "@salesforce/kit" "^3.1.6" - "@salesforce/source-deploy-retrieve" "^12.1.8" + "@salesforce/kit" "^3.2.0" + "@salesforce/source-deploy-retrieve" "^12.1.11" "@salesforce/ts-types" "^2.0.12" - fast-xml-parser "^4.4.0" + fast-xml-parser "^4.4.1" graceful-fs "^4.2.11" isomorphic-git "^1.27.1" ts-retry-promise "^0.8.1" @@ -1960,21 +1934,7 @@ "@smithy/util-middleware" "^3.0.3" tslib "^2.6.2" -"@smithy/core@^2.2.7": - version "2.2.8" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-2.2.8.tgz#d1edc47584497c58aec741b0a2814cdc1db7b72c" - integrity sha512-1Y0XX0Ucyg0LWTfTVLWpmvSRtFRniykUl3dQ0os1sTd03mKDudR6mVyX+2ak1phwPXx2aEWMAAdW52JNi0mc3A== - dependencies: - "@smithy/middleware-endpoint" "^3.0.5" - "@smithy/middleware-retry" "^3.0.11" - "@smithy/middleware-serde" "^3.0.3" - "@smithy/protocol-http" "^4.0.4" - "@smithy/smithy-client" "^3.1.9" - "@smithy/types" "^3.3.0" - "@smithy/util-middleware" "^3.0.3" - tslib "^2.6.2" - -"@smithy/core@^2.3.2": +"@smithy/core@^2.2.7", "@smithy/core@^2.3.2": version "2.3.2" resolved "https://registry.yarnpkg.com/@smithy/core/-/core-2.3.2.tgz#4a1e3da41d2a3a494cbc6bd1fc6eeb26b2e27184" integrity sha512-in5wwt6chDBcUv1Lw1+QzZxN9fBffi+qOixfb65yK4sDuKG7zAUO9HAFqmVzsZM3N+3tTyvZjtnDXePpvp007Q== @@ -1988,18 +1948,7 @@ "@smithy/util-middleware" "^3.0.3" tslib "^2.6.2" -"@smithy/credential-provider-imds@^3.1.4": - version "3.1.4" - resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.4.tgz#797116f68cc3ffa658469558cc014f25d9febe09" - integrity sha512-NKyH01m97Xa5xf3pB2QOF3lnuE8RIK0hTVNU5zvZAwZU8uspYO4DHQVlK+Y5gwSrujTfHvbfd1D9UFJAc0iYKQ== - dependencies: - "@smithy/node-config-provider" "^3.1.4" - "@smithy/property-provider" "^3.1.3" - "@smithy/types" "^3.3.0" - "@smithy/url-parser" "^3.0.3" - tslib "^2.6.2" - -"@smithy/credential-provider-imds@^3.2.0": +"@smithy/credential-provider-imds@^3.1.4", "@smithy/credential-provider-imds@^3.2.0": version "3.2.0" resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.0.tgz#0e0e7ddaff1a8633cb927aee1056c0ab506b7ecf" integrity sha512-0SCIzgd8LYZ9EJxUjLXBmEKSZR/P/w6l7Rz/pab9culE/RWuqelAKGJvn5qUOl8BgX8Yj5HWM50A5hiB/RzsgA== @@ -2055,18 +2004,7 @@ "@smithy/types" "^3.3.0" tslib "^2.6.2" -"@smithy/fetch-http-handler@^3.2.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.2.tgz#67e29be8815dcf793d14186cae00bccaeffb963c" - integrity sha512-3LaWlBZObyGrOOd7e5MlacnAKEwFBmAeiW/TOj2eR9475Vnq30uS2510+tnKbxrGjROfNdOhQqGo5j3sqLT6bA== - dependencies: - "@smithy/protocol-http" "^4.0.4" - "@smithy/querystring-builder" "^3.0.3" - "@smithy/types" "^3.3.0" - "@smithy/util-base64" "^3.0.0" - tslib "^2.6.2" - -"@smithy/fetch-http-handler@^3.2.4": +"@smithy/fetch-http-handler@^3.2.2", "@smithy/fetch-http-handler@^3.2.4": version "3.2.4" resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.4.tgz#c754de7e0ff2541b73ac9ba7cc955940114b3d62" integrity sha512-kBprh5Gs5h7ug4nBWZi1FZthdqSM+T7zMmsZxx0IBvWUn7dK3diz2SHn7Bs4dQGFDk8plDv375gzenDoNwrXjg== @@ -2137,16 +2075,7 @@ "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@smithy/middleware-content-length@^3.0.4": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.4.tgz#7c5804775da0d3d0c045d52293298f608e72311b" - integrity sha512-wySGje/KfhsnF8YSh9hP16pZcl3C+X6zRsvSfItQGvCyte92LliilU3SD0nR7kTlxnAJwxY8vE/k4Eoezj847Q== - dependencies: - "@smithy/protocol-http" "^4.0.4" - "@smithy/types" "^3.3.0" - tslib "^2.6.2" - -"@smithy/middleware-content-length@^3.0.5": +"@smithy/middleware-content-length@^3.0.4", "@smithy/middleware-content-length@^3.0.5": version "3.0.5" resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.5.tgz#1680aa4fb2a1c0505756103c9a5c2916307d9035" integrity sha512-ILEzC2eyxx6ncej3zZSwMpB5RJ0zuqH7eMptxC4KN3f+v9bqT8ohssKbhNR78k/2tWW+KS5Spw+tbPF4Ejyqvw== @@ -2155,20 +2084,7 @@ "@smithy/types" "^3.3.0" tslib "^2.6.2" -"@smithy/middleware-endpoint@^3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.5.tgz#76e8a559e891282d3ede9ab8e228e66cbee89b21" - integrity sha512-V4acqqrh5tDxUEGVTOgf2lYMZqPQsoGntCrjrJZEeBzEzDry2d2vcI1QCXhGltXPPY+BMc6eksZMguA9fIY8vA== - dependencies: - "@smithy/middleware-serde" "^3.0.3" - "@smithy/node-config-provider" "^3.1.4" - "@smithy/shared-ini-file-loader" "^3.1.4" - "@smithy/types" "^3.3.0" - "@smithy/url-parser" "^3.0.3" - "@smithy/util-middleware" "^3.0.3" - tslib "^2.6.2" - -"@smithy/middleware-endpoint@^3.1.0": +"@smithy/middleware-endpoint@^3.0.5", "@smithy/middleware-endpoint@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.0.tgz#9b8a496d87a68ec43f3f1a0139868d6765a88119" integrity sha512-5y5aiKCEwg9TDPB4yFE7H6tYvGFf1OJHNczeY10/EFF8Ir8jZbNntQJxMWNfeQjC1mxPsaQ6mR9cvQbf+0YeMw== @@ -2181,22 +2097,7 @@ "@smithy/util-middleware" "^3.0.3" tslib "^2.6.2" -"@smithy/middleware-retry@^3.0.10", "@smithy/middleware-retry@^3.0.11": - version "3.0.11" - resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-3.0.11.tgz#4a8137a45247233aa83707ff9da3b8ee3dfefbba" - integrity sha512-/TIRWmhwMpv99JCGuMhJPnH7ggk/Lah7s/uNDyr7faF02BxNsyD/fz9Tw7pgCf9tYOKgjimm2Qml1Aq1pbkt6g== - dependencies: - "@smithy/node-config-provider" "^3.1.4" - "@smithy/protocol-http" "^4.0.4" - "@smithy/service-error-classification" "^3.0.3" - "@smithy/smithy-client" "^3.1.9" - "@smithy/types" "^3.3.0" - "@smithy/util-middleware" "^3.0.3" - "@smithy/util-retry" "^3.0.3" - tslib "^2.6.2" - uuid "^9.0.1" - -"@smithy/middleware-retry@^3.0.14": +"@smithy/middleware-retry@^3.0.10", "@smithy/middleware-retry@^3.0.14": version "3.0.14" resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-3.0.14.tgz#739e8bac6e465e0cda26446999db614418e79da3" integrity sha512-7ZaWZJOjUxa5hgmuMspyt8v/zVsh0GXYuF7OvCmdcbVa/xbnKQoYC+uYKunAqRGTkxjOyuOCw9rmFUFOqqC0eQ== @@ -2237,18 +2138,7 @@ "@smithy/types" "^3.3.0" tslib "^2.6.2" -"@smithy/node-http-handler@^3.1.3": - version "3.1.3" - resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-3.1.3.tgz#1b729a8a2ca6b84618a1e92c53c49a1fcf3a3e5a" - integrity sha512-UiKZm8KHb/JeOPzHZtRUfyaRDO1KPKPpsd7iplhiwVGOeVdkiVJ5bVe7+NhWREMOKomrDIDdSZyglvMothLg0Q== - dependencies: - "@smithy/abort-controller" "^3.1.1" - "@smithy/protocol-http" "^4.0.4" - "@smithy/querystring-builder" "^3.0.3" - "@smithy/types" "^3.3.0" - tslib "^2.6.2" - -"@smithy/node-http-handler@^3.1.4": +"@smithy/node-http-handler@^3.1.3", "@smithy/node-http-handler@^3.1.4": version "3.1.4" resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-3.1.4.tgz#be4195e45639e690d522cd5f11513ea822ff9d5f" integrity sha512-+UmxgixgOr/yLsUxcEKGH0fMNVteJFGkmRltYFHnBMlogyFdpzn2CwqWmxOrfJELhV34v0WSlaqG1UtE1uXlJg== @@ -2267,15 +2157,7 @@ "@smithy/types" "^3.3.0" tslib "^2.6.2" -"@smithy/protocol-http@^4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-4.0.4.tgz#f784a03460b971cf10027d0e7f6673835ed7e637" - integrity sha512-fAA2O4EFyNRyYdFLVIv5xMMeRb+3fRKc/Rt2flh5k831vLvUmNFXcydeg7V3UeEhGURJI4c1asmGJBjvmF6j8Q== - dependencies: - "@smithy/types" "^3.3.0" - tslib "^2.6.2" - -"@smithy/protocol-http@^4.1.0": +"@smithy/protocol-http@^4.0.4", "@smithy/protocol-http@^4.1.0": version "4.1.0" resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-4.1.0.tgz#23519d8f45bf4f33960ea5415847bc2b620a010b" integrity sha512-dPVoHYQ2wcHooGXg3LQisa1hH0e4y0pAddPMeeUPipI1tEOqL6A4N0/G7abeq+K8wrwSgjk4C0wnD1XZpJm5aA== @@ -2315,20 +2197,7 @@ "@smithy/types" "^3.3.0" tslib "^2.6.2" -"@smithy/signature-v4@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-4.0.0.tgz#0583baba98819eab49e028166b186ce927c42128" - integrity sha512-ervYjQ+ZvmNG51Ui77IOTPri7nOyo8Kembzt9uwwlmtXJPmFXvslOahbA1blvAVs7G0KlYMiOBog1rAt7RVXxg== - dependencies: - "@smithy/is-array-buffer" "^3.0.0" - "@smithy/types" "^3.3.0" - "@smithy/util-hex-encoding" "^3.0.0" - "@smithy/util-middleware" "^3.0.3" - "@smithy/util-uri-escape" "^3.0.0" - "@smithy/util-utf8" "^3.0.0" - tslib "^2.6.2" - -"@smithy/signature-v4@^4.1.0": +"@smithy/signature-v4@^4.0.0", "@smithy/signature-v4@^4.1.0": version "4.1.0" resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-4.1.0.tgz#251ff43dc1f4ad66776122732fea9e56efc56443" integrity sha512-aRryp2XNZeRcOtuJoxjydO6QTaVhxx/vjaR+gx7ZjaFgrgPRyZ3HCTbfwqYj6ZWEBHkCSUfcaymKPURaByukag== @@ -2342,7 +2211,7 @@ "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@smithy/smithy-client@^3.1.12": +"@smithy/smithy-client@^3.1.12", "@smithy/smithy-client@^3.1.8": version "3.1.12" resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-3.1.12.tgz#fb6386816ff8a5c50eab7503d4ee3ba2e4ebac63" integrity sha512-wtm8JtsycthkHy1YA4zjIh2thJgIQ9vGkoR639DBx5lLlLNU0v4GARpQZkr2WjXue74nZ7MiTSWfVrLkyD8RkA== @@ -2354,18 +2223,6 @@ "@smithy/util-stream" "^3.1.3" tslib "^2.6.2" -"@smithy/smithy-client@^3.1.8", "@smithy/smithy-client@^3.1.9": - version "3.1.9" - resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-3.1.9.tgz#a0d8e867165db64c2a66762df0db279d1f8029eb" - integrity sha512-My2RaInZ4gSwJUPMaiLR/Nk82+c4LlvqpXA+n7lonGYgCZq23Tg+/xFhgmiejJ6XPElYJysTPyV90vKyp17+1g== - dependencies: - "@smithy/middleware-endpoint" "^3.0.5" - "@smithy/middleware-stack" "^3.0.3" - "@smithy/protocol-http" "^4.0.4" - "@smithy/types" "^3.3.0" - "@smithy/util-stream" "^3.1.1" - tslib "^2.6.2" - "@smithy/types@^3.3.0": version "3.3.0" resolved "https://registry.yarnpkg.com/@smithy/types/-/types-3.3.0.tgz#fae037c733d09bc758946a01a3de0ef6e210b16b" @@ -2428,18 +2285,7 @@ dependencies: tslib "^2.6.2" -"@smithy/util-defaults-mode-browser@^3.0.10": - version "3.0.11" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.11.tgz#c8a74369405f55d39492b9ec15458cc2fe56b783" - integrity sha512-O3s9DGb3bmRvEKmT8RwvSWK4A9r6svfd+MnJB+UMi9ZcCkAnoRtliulOnGF0qCMkKF9mwk2tkopBBstalPY/vg== - dependencies: - "@smithy/property-provider" "^3.1.3" - "@smithy/smithy-client" "^3.1.9" - "@smithy/types" "^3.3.0" - bowser "^2.11.0" - tslib "^2.6.2" - -"@smithy/util-defaults-mode-browser@^3.0.14": +"@smithy/util-defaults-mode-browser@^3.0.10", "@smithy/util-defaults-mode-browser@^3.0.14": version "3.0.14" resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.14.tgz#21f3ebcb07b9d6ae1274b9d655c38bdac59e5c06" integrity sha512-0iwTgKKmAIf+vFLV8fji21Jb2px11ktKVxbX6LIDPAUJyWQqGqBVfwba7xwa1f2FZUoolYQgLvxQEpJycXuQ5w== @@ -2450,20 +2296,7 @@ bowser "^2.11.0" tslib "^2.6.2" -"@smithy/util-defaults-mode-node@^3.0.10": - version "3.0.11" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.11.tgz#288f443b65554597082858c4b6624cd362a2caaa" - integrity sha512-qd4a9qtyOa/WY14aHHOkMafhh9z8D2QTwlcBoXMTPnEwtcY+xpe1JyFm9vya7VsB8hHsfn3XodEtwqREiu4ygQ== - dependencies: - "@smithy/config-resolver" "^3.0.5" - "@smithy/credential-provider-imds" "^3.1.4" - "@smithy/node-config-provider" "^3.1.4" - "@smithy/property-provider" "^3.1.3" - "@smithy/smithy-client" "^3.1.9" - "@smithy/types" "^3.3.0" - tslib "^2.6.2" - -"@smithy/util-defaults-mode-node@^3.0.14": +"@smithy/util-defaults-mode-node@^3.0.10", "@smithy/util-defaults-mode-node@^3.0.14": version "3.0.14" resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.14.tgz#6bb9e837282e84bbf5093dbcd120fcd296593f7a" integrity sha512-e9uQarJKfXApkTMMruIdxHprhcXivH1flYCe8JRDTzkkLx8dA3V5J8GZlST9yfDiRWkJpZJlUXGN9Rc9Ade3OQ== @@ -2509,21 +2342,7 @@ "@smithy/types" "^3.3.0" tslib "^2.6.2" -"@smithy/util-stream@^3.1.0", "@smithy/util-stream@^3.1.1": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-3.1.1.tgz#2fffe56d9cdf70e94a7cd690e980454b1b35ad23" - integrity sha512-EhRnVvl3AhoHAT2rGQ5o+oSDRM/BUSMPLZZdRJZLcNVUsFAjOs4vHaPdNQivTSzRcFxf5DA4gtO46WWU2zimaw== - dependencies: - "@smithy/fetch-http-handler" "^3.2.2" - "@smithy/node-http-handler" "^3.1.3" - "@smithy/types" "^3.3.0" - "@smithy/util-base64" "^3.0.0" - "@smithy/util-buffer-from" "^3.0.0" - "@smithy/util-hex-encoding" "^3.0.0" - "@smithy/util-utf8" "^3.0.0" - tslib "^2.6.2" - -"@smithy/util-stream@^3.1.3": +"@smithy/util-stream@^3.1.0", "@smithy/util-stream@^3.1.3": version "3.1.3" resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-3.1.3.tgz#699ee2397cc1d474e46d2034039d5263812dca64" integrity sha512-FIv/bRhIlAxC0U7xM1BCnF2aDRPq0UaelqBHkM2lsCp26mcBbgI0tCVTv+jGdsQLUmAMybua/bjDsSu8RQHbmw== @@ -2701,12 +2520,12 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@^22.0.0": - version "22.0.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.0.0.tgz#04862a2a71e62264426083abe1e27e87cac05a30" - integrity sha512-VT7KSYudcPOzP5Q0wfbowyNLaVR8QWUdw+088uFWwfvpY6uCWaXpqV6ieLAu9WBcnTa7H4Z5RLK8I5t2FuOcqw== +"@types/node@*", "@types/node@^22.1.0": + version "22.2.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.2.0.tgz#7cf046a99f0ba4d628ad3088cb21f790df9b0c5b" + integrity sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ== dependencies: - undici-types "~6.11.1" + undici-types "~6.13.0" "@types/node@20.5.1": version "20.5.1" @@ -2720,13 +2539,6 @@ dependencies: undici-types "~5.26.4" -"@types/node@^22.1.0": - version "22.2.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.2.0.tgz#7cf046a99f0ba4d628ad3088cb21f790df9b0c5b" - integrity sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ== - dependencies: - undici-types "~6.13.0" - "@types/normalize-package-data@^2.4.0": version "2.4.4" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" @@ -4544,20 +4356,13 @@ fast-xml-parser@4.2.5: dependencies: strnum "^1.0.5" -fast-xml-parser@4.4.1: +fast-xml-parser@4.4.1, fast-xml-parser@^4.4.1: version "4.4.1" resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz#86dbf3f18edf8739326447bcaac31b4ae7f6514f" integrity sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw== dependencies: strnum "^1.0.5" -fast-xml-parser@^4.3.6, fast-xml-parser@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.4.0.tgz#341cc98de71e9ba9e651a67f41f1752d1441a501" - integrity sha512-kLY3jFlwIYwBNDojclKsNAC12sfD6NwW74QB2CoNGPvtVxjliYehVunB3HYyNi+n4Tt1dAcgwYvmKF/Z18flqg== - dependencies: - strnum "^1.0.5" - fastest-levenshtein@^1.0.7: version "1.0.16" resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" @@ -7715,16 +7520,7 @@ static-eval@2.0.2: dependencies: escodegen "^1.8.1" -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -7793,14 +7589,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -8188,11 +7977,6 @@ undici-types@~5.26.4: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== -undici-types@~6.11.1: - version "6.11.1" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.11.1.tgz#432ea6e8efd54a48569705a699e62d8f4981b197" - integrity sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ== - undici-types@~6.13.0: version "6.13.0" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.13.0.tgz#e3e79220ab8c81ed1496b5812471afd7cf075ea5" @@ -8382,7 +8166,7 @@ workerpool@^6.5.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -8400,15 +8184,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 604253bf56a02230bfe934f8dc5cc9f7f890b90e Mon Sep 17 00:00:00 2001 From: mshanemc Date: Tue, 13 Aug 2024 12:34:51 -0500 Subject: [PATCH 02/11] chore: comment correction --- src/commands/project/convert/source-behavior.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/project/convert/source-behavior.ts b/src/commands/project/convert/source-behavior.ts index 1ed47151..c6eb247f 100644 --- a/src/commands/project/convert/source-behavior.ts +++ b/src/commands/project/convert/source-behavior.ts @@ -81,7 +81,7 @@ export default class ConvertSourceBehavior extends SfCommand rm(f))); - // @ts-expect-error there's publicly accessible way to clear a project's instance + // @ts-expect-error there's no publicly accessible way to clear a project's instance // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access SfProject.instances.clear(); From b7ae60eac9a74eb4669452dd1ea89752e96a34fd Mon Sep 17 00:00:00 2001 From: mshanemc Date: Tue, 13 Aug 2024 14:17:24 -0500 Subject: [PATCH 03/11] chore: bump core for official project.clearInstances --- package.json | 2 +- src/commands/project/convert/source-behavior.ts | 4 +--- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 6b8ac850..fdc2df83 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "@oclif/core": "^4.0.17", "@salesforce/apex-node": "^8.1.3", - "@salesforce/core": "^8.3.0", + "@salesforce/core": "^8.4.0", "@salesforce/kit": "^3.2.1", "@salesforce/plugin-info": "^3.3.24", "@salesforce/sf-plugins-core": "^11.3.2", diff --git a/src/commands/project/convert/source-behavior.ts b/src/commands/project/convert/source-behavior.ts index c6eb247f..fcdcf408 100644 --- a/src/commands/project/convert/source-behavior.ts +++ b/src/commands/project/convert/source-behavior.ts @@ -81,9 +81,7 @@ export default class ConvertSourceBehavior extends SfCommand rm(f))); - // @ts-expect-error there's no publicly accessible way to clear a project's instance - // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access - SfProject.instances.clear(); + SfProject.clearInstances(); // break the singleton so SDR will re-read to get the new preset const createdFiles = await convertBackToSource({ packageDirsWithPreset: packageDirsWithDecomposable, diff --git a/yarn.lock b/yarn.lock index 9c4879d9..9e6c6106 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1589,10 +1589,10 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0": - version "8.3.0" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.3.0.tgz#b61fb6c0c0dec5664ce12ba62ebe35136ae33878" - integrity sha512-HZchC42oGJ5RQsG9HpAb1bT7ohjB31ATDz46ryMvLngMmrfHnyzv2mlIi6UdYkJ/2meH2BJkibHi8paPrtF+/A== +"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0", "@salesforce/core@^8.4.0": + version "8.4.0" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.4.0.tgz#d2ddfe07994c42b1e917e581e9cf47ad27b97a93" + integrity sha512-P+n0+Sp+v6voLTShW2E5sdF7gCUxEXJjNcc9Jtto0ZMyQesmQJ6WGpWmAuRoi+BVYc8OPSlEffndaYDAo/u73g== dependencies: "@jsforce/jsforce-node" "^3.4.0" "@salesforce/kit" "^3.1.6" From 029664f038640cbd6366dc401d5e39ece8b99a07 Mon Sep 17 00:00:00 2001 From: Shane McLaughlin Date: Tue, 13 Aug 2024 14:47:50 -0500 Subject: [PATCH 04/11] Apply suggestions from code review Co-authored-by: Juliet Shackell <63259011+jshackell-sfdc@users.noreply.github.com> --- messages/convert.source-behavior.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/messages/convert.source-behavior.md b/messages/convert.source-behavior.md index a2cbded0..b977029b 100644 --- a/messages/convert.source-behavior.md +++ b/messages/convert.source-behavior.md @@ -53,11 +53,11 @@ Your project has a default org (target-org) that uses source tracking. This oper # mainDefaultConfirmation -- This command will put components in a newly created `main/default` folder in each package directory. You might need to re-organize them into your preferred structure. +- This command puts components in a newly created `main/default` folder in each package directory. You might need to re-organize them into your preferred structure. # basicConfirmation -- This command will make changes to your project. Be sure you've committed any source changes before continuing so you can easily revert if necessary. +- This command makes changes to your project. Be sure you've committed any source changes before continuing so you can easily revert if necessary. # success.dryRun From b57a80a78a06a6c541e3f53026f8998ecad185b0 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Tue, 13 Aug 2024 15:44:05 -0500 Subject: [PATCH 05/11] test: adjust nut for error=>warn --- .../project/convert/source-behavior.ts | 11 +++-- test/nuts/convert/decompose.nut.ts | 49 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/commands/project/convert/source-behavior.ts b/src/commands/project/convert/source-behavior.ts index fcdcf408..531a994b 100644 --- a/src/commands/project/convert/source-behavior.ts +++ b/src/commands/project/convert/source-behavior.ts @@ -65,12 +65,13 @@ export default class ConvertSourceBehavior extends SfCommand { let session: TestSession; before(async () => { @@ -54,7 +60,7 @@ describe('source behavior changes', () => { await fs.promises.rm(path.join(session.project.dir, DRY_RUN_DIR), { recursive: true }); }); - it('throws on a packageDir not using main/default', async () => { + it('warns on a packageDir not using main/default', async () => { const newDir = path.join(session.project.dir, 'other-dir'); // create the new packageDir await fs.promises.mkdir(path.join(newDir, 'labels'), { recursive: true }); @@ -74,29 +80,21 @@ describe('source behavior changes', () => { ) ); - const result = execCmd('project convert source-behavior --behavior decomposeCustomLabelsBeta --json', { - ensureExitCode: 1, - }); - expect(result.jsonOutput?.name).to.equal('PackageDirectoryNeedsMainDefaultError'); - // put stuff back the way it was - await fs.promises.rm(newDir, { recursive: true }); - await fs.promises.writeFile( - path.join(session.project.dir, 'sfdx-project.json'), - JSON.stringify(originalProject, null, 2) - ); - }); - - it.skip('produces actual output and makes expected changes', async () => { - const result = execCmd( - 'project convert source-behavior --behavior decomposeCustomLabelsBeta --json', + const result = await execInteractiveCmd( + 'project convert source-behavior --behavior decomposeCustomLabelsBeta', + { Proceed: ['y', Interaction.ENTER] }, { ensureExitCode: 0, } ); - expect(result.jsonOutput?.result.deletedFiles).to.deep.equal([ - path.join(session.project.dir, 'force-app', 'main', 'default', 'labels', 'CustomLabels.labels-meta.xml'), - ]); - expect(result.jsonOutput?.result.createdFiles).to.have.length(4); + expect(result.stderr).to.include(messages.getMessage('basicConfirmation')); + expect(result.stderr).to.include(messages.getMessage('mainDefaultConfirmation')); + + expect(result.stdout).to.include('Deleted Files'); + expect(result.stdout).to.include('Created Files'); + expect(result.stdout).to.include( + path.join(session.project.dir, 'force-app', 'main', 'default', 'labels', 'CustomLabels.labels-meta.xml') + ); // it modified the project json expect((await getProject(session))[PRESETS_PROP]).to.deep.equal(['decomposeCustomLabelsBeta']); @@ -104,14 +102,15 @@ describe('source behavior changes', () => { expect(fs.existsSync(path.join(session.project.dir, DRY_RUN_DIR))).to.be.false; }); - it.skip("throws on repeated preset that's already done", () => { - const err = execCmd( + it("throws on repeated preset that's already done", async () => { + const err = await execInteractiveCmd( 'project convert source-behavior --behavior decomposeCustomLabelsBeta --json', + {}, { ensureExitCode: 1, } ); - expect(err.jsonOutput?.name).to.equal('sourceBehaviorOptionAlreadyExists'); + expect(err.stdout).to.include('sourceBehaviorOptionAlreadyExists'); }); after(async () => { From 7aa0596fe4d83c2fef5494308a6b602423d640c1 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Tue, 13 Aug 2024 17:42:48 -0500 Subject: [PATCH 06/11] chore: qa-able branch --- package.json | 5 ++++- src/commands/project/convert/source-behavior.ts | 4 +--- src/utils/convertBehavior.ts | 4 +++- yarn.lock | 14 +++++++------- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index fdc2df83..0798548b 100644 --- a/package.json +++ b/package.json @@ -11,11 +11,14 @@ "@salesforce/kit": "^3.2.1", "@salesforce/plugin-info": "^3.3.24", "@salesforce/sf-plugins-core": "^11.3.2", - "@salesforce/source-deploy-retrieve": "^12.2.1", + "@salesforce/source-deploy-retrieve": "^12.3.0-qa.1", "@salesforce/source-tracking": "^7.1.5", "@salesforce/ts-types": "^2.0.12", "ansis": "^3.3.2" }, + "resolutions": { + "@salesforce/source-deploy-retrieve": "^12.3.0-qa.1" + }, "devDependencies": { "@oclif/plugin-command-snapshot": "^5.2.10", "@salesforce/cli-plugins-testkit": "^5.3.23", diff --git a/src/commands/project/convert/source-behavior.ts b/src/commands/project/convert/source-behavior.ts index 531a994b..519fd426 100644 --- a/src/commands/project/convert/source-behavior.ts +++ b/src/commands/project/convert/source-behavior.ts @@ -9,7 +9,7 @@ import { rm, readFile, writeFile } from 'node:fs/promises'; import { join } from 'node:path'; import { existsSync } from 'node:fs'; import { SfCommand, Flags } from '@salesforce/sf-plugins-core'; -import { Messages, SfProject } from '@salesforce/core'; +import { Messages } from '@salesforce/core'; import { getValidatedProjectJson, TMP_DIR, @@ -82,8 +82,6 @@ export default class ConvertSourceBehavior extends SfCommand rm(f))); - SfProject.clearInstances(); // break the singleton so SDR will re-read to get the new preset - const createdFiles = await convertBackToSource({ packageDirsWithPreset: packageDirsWithDecomposable, projectDir: this.project!.getPath(), diff --git a/src/utils/convertBehavior.ts b/src/utils/convertBehavior.ts index 565ba5ae..f15dc2af 100644 --- a/src/utils/convertBehavior.ts +++ b/src/utils/convertBehavior.ts @@ -15,6 +15,7 @@ import { ConvertResult, MetadataConverter, MetadataRegistry, + RegistryAccess, SourceComponent, presetMap, } from '@salesforce/source-deploy-retrieve'; @@ -142,7 +143,8 @@ const convertToSource = async ({ }): Promise => { // mdapi=>source convert the target dir back to the project // it's a new converter because the project has changed and it should reload the project's registry. - const converter = new MetadataConverter(); + SfProject.clearInstances(); // break the singleton so SDR will re-read to get the new preset + const converter = new MetadataConverter(new RegistryAccess(undefined, projectDir)); return Promise.all( packageDirsWithPreset.map(async (pd) => converter.convert( diff --git a/yarn.lock b/yarn.lock index 9e6c6106..147b0c9b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1589,7 +1589,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0", "@salesforce/core@^8.4.0": +"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.4.0": version "8.4.0" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.4.0.tgz#d2ddfe07994c42b1e917e581e9cf47ad27b97a93" integrity sha512-P+n0+Sp+v6voLTShW2E5sdF7gCUxEXJjNcc9Jtto0ZMyQesmQJ6WGpWmAuRoi+BVYc8OPSlEffndaYDAo/u73g== @@ -1717,13 +1717,13 @@ string-width "^7.2.0" terminal-link "^3.0.0" -"@salesforce/source-deploy-retrieve@^12.1.11", "@salesforce/source-deploy-retrieve@^12.1.5", "@salesforce/source-deploy-retrieve@^12.2.1": - version "12.2.1" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.2.1.tgz#532219fc25f9cea7b7c74c0927e32984275112f5" - integrity sha512-Ke8hO0mCezy3RZ+rQfMzNfmzu5FEpONRM24NY/BYn9f/jZCGX1lnsiWt9j+332CfthZkCK8H5DqWtG/KZJEXcg== +"@salesforce/source-deploy-retrieve@^12.1.11", "@salesforce/source-deploy-retrieve@^12.1.5", "@salesforce/source-deploy-retrieve@^12.3.0-qa.1": + version "12.3.0-qa.1" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.3.0-qa.1.tgz#af2d75b80ce190c93707c4b8e60f2a116549c231" + integrity sha512-JTRcIVt01aod9IqtwTCzG07A1XH06pA92wKwnuTklU9tCA3q9kz/YTh/VsPLpDOUbyzP3XImXUM0e+KXLN4ojg== dependencies: - "@salesforce/core" "^8.3.0" - "@salesforce/kit" "^3.1.6" + "@salesforce/core" "^8.4.0" + "@salesforce/kit" "^3.2.1" "@salesforce/ts-types" "^2.0.12" fast-levenshtein "^3.0.0" fast-xml-parser "^4.4.1" From e6ada01896e061cbf8694549d87593dc9670aeb7 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Thu, 15 Aug 2024 11:09:58 -0500 Subject: [PATCH 07/11] test: prerel stl --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 0798548b..7bf2ae08 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@salesforce/plugin-info": "^3.3.24", "@salesforce/sf-plugins-core": "^11.3.2", "@salesforce/source-deploy-retrieve": "^12.3.0-qa.1", - "@salesforce/source-tracking": "^7.1.5", + "@salesforce/source-tracking": "^7.1.6-qa.0", "@salesforce/ts-types": "^2.0.12", "ansis": "^3.3.2" }, diff --git a/yarn.lock b/yarn.lock index 147b0c9b..91255e78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1589,7 +1589,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.4.0": +"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0", "@salesforce/core@^8.4.0": version "8.4.0" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.4.0.tgz#d2ddfe07994c42b1e917e581e9cf47ad27b97a93" integrity sha512-P+n0+Sp+v6voLTShW2E5sdF7gCUxEXJjNcc9Jtto0ZMyQesmQJ6WGpWmAuRoi+BVYc8OPSlEffndaYDAo/u73g== @@ -1717,7 +1717,7 @@ string-width "^7.2.0" terminal-link "^3.0.0" -"@salesforce/source-deploy-retrieve@^12.1.11", "@salesforce/source-deploy-retrieve@^12.1.5", "@salesforce/source-deploy-retrieve@^12.3.0-qa.1": +"@salesforce/source-deploy-retrieve@^12.1.5", "@salesforce/source-deploy-retrieve@^12.3.0-qa.1": version "12.3.0-qa.1" resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.3.0-qa.1.tgz#af2d75b80ce190c93707c4b8e60f2a116549c231" integrity sha512-JTRcIVt01aod9IqtwTCzG07A1XH06pA92wKwnuTklU9tCA3q9kz/YTh/VsPLpDOUbyzP3XImXUM0e+KXLN4ojg== @@ -1751,15 +1751,15 @@ shelljs "^0.8.4" sinon "^10.0.0" -"@salesforce/source-tracking@^7.1.5": - version "7.1.5" - resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.1.5.tgz#1decd07570f9d2d395358afa06830ff82d7b5ffe" - integrity sha512-l6QU/4u3A3cl4QofNC8IsNgnmcwDNb/3LJVMNYxKHBtF2d97Gnl4qrKRt6b+laO+Ny+2Shhjjvh+BP7IkCwiHA== +"@salesforce/source-tracking@^7.1.6-qa.0": + version "7.1.6-qa.0" + resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.1.6-qa.0.tgz#8590d3f3dfd94576d2e30f5d7f7c52229db98afa" + integrity sha512-BFLuaHYl3u/Fl1rzmw2ZlgPt1JF4U7T/Pd+DeH9kQ7dlIIf9cchN9ZgvAZFVVk4hYp0NLBBFz2pNElF0W+lRVw== dependencies: "@oclif/core" "^4.0.17" - "@salesforce/core" "^8.2.7" - "@salesforce/kit" "^3.2.0" - "@salesforce/source-deploy-retrieve" "^12.1.11" + "@salesforce/core" "^8.3.0" + "@salesforce/kit" "^3.2.1" + "@salesforce/source-deploy-retrieve" "^12.3.0-qa.1" "@salesforce/ts-types" "^2.0.12" fast-xml-parser "^4.4.1" graceful-fs "^4.2.11" From eed10b1efc7e87ac53e146337b1c646723f0175d Mon Sep 17 00:00:00 2001 From: mshanemc Date: Thu, 15 Aug 2024 11:41:54 -0500 Subject: [PATCH 08/11] docs: fix examples to not use deprecated beta --- messages/convert.source-behavior.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/messages/convert.source-behavior.md b/messages/convert.source-behavior.md index b977029b..429b0281 100644 --- a/messages/convert.source-behavior.md +++ b/messages/convert.source-behavior.md @@ -16,17 +16,17 @@ Behavior to enable; the values correspond to the possible values of the "sourceB # examples -- Update your Salesforce DX project to decompose custom labels: +- Update your Salesforce DX project to decompose custom permission sets: - <%= config.bin %> <%= command.id %> --behavior decomposeCustomLabelsBeta + <%= config.bin %> <%= command.id %> --behavior decomposePermissionSetBeta - Display what the command would do, but don't change any existing files: - <%= config.bin %> <%= command.id %> --behavior decomposeCustomLabelsBeta --dry-run + <%= config.bin %> <%= command.id %> --behavior decomposePermissionSetBeta --dry-run - Keep the temporary directory that contains the interim metadata API formatted files: - <%= config.bin %> <%= command.id %> --behavior decomposeCustomLabelsBeta --dry-run --preserve-temp-dir + <%= config.bin %> <%= command.id %> --behavior decomposePermissionSetBeta --dry-run --preserve-temp-dir # flags.dry-run.summary From 45614e4ab717e7e99c7ababf54fd78d3c4abf521 Mon Sep 17 00:00:00 2001 From: Steve Hetzel Date: Thu, 15 Aug 2024 15:31:04 -0600 Subject: [PATCH 09/11] chore: update versions --- package.json | 7 ++----- yarn.lock | 53 ++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 7bf2ae08..6ff26805 100644 --- a/package.json +++ b/package.json @@ -11,14 +11,11 @@ "@salesforce/kit": "^3.2.1", "@salesforce/plugin-info": "^3.3.24", "@salesforce/sf-plugins-core": "^11.3.2", - "@salesforce/source-deploy-retrieve": "^12.3.0-qa.1", - "@salesforce/source-tracking": "^7.1.6-qa.0", + "@salesforce/source-deploy-retrieve": "^12.4.0", + "@salesforce/source-tracking": "^7.1.6", "@salesforce/ts-types": "^2.0.12", "ansis": "^3.3.2" }, - "resolutions": { - "@salesforce/source-deploy-retrieve": "^12.3.0-qa.1" - }, "devDependencies": { "@oclif/plugin-command-snapshot": "^5.2.10", "@salesforce/cli-plugins-testkit": "^5.3.23", diff --git a/yarn.lock b/yarn.lock index 91255e78..068e1e78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1589,7 +1589,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0", "@salesforce/core@^8.4.0": +"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.4.0": version "8.4.0" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.4.0.tgz#d2ddfe07994c42b1e917e581e9cf47ad27b97a93" integrity sha512-P+n0+Sp+v6voLTShW2E5sdF7gCUxEXJjNcc9Jtto0ZMyQesmQJ6WGpWmAuRoi+BVYc8OPSlEffndaYDAo/u73g== @@ -1717,10 +1717,10 @@ string-width "^7.2.0" terminal-link "^3.0.0" -"@salesforce/source-deploy-retrieve@^12.1.5", "@salesforce/source-deploy-retrieve@^12.3.0-qa.1": - version "12.3.0-qa.1" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.3.0-qa.1.tgz#af2d75b80ce190c93707c4b8e60f2a116549c231" - integrity sha512-JTRcIVt01aod9IqtwTCzG07A1XH06pA92wKwnuTklU9tCA3q9kz/YTh/VsPLpDOUbyzP3XImXUM0e+KXLN4ojg== +"@salesforce/source-deploy-retrieve@^12.1.5", "@salesforce/source-deploy-retrieve@^12.4.0": + version "12.4.0" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.4.0.tgz#7e5a72b1d7b559eaa7f6f333ee212380b6316542" + integrity sha512-gvTEjLPbNRt62GEKvejt/f1TtG6Zx8JPd/5BYjnXyEJu8BeOy5kL4zJm9GD3ZiTzBnPGHLzfVL09JjWfNBbo0A== dependencies: "@salesforce/core" "^8.4.0" "@salesforce/kit" "^3.2.1" @@ -1751,15 +1751,15 @@ shelljs "^0.8.4" sinon "^10.0.0" -"@salesforce/source-tracking@^7.1.6-qa.0": - version "7.1.6-qa.0" - resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.1.6-qa.0.tgz#8590d3f3dfd94576d2e30f5d7f7c52229db98afa" - integrity sha512-BFLuaHYl3u/Fl1rzmw2ZlgPt1JF4U7T/Pd+DeH9kQ7dlIIf9cchN9ZgvAZFVVk4hYp0NLBBFz2pNElF0W+lRVw== +"@salesforce/source-tracking@^7.1.6": + version "7.1.6" + resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.1.6.tgz#88fd5defd48521af4531ec4b1e13f699178cbf0f" + integrity sha512-WGGl95p0h5Ai26Fqg7C9DjYZCXJXjGQ4ZWnMyiBPZy1ZiBAIbz0nlvGX1t2+4n3aBNSuZ5dNv0b/c3MCegsEnw== dependencies: "@oclif/core" "^4.0.17" - "@salesforce/core" "^8.3.0" + "@salesforce/core" "^8.4.0" "@salesforce/kit" "^3.2.1" - "@salesforce/source-deploy-retrieve" "^12.3.0-qa.1" + "@salesforce/source-deploy-retrieve" "^12.4.0" "@salesforce/ts-types" "^2.0.12" fast-xml-parser "^4.4.1" graceful-fs "^4.2.11" @@ -7520,7 +7520,16 @@ static-eval@2.0.2: dependencies: escodegen "^1.8.1" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -7589,7 +7598,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -8166,7 +8182,7 @@ workerpool@^6.5.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -8184,6 +8200,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 13462f0cd7856935130e95a7f92fcbc379aa29a2 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Fri, 16 Aug 2024 10:24:51 -0500 Subject: [PATCH 10/11] fix: stl fix and other deps --- package.json | 10 ++--- yarn.lock | 121 ++++++++++++++++++++------------------------------- 2 files changed, 53 insertions(+), 78 deletions(-) diff --git a/package.json b/package.json index 6ff26805..60c5e595 100644 --- a/package.json +++ b/package.json @@ -9,18 +9,18 @@ "@salesforce/apex-node": "^8.1.3", "@salesforce/core": "^8.4.0", "@salesforce/kit": "^3.2.1", - "@salesforce/plugin-info": "^3.3.24", + "@salesforce/plugin-info": "^3.3.28", "@salesforce/sf-plugins-core": "^11.3.2", "@salesforce/source-deploy-retrieve": "^12.4.0", - "@salesforce/source-tracking": "^7.1.6", + "@salesforce/source-tracking": "^7.1.7", "@salesforce/ts-types": "^2.0.12", "ansis": "^3.3.2" }, "devDependencies": { - "@oclif/plugin-command-snapshot": "^5.2.10", - "@salesforce/cli-plugins-testkit": "^5.3.23", + "@oclif/plugin-command-snapshot": "^5.2.12", + "@salesforce/cli-plugins-testkit": "^5.3.25", "@salesforce/dev-scripts": "^10.2.9", - "@salesforce/plugin-command-reference": "^3.1.13", + "@salesforce/plugin-command-reference": "^3.1.16", "@salesforce/schemas": "^1.9.0", "@salesforce/source-testkit": "^2.2.39", "@salesforce/ts-sinon": "^1.4.23", diff --git a/yarn.lock b/yarn.lock index 068e1e78..5f19dde2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1320,7 +1320,7 @@ "@inquirer/core" "^9.0.10" "@inquirer/type" "^1.5.2" -"@inquirer/core@^9.0.10", "@inquirer/core@^9.0.4", "@inquirer/core@^9.0.8": +"@inquirer/core@^9.0.10", "@inquirer/core@^9.0.4": version "9.0.10" resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-9.0.10.tgz#4270191e2ad3bea6223530a093dd9479bcbc7dd0" integrity sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA== @@ -1344,13 +1344,13 @@ resolved "https://registry.yarnpkg.com/@inquirer/figures/-/figures-1.0.5.tgz#57f9a996d64d3e3345d2a3ca04d36912e94f8790" integrity sha512-79hP/VWdZ2UVc9bFGJnoQ/lQMpL74mGgzSYX1xUqCVk7/v73vJCMw1VuyWN1jGkZ9B3z7THAbySqGbCNefcjfA== -"@inquirer/input@^2.2.4": - version "2.2.7" - resolved "https://registry.yarnpkg.com/@inquirer/input/-/input-2.2.7.tgz#87a922243a6c833ee5f1d4a6102c68b3cee9f19d" - integrity sha512-QFk31Gq4Wr+Ve9ilMiFGGrSjGZQBilV0cgTN1zubD98Bx65fsNrh8++Biy/9mjNKRaqHFbZBw5baAcQvOmW8OQ== +"@inquirer/input@^2.2.4", "@inquirer/input@^2.2.7": + version "2.2.9" + resolved "https://registry.yarnpkg.com/@inquirer/input/-/input-2.2.9.tgz#08fdf9a48e4f6fc64c2d508b9d10afac843f9bd8" + integrity sha512-7Z6N+uzkWM7+xsE+3rJdhdG/+mQgejOVqspoW+w0AbSZnL6nq5tGMEVASaYVWbkoSzecABWwmludO2evU3d31g== dependencies: - "@inquirer/core" "^9.0.8" - "@inquirer/type" "^1.5.1" + "@inquirer/core" "^9.0.10" + "@inquirer/type" "^1.5.2" "@inquirer/password@^2.1.22": version "2.1.22" @@ -1372,7 +1372,7 @@ ansi-escapes "^4.3.2" yoctocolors-cjs "^2.1.2" -"@inquirer/type@^1.5.0", "@inquirer/type@^1.5.1", "@inquirer/type@^1.5.2": +"@inquirer/type@^1.5.0", "@inquirer/type@^1.5.2": version "1.5.2" resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-1.5.2.tgz#15f5e4a4dae02c4203650cb07c8a000cdd423939" integrity sha512-w9qFkumYDCNyDZmNQjf/n6qQuvQ4dMC3BJesY4oF+yr0CxR5vxujflAVeIcS6U336uzi9GM0kAfZlLrZ9UTkpA== @@ -1509,19 +1509,19 @@ wordwrap "^1.0.0" wrap-ansi "^7.0.0" -"@oclif/plugin-command-snapshot@^5.2.10": - version "5.2.10" - resolved "https://registry.yarnpkg.com/@oclif/plugin-command-snapshot/-/plugin-command-snapshot-5.2.10.tgz#48f46f341daa21fc28bd67b58420d5d9910cd237" - integrity sha512-Nc7xMdkvQxYfbqfA+UDSFV6SsVzbITVsJXQYPaM9QrlsbgUhzcdMHDX8kvqZV01OcK6Zr7lJ5XksY62lKbtS/A== +"@oclif/plugin-command-snapshot@^5.2.12": + version "5.2.12" + resolved "https://registry.yarnpkg.com/@oclif/plugin-command-snapshot/-/plugin-command-snapshot-5.2.12.tgz#f22aaac03ad1e4fbb62c9beb5c44c99522d29e8b" + integrity sha512-X+UvjS5yNQSrL4f8DDCg93+P0ZyG8pJ6g5R8nA8DjkC22AaKhHMh0BwGdPT6zmTajaIxClrfk1K/sAF4+bwMug== dependencies: "@oclif/core" "^4" - ansis "^3.3.1" + ansis "^3.3.2" globby "^14.0.2" just-diff "^5.2.0" lodash.difference "^4.5.0" lodash.get "^4.4.2" lodash.sortby "^4.7.0" - semver "^7.6.0" + semver "^7.6.3" ts-json-schema-generator "^1.5.1" "@oclif/plugin-help@^6.2.7": @@ -1573,14 +1573,14 @@ istanbul-lib-report "^3.0.1" istanbul-reports "^3.1.7" -"@salesforce/cli-plugins-testkit@^5.3.18", "@salesforce/cli-plugins-testkit@^5.3.23": - version "5.3.23" - resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.3.23.tgz#a7591d9f59fd312e04534082ae78035ad2faa241" - integrity sha512-6z5qi2mM6yPNorbicq/AWRDLSTN0q4h8UdmdFBGvhs7JlVpxRg93YLEchVsVrcifXKXwmBONm7KXMLF5GUP8fA== +"@salesforce/cli-plugins-testkit@^5.3.18", "@salesforce/cli-plugins-testkit@^5.3.25": + version "5.3.25" + resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.3.25.tgz#a3e081d1e8bce8660d602fdf04851986c89f18a1" + integrity sha512-wwFnd7EuEVxc7IRCvOtJO65iEbjYWrIHUdkxf7bZkgrS9ZfjFNDyua/XthT+gWpVfIZiHxEjqYBdHzMNWZQkbg== dependencies: - "@salesforce/core" "^8.2.8" - "@salesforce/kit" "^3.2.0" - "@salesforce/ts-types" "^2.0.10" + "@salesforce/core" "^8.3.0" + "@salesforce/kit" "^3.2.1" + "@salesforce/ts-types" "^2.0.11" "@types/shelljs" "^0.8.15" debug "^4.3.6" jszip "^3.10.1" @@ -1589,7 +1589,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.4.0": +"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0", "@salesforce/core@^8.4.0": version "8.4.0" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.4.0.tgz#d2ddfe07994c42b1e917e581e9cf47ad27b97a93" integrity sha512-P+n0+Sp+v6voLTShW2E5sdF7gCUxEXJjNcc9Jtto0ZMyQesmQJ6WGpWmAuRoi+BVYc8OPSlEffndaYDAo/u73g== @@ -1650,38 +1650,38 @@ typescript "^5.5.4" wireit "^0.14.5" -"@salesforce/kit@^3.1.6", "@salesforce/kit@^3.2.0", "@salesforce/kit@^3.2.1": +"@salesforce/kit@^3.1.6", "@salesforce/kit@^3.2.1": version "3.2.1" resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.2.1.tgz#3de2c9ff52710a169fc887716d97c00d26065c56" integrity sha512-LrZH2F06XPLUTMXC3av6A0VDAJykUqRtYB6tTjAKzwS1gCnp6BEn6VyjZNg0Fg/Kfp6OTrMxiIgbUFsNehEV7A== dependencies: "@salesforce/ts-types" "^2.0.12" -"@salesforce/plugin-command-reference@^3.1.13": - version "3.1.13" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-3.1.13.tgz#e44c1c0daa4e71a5cc7be9058eb05b39c16c253d" - integrity sha512-WWUMHqBPs05+C0wIjQzj9+Zzk2bnT6tPXuG3rubekywxEFTfEraNO3IXU3tz3fup9LO76bbv6QS4hI2ifprOXA== +"@salesforce/plugin-command-reference@^3.1.16": + version "3.1.16" + resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-3.1.16.tgz#ce3fee0854ba92a164527fe0a7fca234e672c7a3" + integrity sha512-DLwMH0BWgOImA8nM6vGIQFG3LV81MRq6AEvLzIHZ2O4ABgqTHS6aV55ENUnDNKO66mcKjy/lWFftMRp1WdOHJw== dependencies: "@oclif/core" "^4" - "@salesforce/core" "^8.2.3" - "@salesforce/kit" "^3.1.6" - "@salesforce/sf-plugins-core" "^11.2.0" - "@salesforce/ts-types" "^2.0.10" + "@salesforce/core" "^8.3.0" + "@salesforce/kit" "^3.2.1" + "@salesforce/sf-plugins-core" "^11.3.0" + "@salesforce/ts-types" "^2.0.11" chalk "^5.3.0" debug "^4.3.6" handlebars "^4.7.8" -"@salesforce/plugin-info@^3.3.24": - version "3.3.24" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-info/-/plugin-info-3.3.24.tgz#bac311e940a31f37a120833220f606ecc2fc10d0" - integrity sha512-U3/i80jPZCTdYzUqOJ18uwPpaIjwuNMtHEfy0ZBUXRCKrTf0ma/AMlnG3luQdfinSPqm94+Hbt3mFV7Ci8/xnA== +"@salesforce/plugin-info@^3.3.28": + version "3.3.28" + resolved "https://registry.yarnpkg.com/@salesforce/plugin-info/-/plugin-info-3.3.28.tgz#4cd1e234344ea835475775a28b276bad6e6a492c" + integrity sha512-4ulrmW3ldcDz2mcirGomgxnkhy5mPh5kc6iNXiENs4RsfNoKrKPBeB8jexk4BQFxlRBLEd2DbBR4np68Ys75kQ== dependencies: - "@inquirer/input" "^2.2.4" + "@inquirer/input" "^2.2.7" "@jsforce/jsforce-node" "^3.2.2" "@oclif/core" "^4" - "@salesforce/core" "^8.2.7" - "@salesforce/kit" "^3.1.6" - "@salesforce/sf-plugins-core" "^11.1.2" + "@salesforce/core" "^8.3.0" + "@salesforce/kit" "^3.2.1" + "@salesforce/sf-plugins-core" "^11.2.4" got "^13.0.0" marked "^4.3.0" marked-terminal "^4.2.0" @@ -1699,7 +1699,7 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.9.0.tgz#ba477a112653a20b4edcf989c61c57bdff9aa3ca" integrity sha512-LiN37zG5ODT6z70sL1fxF7BQwtCX9JOWofSU8iliSNIM+WDEeinnoFtVqPInRSNt8I0RiJxIKCrqstsmQRBNvA== -"@salesforce/sf-plugins-core@^11.1.2", "@salesforce/sf-plugins-core@^11.2.0", "@salesforce/sf-plugins-core@^11.3.2": +"@salesforce/sf-plugins-core@^11.2.4", "@salesforce/sf-plugins-core@^11.3.0", "@salesforce/sf-plugins-core@^11.3.2": version "11.3.2" resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-11.3.2.tgz#8a4ffde0bbef88fe4d669844a119e8f436d6b0ab" integrity sha512-QyFX/PBzw/hkBUJFl1HH+g7ghRSIwWy9Y0NZgCQgWQQJtV6Sfi4fyeaUafsiOjVnyCqa+r+tWHV/JgRr2yK9NA== @@ -1751,10 +1751,10 @@ shelljs "^0.8.4" sinon "^10.0.0" -"@salesforce/source-tracking@^7.1.6": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.1.6.tgz#88fd5defd48521af4531ec4b1e13f699178cbf0f" - integrity sha512-WGGl95p0h5Ai26Fqg7C9DjYZCXJXjGQ4ZWnMyiBPZy1ZiBAIbz0nlvGX1t2+4n3aBNSuZ5dNv0b/c3MCegsEnw== +"@salesforce/source-tracking@^7.1.7": + version "7.1.7" + resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.1.7.tgz#cb2bc65060dd7d25a09e76457caa04d877db5b31" + integrity sha512-qsuP15HqldepAtIdlprlP+hBBtqku1wVEq24nlfGMirHTfaOXZgCKxvbk9JhYrpjNRIdJCyrdBq3et6Z7WJdAA== dependencies: "@oclif/core" "^4.0.17" "@salesforce/core" "^8.4.0" @@ -1775,7 +1775,7 @@ sinon "^5.1.1" tslib "^2.6.3" -"@salesforce/ts-types@^2.0.10", "@salesforce/ts-types@^2.0.12": +"@salesforce/ts-types@^2.0.10", "@salesforce/ts-types@^2.0.11", "@salesforce/ts-types@^2.0.12": version "2.0.12" resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.12.tgz#60420622812a7ec7e46d220667bc29b42dc247ff" integrity sha512-BIJyduJC18Kc8z+arUm5AZ9VkPRyw1KKAm+Tk+9LT99eOzhNilyfKzhZ4t+tG2lIGgnJpmytZfVDZ0e2kFul8g== @@ -7520,16 +7520,7 @@ static-eval@2.0.2: dependencies: escodegen "^1.8.1" -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -7598,14 +7589,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -8182,7 +8166,7 @@ workerpool@^6.5.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -8200,15 +8184,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From e122e725bd8cf0efce0a3f4c76e053ab718f897a Mon Sep 17 00:00:00 2001 From: mshanemc Date: Fri, 16 Aug 2024 11:19:44 -0500 Subject: [PATCH 11/11] fix: always display the "no main/default" warning even in dry-run --- src/commands/project/convert/source-behavior.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/commands/project/convert/source-behavior.ts b/src/commands/project/convert/source-behavior.ts index 519fd426..c53834a3 100644 --- a/src/commands/project/convert/source-behavior.ts +++ b/src/commands/project/convert/source-behavior.ts @@ -65,11 +65,12 @@ export default class ConvertSourceBehavior extends SfCommand