From bd621b46904a0d06c35e6bd05b825c3fc9b8249e Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 27 Mar 2024 10:00:58 -0400 Subject: [PATCH 1/6] Update Zowe deps to fix handling of invalid ds member names Signed-off-by: Timothy Johnson --- .../i18n/sample/src/dataset/ZoweDatasetNode.i18n.json | 2 +- packages/zowe-explorer/src/dataset/ZoweDatasetNode.ts | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/zowe-explorer/i18n/sample/src/dataset/ZoweDatasetNode.i18n.json b/packages/zowe-explorer/i18n/sample/src/dataset/ZoweDatasetNode.i18n.json index 6605b1187d..4c20bd1d02 100644 --- a/packages/zowe-explorer/i18n/sample/src/dataset/ZoweDatasetNode.i18n.json +++ b/packages/zowe-explorer/i18n/sample/src/dataset/ZoweDatasetNode.i18n.json @@ -2,7 +2,7 @@ "getChildren.search": "Use the search button to display data sets", "getChildren.error.invalidNode": "Invalid node", "getChildren.responses.error": "The response from Zowe CLI was not successful", - "getChildren.invalidMember": "Cannot access member with control characters in the name: {0}", + "getChildren.invalidMember": "Failed to load members with control characters in the name", "getChildren.noDataset": "No data sets found", "getDataSets.error.sessionMissing": "Profile auth error", "getDataSets.error.additionalDetails": "Profile is not authenticated, please log in to continue", diff --git a/packages/zowe-explorer/src/dataset/ZoweDatasetNode.ts b/packages/zowe-explorer/src/dataset/ZoweDatasetNode.ts index 3a98412f95..410ea5ad0f 100644 --- a/packages/zowe-explorer/src/dataset/ZoweDatasetNode.ts +++ b/packages/zowe-explorer/src/dataset/ZoweDatasetNode.ts @@ -246,7 +246,7 @@ export class ZoweDatasetNode extends ZoweTreeNode implements IZoweDatasetTreeNod elementChildren[temp.label.toString()] = temp; } else { // Creates a ZoweDatasetNode for a PDS member - const memberInvalid = item.member?.includes("\ufffd"); + const memberInvalid = item.member?.startsWith("…"); const cachedEncoding = this.getSessionNode().encodingMap[`${item.dsname as string}(${item.member as string})`]; const temp = new ZoweDatasetNode({ label: item.member, @@ -260,7 +260,7 @@ export class ZoweDatasetNode extends ZoweTreeNode implements IZoweDatasetTreeNod temp.command = { command: "zowe.ds.ZoweNode.openPS", title: "", arguments: [temp] }; } else { temp.errorDetails = new zowe.imperative.ImperativeError({ - msg: localize("getChildren.invalidMember", "Cannot access member with control characters in the name: {0}", item.member), + msg: localize("getChildren.invalidMember", "Failed to load members with control characters in the name"), }); } @@ -317,6 +317,9 @@ export class ZoweDatasetNode extends ZoweTreeNode implements IZoweDatasetTreeNod const aParent = a.getParent(); if (aParent == null || !contextually.isPds(aParent)) { return (a.label as string) < (b.label as string) ? -1 : 1; + } else if ((a.label as string).startsWith("…") || (b.label as string).startsWith("…")) { + // Keep invalid member nodes at bottom ("... N more members") + return (a.label as string).startsWith("…") ? 1 : -1; } const sortLessThan = sort.direction == SortDirection.Ascending ? -1 : 1; From decd90af2e8f510c6d0d8321d37dc7dfa58cc822 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 27 Mar 2024 17:02:11 -0400 Subject: [PATCH 2/6] Improve UX for ds members with errors Co-authored-by: Trae Yelovich Signed-off-by: Timothy Johnson --- .../src/dataset/ZoweDatasetNode.i18n.json | 2 +- packages/zowe-explorer/package.json | 5 +++ .../resources/dark/fileError.svg | 4 +- .../resources/light/fileError.svg | 4 +- .../src/dataset/ZoweDatasetNode.ts | 42 +++++++++++++------ packages/zowe-explorer/src/globals.ts | 1 + packages/zowe-explorer/src/shared/init.ts | 5 +++ 7 files changed, 46 insertions(+), 17 deletions(-) diff --git a/packages/zowe-explorer/i18n/sample/src/dataset/ZoweDatasetNode.i18n.json b/packages/zowe-explorer/i18n/sample/src/dataset/ZoweDatasetNode.i18n.json index 4c20bd1d02..2a25c1284c 100644 --- a/packages/zowe-explorer/i18n/sample/src/dataset/ZoweDatasetNode.i18n.json +++ b/packages/zowe-explorer/i18n/sample/src/dataset/ZoweDatasetNode.i18n.json @@ -2,7 +2,7 @@ "getChildren.search": "Use the search button to display data sets", "getChildren.error.invalidNode": "Invalid node", "getChildren.responses.error": "The response from Zowe CLI was not successful", - "getChildren.invalidMember": "Failed to load members with control characters in the name", + "getChildren.invalidMember": "{0} members failed to load due to invalid name errors for {1}", "getChildren.noDataset": "No data sets found", "getDataSets.error.sessionMissing": "Profile auth error", "getDataSets.error.additionalDetails": "Profile is not authenticated, please log in to continue", diff --git a/packages/zowe-explorer/package.json b/packages/zowe-explorer/package.json index 970111369c..e8b55cd1f8 100644 --- a/packages/zowe-explorer/package.json +++ b/packages/zowe-explorer/package.json @@ -820,6 +820,11 @@ "command": "zowe.uss.openWithEncoding", "title": "%openWithEncoding%", "category": "Zowe Explorer" + }, + { + "command": "zowe.placeholderCommand", + "title": "%zowe.placeholderCommand%", + "enablement": "false" } ], "menus": { diff --git a/packages/zowe-explorer/resources/dark/fileError.svg b/packages/zowe-explorer/resources/dark/fileError.svg index b7848d5ad2..ffa06767f6 100644 --- a/packages/zowe-explorer/resources/dark/fileError.svg +++ b/packages/zowe-explorer/resources/dark/fileError.svg @@ -1,4 +1,4 @@ - - + + diff --git a/packages/zowe-explorer/resources/light/fileError.svg b/packages/zowe-explorer/resources/light/fileError.svg index b1fd834dee..16d5a39db4 100644 --- a/packages/zowe-explorer/resources/light/fileError.svg +++ b/packages/zowe-explorer/resources/light/fileError.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/packages/zowe-explorer/src/dataset/ZoweDatasetNode.ts b/packages/zowe-explorer/src/dataset/ZoweDatasetNode.ts index 410ea5ad0f..c06fe0c014 100644 --- a/packages/zowe-explorer/src/dataset/ZoweDatasetNode.ts +++ b/packages/zowe-explorer/src/dataset/ZoweDatasetNode.ts @@ -201,6 +201,7 @@ export class ZoweDatasetNode extends ZoweTreeNode implements IZoweDatasetTreeNod contextOverride: globals.DS_FILE_ERROR_CONTEXT, profile: this.getProfile(), }); + temp.command = { command: "zowe.placeholderCommand", title: "" }; temp.errorDetails = item.error; // Save imperative error to avoid extra z/OS requests elementChildren[temp.label.toString()] = temp; // Creates a ZoweDatasetNode for a migrated dataset @@ -246,29 +247,46 @@ export class ZoweDatasetNode extends ZoweTreeNode implements IZoweDatasetTreeNod elementChildren[temp.label.toString()] = temp; } else { // Creates a ZoweDatasetNode for a PDS member - const memberInvalid = item.member?.startsWith("…"); const cachedEncoding = this.getSessionNode().encodingMap[`${item.dsname as string}(${item.member as string})`]; const temp = new ZoweDatasetNode({ label: item.member, collapsibleState: vscode.TreeItemCollapsibleState.None, parentNode: this, - contextOverride: memberInvalid ? globals.DS_FILE_ERROR_CONTEXT : undefined, encoding: cachedEncoding, profile: this.getProfile(), }); - if (!memberInvalid) { - temp.command = { command: "zowe.ds.ZoweNode.openPS", title: "", arguments: [temp] }; - } else { - temp.errorDetails = new zowe.imperative.ImperativeError({ - msg: localize("getChildren.invalidMember", "Failed to load members with control characters in the name"), - }); - } + temp.command = { command: "zowe.ds.ZoweNode.openPS", title: "", arguments: [temp] }; // get user and last modified date for sorting, if available temp.updateStats(item); elementChildren[temp.label.toString()] = temp; } } + + if ( + response.apiResponse.items && + response.apiResponse.returnedRows && + response.apiResponse.items.length < response.apiResponse.returnedRows + ) { + const invalidMemberCount = response.apiResponse.returnedRows - response.apiResponse.items.length; + const temp = new ZoweDatasetNode({ + label: `${invalidMemberCount} members with errors`, + collapsibleState: vscode.TreeItemCollapsibleState.None, + parentNode: this, + contextOverride: globals.DS_FILE_ERROR_MEMBER_CONTEXT, + profile: this.getProfile(), + }); + temp.command = { command: "zowe.placeholderCommand", title: "" }; + temp.errorDetails = new zowe.imperative.ImperativeError({ + msg: localize( + "getChildren.invalidMember", + "{0} members failed to load due to invalid name errors for {1}", + invalidMemberCount, + this.label as string + ), + }); + elementChildren[temp.label.toString()] = temp; + } } this.dirty = false; @@ -317,9 +335,9 @@ export class ZoweDatasetNode extends ZoweTreeNode implements IZoweDatasetTreeNod const aParent = a.getParent(); if (aParent == null || !contextually.isPds(aParent)) { return (a.label as string) < (b.label as string) ? -1 : 1; - } else if ((a.label as string).startsWith("…") || (b.label as string).startsWith("…")) { - // Keep invalid member nodes at bottom ("... N more members") - return (a.label as string).startsWith("…") ? 1 : -1; + } else if (a.contextValue === globals.DS_FILE_ERROR_MEMBER_CONTEXT || b.contextValue === globals.DS_FILE_ERROR_MEMBER_CONTEXT) { + // Keep invalid member node at bottom ("N members with errors") + return a.contextValue === globals.DS_FILE_ERROR_MEMBER_CONTEXT ? 1 : -1; } const sortLessThan = sort.direction == SortDirection.Ascending ? -1 : 1; diff --git a/packages/zowe-explorer/src/globals.ts b/packages/zowe-explorer/src/globals.ts index 6f3ef8ea90..df2ad103d1 100644 --- a/packages/zowe-explorer/src/globals.ts +++ b/packages/zowe-explorer/src/globals.ts @@ -60,6 +60,7 @@ export const DS_MEMBER_CONTEXT = "member"; export const DS_MEMBER_BINARY_CONTEXT = "memberBinary"; export const DS_MIGRATED_FILE_CONTEXT = "migr"; export const DS_FILE_ERROR_CONTEXT = "fileError"; +export const DS_FILE_ERROR_MEMBER_CONTEXT = "fileError_member"; export const USS_SESSION_CONTEXT = "ussSession"; export const USS_DIR_CONTEXT = "directory"; export const USS_FAV_DIR_CONTEXT = "directory_fav"; diff --git a/packages/zowe-explorer/src/shared/init.ts b/packages/zowe-explorer/src/shared/init.ts index 1bec8a1f6c..ce1e1a8ad4 100644 --- a/packages/zowe-explorer/src/shared/init.ts +++ b/packages/zowe-explorer/src/shared/init.ts @@ -204,6 +204,11 @@ export function registerCommonCommands(context: vscode.ExtensionContext, provide } }) ); + context.subscriptions.push( + vscode.commands.registerCommand("zowe.placeholderCommand", () => { + // This command does nothing, its here to let us disable individual items in the tree view + }) + ); } } From bc195beafc8c8c463d9a0b31650bec46b65717b0 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 27 Mar 2024 17:30:04 -0400 Subject: [PATCH 3/6] Fix unit tests for dataset nodes Signed-off-by: Timothy Johnson --- .../__tests__/__unit__/ZoweNode.unit.test.ts | 11 ++++++----- .../__unit__/dataset/DatasetTree.unit.test.ts | 1 + .../__tests__/__unit__/extension.unit.test.ts | 1 + packages/zowe-explorer/src/globals.ts | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/zowe-explorer/__tests__/__unit__/ZoweNode.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/ZoweNode.unit.test.ts index 797d71bc6f..b986075552 100644 --- a/packages/zowe-explorer/__tests__/__unit__/ZoweNode.unit.test.ts +++ b/packages/zowe-explorer/__tests__/__unit__/ZoweNode.unit.test.ts @@ -423,16 +423,17 @@ describe("Unit Tests (Jest)", () => { return { success: true, apiResponse: { - items: [{ member: "BADMEM\ufffd" }, { member: "GOODMEM1" }], + items: [{ member: "MEMBER1" }], + returnedRows: 3, }, }; }); Object.defineProperty(List, "allMembers", { value: allMembers }); const pdsChildren = await pds.getChildren(); - expect(pdsChildren[0].label).toEqual("BADMEM\ufffd"); - expect(pdsChildren[0].contextValue).toEqual(globals.DS_FILE_ERROR_CONTEXT); - expect(pdsChildren[1].label).toEqual("GOODMEM1"); - expect(pdsChildren[1].contextValue).toEqual(globals.DS_MEMBER_CONTEXT); + expect(pdsChildren[0].label).toEqual("MEMBER1"); + expect(pdsChildren[0].contextValue).toEqual(globals.DS_MEMBER_CONTEXT); + expect(pdsChildren[1].label).toEqual("2 members with errors"); + expect(pdsChildren[1].contextValue).toEqual(globals.DS_FILE_ERROR_MEMBER_CONTEXT); getSessionNodeSpy.mockRestore(); }); diff --git a/packages/zowe-explorer/__tests__/__unit__/dataset/DatasetTree.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/dataset/DatasetTree.unit.test.ts index 0f735ff8fc..daa36d9793 100644 --- a/packages/zowe-explorer/__tests__/__unit__/dataset/DatasetTree.unit.test.ts +++ b/packages/zowe-explorer/__tests__/__unit__/dataset/DatasetTree.unit.test.ts @@ -439,6 +439,7 @@ describe("Dataset Tree Unit Tests - Function getChildren", () => { }); const sampleChildren: ZoweDatasetNode[] = [nodeOk, nodeImpError, nodeMigrated]; sampleChildren[0].command = { command: "zowe.ds.ZoweNode.openPS", title: "", arguments: [sampleChildren[0]] }; + sampleChildren[1].command = { command: "zowe.placeholderCommand", title: "" }; const children = await testTree.getChildren(testTree.mSessionNodes[1]); expect(children.map((c) => c.label)).toEqual(sampleChildren.map((c) => c.label)); diff --git a/packages/zowe-explorer/__tests__/__unit__/extension.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/extension.unit.test.ts index 3840f8065a..870903cdd5 100644 --- a/packages/zowe-explorer/__tests__/__unit__/extension.unit.test.ts +++ b/packages/zowe-explorer/__tests__/__unit__/extension.unit.test.ts @@ -259,6 +259,7 @@ async function createGlobalMocks() { "zowe.jobs.deleteProfile", "zowe.issueTsoCmd", "zowe.issueMvsCmd", + "zowe.placeholderCommand", ], }; diff --git a/packages/zowe-explorer/src/globals.ts b/packages/zowe-explorer/src/globals.ts index df2ad103d1..23565ef168 100644 --- a/packages/zowe-explorer/src/globals.ts +++ b/packages/zowe-explorer/src/globals.ts @@ -35,7 +35,7 @@ export let DS_DIR: string; export let CONFIG_PATH; // set during activate export let ISTHEIA = false; // set during activate export let LOG: imperative.Logger; -export const COMMAND_COUNT = 118; +export const COMMAND_COUNT = 119; export const MAX_SEARCH_HISTORY = 5; export const MAX_FILE_HISTORY = 10; export const MS_PER_SEC = 1000; From 19fa4776aff4ad6bf521719218cd3e9f487f86b2 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Tue, 2 Apr 2024 15:18:03 -0400 Subject: [PATCH 4/6] Update cli dependency to 7.24.0 Signed-off-by: Timothy Johnson --- package.json | 2 +- packages/zowe-explorer-api/package.json | 2 +- .../webpack.config.js | 5 + packages/zowe-explorer/webpack.config.js | 5 + samples/uss-profile-sample/package.json | 2 +- yarn.lock | 293 ++++++++++-------- 6 files changed, 179 insertions(+), 130 deletions(-) diff --git a/package.json b/package.json index 832bc0815a..d027c3b356 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "vscode": "^1.53.2" }, "dependencies": { - "@zowe/cli": "7.23.6", + "@zowe/cli": "7.24.0", "vscode-nls": "4.1.2" }, "devDependencies": { diff --git a/packages/zowe-explorer-api/package.json b/packages/zowe-explorer-api/package.json index eaff70adc3..db3af2cef5 100644 --- a/packages/zowe-explorer-api/package.json +++ b/packages/zowe-explorer-api/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "@types/vscode": "^1.53.2", - "@zowe/cli": "7.23.6", + "@zowe/cli": "7.24.0", "@zowe/secrets-for-zowe-sdk": "7.18.6", "handlebars": "^4.7.7", "semver": "^7.5.3" diff --git a/packages/zowe-explorer-ftp-extension/webpack.config.js b/packages/zowe-explorer-ftp-extension/webpack.config.js index 9968b1ca99..a30f819c8e 100644 --- a/packages/zowe-explorer-ftp-extension/webpack.config.js +++ b/packages/zowe-explorer-ftp-extension/webpack.config.js @@ -82,6 +82,11 @@ const config = { }, ], }, + { + test: /\.mjs$/, + include: /markdown-it/, + type: "javascript/auto", + }, ], }, plugins: [new webpack.BannerPlugin(fs.readFileSync("../../scripts/LICENSE_HEADER", "utf-8"))], diff --git a/packages/zowe-explorer/webpack.config.js b/packages/zowe-explorer/webpack.config.js index b8e81d407d..5c2b67b47b 100644 --- a/packages/zowe-explorer/webpack.config.js +++ b/packages/zowe-explorer/webpack.config.js @@ -84,6 +84,11 @@ const config = { }, ], }, + { + test: /\.mjs$/, + include: /markdown-it/, + type: "javascript/auto", + }, ], }, plugins: [ diff --git a/samples/uss-profile-sample/package.json b/samples/uss-profile-sample/package.json index d0baf0418d..71cfd6f620 100644 --- a/samples/uss-profile-sample/package.json +++ b/samples/uss-profile-sample/package.json @@ -33,7 +33,7 @@ "watch": "tsc -watch -p ./" }, "dependencies": { - "@zowe/cli": "7.23.6", + "@zowe/cli": "7.24.0", "@zowe/zowe-explorer-api": "file:../../packages/zowe-explorer-api", "ssh2-sftp-client": "^9.1.0" }, diff --git a/yarn.lock b/yarn.lock index 0da05409bf..321c4432f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1984,15 +1984,15 @@ fastq "^1.6.0" "@npmcli/agent@^2.0.0": - version "2.2.1" - resolved "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.1.tgz#8aa677d0a4136d57524336a35d5679aedf2d56f7" - integrity sha512-H4FrOVtNyWC8MUwL3UfjOsAihHvT1Pe8POj3JvjXhSTJipsZMtgUALCT4mGyYZNxymkUfOw3PUj6dE4QPp6osQ== + version "2.2.2" + resolved "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5" + integrity sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og== dependencies: agent-base "^7.1.0" http-proxy-agent "^7.0.0" https-proxy-agent "^7.0.1" lru-cache "^10.0.1" - socks-proxy-agent "^8.0.1" + socks-proxy-agent "^8.0.3" "@npmcli/fs@^1.0.0": version "1.1.1" @@ -2135,15 +2135,15 @@ dependencies: "@sigstore/protobuf-specs" "^0.3.0" -"@sigstore/core@^1.0.0": - version "1.0.0" - resolved "https://registry.npmjs.org/@sigstore/core/-/core-1.0.0.tgz#0fcdb32d191d4145a70cb837061185353b3b08e3" - integrity sha512-dW2qjbWLRKGu6MIDUTBuJwXCnR8zivcSpf5inUzk7y84zqy/dji0/uahppoIgMoKeR+6pUZucrwHfkQQtiG9Rw== +"@sigstore/core@^1.0.0", "@sigstore/core@^1.1.0": + version "1.1.0" + resolved "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz#5583d8f7ffe599fa0a89f2bf289301a5af262380" + integrity sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg== "@sigstore/protobuf-specs@^0.3.0": - version "0.3.0" - resolved "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.0.tgz#bdcc773671f625bb81591bca86ec5314d57297f3" - integrity sha512-zxiQ66JFOjVvP9hbhGj/F/qNdsZfkGb/dVXSanNRNuAzMlr4MC95voPUBX8//ZNnmv3uSYzdfR/JSkrgvZTGxA== + version "0.3.1" + resolved "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.1.tgz#7095819fa7c5743efde48a858c37b30fab190a09" + integrity sha512-aIL8Z9NsMr3C64jyQzE0XlkEyBLpgEJJFDHLVVStkFV5Q3Il/r/YtY6NJWKQ4cy4AE7spP1IX5Jq7VCAxHHMfQ== "@sigstore/sign@^2.2.3": version "2.2.3" @@ -2156,20 +2156,20 @@ make-fetch-happen "^13.0.0" "@sigstore/tuf@^2.3.1": - version "2.3.1" - resolved "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.1.tgz#86ff3c3c907e271696c88de0108d9063a8cbcc45" - integrity sha512-9Iv40z652td/QbV0o5n/x25H9w6IYRt2pIGbTX55yFDYlApDQn/6YZomjz6+KBx69rXHLzHcbtTS586mDdFD+Q== + version "2.3.2" + resolved "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.2.tgz#e9c5bffc2a5f3434f87195902d7f9cd7f48c70fa" + integrity sha512-mwbY1VrEGU4CO55t+Kl6I7WZzIl+ysSzEYdA1Nv/FTrl2bkeaPXo5PnWZAVfcY2zSdhOpsUTJW67/M2zHXGn5w== dependencies: "@sigstore/protobuf-specs" "^0.3.0" tuf-js "^2.2.0" "@sigstore/verify@^1.1.0": - version "1.1.0" - resolved "https://registry.npmjs.org/@sigstore/verify/-/verify-1.1.0.tgz#ab617c5dc0bc09ead7f101a848f4870af2d84374" - integrity sha512-1fTqnqyTBWvV7cftUUFtDcHPdSox0N3Ub7C0lRyReYx4zZUlNTZjCV+HPy4Lre+r45dV7Qx5JLKvqqsgxuyYfg== + version "1.1.1" + resolved "https://registry.npmjs.org/@sigstore/verify/-/verify-1.1.1.tgz#f90f66e6d738434e687e00590c3619a15934ac69" + integrity sha512-BNANJms49rw9Q5J+fJjrDqOQSzjXDcOq/pgKDaVdDoIvQwqIfaoUriy+fQfh8sBX04hr4bkkrwu3EbhQqoQH7A== dependencies: "@sigstore/bundle" "^2.2.0" - "@sigstore/core" "^1.0.0" + "@sigstore/core" "^1.1.0" "@sigstore/protobuf-specs" "^0.3.0" "@sinclair/typebox@^0.24.1": @@ -2758,42 +2758,42 @@ resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -"@zowe/cli@7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@zowe/cli/-/cli-7.23.6.tgz#36ccf98601c52aa6dc65a00337d08ad70f118ca9" - integrity sha512-+8Nm5I2i0SFLMnzPl+5GUN9XeUYIBxm8BXYmNpTi4oBolaRk/bOXIDq6HDLm21M0tfMmfEAY7qyYNuDUfG7/hQ== - dependencies: - "@zowe/core-for-zowe-sdk" "7.23.6" - "@zowe/imperative" "5.22.5" - "@zowe/provisioning-for-zowe-sdk" "7.23.6" - "@zowe/zos-console-for-zowe-sdk" "7.23.6" - "@zowe/zos-files-for-zowe-sdk" "7.23.6" - "@zowe/zos-jobs-for-zowe-sdk" "7.23.6" - "@zowe/zos-logs-for-zowe-sdk" "7.23.6" - "@zowe/zos-tso-for-zowe-sdk" "7.23.6" - "@zowe/zos-uss-for-zowe-sdk" "7.23.6" - "@zowe/zos-workflows-for-zowe-sdk" "7.23.6" - "@zowe/zosmf-for-zowe-sdk" "7.23.6" +"@zowe/cli@7.24.0": + version "7.24.0" + resolved "https://registry.npmjs.org/@zowe/cli/-/cli-7.24.0.tgz#6889758018cb9905e15d38c547c1022e5ce3e6ef" + integrity sha512-gffTBVv5tE8MoNtwgD7gDqmDi3rIOZDyF1t0k53Gl6JzLey1GTKEyqUZjIc8E2Q08zxG0QadYPzilzBS/bVlBw== + dependencies: + "@zowe/core-for-zowe-sdk" "7.24.0" + "@zowe/imperative" "5.23.0" + "@zowe/provisioning-for-zowe-sdk" "7.24.0" + "@zowe/zos-console-for-zowe-sdk" "7.24.0" + "@zowe/zos-files-for-zowe-sdk" "7.24.0" + "@zowe/zos-jobs-for-zowe-sdk" "7.24.0" + "@zowe/zos-logs-for-zowe-sdk" "7.24.0" + "@zowe/zos-tso-for-zowe-sdk" "7.24.0" + "@zowe/zos-uss-for-zowe-sdk" "7.24.0" + "@zowe/zos-workflows-for-zowe-sdk" "7.24.0" + "@zowe/zosmf-for-zowe-sdk" "7.24.0" find-process "1.4.7" get-stream "6.0.1" lodash "4.17.21" minimatch "5.0.1" - tar "6.1.14" + tar "6.2.1" optionalDependencies: "@zowe/secrets-for-zowe-sdk" "7.18.6" -"@zowe/core-for-zowe-sdk@7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.23.6.tgz#b56754f5b472291c0ca8a4bb9c04f2c89c74b4a6" - integrity sha512-rSAU2zpPI0AjOK7OvjZaDLoDxzyGPhByi6m5nw1+CT6u3nQnf06t/5SzSt4Jg8Y2lZAl78Cl+MASCYqkdB1WnA== +"@zowe/core-for-zowe-sdk@7.24.0": + version "7.24.0" + resolved "https://registry.npmjs.org/@zowe/core-for-zowe-sdk/-/core-for-zowe-sdk-7.24.0.tgz#18310faa4f4a504676c9cca542cebfe3ecccae82" + integrity sha512-CQs0uZtShQ9wnmg5HHYEeUUDmIVdP7ZMQZ8FSzODKlULpzCgaNdztVNlPVx5yD3hbSOW20FBgqIcc4wU5BqGJg== dependencies: comment-json "4.1.1" string-width "4.2.3" -"@zowe/imperative@5.22.5": - version "5.22.5" - resolved "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.22.5.tgz#94d23d83c6d1b54b004effe851649bff1f028e99" - integrity sha512-eZrLQR/75UM9K3zUMxHTAlOwwKtpIWGkImp1o7bH/X9AmRKz12u27Jj9upobYYuBSbdEULY7ytYOMIY9a2TIsw== +"@zowe/imperative@5.23.0": + version "5.23.0" + resolved "https://registry.npmjs.org/@zowe/imperative/-/imperative-5.23.0.tgz#baed60961975ff9f468885f23196e4be772af564" + integrity sha512-AdMFKjzdZef4B412DLQ7utnq5AE557HBKIrTA0sYUh9sxz7a5BvJ9A4F9HPBfEGVIaEaLYoutpcxSP8KONPbPA== dependencies: "@types/yargs" "13.0.4" chalk "2.4.2" @@ -2815,7 +2815,7 @@ lodash "4.17.21" lodash-deep "2.0.0" log4js "6.4.6" - markdown-it "12.3.2" + markdown-it "14.1.0" mustache "4.2.0" npm-package-arg "9.1.0" opener "1.5.2" @@ -2832,10 +2832,10 @@ yamljs "0.3.0" yargs "15.3.1" -"@zowe/provisioning-for-zowe-sdk@7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.23.6.tgz#8c1bfebd2c7d28d696404ab6a6c3bb89ce0f7514" - integrity sha512-OB0/z05VWBCsS+1dU00BehT2WB2uqH80oPh493PlW5X0fDurdKQmgXklqu9VTNCdLVHCZJlIbS9nUXz4J4rZ/A== +"@zowe/provisioning-for-zowe-sdk@7.24.0": + version "7.24.0" + resolved "https://registry.npmjs.org/@zowe/provisioning-for-zowe-sdk/-/provisioning-for-zowe-sdk-7.24.0.tgz#18883dbdd7ccbb6590685a07cb1804eea4bbf101" + integrity sha512-QRgXHI5SbJNzRdC3TiwCxKd0G9B/FqkQAwAZ5Tug2Q1Cc+B200Hj5mmzO5oDJlEW7qg6I1arStUOMU0Gu+RiMg== dependencies: js-yaml "4.1.0" @@ -2844,15 +2844,15 @@ resolved "https://registry.npmjs.org/@zowe/secrets-for-zowe-sdk/-/secrets-for-zowe-sdk-7.18.6.tgz#6b854b344babb291c26d19d82633099a46e08452" integrity sha512-YyS1NoXddb147mBQpu5/dTfo1gdwGa/xdg85U8KCngA+RHCmNct3n2rbK3tHx9C9H6rlgjeS+Mrux5Q+PHJUgQ== -"@zowe/zos-console-for-zowe-sdk@7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.23.6.tgz#551f77c1123c180a750d0211fe34045f25c0ef4a" - integrity sha512-njw1ORK+X4q/QiYYtfF1xo3I/k21uLc0ahiFz3z55/WOlttU+8s9hG/pBO5er6JiXZPiABpnhNV6seTSmmAV0w== +"@zowe/zos-console-for-zowe-sdk@7.24.0": + version "7.24.0" + resolved "https://registry.npmjs.org/@zowe/zos-console-for-zowe-sdk/-/zos-console-for-zowe-sdk-7.24.0.tgz#15182f587ff86d918d1f166d13b1066d84cedd55" + integrity sha512-KNLB0B/bPCdEC0J3THRw1SZXcqhEm11o/4c8+Tr2+UD6hKxLTYezwo/tGSgJWas7BVKfPiplBLwfpHRjhsaWCg== -"@zowe/zos-files-for-zowe-sdk@7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.23.6.tgz#d87283bd66c8994bbf0d5a4aaae08fd2fc335091" - integrity sha512-8iZSENLU84H+F73/5P+owDWkoGl7nAq1VfP8hv6PMlyMnkiMDPnD3hmRWo5rKhomyp32fK6rqHB4hDRv0iLRTQ== +"@zowe/zos-files-for-zowe-sdk@7.24.0": + version "7.24.0" + resolved "https://registry.npmjs.org/@zowe/zos-files-for-zowe-sdk/-/zos-files-for-zowe-sdk-7.24.0.tgz#b1e5231b9ca8d694a01d18d4ca2bf15dbfae6e90" + integrity sha512-DXRzDedJSI9jZZcYtk7lGdTMWIiw94f5yVPKUTxZChcpqucZ9YyoThQjEvgLaETbhXYituayuAmfBrRiHGXUcA== dependencies: get-stream "6.0.1" minimatch "5.0.1" @@ -2864,43 +2864,43 @@ dependencies: zos-node-accessor "1.0.16" -"@zowe/zos-jobs-for-zowe-sdk@7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.23.6.tgz#eec6e0d57ffefa9d4335bd81839b4b0354332ee4" - integrity sha512-UA+ZrJjkr5v7js52GGpuvsvKosBeR3BW1/UHHJoxAnO+cwjIJkzvXBiIhAmESXzPCH62isbnEl4QcYhS/Dpn6g== +"@zowe/zos-jobs-for-zowe-sdk@7.24.0": + version "7.24.0" + resolved "https://registry.npmjs.org/@zowe/zos-jobs-for-zowe-sdk/-/zos-jobs-for-zowe-sdk-7.24.0.tgz#3f6c74831d08ba3046d61b4ec0293a25211e9031" + integrity sha512-de/7za2RdK0t33CgufQ4oOOWqPC4t+L/YizqEDm89ugqRY+5yVTcrM5Ec8RWRz+kw787NC3OfoOTsq50soI/VA== dependencies: - "@zowe/zos-files-for-zowe-sdk" "7.23.6" + "@zowe/zos-files-for-zowe-sdk" "7.24.0" -"@zowe/zos-logs-for-zowe-sdk@7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.23.6.tgz#a835c10ae2426b253dd54b54226713f70c2018d7" - integrity sha512-Q/nWTiiTskd2GY2AXT+r4mjAfwhtsJ9XAldq3iiyZnpE7bQFcA7XLBomhOiCbPETsEWxUekGD/4uldh5vFU94A== +"@zowe/zos-logs-for-zowe-sdk@7.24.0": + version "7.24.0" + resolved "https://registry.npmjs.org/@zowe/zos-logs-for-zowe-sdk/-/zos-logs-for-zowe-sdk-7.24.0.tgz#440e45ffa41593bf6215ddc9153971dba0b71138" + integrity sha512-XUsjmHJCOc78gNYbpXmSCBR+svTcuwtLaZjSwKeeRVgVfrd9q+A9gQhvatojrtLoGl7QjBvza0xxeoKqnVjuYw== -"@zowe/zos-tso-for-zowe-sdk@7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.23.6.tgz#030c83014838906001397dec7fa1868892402800" - integrity sha512-yW9fbRho3FLyDQMy7VDUrsFXrFWnbzYRDUir+RgiNn15+tDFci2FQ24rg5gpphWQwC8nnziTJght78sdG7jv+g== +"@zowe/zos-tso-for-zowe-sdk@7.24.0": + version "7.24.0" + resolved "https://registry.npmjs.org/@zowe/zos-tso-for-zowe-sdk/-/zos-tso-for-zowe-sdk-7.24.0.tgz#49777a40c58829f3e8a09e665e47a166085447f9" + integrity sha512-h2sNMaNjZXab26JMDH+xZrX9NlhPcJuy9xGNS/Zm2+Zv8F+byG0a6N+fo/d/ju8cMU8/p55wdZDyNMzUcGUXSQ== dependencies: - "@zowe/zosmf-for-zowe-sdk" "7.23.6" + "@zowe/zosmf-for-zowe-sdk" "7.24.0" -"@zowe/zos-uss-for-zowe-sdk@7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.23.6.tgz#a12c0904359774e2ba71c967db9e67c24818968f" - integrity sha512-v7TYJpbGiQkpEpHTBcwSfpO80vqjz0jEw97C9a/XHhzLPY/vcMy7rXSdiylTg5RqcuEFcfuwPFucK/ZNirVT4A== +"@zowe/zos-uss-for-zowe-sdk@7.24.0": + version "7.24.0" + resolved "https://registry.npmjs.org/@zowe/zos-uss-for-zowe-sdk/-/zos-uss-for-zowe-sdk-7.24.0.tgz#4573e75d825ce9e30dbf78e6ccee3ed66cc5b600" + integrity sha512-vxvTlAXGnYD8j9lcYIxODGdmRK0xwi3V1HmQ7Mu+fYFGrMlTzcs38CY4ernV5gLirVJfNnl6Bkqf4zcpGkSm0A== dependencies: ssh2 "1.15.0" -"@zowe/zos-workflows-for-zowe-sdk@7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.23.6.tgz#4a8503f5ae718ca21caf86360a7d4318eccd9c1b" - integrity sha512-12PlwVUoxsJEADsJgtjFB68ndf9UcJt2992XA7xE/roM7p7EAVxbfjxBsRxEGFPP2zPPC0XSkn5Ft3ucP5jrag== +"@zowe/zos-workflows-for-zowe-sdk@7.24.0": + version "7.24.0" + resolved "https://registry.npmjs.org/@zowe/zos-workflows-for-zowe-sdk/-/zos-workflows-for-zowe-sdk-7.24.0.tgz#f0aa8a8b31aa95173a119cd07c3b1694eb697231" + integrity sha512-XoVoXlgPuWisChRjkmop2Hb7Jen2c1WyDxbGErXIdbaGzJ6Cm+NgSID5ay8b39NcrbbgGAfnJfcNTfZnbaiEOg== dependencies: - "@zowe/zos-files-for-zowe-sdk" "7.23.6" + "@zowe/zos-files-for-zowe-sdk" "7.24.0" -"@zowe/zosmf-for-zowe-sdk@7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.23.6.tgz#5e901ca8e1a84a07cd46337aa6110dde5e514b18" - integrity sha512-CadC5T6Dz/0fqIScGn3j5Uo1wkTcriTANy/Xd4ml3PdsBye13WJpKvMxxuOczMF+Wvj/mDGzLv6NHj+38OIjOg== +"@zowe/zosmf-for-zowe-sdk@7.24.0": + version "7.24.0" + resolved "https://registry.npmjs.org/@zowe/zosmf-for-zowe-sdk/-/zosmf-for-zowe-sdk-7.24.0.tgz#9af5941a01bc5732a9b4973e4e0590b032215826" + integrity sha512-+/dz7Zf1YGveDlPeoQJgqTfLqDTUZqjD6jOTr19uQ28U18OumsJg9lz3Ybk11yKm3Igu1D05eef8gZvc/S3Ttg== abab@^2.0.3, abab@^2.0.5: version "2.0.6" @@ -2972,10 +2972,10 @@ agent-base@6: dependencies: debug "4" -agent-base@^7.0.2, agent-base@^7.1.0: - version "7.1.0" - resolved "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434" - integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg== +agent-base@^7.0.2, agent-base@^7.1.0, agent-base@^7.1.1: + version "7.1.1" + resolved "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317" + integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA== dependencies: debug "^4.3.4" @@ -5073,6 +5073,11 @@ entities@^2.0.0: resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== +entities@^4.4.0: + version "4.5.0" + resolved "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== + entities@~2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz" @@ -6159,15 +6164,15 @@ glob@7.2.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glo path-is-absolute "^1.0.0" glob@^10.2.2, glob@^10.3.10: - version "10.3.10" - resolved "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" - integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== + version "10.3.12" + resolved "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b" + integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg== dependencies: foreground-child "^3.1.0" - jackspeak "^2.3.5" + jackspeak "^2.3.6" minimatch "^9.0.1" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - path-scurry "^1.10.1" + minipass "^7.0.4" + path-scurry "^1.10.2" glob@~8.0.3: version "8.0.3" @@ -7148,7 +7153,7 @@ istanbul-reports@^3.1.3: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jackspeak@^2.3.5: +jackspeak@^2.3.6: version "2.3.6" resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== @@ -8092,6 +8097,13 @@ linkify-it@^4.0.1: dependencies: uc.micro "^1.0.1" +linkify-it@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz#9ef238bfa6dc70bd8e7f9572b52d369af569b421" + integrity sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ== + dependencies: + uc.micro "^2.0.0" + listenercount@~1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz" @@ -8243,7 +8255,7 @@ lowercase-keys@^1.0.0: resolved "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz" integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== -lru-cache@^10.0.1, "lru-cache@^9.1.1 || ^10.0.0": +lru-cache@^10.0.1, lru-cache@^10.2.0: version "10.2.0" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== @@ -8354,17 +8366,6 @@ markdown-it-anchor@^8.4.1: resolved "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.2.tgz" integrity sha512-JNaekTlIwwyYGBN3zifZDxgz4bSL8sbEj58fdTZGmPSMMGXBZapFjcZk2I33Jy79c1fvCKHpF7MA/67FOTjvzA== -markdown-it@12.3.2, markdown-it@^12.3.2: - version "12.3.2" - resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz" - integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg== - dependencies: - argparse "^2.0.1" - entities "~2.1.0" - linkify-it "^3.0.1" - mdurl "^1.0.1" - uc.micro "^1.0.5" - markdown-it@13.0.1: version "13.0.1" resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz" @@ -8376,6 +8377,29 @@ markdown-it@13.0.1: mdurl "^1.0.1" uc.micro "^1.0.5" +markdown-it@14.1.0: + version "14.1.0" + resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz#3c3c5992883c633db4714ccb4d7b5935d98b7d45" + integrity sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg== + dependencies: + argparse "^2.0.1" + entities "^4.4.0" + linkify-it "^5.0.0" + mdurl "^2.0.0" + punycode.js "^2.3.1" + uc.micro "^2.1.0" + +markdown-it@^12.3.2: + version "12.3.2" + resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz" + integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg== + dependencies: + argparse "^2.0.1" + entities "~2.1.0" + linkify-it "^3.0.1" + mdurl "^1.0.1" + uc.micro "^1.0.5" + markdownlint-cli@^0.33.0: version "0.33.0" resolved "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.33.0.tgz" @@ -8436,6 +8460,11 @@ mdurl@^1.0.1: resolved "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz" integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= +mdurl@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz#80676ec0433025dd3e17ee983d0fe8de5a2237e0" + integrity sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w== + mem@^6.0.1: version "6.1.1" resolved "https://registry.npmjs.org/mem/-/mem-6.1.1.tgz" @@ -8583,9 +8612,9 @@ minimatch@^5.0.1, minimatch@~5.1.2: brace-expansion "^2.0.1" minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.3: - version "9.0.3" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" - integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + version "9.0.4" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" + integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== dependencies: brace-expansion "^2.0.1" @@ -8665,7 +8694,7 @@ minipass@^5.0.0: resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3: +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.0.4: version "7.0.4" resolved "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== @@ -8929,9 +8958,9 @@ node-addon-api@^4.3.0: integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== node-gyp@^10.0.0: - version "10.0.1" - resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz#205514fc19e5830fa991e4a689f9e81af377a966" - integrity sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg== + version "10.1.0" + resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz#75e6f223f2acb4026866c26a2ead6aab75a8ca7e" + integrity sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA== dependencies: env-paths "^2.2.0" exponential-backoff "^3.1.1" @@ -9548,12 +9577,12 @@ path-root@^0.1.1: dependencies: path-root-regex "^0.1.0" -path-scurry@^1.10.1: - version "1.10.1" - resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" - integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== +path-scurry@^1.10.2: + version "1.10.2" + resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7" + integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA== dependencies: - lru-cache "^9.1.1 || ^10.0.0" + lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" path-to-regexp@^1.7.0: @@ -9903,6 +9932,11 @@ pumpify@^1.3.3, pumpify@^1.3.5: inherits "^2.0.3" pump "^2.0.0" +punycode.js@^2.3.1: + version "2.3.1" + resolved "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7" + integrity sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA== + punycode@1.3.2: version "1.3.2" resolved "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" @@ -10731,12 +10765,12 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -socks-proxy-agent@^8.0.1: - version "8.0.2" - resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz#5acbd7be7baf18c46a3f293a840109a430a640ad" - integrity sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g== +socks-proxy-agent@^8.0.3: + version "8.0.3" + resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz#6b2da3d77364fde6292e810b496cb70440b9b89d" + integrity sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A== dependencies: - agent-base "^7.0.2" + agent-base "^7.1.1" debug "^4.3.4" socks "^2.7.1" @@ -11242,10 +11276,10 @@ tar@6.0.2: mkdirp "^1.0.3" yallist "^4.0.0" -tar@6.1.14: - version "6.1.14" - resolved "https://registry.npmjs.org/tar/-/tar-6.1.14.tgz" - integrity sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw== +tar@6.2.1, tar@^6.1.11, tar@^6.1.2: + version "6.2.1" + resolved "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" + integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -11645,6 +11679,11 @@ uc.micro@^1.0.1, uc.micro@^1.0.5: resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz" integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== +uc.micro@^2.0.0, uc.micro@^2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee" + integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A== + uglify-js@^3.1.4: version "3.17.4" resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz" From fc9a695064e3dca8ae9601100e48d4edbd7375d6 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Tue, 2 Apr 2024 17:11:35 -0400 Subject: [PATCH 5/6] Update changelog Signed-off-by: Timothy Johnson --- packages/zowe-explorer/CHANGELOG.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md index 7ee04e16ad..83bba3ce3d 100644 --- a/packages/zowe-explorer/CHANGELOG.md +++ b/packages/zowe-explorer/CHANGELOG.md @@ -8,9 +8,9 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen ### Bug fixes -## `2.15.2` +- Fixed error that could occur when listing data set members that contain control characters in the name [#2807](https://github.com/zowe/zowe-explorer-vscode/pull/2807) -### New features and enhancements +## `2.15.2` ### Bug fixes @@ -19,8 +19,6 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen ## `2.15.1` -### New features and enhancements - ### Bug fixes - Fixed issue where VS Code quick pick separators were used in environments that did not support the feature. [#2771](https://github.com/zowe/vscode-extension-for-zowe/pull/2771) From e4ee8ceca5c15570b96f1dd6b26c060c6667715d Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Tue, 9 Apr 2024 20:32:24 -0400 Subject: [PATCH 6/6] Update lockfile after rebase to fix audit Signed-off-by: Timothy Johnson --- yarn.lock | 122 ++++++++++++++++++++++-------------------------------- 1 file changed, 49 insertions(+), 73 deletions(-) diff --git a/yarn.lock b/yarn.lock index 321c4432f7..98d7686585 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1984,15 +1984,15 @@ fastq "^1.6.0" "@npmcli/agent@^2.0.0": - version "2.2.2" - resolved "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5" - integrity sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og== + version "2.2.1" + resolved "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.1.tgz#8aa677d0a4136d57524336a35d5679aedf2d56f7" + integrity sha512-H4FrOVtNyWC8MUwL3UfjOsAihHvT1Pe8POj3JvjXhSTJipsZMtgUALCT4mGyYZNxymkUfOw3PUj6dE4QPp6osQ== dependencies: agent-base "^7.1.0" http-proxy-agent "^7.0.0" https-proxy-agent "^7.0.1" lru-cache "^10.0.1" - socks-proxy-agent "^8.0.3" + socks-proxy-agent "^8.0.1" "@npmcli/fs@^1.0.0": version "1.1.1" @@ -2135,15 +2135,15 @@ dependencies: "@sigstore/protobuf-specs" "^0.3.0" -"@sigstore/core@^1.0.0", "@sigstore/core@^1.1.0": - version "1.1.0" - resolved "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz#5583d8f7ffe599fa0a89f2bf289301a5af262380" - integrity sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg== +"@sigstore/core@^1.0.0": + version "1.0.0" + resolved "https://registry.npmjs.org/@sigstore/core/-/core-1.0.0.tgz#0fcdb32d191d4145a70cb837061185353b3b08e3" + integrity sha512-dW2qjbWLRKGu6MIDUTBuJwXCnR8zivcSpf5inUzk7y84zqy/dji0/uahppoIgMoKeR+6pUZucrwHfkQQtiG9Rw== "@sigstore/protobuf-specs@^0.3.0": - version "0.3.1" - resolved "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.1.tgz#7095819fa7c5743efde48a858c37b30fab190a09" - integrity sha512-aIL8Z9NsMr3C64jyQzE0XlkEyBLpgEJJFDHLVVStkFV5Q3Il/r/YtY6NJWKQ4cy4AE7spP1IX5Jq7VCAxHHMfQ== + version "0.3.0" + resolved "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.0.tgz#bdcc773671f625bb81591bca86ec5314d57297f3" + integrity sha512-zxiQ66JFOjVvP9hbhGj/F/qNdsZfkGb/dVXSanNRNuAzMlr4MC95voPUBX8//ZNnmv3uSYzdfR/JSkrgvZTGxA== "@sigstore/sign@^2.2.3": version "2.2.3" @@ -2156,20 +2156,20 @@ make-fetch-happen "^13.0.0" "@sigstore/tuf@^2.3.1": - version "2.3.2" - resolved "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.2.tgz#e9c5bffc2a5f3434f87195902d7f9cd7f48c70fa" - integrity sha512-mwbY1VrEGU4CO55t+Kl6I7WZzIl+ysSzEYdA1Nv/FTrl2bkeaPXo5PnWZAVfcY2zSdhOpsUTJW67/M2zHXGn5w== + version "2.3.1" + resolved "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.1.tgz#86ff3c3c907e271696c88de0108d9063a8cbcc45" + integrity sha512-9Iv40z652td/QbV0o5n/x25H9w6IYRt2pIGbTX55yFDYlApDQn/6YZomjz6+KBx69rXHLzHcbtTS586mDdFD+Q== dependencies: "@sigstore/protobuf-specs" "^0.3.0" tuf-js "^2.2.0" "@sigstore/verify@^1.1.0": - version "1.1.1" - resolved "https://registry.npmjs.org/@sigstore/verify/-/verify-1.1.1.tgz#f90f66e6d738434e687e00590c3619a15934ac69" - integrity sha512-BNANJms49rw9Q5J+fJjrDqOQSzjXDcOq/pgKDaVdDoIvQwqIfaoUriy+fQfh8sBX04hr4bkkrwu3EbhQqoQH7A== + version "1.1.0" + resolved "https://registry.npmjs.org/@sigstore/verify/-/verify-1.1.0.tgz#ab617c5dc0bc09ead7f101a848f4870af2d84374" + integrity sha512-1fTqnqyTBWvV7cftUUFtDcHPdSox0N3Ub7C0lRyReYx4zZUlNTZjCV+HPy4Lre+r45dV7Qx5JLKvqqsgxuyYfg== dependencies: "@sigstore/bundle" "^2.2.0" - "@sigstore/core" "^1.1.0" + "@sigstore/core" "^1.0.0" "@sigstore/protobuf-specs" "^0.3.0" "@sinclair/typebox@^0.24.1": @@ -2972,10 +2972,10 @@ agent-base@6: dependencies: debug "4" -agent-base@^7.0.2, agent-base@^7.1.0, agent-base@^7.1.1: - version "7.1.1" - resolved "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317" - integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA== +agent-base@^7.0.2, agent-base@^7.1.0: + version "7.1.0" + resolved "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434" + integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg== dependencies: debug "^4.3.4" @@ -6164,15 +6164,15 @@ glob@7.2.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glo path-is-absolute "^1.0.0" glob@^10.2.2, glob@^10.3.10: - version "10.3.12" - resolved "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b" - integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg== + version "10.3.10" + resolved "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" + integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== dependencies: foreground-child "^3.1.0" - jackspeak "^2.3.6" + jackspeak "^2.3.5" minimatch "^9.0.1" - minipass "^7.0.4" - path-scurry "^1.10.2" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.1" glob@~8.0.3: version "8.0.3" @@ -7153,7 +7153,7 @@ istanbul-reports@^3.1.3: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jackspeak@^2.3.6: +jackspeak@^2.3.5: version "2.3.6" resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== @@ -8255,7 +8255,7 @@ lowercase-keys@^1.0.0: resolved "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz" integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== -lru-cache@^10.0.1, lru-cache@^10.2.0: +lru-cache@^10.0.1, "lru-cache@^9.1.1 || ^10.0.0": version "10.2.0" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== @@ -8612,9 +8612,9 @@ minimatch@^5.0.1, minimatch@~5.1.2: brace-expansion "^2.0.1" minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.3: - version "9.0.4" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" - integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== + version "9.0.3" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== dependencies: brace-expansion "^2.0.1" @@ -8694,7 +8694,7 @@ minipass@^5.0.0: resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.0.4: +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3: version "7.0.4" resolved "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== @@ -8958,9 +8958,9 @@ node-addon-api@^4.3.0: integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== node-gyp@^10.0.0: - version "10.1.0" - resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz#75e6f223f2acb4026866c26a2ead6aab75a8ca7e" - integrity sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA== + version "10.0.1" + resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz#205514fc19e5830fa991e4a689f9e81af377a966" + integrity sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg== dependencies: env-paths "^2.2.0" exponential-backoff "^3.1.1" @@ -9577,12 +9577,12 @@ path-root@^0.1.1: dependencies: path-root-regex "^0.1.0" -path-scurry@^1.10.2: - version "1.10.2" - resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7" - integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA== +path-scurry@^1.10.1: + version "1.10.1" + resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" + integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== dependencies: - lru-cache "^10.2.0" + lru-cache "^9.1.1 || ^10.0.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" path-to-regexp@^1.7.0: @@ -10765,12 +10765,12 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -socks-proxy-agent@^8.0.3: - version "8.0.3" - resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz#6b2da3d77364fde6292e810b496cb70440b9b89d" - integrity sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A== +socks-proxy-agent@^8.0.1: + version "8.0.2" + resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz#5acbd7be7baf18c46a3f293a840109a430a640ad" + integrity sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g== dependencies: - agent-base "^7.1.1" + agent-base "^7.0.2" debug "^4.3.4" socks "^2.7.1" @@ -11266,7 +11266,7 @@ tar-stream@^2.1.4: tar@6.0.2: version "6.0.2" - resolved "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz" + resolved "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz#5df17813468a6264ff14f766886c622b84ae2f39" integrity sha512-Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg== dependencies: chownr "^2.0.0" @@ -11276,7 +11276,7 @@ tar@6.0.2: mkdirp "^1.0.3" yallist "^4.0.0" -tar@6.2.1, tar@^6.1.11, tar@^6.1.2: +tar@6.2.1, tar@^6.0.2, tar@^6.1.11, tar@^6.1.2: version "6.2.1" resolved "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== @@ -11288,30 +11288,6 @@ tar@6.2.1, tar@^6.1.11, tar@^6.1.2: mkdirp "^1.0.3" yallist "^4.0.0" -tar@^6.0.2: - version "6.1.11" - resolved "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^3.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -tar@^6.1.11, tar@^6.1.2: - version "6.2.0" - resolved "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" - integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^5.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - terminal-link@^2.0.0: version "2.1.1" resolved "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz"