diff --git a/package.json b/package.json index 7a9f58a8..bca17552 100644 --- a/package.json +++ b/package.json @@ -12,14 +12,14 @@ "@salesforce/plugin-info": "^3.1.0", "@salesforce/sf-plugins-core": "^8.0.2", "@salesforce/source-deploy-retrieve": "^10.7.0", - "@salesforce/source-tracking": "^5.2.1", + "@salesforce/source-tracking": "^5.2.4", "@salesforce/ts-types": "^2.0.9", "chalk": "^5.3.0" }, "devDependencies": { "@oclif/plugin-command-snapshot": "^5.1.4", "@salesforce/cli-plugins-testkit": "^5.1.13", - "@salesforce/dev-scripts": "^8.4.3", + "@salesforce/dev-scripts": "^8.5.0", "@salesforce/plugin-command-reference": "^3.0.73", "@salesforce/source-testkit": "^2.1.108", "@salesforce/ts-sinon": "^1.4.19", diff --git a/src/commands/project/convert/mdapi.ts b/src/commands/project/convert/mdapi.ts index 3f727111..6df641c8 100644 --- a/src/commands/project/convert/mdapi.ts +++ b/src/commands/project/convert/mdapi.ts @@ -30,12 +30,13 @@ import { MetadataConvertResultFormatter } from '../../../formatters/metadataConv Messages.importMessagesDirectoryFromMetaUrl(import.meta.url); const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'convert.mdapi'); -export interface EnsureFsFlagOptions { +export type EnsureFsFlagOptions = { flagName: string; path: string; type: 'dir' | 'file' | 'any'; throwOnENOENT?: boolean; -} +}; + export class Mdapi extends SfCommand { public static readonly aliases = ['force:mdapi:convert']; public static readonly deprecateAliases = true; diff --git a/src/utils/deploy.ts b/src/utils/deploy.ts index 6a292380..dcd820c8 100644 --- a/src/utils/deploy.ts +++ b/src/utils/deploy.ts @@ -145,13 +145,12 @@ export async function executeDeploy( await deploy.start(); } } else { - // mdapi format deploys don't require a project, but at this point we need one - project ??= await SfProject.resolve(); // instantiate source tracking // stl will decide, based on the org's properties, what needs to be done const stl = await SourceTracking.create({ org, - project, + // mdapi format deploys don't require a project, but at this point we need one + project: project ?? (await SfProject.resolve()), subscribeSDREvents: true, ignoreConflicts: opts['ignore-conflicts'], }); diff --git a/src/utils/flags.ts b/src/utils/flags.ts index 8734c3a1..668e04c1 100644 --- a/src/utils/flags.ts +++ b/src/utils/flags.ts @@ -52,13 +52,13 @@ async function ensureDirectoryPath(path: string): Promise { return resolvedPath; } -function resolveZipFileName(zipFileName?: string): string { +const resolveZipFileName = (zipFileName?: string): string => { if (!zipFileName) { return DEFAULT_ZIP_FILE_NAME; } // If no file extension was provided append, '.zip' - return !extname(zipFileName) ? (zipFileName += '.zip') : zipFileName; -} + return !extname(zipFileName) ? `${zipFileName}.zip` : zipFileName; +}; export const DEFAULT_ZIP_FILE_NAME = 'unpackaged.zip'; diff --git a/src/utils/previewOutput.ts b/src/utils/previewOutput.ts index 17cf6468..07f2375e 100644 --- a/src/utils/previewOutput.ts +++ b/src/utils/previewOutput.ts @@ -42,13 +42,13 @@ export type PreviewFile = { operation?: BaseOperation | 'deletePost' | 'deletePre'; }; -export interface PreviewResult { +export type PreviewResult = { ignored: PreviewFile[]; conflicts: PreviewFile[]; toDeploy: PreviewFile[]; toDelete: PreviewFile[]; toRetrieve: PreviewFile[]; -} +}; const ensureAbsolutePath = (f: string): string => (isAbsolute(f) ? f : resolve(f)); diff --git a/test/nuts/convert/mdapi.nut.ts b/test/nuts/convert/mdapi.nut.ts index 19919e0a..02ef44ff 100644 --- a/test/nuts/convert/mdapi.nut.ts +++ b/test/nuts/convert/mdapi.nut.ts @@ -14,7 +14,7 @@ import { ConvertMdapiJson } from '../../../src/utils/types.js'; let session: TestSession; const writeManifest = (manifestPath: string, contents?: string) => { - contents ??= ` + const defaultContents = ` * @@ -22,7 +22,7 @@ const writeManifest = (manifestPath: string, contents?: string) => { 53.0 `; - fs.writeFileSync(manifestPath, contents); + fs.writeFileSync(manifestPath, contents ?? defaultContents); }; describe('project convert mdapi NUTs', () => { diff --git a/test/nuts/convert/source.nut.ts b/test/nuts/convert/source.nut.ts index 359d8c63..f96fa475 100644 --- a/test/nuts/convert/source.nut.ts +++ b/test/nuts/convert/source.nut.ts @@ -13,7 +13,7 @@ import { ConvertResultJson } from '../../../src/utils/types.js'; let session: TestSession; const writeManifest = (manifestPath: string, contents?: string) => { - contents ??= ` + const defaultContents = ` * @@ -21,7 +21,7 @@ const writeManifest = (manifestPath: string, contents?: string) => { 53.0 `; - fs.writeFileSync(manifestPath, contents); + fs.writeFileSync(manifestPath, contents ?? defaultContents); }; describe('project convert source NUTs', () => { diff --git a/test/nuts/digitalExperienceBundle/helper.ts b/test/nuts/digitalExperienceBundle/helper.ts index e4104371..29fd46b2 100644 --- a/test/nuts/digitalExperienceBundle/helper.ts +++ b/test/nuts/digitalExperienceBundle/helper.ts @@ -4,6 +4,9 @@ * 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 */ +// existing tests do a lot mutation. I decided to leave rather than refactor +/* eslint-disable no-param-reassign */ + import { join, relative } from 'node:path'; import * as fs from 'node:fs'; import { FileResponse } from '@salesforce/source-deploy-retrieve'; diff --git a/test/nuts/specialTypes/folderTypes.nut.ts b/test/nuts/specialTypes/folderTypes.nut.ts index 9706506a..8ace99cf 100644 --- a/test/nuts/specialTypes/folderTypes.nut.ts +++ b/test/nuts/specialTypes/folderTypes.nut.ts @@ -72,11 +72,10 @@ describe('metadata types that go in folders', () => { ]; const getRelativeFileResponses = (resp: FileResponse[]) => - resp.map((s) => { - // grab the last 2 directories with the file only - s.filePath = s.filePath?.split(path.sep).slice(-3).join(path.sep); - return s; - }); + resp.map((fr) => ({ + ...fr, + filePath: fr.filePath?.split(path.sep).slice(-3).join(path.sep), + })); it('can generate manifest for just the emailTemplates', () => { const pathToEmails = path.join('force-app', 'main', 'default', 'email'); diff --git a/yarn.lock b/yarn.lock index 770c6cee..ad249c2c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1137,27 +1137,7 @@ strip-ansi "^6.0.1" wrap-ansi "^6.2.0" -"@inquirer/core@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-7.1.0.tgz#fb78738fd6624de50f027c08d6f24298b72a402b" - integrity sha512-FRCiDiU54XHt5B/D8hX4twwZuzSP244ANHbu3R7CAsJfiv1dUOz24ePBgCZjygEjDUi6BWIJuk4eWLKJ7LATUw== - dependencies: - "@inquirer/type" "^1.2.1" - "@types/mute-stream" "^0.0.4" - "@types/node" "^20.11.26" - "@types/wrap-ansi" "^3.0.0" - ansi-escapes "^4.3.2" - chalk "^4.1.2" - cli-spinners "^2.9.2" - cli-width "^4.1.0" - figures "^3.2.0" - mute-stream "^1.0.0" - run-async "^3.0.0" - signal-exit "^4.1.0" - strip-ansi "^6.0.1" - wrap-ansi "^6.2.0" - -"@inquirer/core@^7.1.2": +"@inquirer/core@^7.1.0", "@inquirer/core@^7.1.2": version "7.1.2" resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-7.1.2.tgz#f16222e8838193c29a868d9d6d5ae3b79313342f" integrity sha512-ne5VhDqruYYzx8mmjDZ9F58ymrLJGxmSHJUcJGiW3tifzvl3goAm6gNX11w6+zUnGE54vgQ6ALDXL3IOSezMRw== @@ -1451,23 +1431,23 @@ resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.1.0.tgz#e529576466d074e7a5f1441236510fef123da01e" integrity sha512-2iDDepiIwjXHS5IVY7pwv8jMo4xWosJ7p/UTj+lllpB/gnJiYLhjJPE4Z3FCGFKyvfg5jGaimCd8Ca6bLGsCQA== -"@salesforce/dev-scripts@^8.4.3": - version "8.4.3" - resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-8.4.3.tgz#b2bff106301bc238088c069a801eb7c998792540" - integrity sha512-FR40IfEYFewIsN4OQ5WzFxl2t+/V4kZ005MRzAvcvq98FUUMGVkrMMrWNkjMBQHJNL41mpK6DR7xcQuY1DkZ2w== +"@salesforce/dev-scripts@^8.5.0": + version "8.5.0" + resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-8.5.0.tgz#b0b44ca595450328c6186968528d9c0ef06cd27e" + integrity sha512-vR+CB5VoQrNAqNTcu5GZ/l4I4Rxd5HkIj/qTxEzP1EYnIlgjrbcsQgaunSnTrttIEy/BD8epd6UWAT8yAItufg== dependencies: "@commitlint/cli" "^17.1.2" "@commitlint/config-conventional" "^17.8.1" "@salesforce/dev-config" "^4.1.0" "@salesforce/prettier-config" "^0.0.3" - "@types/chai" "^4.3.11" + "@types/chai" "^4.3.14" "@types/mocha" "^10.0.6" "@types/node" "^18.19.28" "@types/sinon" "^10.0.20" chai "^4.3.10" chalk "^4.0.0" - cosmiconfig "^7.0.0" - eslint-config-salesforce-typescript "^3.2.12" + cosmiconfig "^8.3.6" + eslint-config-salesforce-typescript "^3.3.0" husky "^7.0.4" linkinator "^6.0.4" mocha "^10.4.0" @@ -1558,10 +1538,10 @@ "@salesforce/ts-types" "^2.0.9" chalk "^5.3.0" -"@salesforce/source-deploy-retrieve@^10.5.5", "@salesforce/source-deploy-retrieve@^10.6.1", "@salesforce/source-deploy-retrieve@^10.7.0": - version "10.7.0" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.7.0.tgz#1aff894bd86671b27ab4a7e68741f99851dde402" - integrity sha512-4MI8+m0yTdxTiJFel0OesS/pMWvypGA0/Nti0PJE2h2LMkwTLAlzBZugqe2NsNAcv+64cxYLZ0pFGEdoOVlx/g== +"@salesforce/source-deploy-retrieve@^10.5.5", "@salesforce/source-deploy-retrieve@^10.7.0", "@salesforce/source-deploy-retrieve@^10.9.1": + version "10.9.1" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.9.1.tgz#315981e58e684b4fe49dd812b3e3c6a3daf92bf6" + integrity sha512-FmSO6F4DFv7CqtFIzs0v8yuMlEie+hG2fq7QrBmhBxd6+1WNfk7wM3vXZyO0zOv9uarkILStB5+Dy91DYVrRHw== dependencies: "@salesforce/core" "^6.7.3" "@salesforce/kit" "^3.1.0" @@ -1593,15 +1573,15 @@ shelljs "^0.8.4" sinon "^10.0.0" -"@salesforce/source-tracking@^5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-5.2.1.tgz#aaaa8e5e00db017aeb0787fe042ee0cd45763fb9" - integrity sha512-RnFuESSVNn4kxGbGE/a8AdKZrxt4vo7JT32NkTr7RBKokzkpczIacIDHcFGqkDLX409fZcAD4HDdvYBRpSFudw== +"@salesforce/source-tracking@^5.2.4": + version "5.2.4" + resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-5.2.4.tgz#3e229f3105f780056315d85d6b7600ad113943a5" + integrity sha512-n3X8F9Pb2teuGgcip5dE8WuANC/oPXh6FubTNDFFA5DxPuXHARrYsG6BZQdo4EVFe+7kEzyeitESQ9cdcm9xNQ== dependencies: "@oclif/core" "^3.26.0" - "@salesforce/core" "^6.7.3" + "@salesforce/core" "^6.7.6" "@salesforce/kit" "^3.1.0" - "@salesforce/source-deploy-retrieve" "^10.6.1" + "@salesforce/source-deploy-retrieve" "^10.9.1" "@salesforce/ts-types" "^2.0.9" fast-xml-parser "^4.3.6" graceful-fs "^4.2.11" @@ -1660,13 +1640,6 @@ dependencies: type-detect "4.0.8" -"@sinonjs/fake-timers@^10.0.2": - version "10.2.0" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.2.0.tgz#b3e322a34c5f26e3184e7f6115695f299c1b1194" - integrity sha512-OPwQlEdg40HAj5KNF8WW6q2KG4Z+cBCZb3m4ninfTZKaBmbIJodviQsDBoYMPHkOyJJMHnOJo5j2+LKDOhOACg== - dependencies: - "@sinonjs/commons" "^3.0.0" - "@sinonjs/fake-timers@^11.2.2": version "11.2.2" resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz#50063cc3574f4a27bd8453180a04171c85cc9699" @@ -2258,10 +2231,10 @@ "@types/node" "*" "@types/responselike" "^1.0.0" -"@types/chai@^4.3.11": - version "4.3.11" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.11.tgz#e95050bf79a932cb7305dd130254ccdf9bde671c" - integrity sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ== +"@types/chai@^4.3.14": + version "4.3.14" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.14.tgz#ae3055ea2be43c91c9fd700a36d67820026d96e6" + integrity sha512-Wj71sXE4Q4AkGdG9Tvq1u/fquNz9EdG4LIJMwVVII7ashjD/8cf8fyIfJAjRr6YcsXnSE8cOGQPq1gqeR8z+3w== "@types/cli-progress@^3.11.5": version "3.11.5" @@ -2361,10 +2334,10 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@^20.10.7", "@types/node@^20.11.26": - version "20.11.30" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.30.tgz#9c33467fc23167a347e73834f788f4b9f399d66f" - integrity sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw== +"@types/node@*", "@types/node@^20.10.7", "@types/node@^20.12.4": + version "20.12.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.5.tgz#74c4f31ab17955d0b5808cdc8fd2839526ad00b3" + integrity sha512-BD+BjQ9LS/D8ST9p5uqBxghlN+S42iuNxjsUGjeZobe/ciXzk2qb1B6IXc6AnRLS+yFJRpN2IPEHMzwspfDJNw== dependencies: undici-types "~5.26.4" @@ -2380,23 +2353,11 @@ dependencies: undici-types "~5.26.4" -"@types/node@^20.12.4": - version "20.12.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.5.tgz#74c4f31ab17955d0b5808cdc8fd2839526ad00b3" - integrity sha512-BD+BjQ9LS/D8ST9p5uqBxghlN+S42iuNxjsUGjeZobe/ciXzk2qb1B6IXc6AnRLS+yFJRpN2IPEHMzwspfDJNw== - dependencies: - undici-types "~5.26.4" - "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== -"@types/parse-json@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== - "@types/responselike@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" @@ -3457,25 +3418,14 @@ cosmiconfig-typescript-loader@^4.0.0: resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz#c4259ce474c9df0f32274ed162c0447c951ef073" integrity sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q== -cosmiconfig@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" - integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA== +cosmiconfig@^8.0.0, cosmiconfig@^8.3.6: + version "8.3.6" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3" + integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA== dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" - -cosmiconfig@^8.0.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd" - integrity sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ== - dependencies: - import-fresh "^3.2.1" + import-fresh "^3.3.0" js-yaml "^4.1.0" - parse-json "^5.0.0" + parse-json "^5.2.0" path-type "^4.0.0" crc-32@^1.2.0: @@ -3933,10 +3883,10 @@ eslint-config-salesforce-license@^0.2.0: resolved "https://registry.yarnpkg.com/eslint-config-salesforce-license/-/eslint-config-salesforce-license-0.2.0.tgz#323193f1aa15dd33fbf108d25fc1210afc11065e" integrity sha512-DJdBvgj82Erum82YMe+YvG/o6ukna3UA++lRl0HSTldj0VlBl3Q8hzCp97nRXZHra6JH1I912yievZzklXDw6w== -eslint-config-salesforce-typescript@^3.2.12: - version "3.2.12" - resolved "https://registry.yarnpkg.com/eslint-config-salesforce-typescript/-/eslint-config-salesforce-typescript-3.2.12.tgz#be87ce5ab9a846ac577c1aa7441fc63c6a675d40" - integrity sha512-dCXU2V7DE8woGtfEZyxD9hSX3F+ZS/26nS6oG963I7/p9aeA1S6apPR1v3kV7o9VDR86ry1OIFbvK//1oDcz/w== +eslint-config-salesforce-typescript@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/eslint-config-salesforce-typescript/-/eslint-config-salesforce-typescript-3.3.0.tgz#308acead1909665a92e9d32895c592ec4c9ee87a" + integrity sha512-83+zp2Y2h9oz9D3UksjNGCw+xWD7ylIiAJZ58vUbBD10l8FRUMNyn+RDCKn0xCQz7xed5/LcmgUE4T7roe+HBw== dependencies: "@typescript-eslint/eslint-plugin" "^6.21.0" "@typescript-eslint/parser" "^6.21.0" @@ -4941,7 +4891,7 @@ immediate@~3.0.5: resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ== -import-fresh@^3.0.0, import-fresh@^3.2.1: +import-fresh@^3.0.0, import-fresh@^3.2.1, import-fresh@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== @@ -6173,18 +6123,7 @@ nise@^4.1.0: just-extend "^4.0.2" path-to-regexp "^1.7.0" -nise@^5.0.1: - version "5.1.4" - resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.4.tgz#491ce7e7307d4ec546f5a659b2efe94a18b4bbc0" - integrity sha512-8+Ib8rRJ4L0o3kfmyVCL7gzrohyDe0cMFTBa2d364yIrEGMEoetznKJx899YxjybU6bL9SQkYPSBBs1gyYs8Xg== - dependencies: - "@sinonjs/commons" "^2.0.0" - "@sinonjs/fake-timers" "^10.0.2" - "@sinonjs/text-encoding" "^0.7.1" - just-extend "^4.0.2" - path-to-regexp "^1.7.0" - -nise@^5.1.5: +nise@^5.0.1, nise@^5.1.5: version "5.1.9" resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.9.tgz#0cb73b5e4499d738231a473cd89bd8afbb618139" integrity sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww== @@ -6566,7 +6505,7 @@ parse-json@^4.0.0: error-ex "^1.3.1" json-parse-better-errors "^1.0.1" -parse-json@^5.0.0: +parse-json@^5.0.0, parse-json@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== @@ -8246,11 +8185,6 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yaml@^1.10.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== - yargs-parser@20.2.4: version "20.2.4" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"