From 74f29ec3ed2d43cc28a34d1882524a2ae0ef5237 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Mon, 3 Jun 2024 17:56:15 -0400 Subject: [PATCH 01/20] update SDKs and address breaking changes Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/zowe-explorer-api/package.json | 18 +-- .../src/globals/Interfaces.ts | 2 +- .../src/profiles/ProfilesCache.ts | 26 ++-- .../zowe-explorer-ftp-extension/package.json | 4 +- packages/zowe-explorer/package.json | 10 +- pnpm-lock.yaml | 135 +++++++++--------- 6 files changed, 98 insertions(+), 97 deletions(-) diff --git a/packages/zowe-explorer-api/package.json b/packages/zowe-explorer-api/package.json index a4c22e066a..35746a17e2 100644 --- a/packages/zowe-explorer-api/package.json +++ b/packages/zowe-explorer-api/package.json @@ -21,15 +21,15 @@ }, "dependencies": { "@types/vscode": "^1.53.2", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202404032038", - "@zowe/imperative": "8.0.0-next.202404032038", - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202404032038", - "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202404032038", - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202404032038", - "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202404032038", - "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202404032038", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202404032038", - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202404032038", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/imperative": "8.0.0-next.202405241828", + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202405241828", "handlebars": "^4.7.7", "semver": "^7.6.0" }, diff --git a/packages/zowe-explorer-api/src/globals/Interfaces.ts b/packages/zowe-explorer-api/src/globals/Interfaces.ts index 79a9c15c17..613b595468 100644 --- a/packages/zowe-explorer-api/src/globals/Interfaces.ts +++ b/packages/zowe-explorer-api/src/globals/Interfaces.ts @@ -14,5 +14,5 @@ import * as imperative from "@zowe/imperative"; export interface ZeApiConvertResponse { success: string; warnings: string; - convertResult: imperative.IConfigConvertResult; + convertResult: imperative.ConvertV1Profiles; } diff --git a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts index b1f7130e3e..bc2953f2fe 100644 --- a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts +++ b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts @@ -358,7 +358,7 @@ export class ProfilesCache { const zoweDir = FileManagement.getZoweDir(); const profilesPath = path.join(zoweDir, "profiles"); const oldProfilesPath = `${profilesPath.replace(/[\\/]$/, "")}-old`; - const convertResult = await imperative.ConfigBuilder.convert(profilesPath); + const convertResult = await imperative.ConvertV1Profiles.convert({ deleteV1Profs: false }); for (const [k, v] of Object.entries(convertResult.profilesConverted)) { successMsg.push(`Converted ${k} profile: ${v.join(", ")}\n`); } @@ -372,23 +372,23 @@ export class ProfilesCache { } } } - const teamConfig = await imperative.Config.load("zowe", { - homeDir: zoweDir, - projectDir: false, - }); - teamConfig.api.layers.activate(false, true); - teamConfig.api.layers.merge(convertResult.config); - const knownCliConfig: imperative.ICommandProfileTypeConfiguration[] = this.getCoreProfileTypes(); - knownCliConfig.push(ProfileConstants.BaseProfile); - this.addToConfigArray(knownCliConfig); - teamConfig.setSchema(imperative.ConfigSchema.buildSchema(this.getConfigArray())); - await teamConfig.save(); + // const teamConfig = await imperative.Config.load("zowe", { + // homeDir: zoweDir, + // projectDir: false, + // }); + // teamConfig.api.layers.activate(false, true); + // teamConfig.api.layers.merge(convertResult.profilesConverted); + // const knownCliConfig: imperative.ICommandProfileTypeConfiguration[] = this.getCoreProfileTypes(); + // knownCliConfig.push(ProfileConstants.BaseProfile); + // this.addToConfigArray(knownCliConfig); + // teamConfig.setSchema(imperative.ConfigSchema.buildSchema(this.getConfigArray())); + // await teamConfig.save(); try { fs.renameSync(profilesPath, oldProfilesPath); } catch (error) { warningMsg.push(`Failed to rename profiles directory to ${oldProfilesPath}:\n ${String(error)}`); } - successMsg.push(`Your new profiles have been saved to ${teamConfig.layerActive().path}.\n`); + successMsg.push(`Your new profiles have been saved to ${convertResult.cfgFilePathNm}.\n`); return { success: String(successMsg.join("")), warnings: String(warningMsg.join("")), diff --git a/packages/zowe-explorer-ftp-extension/package.json b/packages/zowe-explorer-ftp-extension/package.json index 0ce2d37a55..bb64f8a3e2 100644 --- a/packages/zowe-explorer-ftp-extension/package.json +++ b/packages/zowe-explorer-ftp-extension/package.json @@ -48,9 +48,9 @@ "vscode": "^1.79.0" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202404032038", + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202405241828", "@zowe/zos-ftp-for-zowe-cli": "3.0.0-next.202403191358", - "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202404032038", + "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202405241828", "@zowe/zowe-explorer-api": "3.0.0-next-SNAPSHOT", "tmp": "0.2.3" }, diff --git a/packages/zowe-explorer/package.json b/packages/zowe-explorer/package.json index 07f2aceedb..186fa98315 100644 --- a/packages/zowe-explorer/package.json +++ b/packages/zowe-explorer/package.json @@ -2111,11 +2111,11 @@ "sinon": "^6.1.0" }, "dependencies": { - "@zowe/core-for-zowe-sdk": "8.0.0-next.202404032038", - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202404032038", - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202404032038", - "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202404032038", - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202404032038", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202405241828", "@zowe/zowe-explorer-api": "3.0.0-next-SNAPSHOT", "dayjs": "^1.11.10", "fs-extra": "8.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 92089f5f00..09e081e21a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -136,20 +136,20 @@ importers: packages/zowe-explorer: dependencies: '@zowe/core-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038(@zowe/imperative@8.0.0-next.202404032038) + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) '@zowe/secrets-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038 + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828 '@zowe/zos-files-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038) + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) '@zowe/zos-jobs-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038) + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) '@zowe/zosmf-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038) + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) '@zowe/zowe-explorer-api': specifier: 3.0.0-next-SNAPSHOT version: link:../zowe-explorer-api @@ -224,32 +224,32 @@ importers: specifier: ^1.53.2 version: 1.89.0 '@zowe/core-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038(@zowe/imperative@8.0.0-next.202404032038) + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) '@zowe/imperative': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038 + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828 '@zowe/secrets-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038 + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828 '@zowe/zos-console-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038) + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) '@zowe/zos-files-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038) + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) '@zowe/zos-jobs-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038) + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) '@zowe/zos-tso-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038) + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) '@zowe/zos-uss-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038(@zowe/imperative@8.0.0-next.202404032038) + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) '@zowe/zosmf-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038) + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) handlebars: specifier: ^4.7.7 version: 4.7.8 @@ -267,14 +267,14 @@ importers: packages/zowe-explorer-ftp-extension: dependencies: '@zowe/zos-files-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038) + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) '@zowe/zos-ftp-for-zowe-cli': specifier: 3.0.0-next.202403191358 - version: 3.0.0-next.202403191358(@zowe/imperative@8.0.0-next.202404032038) + version: 3.0.0-next.202403191358(@zowe/imperative@8.0.0-next.202405241828) '@zowe/zos-jobs-for-zowe-sdk': - specifier: 8.0.0-next.202404032038 - version: 8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038) + specifier: 8.0.0-next.202405241828 + version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) '@zowe/zowe-explorer-api': specifier: 3.0.0-next-SNAPSHOT version: link:../zowe-explorer-api @@ -2628,19 +2628,19 @@ packages: resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==} dev: true - /@zowe/core-for-zowe-sdk@8.0.0-next.202404032038(@zowe/imperative@8.0.0-next.202404032038): - resolution: {integrity: sha512-pjk5DXhnplzax2/P/CT5jN9ZnsMGxTTLraIgfp3k2bBC0lW4tIzw9E1lTQaz94Pra1A+oFkJVHHLVtoFXzn0rg==} + /@zowe/core-for-zowe-sdk@8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828): + resolution: {integrity: sha512-JwbkREv26gH8aXMrwVpCxHex8jN0Lvy7hHFRDvRiFro2ta2KLwY1CqTDZW8IsEbj/J38t11KV8cG3OscIvLg+g==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/imperative': 8.0.0-next.202404032038 + '@zowe/imperative': 8.0.0-next.202405241828 comment-json: 4.2.3 string-width: 4.2.3 dev: false - /@zowe/imperative@8.0.0-next.202404032038: - resolution: {integrity: sha512-jzO16DgJo9an4o89CvIyabscLm8n0MwszB8H0bmsVjUA+BPmCKzPjSPxlmXX9RxKihu0yCypgJnv5uK3Gtn2kg==} + /@zowe/imperative@8.0.0-next.202405241828: + resolution: {integrity: sha512-wba87FQn4VcFIEaeaE/XWtEkNnhgyHoT6/G5nEjIcSLy+zyVR/55M/pcWDwMFdVR4We7PhfnvzVwAqoUH6At7A==} engines: {node: '>=18.12.0'} dependencies: '@types/yargs': 17.0.32 @@ -2683,87 +2683,87 @@ packages: - supports-color dev: false - /@zowe/secrets-for-zowe-sdk@8.0.0-next.202404032038: - resolution: {integrity: sha512-yOqieH6Rap3y3sJULSkzVBMlkctUyzmux7EbHfozafO99X66ih5A0p+S9sKpgmU/qSxCcQkJpFFwvmM8b3kj1A==} + /@zowe/secrets-for-zowe-sdk@8.0.0-next.202405241828: + resolution: {integrity: sha512-48UQrJcBLrt0TckrS5j/Hfgyd1Wh21FG/Q/Np7aOTeJk8IrvgicdO6eL8z3kiLwmEDngCv2xd3wvIhcZgFyfpg==} engines: {node: '>=14'} requiresBuild: true dev: false - /@zowe/zos-console-for-zowe-sdk@8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038): - resolution: {integrity: sha512-JVv6UQaFsoCQJgSF0R8allcad0P1NsWJfm0m6VqWvKfXvr2/lcy6FR5ZVvqxpqhE4LsUujrbal+UayTaOahZBg==} + /@zowe/zos-console-for-zowe-sdk@8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828): + resolution: {integrity: sha512-pWHx4vk/QJpsFE575jgE/GsfgAgfSL8XaYi9lEKrgO8dz0i8I+fuGr0kp8vJoHqhYRhhT6h9/yXelLiwJGy2vg==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/core-for-zowe-sdk': ^8.0.0-next '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/core-for-zowe-sdk': 8.0.0-next.202404032038(@zowe/imperative@8.0.0-next.202404032038) - '@zowe/imperative': 8.0.0-next.202404032038 + '@zowe/core-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) + '@zowe/imperative': 8.0.0-next.202405241828 dev: false - /@zowe/zos-files-for-zowe-sdk@8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038): - resolution: {integrity: sha512-9WMdXk/HF9Ml/susL1QSeQ7rSlvUnzSS0LX6geeZ8Ki5t6UrbGmeVaG/OY43i52DoCzuNsdlYQ3bESLOGelQzw==} + /@zowe/zos-files-for-zowe-sdk@8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828): + resolution: {integrity: sha512-+BPs44qjw+C7RbOaqC0vQDX1E5EBeHVVtoqUoYkA60djVU+cjZUvYvCBbw6gDSDq1t8HRlJF8UEno9uqfRRXqw==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/core-for-zowe-sdk': ^8.0.0-next '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/core-for-zowe-sdk': 8.0.0-next.202404032038(@zowe/imperative@8.0.0-next.202404032038) - '@zowe/imperative': 8.0.0-next.202404032038 + '@zowe/core-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) + '@zowe/imperative': 8.0.0-next.202405241828 minimatch: 9.0.4 dev: false - /@zowe/zos-ftp-for-zowe-cli@3.0.0-next.202403191358(@zowe/imperative@8.0.0-next.202404032038): + /@zowe/zos-ftp-for-zowe-cli@3.0.0-next.202403191358(@zowe/imperative@8.0.0-next.202405241828): resolution: {integrity: sha512-jTiGcqFZNKIanUQAWOT+2M+3X6P9FAlPrie999HjDm79DpEltkjNwdNLM8EZLtSXsTjBrifaTo/pMVVmmhfl4A==} peerDependencies: '@zowe/imperative': '>=8.0.0-next.0 <8.0.0' dependencies: - '@zowe/imperative': 8.0.0-next.202404032038 + '@zowe/imperative': 8.0.0-next.202405241828 zos-node-accessor: 2.0.9 dev: false - /@zowe/zos-jobs-for-zowe-sdk@8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038): - resolution: {integrity: sha512-zj8jS4/D/XjvP9CIVPtsKmja/OCdRd5kslxc4bkWbP4DIjypc7AgXYTE0fT8DjrON/vGAiQU+GLcuqheXOBzLQ==} + /@zowe/zos-jobs-for-zowe-sdk@8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828): + resolution: {integrity: sha512-ldWGwVQh+Qf4jEh6kcWs6R1ISm06Zanjv1GaOsz5GPG6amfpv2vk6TOyGc1LaLfOrnRmhXoA9yf7MUJK7/71JQ==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/core-for-zowe-sdk': ^8.0.0-next '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/core-for-zowe-sdk': 8.0.0-next.202404032038(@zowe/imperative@8.0.0-next.202404032038) - '@zowe/imperative': 8.0.0-next.202404032038 - '@zowe/zos-files-for-zowe-sdk': 8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038) + '@zowe/core-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) + '@zowe/imperative': 8.0.0-next.202405241828 + '@zowe/zos-files-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) dev: false - /@zowe/zos-tso-for-zowe-sdk@8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038): - resolution: {integrity: sha512-xn4GtkEer/jsnOP+e7j/nXWzIinx2wCB5TLAGySWafpGMUIQJ1t76Yw5pOxBAXzfVPCEmgfpsT+jutfqg1/rdg==} + /@zowe/zos-tso-for-zowe-sdk@8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828): + resolution: {integrity: sha512-fWSfkDIzPCSKiQe8S6l1Dc5Vq85oYrphs5aJ9gmycaSPXtO43vLodjX9vFifSpM9oLTwuG9HEApUfNOfG5UsBg==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/core-for-zowe-sdk': ^8.0.0-next '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/core-for-zowe-sdk': 8.0.0-next.202404032038(@zowe/imperative@8.0.0-next.202404032038) - '@zowe/imperative': 8.0.0-next.202404032038 - '@zowe/zosmf-for-zowe-sdk': 8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038) + '@zowe/core-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) + '@zowe/imperative': 8.0.0-next.202405241828 + '@zowe/zosmf-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) dev: false - /@zowe/zos-uss-for-zowe-sdk@8.0.0-next.202404032038(@zowe/imperative@8.0.0-next.202404032038): - resolution: {integrity: sha512-YKq8Om6i84lh3d9Kv0nQ8Ux+v9UYHmvq+ni7US9jTlI+uMqi29QM1Ww24GhETxx4ecUPzHgQ5zdUhmpUhYUeaA==} + /@zowe/zos-uss-for-zowe-sdk@8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828): + resolution: {integrity: sha512-Bc+bZCElq7QmHwWRQLfJiWFBAfJAIG93/PchGMcmFQTCUELUSuy9qCLq51Csd0i/wEyXzsMv3UTGTtldTW52Vw==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/imperative': 8.0.0-next.202404032038 + '@zowe/imperative': 8.0.0-next.202405241828 ssh2: 1.15.0 dev: false - /@zowe/zosmf-for-zowe-sdk@8.0.0-next.202404032038(@zowe/core-for-zowe-sdk@8.0.0-next.202404032038)(@zowe/imperative@8.0.0-next.202404032038): - resolution: {integrity: sha512-uKPq7l9K0aGZVDbtpv/E3pa+8g1Mk7hSNIKGVRwe4ygJka8BJZ4GgbrGL34IFYnGJb8XLqJcrdCDALiBRgNRtQ==} + /@zowe/zosmf-for-zowe-sdk@8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828): + resolution: {integrity: sha512-NKQdyFWN05Vi4J6BGehjiEIQXcxUScHv88ix3aMQeRnykz1Qh8oX1KkCdkDXlh959/Xxtl6WNSCtbaHsW6D3+g==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/core-for-zowe-sdk': ^8.0.0-next '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/core-for-zowe-sdk': 8.0.0-next.202404032038(@zowe/imperative@8.0.0-next.202404032038) - '@zowe/imperative': 8.0.0-next.202404032038 + '@zowe/core-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) + '@zowe/imperative': 8.0.0-next.202405241828 dev: false /abbrev@1.1.1: @@ -8215,6 +8215,7 @@ packages: /read-package-json@7.0.1: resolution: {integrity: sha512-8PcDiZ8DXUjLf687Ol4BR8Bpm2umR7vhoZOzNRt+uxD9GpBh/K+CAAALVIiYFknmvlmyg7hM7BSNUXPaCCqd0Q==} engines: {node: ^16.14.0 || >=18.0.0} + deprecated: This package is no longer supported. Please use @npmcli/package-json instead. dependencies: glob: 10.3.15 json-parse-even-better-errors: 3.0.2 From e39b222b7650d9e9df5b01717ed132f4b39c935b Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Tue, 4 Jun 2024 10:38:25 -0400 Subject: [PATCH 02/20] add CHANGELOGs Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- package.json | 2 +- packages/zowe-explorer-api/CHANGELOG.md | 2 + .../zowe-explorer-ftp-extension/CHANGELOG.md | 1 + packages/zowe-explorer/CHANGELOG.md | 1 + pnpm-lock.yaml | 314 +++++++++++++++--- 5 files changed, 281 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index c798cc73a6..8d50230487 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,6 @@ "pretest:integration": "tsx ./scripts/create-env.ts", "posttest:integration": "tsx ./scripts/clean-env.ts", "preinstall": "npx only-allow pnpm", - "update-sdks": "pnpm -r update \"@zowe/*@next\" \"!@zowe/zowe-explorer-api\"" + "update-sdks": "pnpm -r update \"@zowe/*@next\" \"!@zowe/zowe-explorer-api\" \"!@zowe/zos-ftp-for-zowe-cli\"" } } diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md index 7ce8a85f2b..dea6257c53 100644 --- a/packages/zowe-explorer-api/CHANGELOG.md +++ b/packages/zowe-explorer-api/CHANGELOG.md @@ -18,6 +18,8 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t ### Bug fixes +- Update Zowe SDKs to `8.0.0-next.202405241828` for technical currency. [#2918](https://github.com/zowe/zowe-explorer-vscode/issues/2918) + ## `3.0.0-next.202404242037` ### New features and enhancements diff --git a/packages/zowe-explorer-ftp-extension/CHANGELOG.md b/packages/zowe-explorer-ftp-extension/CHANGELOG.md index ff80cc4bcd..c05dc4376c 100644 --- a/packages/zowe-explorer-ftp-extension/CHANGELOG.md +++ b/packages/zowe-explorer-ftp-extension/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to the "zowe-explorer-ftp-extension" extension will be docum - Changed the hashing algorithm for e-tag generation from `sha1` to `sha256` to avoid collisions. [#2890](https://github.com/zowe/zowe-explorer-vscode/pull/2890) - Updated the FTP plugin dependency to `3.0.0-next.202403191358` for technical currency [#2783](https://github.com/zowe/vscode-extension-for-zowe/pull/2783). +- Update Zowe SDKs to `8.0.0-next.202405241828` for technical currency. [#2918](https://github.com/zowe/zowe-explorer-vscode/issues/2918) ## `3.0.0-next.202404242037` diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md index 89f5fc6b06..c96cb38c69 100644 --- a/packages/zowe-explorer/CHANGELOG.md +++ b/packages/zowe-explorer/CHANGELOG.md @@ -15,6 +15,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen ### Bug fixes - Fixed vNext-only issue where users are not able to create data sets. [#2783](https://github.com/zowe/vscode-extension-for-zowe/pull/2783). +- Update Zowe SDKs to `8.0.0-next.202405241828` for technical currency. [#2918](https://github.com/zowe/zowe-explorer-vscode/issues/2918) ## `3.0.0-next.202404242037` diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 09e081e21a..63ae82897a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -107,7 +107,7 @@ importers: version: 5.3.10(webpack@5.91.0) ts-jest: specifier: ^29.0.3 - version: 29.1.2(@babel/core@7.24.5)(jest@29.7.0)(typescript@5.4.5) + version: 29.1.2(@babel/core@7.24.6)(jest@29.7.0)(typescript@5.4.5) tsconfig-paths-webpack-plugin: specifier: ^4.1.0 version: 4.1.0 @@ -303,7 +303,7 @@ importers: devDependencies: '@preact/preset-vite': specifier: ^2.5.0 - version: 2.8.2(@babel/core@7.24.5)(preact@10.22.0)(vite@4.5.3) + version: 2.8.2(@babel/core@7.24.6)(preact@10.22.0)(vite@4.5.3) '@types/lodash': specifier: ^4.17.0 version: 4.17.4 @@ -490,11 +490,24 @@ packages: picocolors: 1.0.1 dev: true + /@babel/code-frame@7.24.6: + resolution: {integrity: sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/highlight': 7.24.6 + picocolors: 1.0.1 + dev: true + /@babel/compat-data@7.24.4: resolution: {integrity: sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==} engines: {node: '>=6.9.0'} dev: true + /@babel/compat-data@7.24.6: + resolution: {integrity: sha512-aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ==} + engines: {node: '>=6.9.0'} + dev: true + /@babel/core@7.24.5: resolution: {integrity: sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==} engines: {node: '>=6.9.0'} @@ -518,6 +531,29 @@ packages: - supports-color dev: true + /@babel/core@7.24.6: + resolution: {integrity: sha512-qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@ampproject/remapping': 2.3.0 + '@babel/code-frame': 7.24.6 + '@babel/generator': 7.24.6 + '@babel/helper-compilation-targets': 7.24.6 + '@babel/helper-module-transforms': 7.24.6(@babel/core@7.24.6) + '@babel/helpers': 7.24.6 + '@babel/parser': 7.24.6 + '@babel/template': 7.24.6 + '@babel/traverse': 7.24.6 + '@babel/types': 7.24.6 + convert-source-map: 2.0.0 + debug: 4.3.5 + gensync: 1.0.0-beta.2 + json5: 2.2.3 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/generator@7.24.5: resolution: {integrity: sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==} engines: {node: '>=6.9.0'} @@ -528,6 +564,16 @@ packages: jsesc: 2.5.2 dev: true + /@babel/generator@7.24.6: + resolution: {integrity: sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.24.6 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 + jsesc: 2.5.2 + dev: true + /@babel/helper-annotate-as-pure@7.22.5: resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==} engines: {node: '>=6.9.0'} @@ -546,11 +592,27 @@ packages: semver: 6.3.1 dev: true + /@babel/helper-compilation-targets@7.24.6: + resolution: {integrity: sha512-VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/compat-data': 7.24.6 + '@babel/helper-validator-option': 7.24.6 + browserslist: 4.23.0 + lru-cache: 5.1.1 + semver: 6.3.1 + dev: true + /@babel/helper-environment-visitor@7.22.20: resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==} engines: {node: '>=6.9.0'} dev: true + /@babel/helper-environment-visitor@7.24.6: + resolution: {integrity: sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==} + engines: {node: '>=6.9.0'} + dev: true + /@babel/helper-function-name@7.23.0: resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==} engines: {node: '>=6.9.0'} @@ -559,6 +621,14 @@ packages: '@babel/types': 7.24.5 dev: true + /@babel/helper-function-name@7.24.6: + resolution: {integrity: sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/template': 7.24.6 + '@babel/types': 7.24.6 + dev: true + /@babel/helper-hoist-variables@7.22.5: resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} engines: {node: '>=6.9.0'} @@ -566,6 +636,13 @@ packages: '@babel/types': 7.24.5 dev: true + /@babel/helper-hoist-variables@7.24.6: + resolution: {integrity: sha512-SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.24.6 + dev: true + /@babel/helper-module-imports@7.24.3: resolution: {integrity: sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==} engines: {node: '>=6.9.0'} @@ -573,6 +650,13 @@ packages: '@babel/types': 7.24.5 dev: true + /@babel/helper-module-imports@7.24.6: + resolution: {integrity: sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.24.6 + dev: true + /@babel/helper-module-transforms@7.24.5(@babel/core@7.24.5): resolution: {integrity: sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==} engines: {node: '>=6.9.0'} @@ -587,6 +671,20 @@ packages: '@babel/helper-validator-identifier': 7.24.5 dev: true + /@babel/helper-module-transforms@7.24.6(@babel/core@7.24.6): + resolution: {integrity: sha512-Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.24.6 + '@babel/helper-environment-visitor': 7.24.6 + '@babel/helper-module-imports': 7.24.6 + '@babel/helper-simple-access': 7.24.6 + '@babel/helper-split-export-declaration': 7.24.6 + '@babel/helper-validator-identifier': 7.24.6 + dev: true + /@babel/helper-plugin-utils@7.24.5: resolution: {integrity: sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==} engines: {node: '>=6.9.0'} @@ -599,6 +697,13 @@ packages: '@babel/types': 7.24.5 dev: true + /@babel/helper-simple-access@7.24.6: + resolution: {integrity: sha512-nZzcMMD4ZhmB35MOOzQuiGO5RzL6tJbsT37Zx8M5L/i9KSrukGXWTjLe1knIbb/RmxoJE9GON9soq0c0VEMM5g==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.24.6 + dev: true + /@babel/helper-split-export-declaration@7.24.5: resolution: {integrity: sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==} engines: {node: '>=6.9.0'} @@ -606,21 +711,43 @@ packages: '@babel/types': 7.24.5 dev: true + /@babel/helper-split-export-declaration@7.24.6: + resolution: {integrity: sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.24.6 + dev: true + /@babel/helper-string-parser@7.24.1: resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==} engines: {node: '>=6.9.0'} dev: true + /@babel/helper-string-parser@7.24.6: + resolution: {integrity: sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==} + engines: {node: '>=6.9.0'} + dev: true + /@babel/helper-validator-identifier@7.24.5: resolution: {integrity: sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==} engines: {node: '>=6.9.0'} dev: true + /@babel/helper-validator-identifier@7.24.6: + resolution: {integrity: sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==} + engines: {node: '>=6.9.0'} + dev: true + /@babel/helper-validator-option@7.23.5: resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==} engines: {node: '>=6.9.0'} dev: true + /@babel/helper-validator-option@7.24.6: + resolution: {integrity: sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ==} + engines: {node: '>=6.9.0'} + dev: true + /@babel/helpers@7.24.5: resolution: {integrity: sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==} engines: {node: '>=6.9.0'} @@ -632,6 +759,14 @@ packages: - supports-color dev: true + /@babel/helpers@7.24.6: + resolution: {integrity: sha512-V2PI+NqnyFu1i0GyTd/O/cTpxzQCYioSkUIRmgo7gFEHKKCg5w46+r/A6WeUR1+P3TeQ49dspGPNd/E3n9AnnA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/template': 7.24.6 + '@babel/types': 7.24.6 + dev: true + /@babel/highlight@7.24.5: resolution: {integrity: sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==} engines: {node: '>=6.9.0'} @@ -642,6 +777,16 @@ packages: picocolors: 1.0.1 dev: true + /@babel/highlight@7.24.6: + resolution: {integrity: sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-validator-identifier': 7.24.6 + chalk: 2.4.2 + js-tokens: 4.0.0 + picocolors: 1.0.1 + dev: true + /@babel/parser@7.24.5: resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==} engines: {node: '>=6.0.0'} @@ -650,6 +795,14 @@ packages: '@babel/types': 7.24.5 dev: true + /@babel/parser@7.24.6: + resolution: {integrity: sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.24.6 + dev: true + /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.5): resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} peerDependencies: @@ -705,6 +858,16 @@ packages: '@babel/helper-plugin-utils': 7.24.5 dev: true + /@babel/plugin-syntax-jsx@7.24.1(@babel/core@7.24.6): + resolution: {integrity: sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.24.6 + '@babel/helper-plugin-utils': 7.24.5 + dev: true + /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.5): resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} peerDependencies: @@ -779,27 +942,27 @@ packages: '@babel/helper-plugin-utils': 7.24.5 dev: true - /@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.24.5): + /@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.24.6): resolution: {integrity: sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.24.5 - '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.24.5) + '@babel/core': 7.24.6 + '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.24.6) dev: true - /@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.24.5): + /@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.24.6): resolution: {integrity: sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.24.5 + '@babel/core': 7.24.6 '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-module-imports': 7.24.3 '@babel/helper-plugin-utils': 7.24.5 - '@babel/plugin-syntax-jsx': 7.24.1(@babel/core@7.24.5) + '@babel/plugin-syntax-jsx': 7.24.1(@babel/core@7.24.6) '@babel/types': 7.24.5 dev: true @@ -819,6 +982,15 @@ packages: '@babel/types': 7.24.5 dev: true + /@babel/template@7.24.6: + resolution: {integrity: sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.24.6 + '@babel/parser': 7.24.6 + '@babel/types': 7.24.6 + dev: true + /@babel/traverse@7.24.5: resolution: {integrity: sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==} engines: {node: '>=6.9.0'} @@ -837,6 +1009,24 @@ packages: - supports-color dev: true + /@babel/traverse@7.24.6: + resolution: {integrity: sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.24.6 + '@babel/generator': 7.24.6 + '@babel/helper-environment-visitor': 7.24.6 + '@babel/helper-function-name': 7.24.6 + '@babel/helper-hoist-variables': 7.24.6 + '@babel/helper-split-export-declaration': 7.24.6 + '@babel/parser': 7.24.6 + '@babel/types': 7.24.6 + debug: 4.3.5 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/types@7.24.5: resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==} engines: {node: '>=6.9.0'} @@ -846,6 +1036,15 @@ packages: to-fast-properties: 2.0.0 dev: true + /@babel/types@7.24.6: + resolution: {integrity: sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-string-parser': 7.24.6 + '@babel/helper-validator-identifier': 7.24.6 + to-fast-properties: 2.0.0 + dev: true + /@bcoe/v8-coverage@0.2.3: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} dev: true @@ -1795,12 +1994,12 @@ packages: engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dev: false - /@npmcli/package-json@5.1.0: - resolution: {integrity: sha512-1aL4TuVrLS9sf8quCLerU3H9J4vtCtgu8VauYozrmEyU57i/EdKleCnsQ7vpnABIH6c9mnTxcH5sFkO3BlV8wQ==} + /@npmcli/package-json@5.2.0: + resolution: {integrity: sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==} engines: {node: ^16.14.0 || >=18.0.0} dependencies: '@npmcli/git': 5.0.7 - glob: 10.3.15 + glob: 10.4.1 hosted-git-info: 7.0.2 json-parse-even-better-errors: 3.0.2 normalize-package-data: 6.0.1 @@ -1827,7 +2026,7 @@ packages: engines: {node: ^16.14.0 || >=18.0.0} dependencies: '@npmcli/node-gyp': 3.0.0 - '@npmcli/package-json': 5.1.0 + '@npmcli/package-json': 5.2.0 '@npmcli/promise-spawn': 7.0.2 node-gyp: 10.1.0 which: 4.0.0 @@ -1846,18 +2045,18 @@ packages: resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} dev: true - /@preact/preset-vite@2.8.2(@babel/core@7.24.5)(preact@10.22.0)(vite@4.5.3): + /@preact/preset-vite@2.8.2(@babel/core@7.24.6)(preact@10.22.0)(vite@4.5.3): resolution: {integrity: sha512-m3tl+M8IO8jgiHnk+7LSTFl8axdPXloewi7iGVLdmCwf34XOzEUur0bZVewW4DUbUipFjTS2CXu27+5f/oexBA==} peerDependencies: '@babel/core': 7.x vite: 2.x || 3.x || 4.x || 5.x dependencies: - '@babel/core': 7.24.5 - '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.24.5) - '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.24.5) + '@babel/core': 7.24.6 + '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.24.6) + '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.24.6) '@prefresh/vite': 2.4.5(preact@10.22.0)(vite@4.5.3) '@rollup/pluginutils': 4.2.1 - babel-plugin-transform-hook-names: 1.0.2(@babel/core@7.24.5) + babel-plugin-transform-hook-names: 1.0.2(@babel/core@7.24.6) debug: 4.3.4(supports-color@8.1.1) kolorist: 1.8.0 magic-string: 0.30.5 @@ -3106,12 +3305,12 @@ packages: '@types/babel__traverse': 7.20.5 dev: true - /babel-plugin-transform-hook-names@1.0.2(@babel/core@7.24.5): + /babel-plugin-transform-hook-names@1.0.2(@babel/core@7.24.6): resolution: {integrity: sha512-5gafyjyyBTTdX/tQQ0hRgu4AhNHG/hqWi0ZZmg2xvs2FgRkJXzDNKBZCyoYqgFkovfDrgM8OoKg8karoUvWeCw==} peerDependencies: '@babel/core': ^7.12.10 dependencies: - '@babel/core': 7.24.5 + '@babel/core': 7.24.6 dev: true /babel-preset-current-node-syntax@1.0.1(@babel/core@7.24.5): @@ -3321,9 +3520,9 @@ packages: dependencies: '@npmcli/fs': 3.1.1 fs-minipass: 3.0.3 - glob: 10.3.15 + glob: 10.4.1 lru-cache: 10.2.2 - minipass: 7.1.1 + minipass: 7.1.2 minipass-collect: 2.0.1 minipass-flush: 1.0.5 minipass-pipeline: 1.2.4 @@ -3901,6 +4100,17 @@ packages: ms: 2.1.2 supports-color: 8.1.1 + /debug@4.3.5: + resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.2 + /decamelize@4.0.0: resolution: {integrity: sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==} engines: {node: '>=10'} @@ -5082,7 +5292,7 @@ packages: resolution: {integrity: sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dependencies: - minipass: 7.1.1 + minipass: 7.1.2 dev: false /fs-monkey@1.0.6: @@ -5247,6 +5457,19 @@ packages: minimatch: 9.0.4 minipass: 7.1.1 path-scurry: 1.11.1 + dev: true + + /glob@10.4.1: + resolution: {integrity: sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==} + engines: {node: '>=16 || 14 >=14.18'} + hasBin: true + dependencies: + foreground-child: 3.1.1 + jackspeak: 3.2.3 + minimatch: 9.0.4 + minipass: 7.1.2 + path-scurry: 1.11.1 + dev: false /glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} @@ -6017,6 +6240,16 @@ packages: '@isaacs/cliui': 8.0.2 optionalDependencies: '@pkgjs/parseargs': 0.11.0 + dev: true + + /jackspeak@3.2.3: + resolution: {integrity: sha512-htOzIMPbpLid/Gq9/zaz9SfExABxqRe1sSCdxntlO/aMD6u0issZQiY25n2GKQUtJ02j7z5sfptlAOMpWWOmvw==} + engines: {node: '>=14'} + dependencies: + '@isaacs/cliui': 8.0.2 + optionalDependencies: + '@pkgjs/parseargs': 0.11.0 + dev: false /jest-changed-files@29.7.0: resolution: {integrity: sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==} @@ -6975,7 +7208,7 @@ packages: cacache: 18.0.3 http-cache-semantics: 4.1.1 is-lambda: 1.0.1 - minipass: 7.1.1 + minipass: 7.1.2 minipass-fetch: 3.0.5 minipass-flush: 1.0.5 minipass-pipeline: 1.2.4 @@ -7188,14 +7421,14 @@ packages: resolution: {integrity: sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==} engines: {node: '>=16 || 14 >=14.17'} dependencies: - minipass: 7.1.1 + minipass: 7.1.2 dev: false /minipass-fetch@3.0.5: resolution: {integrity: sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dependencies: - minipass: 7.1.1 + minipass: 7.1.2 minipass-sized: 1.0.3 minizlib: 2.1.2 optionalDependencies: @@ -7246,6 +7479,11 @@ packages: resolution: {integrity: sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==} engines: {node: '>=16 || 14 >=14.17'} + /minipass@7.1.2: + resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} + engines: {node: '>=16 || 14 >=14.17'} + dev: false + /minizlib@2.1.2: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} @@ -7483,7 +7721,7 @@ packages: dependencies: env-paths: 2.2.1 exponential-backoff: 3.1.1 - glob: 10.3.15 + glob: 10.4.1 graceful-fs: 4.2.11 make-fetch-happen: 13.0.1 nopt: 7.2.1 @@ -7623,7 +7861,7 @@ packages: dependencies: '@npmcli/redact': 1.1.0 make-fetch-happen: 13.0.1 - minipass: 7.1.1 + minipass: 7.1.2 minipass-fetch: 3.0.5 minipass-json-stream: 1.0.1 minizlib: 2.1.2 @@ -7796,7 +8034,7 @@ packages: '@npmcli/run-script': 7.0.4 cacache: 18.0.3 fs-minipass: 3.0.3 - minipass: 7.1.1 + minipass: 7.1.2 npm-package-arg: 11.0.2 npm-packlist: 8.0.2 npm-pick-manifest: 9.0.1 @@ -8217,7 +8455,7 @@ packages: engines: {node: ^16.14.0 || >=18.0.0} deprecated: This package is no longer supported. Please use @npmcli/package-json instead. dependencies: - glob: 10.3.15 + glob: 10.4.1 json-parse-even-better-errors: 3.0.2 normalize-package-data: 6.0.1 npm-normalize-package-bin: 3.0.1 @@ -8755,7 +8993,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.5 socks: 2.8.3 transitivePeerDependencies: - supports-color @@ -8830,7 +9068,7 @@ packages: resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} dependencies: spdx-expression-parse: 3.0.1 - spdx-license-ids: 3.0.17 + spdx-license-ids: 3.0.18 dev: false /spdx-exceptions@2.5.0: @@ -8841,11 +9079,11 @@ packages: resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} dependencies: spdx-exceptions: 2.5.0 - spdx-license-ids: 3.0.17 + spdx-license-ids: 3.0.18 dev: false - /spdx-license-ids@3.0.17: - resolution: {integrity: sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==} + /spdx-license-ids@3.0.18: + resolution: {integrity: sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==} dev: false /split-string@3.1.0: @@ -8878,7 +9116,7 @@ packages: resolution: {integrity: sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dependencies: - minipass: 7.1.1 + minipass: 7.1.2 dev: false /stack-trace@0.0.10: @@ -9273,7 +9511,7 @@ packages: engines: {node: '>=14.16'} dev: true - /ts-jest@29.1.2(@babel/core@7.24.5)(jest@29.7.0)(typescript@5.4.5): + /ts-jest@29.1.2(@babel/core@7.24.6)(jest@29.7.0)(typescript@5.4.5): resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==} engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true @@ -9294,7 +9532,7 @@ packages: esbuild: optional: true dependencies: - '@babel/core': 7.24.5 + '@babel/core': 7.24.6 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 jest: 29.7.0(@types/node@18.19.33) @@ -9357,7 +9595,7 @@ packages: engines: {node: ^16.14.0 || >=18.0.0} dependencies: '@tufjs/models': 2.0.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.5 make-fetch-happen: 13.0.1 transitivePeerDependencies: - supports-color From 88f3ecae8525b66527bf98ce3ffa824e8e218ee3 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Tue, 4 Jun 2024 15:50:09 -0400 Subject: [PATCH 03/20] Replace ConfigBuilder with ConvertV1Profiles in API unit tests Signed-off-by: Timothy Johnson --- .../__unit__/profiles/ProfilesCache.unit.test.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/zowe-explorer-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts b/packages/zowe-explorer-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts index f516492150..f8a47b024a 100644 --- a/packages/zowe-explorer-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts +++ b/packages/zowe-explorer-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts @@ -13,7 +13,7 @@ import * as path from "path"; import * as fs from "fs"; import * as imperative from "@zowe/imperative"; import { ProfilesCache } from "../../../src/profiles/ProfilesCache"; -import { FileManagement, ZoweExplorerApi } from "../../../src"; +import { FileManagement, Types } from "../../../src"; jest.mock("fs"); @@ -260,7 +260,7 @@ describe("ProfilesCache", () => { it("should refresh profile data for multiple profile types", async () => { const profCache = new ProfilesCache({ ...fakeLogger, error: mockLogError } as unknown as imperative.Logger); const getProfInfoSpy = jest.spyOn(profCache, "getProfileInfo").mockResolvedValue(createProfInfoMock([lpar1Profile, zftpProfile])); - await profCache.refresh(fakeApiRegister as unknown as ZoweExplorerApi.IApiRegisterClient); + await profCache.refresh(fakeApiRegister as unknown as Types.IApiRegisterClient); expect(profCache.allProfiles.length).toEqual(2); expect(profCache.allProfiles[0]).toMatchObject(lpar1Profile); expect(profCache.allProfiles[1]).toMatchObject(zftpProfile); @@ -273,7 +273,7 @@ describe("ProfilesCache", () => { jest.spyOn(profCache, "getProfileInfo").mockResolvedValue( createProfInfoMock([lpar1ProfileWithToken, lpar2ProfileWithToken, baseProfileWithToken]) ); - await profCache.refresh(fakeApiRegister as unknown as ZoweExplorerApi.IApiRegisterClient); + await profCache.refresh(fakeApiRegister as unknown as Types.IApiRegisterClient); expect(profCache.allProfiles.length).toEqual(3); expect(profCache.allProfiles[0]).toMatchObject(lpar1ProfileWithToken); expect(profCache.allProfiles[1]).toMatchObject(lpar2Profile); // without token @@ -288,7 +288,7 @@ describe("ProfilesCache", () => { jest.spyOn(profCache, "getProfileInfo").mockImplementation(() => { throw fakeError; }); - await profCache.refresh(fakeApiRegister as unknown as ZoweExplorerApi.IApiRegisterClient); + await profCache.refresh(fakeApiRegister as unknown as Types.IApiRegisterClient); expect(profCache.allProfiles.length).toEqual(0); expect(profCache.getAllTypes().length).toEqual(0); expect(mockLogError).toHaveBeenCalledWith(fakeError); @@ -442,7 +442,7 @@ describe("ProfilesCache", () => { Object.defineProperty(ProfilesCache, "getConfigArray", { value: jest.fn(), configurable: true }); it("Should convert v1 profiles to config file", async () => { const profCache = new ProfilesCache(fakeLogger as unknown as imperative.Logger); - jest.spyOn(imperative.ConfigBuilder, "convert").mockImplementationOnce(() => { + jest.spyOn(imperative.ConvertV1Profiles, "convert").mockImplementationOnce(() => { return { profilesConverted: { zosmf: ["profile1"] }, profilesFailed: {}, @@ -453,7 +453,7 @@ describe("ProfilesCache", () => { }); it("Should convert v1 profiles to config file with profilesFailed", async () => { const profCache = new ProfilesCache(fakeLogger as unknown as imperative.Logger); - jest.spyOn(imperative.ConfigBuilder, "convert").mockImplementationOnce(() => { + jest.spyOn(imperative.ConvertV1Profiles, "convert").mockImplementationOnce(() => { return { profilesConverted: {}, profilesFailed: [{ name: ["profile2"], types: "zosmf", error: "Error converting" }], @@ -470,7 +470,7 @@ describe("ProfilesCache", () => { configurable: true, }); const profCache = new ProfilesCache(fakeLogger as unknown as imperative.Logger); - jest.spyOn(imperative.ConfigBuilder, "convert").mockImplementationOnce(() => { + jest.spyOn(imperative.ConvertV1Profiles, "convert").mockImplementationOnce(() => { return { profilesConverted: {}, profilesFailed: [{ name: ["profile2"], types: "zosmf", error: "Error converting" }], @@ -481,7 +481,7 @@ describe("ProfilesCache", () => { }); it("Should reject if error thrown other than renaming profiles directory", async () => { const profCache = new ProfilesCache(fakeLogger as unknown as imperative.Logger); - jest.spyOn(imperative.ConfigBuilder, "convert").mockImplementationOnce(() => { + jest.spyOn(imperative.ConvertV1Profiles, "convert").mockImplementationOnce(() => { throw new Error("Error converting config"); }); await expect(profCache.convertV1ProfToConfig()).rejects.toThrow("Error converting config"); From 1efd4f71a0cfa1e4acb2db38211bd27532bb630c Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Tue, 4 Jun 2024 16:10:50 -0400 Subject: [PATCH 04/20] Add appendFileSync mock to fix unit test Signed-off-by: Timothy Johnson --- packages/zowe-explorer/__tests__/__mocks__/fs.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/zowe-explorer/__tests__/__mocks__/fs.ts b/packages/zowe-explorer/__tests__/__mocks__/fs.ts index b30226cf41..3424b4e183 100644 --- a/packages/zowe-explorer/__tests__/__mocks__/fs.ts +++ b/packages/zowe-explorer/__tests__/__mocks__/fs.ts @@ -32,6 +32,8 @@ export class FakeStats implements Stats { export function access(path: string, callback: any): void {} +export function appendFileSync(path: string, data: any, encoding: string): void {} + export function closeSync(fd: number): void {} export function existsSync(path: string | Buffer): boolean { From c75910010340f172779c4df27d97352d5bf032bd Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:06:40 -0400 Subject: [PATCH 05/20] changes after testing convertV1Profiles Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- .../src/profiles/ProfilesCache.ts | 42 +++--------- .../__tests__/__mocks__/@zowe/imperative.ts | 11 +++ .../zowe-explorer/src/utils/ProfilesUtils.ts | 67 ++++++++++++++++--- 3 files changed, 77 insertions(+), 43 deletions(-) diff --git a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts index bc2953f2fe..faa821f14a 100644 --- a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts +++ b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts @@ -352,48 +352,26 @@ export class ProfilesCache { }; } - public async convertV1ProfToConfig(): Promise { - const successMsg: string[] = []; - const warningMsg: string[] = []; - const zoweDir = FileManagement.getZoweDir(); - const profilesPath = path.join(zoweDir, "profiles"); - const oldProfilesPath = `${profilesPath.replace(/[\\/]$/, "")}-old`; - const convertResult = await imperative.ConvertV1Profiles.convert({ deleteV1Profs: false }); - for (const [k, v] of Object.entries(convertResult.profilesConverted)) { - successMsg.push(`Converted ${k} profile: ${v.join(", ")}\n`); - } - if (convertResult.profilesFailed.length > 0) { - warningMsg.push(`Failed to convert ${convertResult.profilesFailed.length} profile(s). See details below\n`); - for (const { name, type, error } of convertResult.profilesFailed) { - if (name != null) { - warningMsg.push(`Failed to load ${type} profile "${name}":\n${String(error)}\n`); - } else { - warningMsg.push(`Failed to find default ${type} profile:\n${String(error)}\n`); - } - } - } + public async convertV1ProfToConfig(deleteV1Profs: boolean = false): Promise { + const convertResult = await imperative.ConvertV1Profiles.convert({ deleteV1Profs }); // const teamConfig = await imperative.Config.load("zowe", { // homeDir: zoweDir, // projectDir: false, // }); + // console.log(convertResult.profilesConverted); // teamConfig.api.layers.activate(false, true); - // teamConfig.api.layers.merge(convertResult.profilesConverted); + // teamConfig.api.layers.merge(convertResult.profilesConverted as any); // const knownCliConfig: imperative.ICommandProfileTypeConfiguration[] = this.getCoreProfileTypes(); // knownCliConfig.push(ProfileConstants.BaseProfile); // this.addToConfigArray(knownCliConfig); // teamConfig.setSchema(imperative.ConfigSchema.buildSchema(this.getConfigArray())); // await teamConfig.save(); - try { - fs.renameSync(profilesPath, oldProfilesPath); - } catch (error) { - warningMsg.push(`Failed to rename profiles directory to ${oldProfilesPath}:\n ${String(error)}`); - } - successMsg.push(`Your new profiles have been saved to ${convertResult.cfgFilePathNm}.\n`); - return { - success: String(successMsg.join("")), - warnings: String(warningMsg.join("")), - convertResult, - }; + // try { + // fs.renameSync(profilesPath, oldProfilesPath); + // } catch (error) { + // warningMsg.push(`Failed to rename profiles directory to ${oldProfilesPath}:\n ${String(error)}`); + // } + return convertResult; } protected getCoreProfileTypes(): imperative.IProfileTypeConfiguration[] { diff --git a/packages/zowe-explorer/__tests__/__mocks__/@zowe/imperative.ts b/packages/zowe-explorer/__tests__/__mocks__/@zowe/imperative.ts index a50dcb6f77..26752b3c1c 100644 --- a/packages/zowe-explorer/__tests__/__mocks__/@zowe/imperative.ts +++ b/packages/zowe-explorer/__tests__/__mocks__/@zowe/imperative.ts @@ -393,3 +393,14 @@ export namespace SessConstants { export const apiErrorHeader = { message: "API Error", }; + +export class ConvertV1Profiles { + public static convert() { + return { + msgs: "", + profilesConverted: [], + profilesFailed: [], + v1ScsPluginName: undefined, + }; + } +} diff --git a/packages/zowe-explorer/src/utils/ProfilesUtils.ts b/packages/zowe-explorer/src/utils/ProfilesUtils.ts index 74ae4b9285..5616b38fb8 100644 --- a/packages/zowe-explorer/src/utils/ProfilesUtils.ts +++ b/packages/zowe-explorer/src/utils/ProfilesUtils.ts @@ -297,7 +297,7 @@ export class ProfilesUtils { ); ZoweLogger.debug(`Summary of team configuration files considered for Zowe Explorer: ${JSON.stringify(layerSummary)}`); } else { - if (mProfileInfo.getAllProfiles()?.length > 0) { + if (imperative.ProfileInfo.onlyV1ProfilesExist) { this.v1ProfileOptions(); } } @@ -489,16 +489,7 @@ export class ProfilesUtils { } case convertButton: { ZoweLogger.info("Convert v1 profiles to team configuration chosen."); - const convertResults = await Constants.PROFILES_CACHE.convertV1ProfToConfig(); - let responseMsg = ""; - if (convertResults.success) { - responseMsg += `Success: ${convertResults.success}\n`; - } - if (convertResults.warnings) { - responseMsg += `Warning: ${convertResults.warnings}\n`; - } - ZoweLogger.info(responseMsg); - Gui.infoMessage(vscode.l10n.t(responseMsg), { vsCodeOpts: { modal: true } }); + await this.convertV1Profs(); break; } default: { @@ -539,4 +530,58 @@ export class ProfilesUtils { } throw new Error(vscode.l10n.t("Tree Item is not a Zowe Explorer item.")); } + + private static async convertV1Profs(): Promise { + const convertResults: imperative.IConvertV1ProfResult = await imperative.ConvertV1Profiles.convert({ deleteV1Profs: false }); + // await Constants.PROFILES_CACHE.convertV1ProfToConfig(); + const successMsg: string[] = []; + const warningMsg: string[] = []; + if (convertResults.profilesConverted) { + for (const [k, v] of Object.entries(convertResults?.profilesConverted)) { + successMsg.push(`Converted ${k} profile: ${v.join(", ")}\n`); + } + } + if (convertResults?.profilesFailed?.length > 0) { + warningMsg.push(`Failed to convert ${convertResults?.profilesFailed.length} profile(s). See details below\n`); + for (const { name, type, error } of convertResults.profilesFailed) { + if (name != null) { + warningMsg.push(`Failed to load ${String(type)} profile "${String(name)}":\n${String(error)}\n`); + } else { + warningMsg.push(`Failed to find default ${String(type)} profile:\n${String(error)}\n`); + } + } + } + let responseMsg = ""; + // console.log(convertResults.v1ScsPluginName); + // if (convertResults.v1ScsPluginName) { + // try { + // imperative.uninstallPlugin(convertResults.v1ScsPluginName); + // const newMsg = new imperative.ConvertMsg( + // imperative.ConvertMsgFmt.REPORT_LINE, + // `Uninstalled plug-in "${convertResults.v1ScsPluginName}"` + // ); + // convertResults.msgs.push(newMsg); + // } catch (error) { + // let newMsg = new imperative.ConvertMsg( + // imperative.ConvertMsgFmt.ERROR_LINE, + // `Failed to uninstall plug-in "${convertResults.v1ScsPluginName}"` + // ); + // convertResults.msgs.push(newMsg); + + // newMsg = new imperative.ConvertMsg(imperative.ConvertMsgFmt.ERROR_LINE | imperative.ConvertMsgFmt.INDENT, error.message); + // convertResults.msgs.push(newMsg); + // } + // } + if (convertResults.msgs) { + responseMsg += `${String(convertResults.msgs.join(""))}\n`; + } + if (successMsg?.length > 0) { + responseMsg += `Success: ${String(successMsg.join(""))}\n`; + } + if (warningMsg?.length > 0) { + responseMsg += `Warning: ${String(warningMsg.join(""))}\n`; + } + ZoweLogger.info(responseMsg); + Gui.infoMessage(vscode.l10n.t(responseMsg), { vsCodeOpts: { modal: true } }); + } } From 7c810efa43fae3ecf320b79468bda8549120ba5f Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 7 Jun 2024 15:50:06 -0400 Subject: [PATCH 06/20] Add base profile when creating team config Signed-off-by: Timothy Johnson --- packages/zowe-explorer/src/configuration/Profiles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/zowe-explorer/src/configuration/Profiles.ts b/packages/zowe-explorer/src/configuration/Profiles.ts index 7e601fee8d..73aed94c52 100644 --- a/packages/zowe-explorer/src/configuration/Profiles.ts +++ b/packages/zowe-explorer/src/configuration/Profiles.ts @@ -471,7 +471,7 @@ export class Profiles extends ProfilesCache { // Build new config and merge with existing layer const impConfig: Partial = { - profiles: this.getCoreProfileTypes(), + profiles: [...this.getCoreProfileTypes(), ProfileConstants.BaseProfile], baseProfile: ProfileConstants.BaseProfile, }; const newConfig: imperative.IConfig = await imperative.ConfigBuilder.build(impConfig, opts); From b795f0564d12ed96849e7ba4c5af0b6e60b6e373 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Mon, 24 Jun 2024 11:45:18 -0400 Subject: [PATCH 07/20] Await profile conversion before loading ZE Signed-off-by: Timothy Johnson --- packages/zowe-explorer/src/utils/ProfilesUtils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/zowe-explorer/src/utils/ProfilesUtils.ts b/packages/zowe-explorer/src/utils/ProfilesUtils.ts index f684e3e74e..af9e55fff9 100644 --- a/packages/zowe-explorer/src/utils/ProfilesUtils.ts +++ b/packages/zowe-explorer/src/utils/ProfilesUtils.ts @@ -298,7 +298,7 @@ export class ProfilesUtils { ZoweLogger.debug(`Summary of team configuration files considered for Zowe Explorer: ${JSON.stringify(layerSummary)}`); } else { if (imperative.ProfileInfo.onlyV1ProfilesExist) { - this.v1ProfileOptions(); + await this.v1ProfileOptions(); } } } @@ -470,7 +470,7 @@ export class ProfilesUtils { } } - private static v1ProfileOptions(): void { + private static async v1ProfileOptions(): Promise { const v1ProfileErrorMsg = vscode.l10n.t( // eslint-disable-next-line max-len "Zowe v1 profiles in use.\nZowe Explorer no longer supports v1 profiles, choose to convert existing profiles to a team configuration or create new." @@ -478,7 +478,7 @@ export class ProfilesUtils { ZoweLogger.warn(v1ProfileErrorMsg); const createButton = vscode.l10n.t("Create New"); const convertButton = vscode.l10n.t("Convert Existing Profiles"); - Gui.infoMessage(v1ProfileErrorMsg, { items: [createButton, convertButton], vsCodeOpts: { modal: true } }).then(async (selection) => { + await Gui.infoMessage(v1ProfileErrorMsg, { items: [createButton, convertButton], vsCodeOpts: { modal: true } }).then(async (selection) => { switch (selection) { case createButton: { ZoweLogger.info("Create new team configuration chosen."); From b6ea6c857583d2f30226795a48b905c3d71116ac Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 5 Jul 2024 09:55:16 -0400 Subject: [PATCH 08/20] Update dialog text and pass ProfileInfo to convert API Signed-off-by: Timothy Johnson --- packages/zowe-explorer/l10n/bundle.l10n.json | 38 +++++++++---------- packages/zowe-explorer/l10n/poeditor.json | 14 +++---- .../zowe-explorer/src/utils/ProfilesUtils.ts | 22 ++++++----- 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/packages/zowe-explorer/l10n/bundle.l10n.json b/packages/zowe-explorer/l10n/bundle.l10n.json index 9d1d893fc9..9e84a07d99 100644 --- a/packages/zowe-explorer/l10n/bundle.l10n.json +++ b/packages/zowe-explorer/l10n/bundle.l10n.json @@ -84,8 +84,8 @@ ] }, "Zowe Profiles initialized successfully.": "Zowe Profiles initialized successfully.", - "Create New": "Create New", "Convert Existing Profiles": "Convert Existing Profiles", + "Create New": "Create New", "Operation cancelled": "Operation cancelled", "Tree Item is not a Zowe Explorer item.": "Tree Item is not a Zowe Explorer item.", "Zowe Explorer": "Zowe Explorer", @@ -172,6 +172,24 @@ "Required API functions for pasting (fileList and copy/uploadFromBuffer) were not found.": "Required API functions for pasting (fileList and copy/uploadFromBuffer) were not found.", "Uploading USS files...": "Uploading USS files...", "Error uploading files": "Error uploading files", + "The 'move' function is not implemented for this USS API.": "The 'move' function is not implemented for this USS API.", + "Could not list USS files: Empty path provided in URI": "Could not list USS files: Empty path provided in URI", + "Profile does not exist for this file.": "Profile does not exist for this file.", + "$(sync~spin) Saving USS file...": "$(sync~spin) Saving USS file...", + "Renaming {0} failed due to API error: {1}/File pathError message": { + "message": "Renaming {0} failed due to API error: {1}", + "comment": [ + "File path", + "Error message" + ] + }, + "Deleting {0} failed due to API error: {1}/File nameError message": { + "message": "Deleting {0} failed due to API error: {1}", + "comment": [ + "File name", + "Error message" + ] + }, "Downloaded: {0}/Download time": { "message": "Downloaded: {0}", "comment": [ @@ -242,24 +260,6 @@ "initializeUSSFavorites.error.buttonRemove": "initializeUSSFavorites.error.buttonRemove", "File does not exist. It may have been deleted.": "File does not exist. It may have been deleted.", "$(sync~spin) Pulling from Mainframe...": "$(sync~spin) Pulling from Mainframe...", - "The 'move' function is not implemented for this USS API.": "The 'move' function is not implemented for this USS API.", - "Could not list USS files: Empty path provided in URI": "Could not list USS files: Empty path provided in URI", - "Profile does not exist for this file.": "Profile does not exist for this file.", - "$(sync~spin) Saving USS file...": "$(sync~spin) Saving USS file...", - "Renaming {0} failed due to API error: {1}/File pathError message": { - "message": "Renaming {0} failed due to API error: {1}", - "comment": [ - "File path", - "Error message" - ] - }, - "Deleting {0} failed due to API error: {1}/File nameError message": { - "message": "Deleting {0} failed due to API error: {1}", - "comment": [ - "File name", - "Error message" - ] - }, "{0} location/Node type": { "message": "{0} location", "comment": [ diff --git a/packages/zowe-explorer/l10n/poeditor.json b/packages/zowe-explorer/l10n/poeditor.json index a41c4d5175..1a7957694e 100644 --- a/packages/zowe-explorer/l10n/poeditor.json +++ b/packages/zowe-explorer/l10n/poeditor.json @@ -437,8 +437,8 @@ "Updating imperative.json Credential Manager to {0}.\n{1}": "", "Failed to initialize Zowe folder: {0}": "", "Zowe Profiles initialized successfully.": "", - "Create New": "", "Convert Existing Profiles": "", + "Create New": "", "Operation cancelled": "", "Tree Item is not a Zowe Explorer item.": "", "Zowe Explorer": "", @@ -480,6 +480,12 @@ "Required API functions for pasting (fileList and copy/uploadFromBuffer) were not found.": "", "Uploading USS files...": "", "Error uploading files": "", + "The 'move' function is not implemented for this USS API.": "", + "Could not list USS files: Empty path provided in URI": "", + "Profile does not exist for this file.": "", + "$(sync~spin) Saving USS file...": "", + "Renaming {0} failed due to API error: {1}": "", + "Deleting {0} failed due to API error: {1}": "", "Downloaded: {0}": "", "Encoding: {0}": "", "Binary": "", @@ -508,12 +514,6 @@ "initializeUSSFavorites.error.buttonRemove": "", "File does not exist. It may have been deleted.": "", "$(sync~spin) Pulling from Mainframe...": "", - "The 'move' function is not implemented for this USS API.": "", - "Could not list USS files: Empty path provided in URI": "", - "Profile does not exist for this file.": "", - "$(sync~spin) Saving USS file...": "", - "Renaming {0} failed due to API error: {1}": "", - "Deleting {0} failed due to API error: {1}": "", "{0} location": "", "Choose a location to create the {0}": "", "Name of file or directory": "", diff --git a/packages/zowe-explorer/src/utils/ProfilesUtils.ts b/packages/zowe-explorer/src/utils/ProfilesUtils.ts index 09f60ea9fd..76287e74ad 100644 --- a/packages/zowe-explorer/src/utils/ProfilesUtils.ts +++ b/packages/zowe-explorer/src/utils/ProfilesUtils.ts @@ -507,12 +507,12 @@ export class ProfilesUtils { private static async v1ProfileOptions(): Promise { const v1ProfileErrorMsg = vscode.l10n.t( // eslint-disable-next-line max-len - "Zowe v1 profiles in use.\nZowe Explorer no longer supports v1 profiles, choose to convert existing profiles to a team configuration or create new." + "Zowe V1 profiles in use.\nZowe Explorer no longer supports V1 profiles. Choose to convert existing profiles to a team configuration or create new profiles." ); ZoweLogger.warn(v1ProfileErrorMsg); - const createButton = vscode.l10n.t("Create New"); const convertButton = vscode.l10n.t("Convert Existing Profiles"); - await Gui.infoMessage(v1ProfileErrorMsg, { items: [createButton, convertButton], vsCodeOpts: { modal: true } }).then(async (selection) => { + const createButton = vscode.l10n.t("Create New"); + await Gui.infoMessage(v1ProfileErrorMsg, { items: [convertButton, createButton], vsCodeOpts: { modal: true } }).then(async (selection) => { switch (selection) { case createButton: { ZoweLogger.info("Create new team configuration chosen."); @@ -564,7 +564,9 @@ export class ProfilesUtils { } private static async convertV1Profs(): Promise { - const convertResults: imperative.IConvertV1ProfResult = await imperative.ConvertV1Profiles.convert({ deleteV1Profs: false }); + const profileInfo = await this.getProfileInfo(); + const convertResults: imperative.IConvertV1ProfResult = await imperative.ConvertV1Profiles.convert({ deleteV1Profs: false, profileInfo }); + ZoweLogger.debug(JSON.stringify(convertResults)); // await Constants.PROFILES_CACHE.convertV1ProfToConfig(); const successMsg: string[] = []; const warningMsg: string[] = []; @@ -577,9 +579,9 @@ export class ProfilesUtils { warningMsg.push(`Failed to convert ${convertResults?.profilesFailed.length} profile(s). See details below\n`); for (const { name, type, error } of convertResults.profilesFailed) { if (name != null) { - warningMsg.push(`Failed to load ${String(type)} profile "${String(name)}":\n${String(error)}\n`); + warningMsg.push(`Failed to load ${type} profile "${name}":\n${String(error)}\n`); } else { - warningMsg.push(`Failed to find default ${String(type)} profile:\n${String(error)}\n`); + warningMsg.push(`Failed to find default ${type} profile:\n${String(error)}\n`); } } } @@ -605,15 +607,15 @@ export class ProfilesUtils { // } // } if (convertResults.msgs) { - responseMsg += `${String(convertResults.msgs.join(""))}\n`; + responseMsg += `${convertResults.msgs.map((msg) => msg.msgText).join("")}\n`; } if (successMsg?.length > 0) { - responseMsg += `Success: ${String(successMsg.join(""))}\n`; + responseMsg += `Success: ${successMsg.join("")}\n`; } if (warningMsg?.length > 0) { - responseMsg += `Warning: ${String(warningMsg.join(""))}\n`; + responseMsg += `Warning: ${warningMsg.join("")}\n`; } ZoweLogger.info(responseMsg); - Gui.infoMessage(vscode.l10n.t(responseMsg), { vsCodeOpts: { modal: true } }); + Gui.infoMessage(responseMsg, { vsCodeOpts: { modal: true } }); } } From 634884b0f4eba747f5f5e720b15606b670b0e3c9 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Mon, 8 Jul 2024 08:10:37 -0400 Subject: [PATCH 09/20] Update Zowe SDKs again and fix unit test Signed-off-by: Timothy Johnson --- packages/zowe-explorer-api/package.json | 18 +- .../zowe-explorer-ftp-extension/package.json | 4 +- .../__unit__/utils/ProfilesUtils.unit.test.ts | 9 +- packages/zowe-explorer/package.json | 10 +- .../zowe-explorer/src/tools/ZoweLogger.ts | 7 +- pnpm-lock.yaml | 923 ++++++++++++------ 6 files changed, 659 insertions(+), 312 deletions(-) diff --git a/packages/zowe-explorer-api/package.json b/packages/zowe-explorer-api/package.json index f106102635..39f9afafbc 100644 --- a/packages/zowe-explorer-api/package.json +++ b/packages/zowe-explorer-api/package.json @@ -22,15 +22,15 @@ }, "dependencies": { "@types/vscode": "^1.53.2", - "@zowe/core-for-zowe-sdk": "8.0.0-next.202405241828", - "@zowe/imperative": "8.0.0-next.202405241828", - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202405241828", - "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202405241828", - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202405241828", - "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202405241828", - "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202405241828", - "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202405241828", - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202407051717", + "@zowe/imperative": "8.0.0-next.202407051717", + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202407051717", + "@zowe/zos-console-for-zowe-sdk": "8.0.0-next.202407051717", + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202407051717", + "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202407051717", + "@zowe/zos-tso-for-zowe-sdk": "8.0.0-next.202407051717", + "@zowe/zos-uss-for-zowe-sdk": "8.0.0-next.202407051717", + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202407051717", "mustache": "^4.2.0", "semver": "^7.6.0" }, diff --git a/packages/zowe-explorer-ftp-extension/package.json b/packages/zowe-explorer-ftp-extension/package.json index bb64f8a3e2..db86bf27f6 100644 --- a/packages/zowe-explorer-ftp-extension/package.json +++ b/packages/zowe-explorer-ftp-extension/package.json @@ -48,9 +48,9 @@ "vscode": "^1.79.0" }, "dependencies": { - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202407051717", "@zowe/zos-ftp-for-zowe-cli": "3.0.0-next.202403191358", - "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202407051717", "@zowe/zowe-explorer-api": "3.0.0-next-SNAPSHOT", "tmp": "0.2.3" }, diff --git a/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts index 445f4f461d..239170125a 100644 --- a/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts +++ b/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts @@ -316,11 +316,10 @@ describe("ProfilesUtils unit tests", () => { await expect(ProfilesUtils.readConfigFromDisk()).resolves.not.toThrow(); Object.defineProperty(imperative.ProfileInfo, "onlyV1ProfilesExist", { value: false, configurable: true }); - expect(msgSpy).toHaveBeenCalledWith( - // eslint-disable-next-line max-len - "Zowe v1 profiles in use.\nZowe Explorer no longer supports v1 profiles, choose to convert existing profiles to a team configuration or create new.", - { items: ["Create New", "Convert Existing Profiles"], vsCodeOpts: { modal: true } } - ); + expect(msgSpy).toHaveBeenCalledWith(expect.stringContaining("Zowe V1 profiles in use."), { + items: ["Convert Existing Profiles", "Create New"], + vsCodeOpts: { modal: true }, + }); expect(commandSpy).toHaveBeenCalledWith("zowe.ds.addSession", undefined); msgSpy.mockRestore(); commandSpy.mockRestore(); diff --git a/packages/zowe-explorer/package.json b/packages/zowe-explorer/package.json index 1221532d16..b92f165610 100644 --- a/packages/zowe-explorer/package.json +++ b/packages/zowe-explorer/package.json @@ -1811,11 +1811,11 @@ "webdriverio": "^8.36.1" }, "dependencies": { - "@zowe/core-for-zowe-sdk": "8.0.0-next.202405241828", - "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202405241828", - "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202405241828", - "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202405241828", - "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202405241828", + "@zowe/core-for-zowe-sdk": "8.0.0-next.202407051717", + "@zowe/secrets-for-zowe-sdk": "8.0.0-next.202407051717", + "@zowe/zos-files-for-zowe-sdk": "8.0.0-next.202407051717", + "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202407051717", + "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202407051717", "@zowe/zowe-explorer-api": "3.0.0-next-SNAPSHOT", "dayjs": "^1.11.10", "fs-extra": "8.0.1", diff --git a/packages/zowe-explorer/src/tools/ZoweLogger.ts b/packages/zowe-explorer/src/tools/ZoweLogger.ts index a8bd7d277c..f19f2dc9ae 100644 --- a/packages/zowe-explorer/src/tools/ZoweLogger.ts +++ b/packages/zowe-explorer/src/tools/ZoweLogger.ts @@ -15,7 +15,6 @@ import * as vscode from "vscode"; import * as loggerConfig from "../../log4jsconfig.json"; import * as path from "path"; import { Gui, imperative, MessageSeverity, ZoweVsCodeExtension } from "@zowe/zowe-explorer-api"; -import { padLeft } from "@zowe/core-for-zowe-sdk"; export class ZoweLogger { public static zeOutputChannel: vscode.OutputChannel; @@ -115,9 +114,9 @@ export class ZoweLogger { private static getTime(): string { const dateObj = new Date(Date.now()); - const hours = padLeft(dateObj?.getHours().toString(), 2, "0"); - const minutes = padLeft(dateObj?.getMinutes().toString(), 2, "0"); - const seconds = padLeft(dateObj?.getSeconds().toString(), 2, "0"); + const hours = dateObj?.getHours().toString().padStart(2, "0"); + const minutes = dateObj?.getMinutes().toString().padStart(2, "0"); + const seconds = dateObj?.getSeconds().toString().padStart(2, "0"); return `${hours}:${minutes}:${seconds}`; } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a6e2511990..4bce7f26a4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -107,7 +107,7 @@ importers: version: 5.3.10(webpack@5.91.0) ts-jest: specifier: ^29.0.3 - version: 29.1.2(@babel/core@7.24.6)(jest@29.7.0)(typescript@5.4.5) + version: 29.1.2(@babel/core@7.24.7)(jest@29.7.0)(typescript@5.4.5) tsconfig-paths-webpack-plugin: specifier: ^4.1.0 version: 4.1.0 @@ -136,20 +136,20 @@ importers: packages/zowe-explorer: dependencies: '@zowe/core-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717(@zowe/imperative@8.0.0-next.202407051717) '@zowe/secrets-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828 + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717 '@zowe/zos-files-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717) '@zowe/zos-jobs-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717) '@zowe/zosmf-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717) '@zowe/zowe-explorer-api': specifier: 3.0.0-next-SNAPSHOT version: link:../zowe-explorer-api @@ -192,7 +192,7 @@ importers: version: 17.0.3 '@wdio/cli': specifier: ^8.36.1 - version: 8.38.2(typescript@5.4.5) + version: 8.38.2(typescript@5.5.3) '@wdio/cucumber-framework': specifier: ^8.36.1 version: 8.38.2 @@ -201,7 +201,7 @@ importers: version: 8.38.2 '@wdio/local-runner': specifier: ^8.36.1 - version: 8.38.2(typescript@5.4.5) + version: 8.38.2(typescript@5.5.3) '@wdio/mocha-framework': specifier: ^8.37.0 version: 8.38.2 @@ -222,7 +222,7 @@ importers: version: 2.4.2 copy-webpack-plugin: specifier: ^12.0.2 - version: 12.0.2(webpack@5.91.0) + version: 12.0.2(webpack@5.92.1) eslint-plugin-zowe-explorer: specifier: 3.0.0-next-SNAPSHOT version: link:../eslint-plugin-zowe-explorer @@ -231,7 +231,7 @@ importers: version: 24.9.0 expect-webdriverio: specifier: ^4.13.0 - version: 4.14.0(typescript@5.4.5) + version: 4.14.0(typescript@5.5.3) glob: specifier: ^7.1.6 version: 7.2.3 @@ -249,7 +249,7 @@ importers: version: 16.1.3 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@18.19.33)(typescript@5.4.5) + version: 10.9.2(@types/node@20.14.10)(typescript@5.5.3) wdio-vscode-service: specifier: ^6.0.3 version: 6.0.3(webdriverio@8.38.2) @@ -258,7 +258,7 @@ importers: version: 3.0.11 webdriverio: specifier: ^8.36.1 - version: 8.38.2(typescript@5.4.5) + version: 8.38.2(typescript@5.5.3) packages/zowe-explorer-api: dependencies: @@ -266,32 +266,32 @@ importers: specifier: ^1.53.2 version: 1.89.0 '@zowe/core-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717(@zowe/imperative@8.0.0-next.202407051717) '@zowe/imperative': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828 + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717 '@zowe/secrets-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828 + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717 '@zowe/zos-console-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717) '@zowe/zos-files-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717) '@zowe/zos-jobs-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717) '@zowe/zos-tso-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717) '@zowe/zos-uss-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717(@zowe/imperative@8.0.0-next.202407051717) '@zowe/zosmf-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717) mustache: specifier: ^4.2.0 version: 4.2.0 @@ -312,14 +312,14 @@ importers: packages/zowe-explorer-ftp-extension: dependencies: '@zowe/zos-files-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717) '@zowe/zos-ftp-for-zowe-cli': specifier: 3.0.0-next.202403191358 - version: 3.0.0-next.202403191358(@zowe/imperative@8.0.0-next.202405241828) + version: 3.0.0-next.202403191358(@zowe/imperative@8.0.0-next.202407051717) '@zowe/zos-jobs-for-zowe-sdk': - specifier: 8.0.0-next.202405241828 - version: 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) + specifier: 8.0.0-next.202407051717 + version: 8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717) '@zowe/zowe-explorer-api': specifier: 3.0.0-next-SNAPSHOT version: link:../zowe-explorer-api @@ -348,7 +348,7 @@ importers: devDependencies: '@preact/preset-vite': specifier: ^2.5.0 - version: 2.8.2(@babel/core@7.24.6)(preact@10.22.0)(vite@4.5.3) + version: 2.8.2(@babel/core@7.24.7)(preact@10.22.0)(vite@4.5.3) '@types/lodash': specifier: ^4.17.0 version: 4.17.4 @@ -535,11 +535,11 @@ packages: picocolors: 1.0.1 dev: true - /@babel/code-frame@7.24.6: - resolution: {integrity: sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==} + /@babel/code-frame@7.24.7: + resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/highlight': 7.24.6 + '@babel/highlight': 7.24.7 picocolors: 1.0.1 dev: true @@ -548,8 +548,8 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/compat-data@7.24.6: - resolution: {integrity: sha512-aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ==} + /@babel/compat-data@7.24.7: + resolution: {integrity: sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==} engines: {node: '>=6.9.0'} dev: true @@ -576,20 +576,20 @@ packages: - supports-color dev: true - /@babel/core@7.24.6: - resolution: {integrity: sha512-qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ==} + /@babel/core@7.24.7: + resolution: {integrity: sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.3.0 - '@babel/code-frame': 7.24.6 - '@babel/generator': 7.24.6 - '@babel/helper-compilation-targets': 7.24.6 - '@babel/helper-module-transforms': 7.24.6(@babel/core@7.24.6) - '@babel/helpers': 7.24.6 - '@babel/parser': 7.24.6 - '@babel/template': 7.24.6 - '@babel/traverse': 7.24.6 - '@babel/types': 7.24.6 + '@babel/code-frame': 7.24.7 + '@babel/generator': 7.24.7 + '@babel/helper-compilation-targets': 7.24.7 + '@babel/helper-module-transforms': 7.24.7(@babel/core@7.24.7) + '@babel/helpers': 7.24.7 + '@babel/parser': 7.24.7 + '@babel/template': 7.24.7 + '@babel/traverse': 7.24.7 + '@babel/types': 7.24.7 convert-source-map: 2.0.0 debug: 4.3.5 gensync: 1.0.0-beta.2 @@ -609,11 +609,11 @@ packages: jsesc: 2.5.2 dev: true - /@babel/generator@7.24.6: - resolution: {integrity: sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==} + /@babel/generator@7.24.7: + resolution: {integrity: sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.24.6 + '@babel/types': 7.24.7 '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 @@ -637,13 +637,13 @@ packages: semver: 6.3.1 dev: true - /@babel/helper-compilation-targets@7.24.6: - resolution: {integrity: sha512-VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg==} + /@babel/helper-compilation-targets@7.24.7: + resolution: {integrity: sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/compat-data': 7.24.6 - '@babel/helper-validator-option': 7.24.6 - browserslist: 4.23.0 + '@babel/compat-data': 7.24.7 + '@babel/helper-validator-option': 7.24.7 + browserslist: 4.23.1 lru-cache: 5.1.1 semver: 6.3.1 dev: true @@ -653,9 +653,11 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helper-environment-visitor@7.24.6: - resolution: {integrity: sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==} + /@babel/helper-environment-visitor@7.24.7: + resolution: {integrity: sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==} engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.24.7 dev: true /@babel/helper-function-name@7.23.0: @@ -666,12 +668,12 @@ packages: '@babel/types': 7.24.5 dev: true - /@babel/helper-function-name@7.24.6: - resolution: {integrity: sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w==} + /@babel/helper-function-name@7.24.7: + resolution: {integrity: sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.24.6 - '@babel/types': 7.24.6 + '@babel/template': 7.24.7 + '@babel/types': 7.24.7 dev: true /@babel/helper-hoist-variables@7.22.5: @@ -681,11 +683,11 @@ packages: '@babel/types': 7.24.5 dev: true - /@babel/helper-hoist-variables@7.24.6: - resolution: {integrity: sha512-SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA==} + /@babel/helper-hoist-variables@7.24.7: + resolution: {integrity: sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.24.6 + '@babel/types': 7.24.7 dev: true /@babel/helper-module-imports@7.24.3: @@ -695,11 +697,14 @@ packages: '@babel/types': 7.24.5 dev: true - /@babel/helper-module-imports@7.24.6: - resolution: {integrity: sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==} + /@babel/helper-module-imports@7.24.7: + resolution: {integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.24.6 + '@babel/traverse': 7.24.7 + '@babel/types': 7.24.7 + transitivePeerDependencies: + - supports-color dev: true /@babel/helper-module-transforms@7.24.5(@babel/core@7.24.5): @@ -716,18 +721,20 @@ packages: '@babel/helper-validator-identifier': 7.24.5 dev: true - /@babel/helper-module-transforms@7.24.6(@babel/core@7.24.6): - resolution: {integrity: sha512-Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA==} + /@babel/helper-module-transforms@7.24.7(@babel/core@7.24.7): + resolution: {integrity: sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.24.6 - '@babel/helper-environment-visitor': 7.24.6 - '@babel/helper-module-imports': 7.24.6 - '@babel/helper-simple-access': 7.24.6 - '@babel/helper-split-export-declaration': 7.24.6 - '@babel/helper-validator-identifier': 7.24.6 + '@babel/core': 7.24.7 + '@babel/helper-environment-visitor': 7.24.7 + '@babel/helper-module-imports': 7.24.7 + '@babel/helper-simple-access': 7.24.7 + '@babel/helper-split-export-declaration': 7.24.7 + '@babel/helper-validator-identifier': 7.24.7 + transitivePeerDependencies: + - supports-color dev: true /@babel/helper-plugin-utils@7.24.5: @@ -742,11 +749,14 @@ packages: '@babel/types': 7.24.5 dev: true - /@babel/helper-simple-access@7.24.6: - resolution: {integrity: sha512-nZzcMMD4ZhmB35MOOzQuiGO5RzL6tJbsT37Zx8M5L/i9KSrukGXWTjLe1knIbb/RmxoJE9GON9soq0c0VEMM5g==} + /@babel/helper-simple-access@7.24.7: + resolution: {integrity: sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.24.6 + '@babel/traverse': 7.24.7 + '@babel/types': 7.24.7 + transitivePeerDependencies: + - supports-color dev: true /@babel/helper-split-export-declaration@7.24.5: @@ -756,11 +766,11 @@ packages: '@babel/types': 7.24.5 dev: true - /@babel/helper-split-export-declaration@7.24.6: - resolution: {integrity: sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw==} + /@babel/helper-split-export-declaration@7.24.7: + resolution: {integrity: sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.24.6 + '@babel/types': 7.24.7 dev: true /@babel/helper-string-parser@7.24.1: @@ -768,8 +778,8 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helper-string-parser@7.24.6: - resolution: {integrity: sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==} + /@babel/helper-string-parser@7.24.7: + resolution: {integrity: sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==} engines: {node: '>=6.9.0'} dev: true @@ -778,8 +788,8 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helper-validator-identifier@7.24.6: - resolution: {integrity: sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==} + /@babel/helper-validator-identifier@7.24.7: + resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==} engines: {node: '>=6.9.0'} dev: true @@ -788,8 +798,8 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helper-validator-option@7.24.6: - resolution: {integrity: sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ==} + /@babel/helper-validator-option@7.24.7: + resolution: {integrity: sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==} engines: {node: '>=6.9.0'} dev: true @@ -804,12 +814,12 @@ packages: - supports-color dev: true - /@babel/helpers@7.24.6: - resolution: {integrity: sha512-V2PI+NqnyFu1i0GyTd/O/cTpxzQCYioSkUIRmgo7gFEHKKCg5w46+r/A6WeUR1+P3TeQ49dspGPNd/E3n9AnnA==} + /@babel/helpers@7.24.7: + resolution: {integrity: sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.24.6 - '@babel/types': 7.24.6 + '@babel/template': 7.24.7 + '@babel/types': 7.24.7 dev: true /@babel/highlight@7.24.5: @@ -822,11 +832,11 @@ packages: picocolors: 1.0.1 dev: true - /@babel/highlight@7.24.6: - resolution: {integrity: sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==} + /@babel/highlight@7.24.7: + resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-validator-identifier': 7.24.6 + '@babel/helper-validator-identifier': 7.24.7 chalk: 2.4.2 js-tokens: 4.0.0 picocolors: 1.0.1 @@ -840,12 +850,12 @@ packages: '@babel/types': 7.24.5 dev: true - /@babel/parser@7.24.6: - resolution: {integrity: sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==} + /@babel/parser@7.24.7: + resolution: {integrity: sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==} engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.24.6 + '@babel/types': 7.24.7 dev: true /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.5): @@ -903,13 +913,13 @@ packages: '@babel/helper-plugin-utils': 7.24.5 dev: true - /@babel/plugin-syntax-jsx@7.24.1(@babel/core@7.24.6): + /@babel/plugin-syntax-jsx@7.24.1(@babel/core@7.24.7): resolution: {integrity: sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.24.6 + '@babel/core': 7.24.7 '@babel/helper-plugin-utils': 7.24.5 dev: true @@ -987,27 +997,27 @@ packages: '@babel/helper-plugin-utils': 7.24.5 dev: true - /@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.24.6): + /@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.24.7): resolution: {integrity: sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.24.6 - '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.24.6) + '@babel/core': 7.24.7 + '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.24.7) dev: true - /@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.24.6): + /@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.24.7): resolution: {integrity: sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.24.6 + '@babel/core': 7.24.7 '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-module-imports': 7.24.3 '@babel/helper-plugin-utils': 7.24.5 - '@babel/plugin-syntax-jsx': 7.24.1(@babel/core@7.24.6) + '@babel/plugin-syntax-jsx': 7.24.1(@babel/core@7.24.7) '@babel/types': 7.24.5 dev: true @@ -1027,13 +1037,13 @@ packages: '@babel/types': 7.24.5 dev: true - /@babel/template@7.24.6: - resolution: {integrity: sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==} + /@babel/template@7.24.7: + resolution: {integrity: sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.24.6 - '@babel/parser': 7.24.6 - '@babel/types': 7.24.6 + '@babel/code-frame': 7.24.7 + '@babel/parser': 7.24.7 + '@babel/types': 7.24.7 dev: true /@babel/traverse@7.24.5: @@ -1054,18 +1064,18 @@ packages: - supports-color dev: true - /@babel/traverse@7.24.6: - resolution: {integrity: sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw==} + /@babel/traverse@7.24.7: + resolution: {integrity: sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.24.6 - '@babel/generator': 7.24.6 - '@babel/helper-environment-visitor': 7.24.6 - '@babel/helper-function-name': 7.24.6 - '@babel/helper-hoist-variables': 7.24.6 - '@babel/helper-split-export-declaration': 7.24.6 - '@babel/parser': 7.24.6 - '@babel/types': 7.24.6 + '@babel/code-frame': 7.24.7 + '@babel/generator': 7.24.7 + '@babel/helper-environment-visitor': 7.24.7 + '@babel/helper-function-name': 7.24.7 + '@babel/helper-hoist-variables': 7.24.7 + '@babel/helper-split-export-declaration': 7.24.7 + '@babel/parser': 7.24.7 + '@babel/types': 7.24.7 debug: 4.3.5 globals: 11.12.0 transitivePeerDependencies: @@ -1081,12 +1091,12 @@ packages: to-fast-properties: 2.0.0 dev: true - /@babel/types@7.24.6: - resolution: {integrity: sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==} + /@babel/types@7.24.7: + resolution: {integrity: sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-string-parser': 7.24.6 - '@babel/helper-validator-identifier': 7.24.6 + '@babel/helper-string-parser': 7.24.7 + '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 dev: true @@ -2231,8 +2241,8 @@ packages: agent-base: 7.1.1 http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.4 - lru-cache: 10.2.2 - socks-proxy-agent: 8.0.3 + lru-cache: 10.4.0 + socks-proxy-agent: 8.0.4 transitivePeerDependencies: - supports-color dev: false @@ -2249,7 +2259,7 @@ packages: engines: {node: ^16.14.0 || >=18.0.0} dependencies: '@npmcli/promise-spawn': 7.0.2 - lru-cache: 10.2.2 + lru-cache: 10.4.0 npm-pick-manifest: 9.0.1 proc-log: 4.2.0 promise-inflight: 1.0.1 @@ -2279,10 +2289,10 @@ packages: engines: {node: ^16.14.0 || >=18.0.0} dependencies: '@npmcli/git': 5.0.7 - glob: 10.4.1 + glob: 10.4.3 hosted-git-info: 7.0.2 json-parse-even-better-errors: 3.0.2 - normalize-package-data: 6.0.1 + normalize-package-data: 6.0.2 proc-log: 4.2.0 semver: 7.6.2 transitivePeerDependencies: @@ -2296,19 +2306,20 @@ packages: which: 4.0.0 dev: false - /@npmcli/redact@1.1.0: - resolution: {integrity: sha512-PfnWuOkQgu7gCbnSsAisaX7hKOdZ4wSAhAzH3/ph5dSGau52kCRrMMGbiSQLwyTZpgldkZ49b0brkOr1AzGBHQ==} + /@npmcli/redact@2.0.1: + resolution: {integrity: sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==} engines: {node: ^16.14.0 || >=18.0.0} dev: false - /@npmcli/run-script@7.0.4: - resolution: {integrity: sha512-9ApYM/3+rBt9V80aYg6tZfzj3UWdiYyCt7gJUD1VJKvWF5nwKDSICXbYIQbspFTq6TOpbsEtIC0LArB8d9PFmg==} + /@npmcli/run-script@8.1.0: + resolution: {integrity: sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==} engines: {node: ^16.14.0 || >=18.0.0} dependencies: '@npmcli/node-gyp': 3.0.0 '@npmcli/package-json': 5.2.0 '@npmcli/promise-spawn': 7.0.2 node-gyp: 10.1.0 + proc-log: 4.2.0 which: 4.0.0 transitivePeerDependencies: - bluebird @@ -2325,18 +2336,18 @@ packages: resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} dev: true - /@preact/preset-vite@2.8.2(@babel/core@7.24.6)(preact@10.22.0)(vite@4.5.3): + /@preact/preset-vite@2.8.2(@babel/core@7.24.7)(preact@10.22.0)(vite@4.5.3): resolution: {integrity: sha512-m3tl+M8IO8jgiHnk+7LSTFl8axdPXloewi7iGVLdmCwf34XOzEUur0bZVewW4DUbUipFjTS2CXu27+5f/oexBA==} peerDependencies: '@babel/core': 7.x vite: 2.x || 3.x || 4.x || 5.x dependencies: - '@babel/core': 7.24.6 - '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.24.6) - '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.24.6) + '@babel/core': 7.24.7 + '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.24.7) + '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.24.7) '@prefresh/vite': 2.4.5(preact@10.22.0)(vite@4.5.3) '@rollup/pluginutils': 4.2.1 - babel-plugin-transform-hook-names: 1.0.2(@babel/core@7.24.6) + babel-plugin-transform-hook-names: 1.0.2(@babel/core@7.24.7) debug: 4.3.4(supports-color@8.1.1) kolorist: 1.8.0 magic-string: 0.30.5 @@ -2391,7 +2402,15 @@ packages: spacetrim: 0.11.25 dev: true - /@puppeteer/browsers@1.4.6(typescript@5.4.5): + /@promptbook/utils@0.58.0: + resolution: {integrity: sha512-TglWndmjikWN+OGg9eNOUaMTM7RHr8uFCtgxfWULT1BUjcohywdijf54vS1U4mZ1tBLdHD4/fIrIHtmHzPUIZQ==} + requiresBuild: true + dependencies: + spacetrim: 0.11.36 + dev: true + optional: true + + /@puppeteer/browsers@1.4.6(typescript@5.5.3): resolution: {integrity: sha512-x4BEjr2SjOPowNeiguzjozQbsc6h437ovD/wu+JpaenxVLm3jkgzHY2xOslMTp50HoTvQreMjiexiGQw1sqZlQ==} engines: {node: '>=16.3.0'} hasBin: true @@ -2406,7 +2425,7 @@ packages: progress: 2.0.3 proxy-agent: 6.3.0 tar-fs: 3.0.4 - typescript: 5.4.5 + typescript: 5.5.3 unbzip2-stream: 1.4.3 yargs: 17.7.1 transitivePeerDependencies: @@ -2588,7 +2607,7 @@ packages: engines: {node: ^16.14.0 || >=18.0.0} dependencies: '@tufjs/canonical-json': 2.0.0 - minimatch: 9.0.4 + minimatch: 9.0.5 dev: false /@types/babel__core@7.20.5: @@ -2726,6 +2745,12 @@ packages: undici-types: 5.26.5 dev: true + /@types/node@20.14.10: + resolution: {integrity: sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==} + dependencies: + undici-types: 5.26.5 + dev: true + /@types/node@20.14.2: resolution: {integrity: sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==} dependencies: @@ -3130,7 +3155,7 @@ packages: tslib: 2.6.2 dev: false - /@wdio/cli@8.38.2(typescript@5.4.5): + /@wdio/cli@8.38.2(typescript@5.5.3): resolution: {integrity: sha512-p9y6jxmpmw53OoB9v/uTLwMetmz7Q0K7NewdVONgmeTY/ERpkU15qL3fMw1rXb+E+vrV8dlce4srnXroec6SFA==} engines: {node: ^16.13 || >=18} hasBin: true @@ -3138,7 +3163,7 @@ packages: '@types/node': 20.14.2 '@vitest/snapshot': 1.6.0 '@wdio/config': 8.38.2 - '@wdio/globals': 8.38.2(typescript@5.4.5) + '@wdio/globals': 8.38.2(typescript@5.5.3) '@wdio/logger': 8.38.0 '@wdio/protocols': 8.38.0 '@wdio/types': 8.38.2 @@ -3157,7 +3182,7 @@ packages: lodash.union: 4.6.0 read-pkg-up: 10.0.0 recursive-readdir: 2.2.3 - webdriverio: 8.38.2(typescript@5.4.5) + webdriverio: 8.38.2(typescript@5.5.3) yargs: 17.7.2 transitivePeerDependencies: - bufferutil @@ -3183,6 +3208,23 @@ packages: - supports-color dev: true + /@wdio/config@8.39.0: + resolution: {integrity: sha512-yNuGPMPibY91s936gnJCHWlStvIyDrwLwGfLC/NCdTin4F7HL4Gp5iJnHWkJFty1/DfFi8jjoIUBNLM8HEez+A==} + engines: {node: ^16.13 || >=18} + requiresBuild: true + dependencies: + '@wdio/logger': 8.38.0 + '@wdio/types': 8.39.0 + '@wdio/utils': 8.39.0 + decamelize: 6.0.0 + deepmerge-ts: 5.1.0 + glob: 10.4.3 + import-meta-resolve: 4.1.0 + transitivePeerDependencies: + - supports-color + dev: true + optional: true + /@wdio/cucumber-framework@8.38.2: resolution: {integrity: sha512-9Rnybc6qTn3EDPcRA7F2WHHwf+ZEZwfBZA1DXOXJTVPzrq/GEn6UNQ8U3QuMIPgiJCtFbwGhVJmFZPtsNbolmQ==} engines: {node: ^16.13 || >=18} @@ -3201,12 +3243,12 @@ packages: - supports-color dev: true - /@wdio/globals@8.38.2(typescript@5.4.5): + /@wdio/globals@8.38.2(typescript@5.5.3): resolution: {integrity: sha512-iIrUF1EODfHLh3V/CSNCqbNNxUTe3ND+c86zDjzJcPFjawLX1plvAApsU/eDmtsFShcOS2KHbfSjiydFoqQG1Q==} engines: {node: ^16.13 || >=18} optionalDependencies: - expect-webdriverio: 4.14.0(typescript@5.4.5) - webdriverio: 8.38.2(typescript@5.4.5) + expect-webdriverio: 4.14.0(typescript@5.5.3) + webdriverio: 8.38.2(typescript@5.5.3) transitivePeerDependencies: - bufferutil - devtools @@ -3216,6 +3258,23 @@ packages: - utf-8-validate dev: true + /@wdio/globals@8.39.1(typescript@5.5.3): + resolution: {integrity: sha512-kNb1TlxI8Le/tsOiw7CMQcG0+ZGyxk9ZDO/PQLxkJvjo/q2QmiBcgaNMPuf+j1ABETcQK4bI7QtiT5uZ+f2AGA==} + engines: {node: ^16.13 || >=18} + requiresBuild: true + optionalDependencies: + expect-webdriverio: 4.14.0(typescript@5.5.3) + webdriverio: 8.39.1(typescript@5.5.3) + transitivePeerDependencies: + - bufferutil + - devtools + - encoding + - supports-color + - typescript + - utf-8-validate + dev: true + optional: true + /@wdio/junit-reporter@8.38.2: resolution: {integrity: sha512-egJp7QULWw6+Vn8WlaM1tq0/vapl6Wh/gupyZYseUqvvgbfeDJKOaU0xJQo6sO2R15gxxZSAL0Coq4+58hwAzA==} engines: {node: ^16.13 || >=18} @@ -3226,14 +3285,14 @@ packages: junit-report-builder: 3.2.1 dev: true - /@wdio/local-runner@8.38.2(typescript@5.4.5): + /@wdio/local-runner@8.38.2(typescript@5.5.3): resolution: {integrity: sha512-syW+R5VUHJ3GBkQGFcNYe6MYwWRgklc9W7A83xQDTvKWFNHCetLvc8AtKZ54vs8MItBejjU+Oh94ZNbNX1pBcg==} engines: {node: ^16.13 || >=18} dependencies: '@types/node': 20.14.2 '@wdio/logger': 8.38.0 '@wdio/repl': 8.24.12 - '@wdio/runner': 8.38.2(typescript@5.4.5) + '@wdio/runner': 8.38.2(typescript@5.5.3) '@wdio/types': 8.38.2 async-exit-hook: 2.0.1 split2: 4.2.0 @@ -3293,21 +3352,21 @@ packages: object-inspect: 1.13.1 dev: true - /@wdio/runner@8.38.2(typescript@5.4.5): + /@wdio/runner@8.38.2(typescript@5.5.3): resolution: {integrity: sha512-5lPnKSX2BBLI2AbYW+hoGPiEUAJXj8F8I6NC2LaBVzf1CLN+w2HWZ7lUiqS14XT0b5/hlSUX6+JYwUXlDbpuuw==} engines: {node: ^16.13 || >=18} dependencies: '@types/node': 20.14.2 '@wdio/config': 8.38.2 - '@wdio/globals': 8.38.2(typescript@5.4.5) + '@wdio/globals': 8.38.2(typescript@5.5.3) '@wdio/logger': 8.38.0 '@wdio/types': 8.38.2 '@wdio/utils': 8.38.2 deepmerge-ts: 5.1.0 - expect-webdriverio: 4.14.0(typescript@5.4.5) + expect-webdriverio: 4.14.0(typescript@5.5.3) gaze: 1.1.3 webdriver: 8.38.2 - webdriverio: 8.38.2(typescript@5.4.5) + webdriverio: 8.38.2(typescript@5.5.3) transitivePeerDependencies: - bufferutil - devtools @@ -3335,6 +3394,15 @@ packages: '@types/node': 20.14.2 dev: true + /@wdio/types@8.39.0: + resolution: {integrity: sha512-86lcYROTapOJuFd9ouomFDfzDnv3Kn+jE0RmqfvN9frZAeLVJ5IKjX9M6HjplsyTZhjGO1uCaehmzx+HJus33Q==} + engines: {node: ^16.13 || >=18} + requiresBuild: true + dependencies: + '@types/node': 20.14.10 + dev: true + optional: true + /@wdio/utils@8.38.2: resolution: {integrity: sha512-y5AnBwsGcu/XuCBGCgKmlvKdwEIFyzLA+Cr+denySxY3jbWDONtPUcGaVdFALwsIa5jcIjcATqGmZcCPGnkd7g==} engines: {node: ^16.13 || >=18} @@ -3356,6 +3424,29 @@ packages: - supports-color dev: true + /@wdio/utils@8.39.0: + resolution: {integrity: sha512-jY+n6jlGeK+9Tx8T659PKLwMQTGpLW5H78CSEWgZLbjbVSr2LfGR8Lx0CRktNXxAtqEVZPj16Pi74OtAhvhE6Q==} + engines: {node: ^16.13 || >=18} + requiresBuild: true + dependencies: + '@puppeteer/browsers': 1.9.1 + '@wdio/logger': 8.38.0 + '@wdio/types': 8.39.0 + decamelize: 6.0.0 + deepmerge-ts: 5.1.0 + edgedriver: 5.6.0 + geckodriver: 4.4.1 + get-port: 7.1.0 + import-meta-resolve: 4.1.0 + locate-app: 2.4.21 + safaridriver: 0.1.2 + split2: 4.2.0 + wait-port: 1.1.0 + transitivePeerDependencies: + - supports-color + dev: true + optional: true + /@webassemblyjs/ast@1.12.1: resolution: {integrity: sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==} dependencies: @@ -3512,25 +3603,25 @@ packages: engines: {bun: '>=0.7.0', deno: '>=1.0.0', node: '>=16.5.0'} dev: true - /@zowe/core-for-zowe-sdk@8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828): - resolution: {integrity: sha512-JwbkREv26gH8aXMrwVpCxHex8jN0Lvy7hHFRDvRiFro2ta2KLwY1CqTDZW8IsEbj/J38t11KV8cG3OscIvLg+g==} + /@zowe/core-for-zowe-sdk@8.0.0-next.202407051717(@zowe/imperative@8.0.0-next.202407051717): + resolution: {integrity: sha512-OeZnlNP7ySBPSl+sxhRnAJFV27NMuLFHhsJ9jneWA1B5tQQPzxH67Ydt6vNswtElUfjctUlq8WF6xX8oFhAY7A==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/imperative': 8.0.0-next.202405241828 - comment-json: 4.2.3 + '@zowe/imperative': 8.0.0-next.202407051717 + comment-json: 4.2.4 string-width: 4.2.3 dev: false - /@zowe/imperative@8.0.0-next.202405241828: - resolution: {integrity: sha512-wba87FQn4VcFIEaeaE/XWtEkNnhgyHoT6/G5nEjIcSLy+zyVR/55M/pcWDwMFdVR4We7PhfnvzVwAqoUH6At7A==} + /@zowe/imperative@8.0.0-next.202407051717: + resolution: {integrity: sha512-iUa+r2cm7aul96D2q2KRssR99unm2YXRtS+qnP1DF92tjNFJs5ko6OJBtEawEDh50ZvGS9cFTl4nkc/KWoLlXw==} engines: {node: '>=18.12.0'} dependencies: '@types/yargs': 17.0.32 chalk: 4.1.2 cli-table3: 0.6.5 - comment-json: 4.2.3 + comment-json: 4.2.4 cross-spawn: 7.0.3 dataobject-parser: 1.2.25 deepmerge: 4.3.1 @@ -3540,6 +3631,8 @@ packages: fastest-levenshtein: 1.0.16 find-up: 5.0.0 fs-extra: 11.2.0 + http-proxy-agent: 7.0.2 + https-proxy-agent: 7.0.4 jest-diff: 29.7.0 js-yaml: 4.1.0 jsonfile: 6.1.0 @@ -3551,7 +3644,7 @@ packages: mustache: 4.2.0 npm-package-arg: 11.0.2 opener: 1.5.2 - pacote: 17.0.7 + pacote: 18.0.6 prettyjson: 1.2.5 progress: 2.0.3 read: 3.0.1 @@ -3567,87 +3660,87 @@ packages: - supports-color dev: false - /@zowe/secrets-for-zowe-sdk@8.0.0-next.202405241828: - resolution: {integrity: sha512-48UQrJcBLrt0TckrS5j/Hfgyd1Wh21FG/Q/Np7aOTeJk8IrvgicdO6eL8z3kiLwmEDngCv2xd3wvIhcZgFyfpg==} + /@zowe/secrets-for-zowe-sdk@8.0.0-next.202407051717: + resolution: {integrity: sha512-vZ8VbkJfJDT0rzbqSBzpv8UG0WGrKzUU4BawKLhP8eWMeVJ8Er9Jcb0itsotHYn9W3e6GMlVrJvZOzqLL8+feA==} engines: {node: '>=14'} requiresBuild: true dev: false - /@zowe/zos-console-for-zowe-sdk@8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828): - resolution: {integrity: sha512-pWHx4vk/QJpsFE575jgE/GsfgAgfSL8XaYi9lEKrgO8dz0i8I+fuGr0kp8vJoHqhYRhhT6h9/yXelLiwJGy2vg==} + /@zowe/zos-console-for-zowe-sdk@8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717): + resolution: {integrity: sha512-KSvTEMF+t3KuRg9k/o3+c1Q58/qSIVi2B2m+AXdDZ42qCI59VbS7sZC46a/yHfYC4uxXvwk4jJmhmTY82Jnqjw==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/core-for-zowe-sdk': ^8.0.0-next '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/core-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) - '@zowe/imperative': 8.0.0-next.202405241828 + '@zowe/core-for-zowe-sdk': 8.0.0-next.202407051717(@zowe/imperative@8.0.0-next.202407051717) + '@zowe/imperative': 8.0.0-next.202407051717 dev: false - /@zowe/zos-files-for-zowe-sdk@8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828): - resolution: {integrity: sha512-+BPs44qjw+C7RbOaqC0vQDX1E5EBeHVVtoqUoYkA60djVU+cjZUvYvCBbw6gDSDq1t8HRlJF8UEno9uqfRRXqw==} + /@zowe/zos-files-for-zowe-sdk@8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717): + resolution: {integrity: sha512-lMXB4b6ti0xhXNf4nP1nNEZReRQGG8vef6CyxeuQrfV41emk8i4Gt4D2SwQH2nQMMSJCN25mPrJkCUxR06VZlQ==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/core-for-zowe-sdk': ^8.0.0-next '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/core-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) - '@zowe/imperative': 8.0.0-next.202405241828 - minimatch: 9.0.4 + '@zowe/core-for-zowe-sdk': 8.0.0-next.202407051717(@zowe/imperative@8.0.0-next.202407051717) + '@zowe/imperative': 8.0.0-next.202407051717 + minimatch: 9.0.5 dev: false - /@zowe/zos-ftp-for-zowe-cli@3.0.0-next.202403191358(@zowe/imperative@8.0.0-next.202405241828): + /@zowe/zos-ftp-for-zowe-cli@3.0.0-next.202403191358(@zowe/imperative@8.0.0-next.202407051717): resolution: {integrity: sha512-jTiGcqFZNKIanUQAWOT+2M+3X6P9FAlPrie999HjDm79DpEltkjNwdNLM8EZLtSXsTjBrifaTo/pMVVmmhfl4A==} peerDependencies: '@zowe/imperative': '>=8.0.0-next.0 <8.0.0' dependencies: - '@zowe/imperative': 8.0.0-next.202405241828 + '@zowe/imperative': 8.0.0-next.202407051717 zos-node-accessor: 2.0.9 dev: false - /@zowe/zos-jobs-for-zowe-sdk@8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828): - resolution: {integrity: sha512-ldWGwVQh+Qf4jEh6kcWs6R1ISm06Zanjv1GaOsz5GPG6amfpv2vk6TOyGc1LaLfOrnRmhXoA9yf7MUJK7/71JQ==} + /@zowe/zos-jobs-for-zowe-sdk@8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717): + resolution: {integrity: sha512-gG2uVv8W0zfZIIg3QZuKWsfnlrnOIxvm8bcHwlRXkysGlgECYaSUBelZGCmimuQ51X5FXyD59enoQjw7TeMmVg==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/core-for-zowe-sdk': ^8.0.0-next '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/core-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) - '@zowe/imperative': 8.0.0-next.202405241828 - '@zowe/zos-files-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) + '@zowe/core-for-zowe-sdk': 8.0.0-next.202407051717(@zowe/imperative@8.0.0-next.202407051717) + '@zowe/imperative': 8.0.0-next.202407051717 + '@zowe/zos-files-for-zowe-sdk': 8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717) dev: false - /@zowe/zos-tso-for-zowe-sdk@8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828): - resolution: {integrity: sha512-fWSfkDIzPCSKiQe8S6l1Dc5Vq85oYrphs5aJ9gmycaSPXtO43vLodjX9vFifSpM9oLTwuG9HEApUfNOfG5UsBg==} + /@zowe/zos-tso-for-zowe-sdk@8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717): + resolution: {integrity: sha512-A+A/N9k/wSlQldKlm9EiuZ6AZip8qWGzfxUTzpl4wiGGk0bUIRrOP4SxRNU8gcaUvfslaKLO/lbKBtQ1X/eCZw==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/core-for-zowe-sdk': ^8.0.0-next '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/core-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) - '@zowe/imperative': 8.0.0-next.202405241828 - '@zowe/zosmf-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828) + '@zowe/core-for-zowe-sdk': 8.0.0-next.202407051717(@zowe/imperative@8.0.0-next.202407051717) + '@zowe/imperative': 8.0.0-next.202407051717 + '@zowe/zosmf-for-zowe-sdk': 8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717) dev: false - /@zowe/zos-uss-for-zowe-sdk@8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828): - resolution: {integrity: sha512-Bc+bZCElq7QmHwWRQLfJiWFBAfJAIG93/PchGMcmFQTCUELUSuy9qCLq51Csd0i/wEyXzsMv3UTGTtldTW52Vw==} + /@zowe/zos-uss-for-zowe-sdk@8.0.0-next.202407051717(@zowe/imperative@8.0.0-next.202407051717): + resolution: {integrity: sha512-igiTGJVBvJiNA9jDBK4YTlTUIKKsluXyrLTjgIJeYTn9A9fk2IQQlAg0T6Fj53SSue/H3/y7XAhoZmFRH6f3eA==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/imperative': 8.0.0-next.202405241828 + '@zowe/imperative': 8.0.0-next.202407051717 ssh2: 1.15.0 dev: false - /@zowe/zosmf-for-zowe-sdk@8.0.0-next.202405241828(@zowe/core-for-zowe-sdk@8.0.0-next.202405241828)(@zowe/imperative@8.0.0-next.202405241828): - resolution: {integrity: sha512-NKQdyFWN05Vi4J6BGehjiEIQXcxUScHv88ix3aMQeRnykz1Qh8oX1KkCdkDXlh959/Xxtl6WNSCtbaHsW6D3+g==} + /@zowe/zosmf-for-zowe-sdk@8.0.0-next.202407051717(@zowe/core-for-zowe-sdk@8.0.0-next.202407051717)(@zowe/imperative@8.0.0-next.202407051717): + resolution: {integrity: sha512-vA/DuxMnnfhHf+8rVLuu9uSt9j4YzUK1FKi/37y/KgyAvNnidJukDz8VqfFSgLNpKygxfoO9tbtFtClNbuFSoQ==} engines: {node: '>=18.12.0'} peerDependencies: '@zowe/core-for-zowe-sdk': ^8.0.0-next '@zowe/imperative': ^8.0.0-next dependencies: - '@zowe/core-for-zowe-sdk': 8.0.0-next.202405241828(@zowe/imperative@8.0.0-next.202405241828) - '@zowe/imperative': 8.0.0-next.202405241828 + '@zowe/core-for-zowe-sdk': 8.0.0-next.202407051717(@zowe/imperative@8.0.0-next.202407051717) + '@zowe/imperative': 8.0.0-next.202407051717 dev: false /abbrev@1.1.1: @@ -3678,6 +3771,14 @@ packages: acorn: 8.11.3 dev: true + /acorn-import-attributes@1.9.5(acorn@8.12.1): + resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==} + peerDependencies: + acorn: ^8 + dependencies: + acorn: 8.12.1 + dev: true + /acorn-jsx@5.3.2(acorn@7.4.1): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: @@ -3711,6 +3812,12 @@ packages: hasBin: true dev: true + /acorn@8.12.1: + resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==} + engines: {node: '>=0.4.0'} + hasBin: true + dev: true + /agent-base@6.0.2: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} @@ -4105,12 +4212,12 @@ packages: '@types/babel__traverse': 7.20.5 dev: true - /babel-plugin-transform-hook-names@1.0.2(@babel/core@7.24.6): + /babel-plugin-transform-hook-names@1.0.2(@babel/core@7.24.7): resolution: {integrity: sha512-5gafyjyyBTTdX/tQQ0hRgu4AhNHG/hqWi0ZZmg2xvs2FgRkJXzDNKBZCyoYqgFkovfDrgM8OoKg8karoUvWeCw==} peerDependencies: '@babel/core': ^7.12.10 dependencies: - '@babel/core': 7.24.6 + '@babel/core': 7.24.7 dev: true /babel-preset-current-node-syntax@1.0.1(@babel/core@7.24.5): @@ -4147,8 +4254,8 @@ packages: /balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - /bare-events@2.4.0: - resolution: {integrity: sha512-WHJZ24ZAYAlF38qfAEJmsypd5Qdr6qFF8ar4iMSr2fNTlzVwcBhYTsQc018x1XYqLwgndNvzfh3q3Kfe1Bg33Q==} + /bare-events@2.4.2: + resolution: {integrity: sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==} requiresBuild: true dev: true optional: true @@ -4157,7 +4264,7 @@ packages: resolution: {integrity: sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==} requiresBuild: true dependencies: - bare-events: 2.4.0 + bare-events: 2.4.2 bare-path: 2.1.3 bare-stream: 2.1.2 dev: true @@ -4323,6 +4430,17 @@ packages: update-browserslist-db: 1.0.16(browserslist@4.23.0) dev: true + /browserslist@4.23.1: + resolution: {integrity: sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + dependencies: + caniuse-lite: 1.0.30001640 + electron-to-chromium: 1.4.818 + node-releases: 2.0.14 + update-browserslist-db: 1.1.0(browserslist@4.23.1) + dev: true + /bs-logger@0.2.6: resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==} engines: {node: '>= 6'} @@ -4405,8 +4523,8 @@ packages: dependencies: '@npmcli/fs': 3.1.1 fs-minipass: 3.0.3 - glob: 10.4.1 - lru-cache: 10.2.2 + glob: 10.4.3 + lru-cache: 10.4.0 minipass: 7.1.2 minipass-collect: 2.0.1 minipass-flush: 1.0.5 @@ -4491,6 +4609,10 @@ packages: resolution: {integrity: sha512-WJvYsOjd1/BYUY6SNGUosK9DUidBPDTnOARHp3fSmFO1ekdxaY6nKRttEVrfMmYi80ctS0kz1wiWmm14fVc3ew==} dev: true + /caniuse-lite@1.0.30001640: + resolution: {integrity: sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==} + dev: true + /capital-case@1.0.4: resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==} dependencies: @@ -4644,6 +4766,11 @@ packages: engines: {node: '>=6.0'} dev: true + /chrome-trace-event@1.0.4: + resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==} + engines: {node: '>=6.0'} + dev: true + /chromium-bidi@0.4.16(devtools-protocol@0.0.1147663): resolution: {integrity: sha512-7ZbXdWERxRxSwo3txsBjjmc/NLxqb1Bk30mRb0BMS4YIaiV6zvKZqL/UAH+DdqcDYayDWk2n/y8klkBDODrPvA==} peerDependencies: @@ -4864,8 +4991,8 @@ packages: engines: {node: ^12.20.0 || >=14} dev: true - /comment-json@4.2.3: - resolution: {integrity: sha512-SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw==} + /comment-json@4.2.4: + resolution: {integrity: sha512-E5AjpSW+O+N5T2GsOQMHLLsJvrYw6G/AFt9GvU6NguEAfzKShh7hRiLtVo6S9KbRpFMGqE5ojo0/hE+sdteWvQ==} engines: {node: '>= 6'} dependencies: array-timsort: 1.0.3 @@ -4933,7 +5060,7 @@ packages: engines: {node: '>=0.10.0'} dev: true - /copy-webpack-plugin@12.0.2(webpack@5.91.0): + /copy-webpack-plugin@12.0.2(webpack@5.92.1): resolution: {integrity: sha512-SNwdBeHyII+rWvee/bTnAYyO8vfVdcSTud4EIb6jcZ8inLeWucJE0DnxXQBjlQ5zlteuuvooGQy3LIyGxhvlOA==} engines: {node: '>= 18.12.0'} peerDependencies: @@ -4945,7 +5072,7 @@ packages: normalize-path: 3.0.0 schema-utils: 4.2.0 serialize-javascript: 6.0.2 - webpack: 5.91.0(webpack-cli@5.1.4) + webpack: 5.92.1(webpack-cli@5.1.4) dev: true /copyfiles@2.4.1: @@ -4990,7 +5117,7 @@ packages: requiresBuild: true dependencies: buildcheck: 0.0.6 - nan: 2.19.0 + nan: 2.20.0 dev: false optional: true @@ -5663,6 +5790,10 @@ packages: resolution: {integrity: sha512-87eHF+h3PlCRwbxVEAw9KtK3v7lWfc/sUDr0W76955AdYTG4bV/k0zrl585Qnj/skRMH2qOSiE+kqMeOQ+LOpw==} dev: true + /electron-to-chromium@1.4.818: + resolution: {integrity: sha512-eGvIk2V0dGImV9gWLq8fDfTTsCAeMDwZqEPMr+jMInxZdnp9Us8UpovYpRCf9NQ7VOFgrN2doNSgvISbsbNpxA==} + dev: true + /emittery@0.13.1: resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} engines: {node: '>=12'} @@ -5706,6 +5837,14 @@ packages: tapable: 2.2.1 dev: true + /enhanced-resolve@5.17.0: + resolution: {integrity: sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==} + engines: {node: '>=10.13.0'} + dependencies: + graceful-fs: 4.2.11 + tapable: 2.2.1 + dev: true + /enquirer@2.4.1: resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} engines: {node: '>=8.6'} @@ -5820,6 +5959,10 @@ packages: resolution: {integrity: sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA==} dev: true + /es-module-lexer@1.5.4: + resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==} + dev: true + /es-object-atoms@1.0.0: resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==} engines: {node: '>= 0.4'} @@ -6260,7 +6403,7 @@ packages: dev: true optional: true - /expect-webdriverio@4.14.0(typescript@5.4.5): + /expect-webdriverio@4.14.0(typescript@5.5.3): resolution: {integrity: sha512-bPZ9zfyJHF41dO8o7iFcEV4Dvcw45yhsv1WjtJyPLZPjQ+ixVBrbSil9+rjRiONoX4f45EZRCqaGvPlzNC523Q==} engines: {node: '>=16 || >=18 || >=20'} dependencies: @@ -6269,9 +6412,9 @@ packages: jest-matcher-utils: 29.7.0 lodash.isequal: 4.5.0 optionalDependencies: - '@wdio/globals': 8.38.2(typescript@5.4.5) + '@wdio/globals': 8.39.1(typescript@5.5.3) '@wdio/logger': 8.38.0 - webdriverio: 8.38.2(typescript@5.4.5) + webdriverio: 8.38.2(typescript@5.5.3) transitivePeerDependencies: - bufferutil - devtools @@ -6682,6 +6825,14 @@ packages: dependencies: cross-spawn: 7.0.3 signal-exit: 4.1.0 + dev: true + + /foreground-child@3.2.1: + resolution: {integrity: sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==} + engines: {node: '>=14'} + dependencies: + cross-spawn: 7.0.3 + signal-exit: 4.1.0 /fork-ts-checker-webpack-plugin@9.0.2(typescript@5.4.5)(webpack@5.91.0): resolution: {integrity: sha512-Uochze2R8peoN1XqlSi/rGUkDQpRogtLFocP9+PGu68zk1BDAKXfdeCdyVZpgTk8V8WFVQXdEz426VKjXLO1Gg==} @@ -7042,17 +7193,17 @@ packages: path-scurry: 1.11.1 dev: true - /glob@10.4.1: - resolution: {integrity: sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==} - engines: {node: '>=16 || 14 >=14.18'} + /glob@10.4.3: + resolution: {integrity: sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==} + engines: {node: '>=18'} hasBin: true dependencies: - foreground-child: 3.1.1 - jackspeak: 3.2.3 - minimatch: 9.0.4 + foreground-child: 3.2.1 + jackspeak: 3.4.1 + minimatch: 9.0.5 minipass: 7.1.2 + package-json-from-dist: 1.0.0 path-scurry: 1.11.1 - dev: false /glob@7.1.7: resolution: {integrity: sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==} @@ -7061,7 +7212,7 @@ packages: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.4 - minimatch: 3.1.2 + minimatch: 3.0.8 once: 1.4.0 path-is-absolute: 1.0.1 dev: true @@ -7358,7 +7509,7 @@ packages: resolution: {integrity: sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==} engines: {node: ^16.14.0 || >=18.0.0} dependencies: - lru-cache: 10.2.2 + lru-cache: 10.4.0 /hpagent@1.2.0: resolution: {integrity: sha512-A91dYTeIB6NoXG+PxTQpCCDDnfHsW9kc06Lvpu1TEe9gnd6ZFeiBoRO9JvzEv6xK7EX97/dUE8g/vBMTqTS3CA==} @@ -7412,7 +7563,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.5 transitivePeerDependencies: - supports-color @@ -7437,11 +7588,21 @@ packages: /https-proxy-agent@7.0.4: resolution: {integrity: sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==} engines: {node: '>= 14'} + dependencies: + agent-base: 7.1.1 + debug: 4.3.5 + transitivePeerDependencies: + - supports-color + + /https-proxy-agent@7.0.5: + resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==} + engines: {node: '>= 14'} dependencies: agent-base: 7.1.1 debug: 4.3.4(supports-color@8.1.1) transitivePeerDependencies: - supports-color + dev: true /human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} @@ -7482,7 +7643,7 @@ packages: resolution: {integrity: sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dependencies: - minimatch: 9.0.4 + minimatch: 9.0.5 dev: false /ignore@4.0.6: @@ -7671,6 +7832,7 @@ packages: resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} dependencies: hasown: 2.0.2 + dev: true /is-data-descriptor@1.0.1: resolution: {integrity: sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==} @@ -8044,14 +8206,13 @@ packages: '@pkgjs/parseargs': 0.11.0 dev: true - /jackspeak@3.2.3: - resolution: {integrity: sha512-htOzIMPbpLid/Gq9/zaz9SfExABxqRe1sSCdxntlO/aMD6u0issZQiY25n2GKQUtJ02j7z5sfptlAOMpWWOmvw==} - engines: {node: '>=14'} + /jackspeak@3.4.1: + resolution: {integrity: sha512-U23pQPDnmYybVkYjObcuYMk43VRlMLLqLI+RdZy8s8WV8WsxO9SnqSroKaluuvcNOdCAlauKszDwd+umbot5Mg==} + engines: {node: '>=18'} dependencies: '@isaacs/cliui': 8.0.2 optionalDependencies: '@pkgjs/parseargs': 0.11.0 - dev: false /jake@10.9.1: resolution: {integrity: sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==} @@ -8914,6 +9075,16 @@ packages: userhome: 1.0.0 dev: true + /locate-app@2.4.21: + resolution: {integrity: sha512-ySSBwlUnVKoLgw39q8YaNtvklhaTMoVqBf2+CuY3hkOFuWubHAJ6NJuTjv+jfTV1FuOgKsigRdsYUIeVgKHvNA==} + requiresBuild: true + dependencies: + '@promptbook/utils': 0.58.0 + type-fest: 2.13.0 + userhome: 1.0.0 + dev: true + optional: true + /locate-path@3.0.0: resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==} engines: {node: '>=6'} @@ -9099,6 +9270,10 @@ packages: resolution: {integrity: sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==} engines: {node: 14 || >=16.14} + /lru-cache@10.4.0: + resolution: {integrity: sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==} + engines: {node: '>=18'} + /lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} dependencies: @@ -9429,6 +9604,13 @@ packages: engines: {node: '>=16 || 14 >=14.17'} dependencies: brace-expansion: 2.0.1 + dev: true + + /minimatch@9.0.5: + resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 /minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} @@ -9458,13 +9640,6 @@ packages: minipass: 3.3.6 dev: false - /minipass-json-stream@1.0.1: - resolution: {integrity: sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==} - dependencies: - jsonparse: 1.3.1 - minipass: 3.3.6 - dev: false - /minipass-pipeline@1.2.4: resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==} engines: {node: '>=8'} @@ -9498,7 +9673,6 @@ packages: /minipass@7.1.2: resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} engines: {node: '>=16 || 14 >=14.17'} - dev: false /minizlib@2.1.2: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} @@ -9670,8 +9844,8 @@ packages: thenify-all: 1.6.0 dev: true - /nan@2.19.0: - resolution: {integrity: sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==} + /nan@2.20.0: + resolution: {integrity: sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==} requiresBuild: true dev: false optional: true @@ -9798,7 +9972,7 @@ packages: dependencies: env-paths: 2.2.1 exponential-backoff: 3.1.1 - glob: 10.4.1 + glob: 10.4.3 graceful-fs: 4.2.11 make-fetch-happen: 13.0.1 nopt: 7.2.1 @@ -9879,6 +10053,16 @@ packages: is-core-module: 2.13.1 semver: 7.6.2 validate-npm-package-license: 3.0.4 + dev: true + + /normalize-package-data@6.0.2: + resolution: {integrity: sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==} + engines: {node: ^16.14.0 || >=18.0.0} + dependencies: + hosted-git-info: 7.0.2 + semver: 7.6.2 + validate-npm-package-license: 3.0.4 + dev: false /normalize-path@3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} @@ -9945,15 +10129,15 @@ packages: semver: 7.6.2 dev: false - /npm-registry-fetch@16.2.1: - resolution: {integrity: sha512-8l+7jxhim55S85fjiDGJ1rZXBWGtRLi1OSb4Z3BPLObPuIaeKRlPRiYMSHU4/81ck3t71Z+UwDDl47gcpmfQQA==} + /npm-registry-fetch@17.1.0: + resolution: {integrity: sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==} engines: {node: ^16.14.0 || >=18.0.0} dependencies: - '@npmcli/redact': 1.1.0 + '@npmcli/redact': 2.0.1 + jsonparse: 1.3.1 make-fetch-happen: 13.0.1 minipass: 7.1.2 minipass-fetch: 3.0.5 - minipass-json-stream: 1.0.1 minizlib: 2.1.2 npm-package-arg: 11.0.2 proc-log: 4.2.0 @@ -10218,7 +10402,7 @@ packages: debug: 4.3.4(supports-color@8.1.1) get-uri: 6.0.3 http-proxy-agent: 7.0.2 - https-proxy-agent: 7.0.4 + https-proxy-agent: 7.0.5 pac-resolver: 7.0.1 socks-proxy-agent: 8.0.3 transitivePeerDependencies: @@ -10233,26 +10417,28 @@ packages: netmask: 2.0.2 dev: true - /pacote@17.0.7: - resolution: {integrity: sha512-sgvnoUMlkv9xHwDUKjKQFXVyUi8dtJGKp3vg6sYy+TxbDic5RjZCHF3ygv0EJgNRZ2GfRONjlKPUfokJ9lDpwQ==} + /package-json-from-dist@1.0.0: + resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==} + + /pacote@18.0.6: + resolution: {integrity: sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==} engines: {node: ^16.14.0 || >=18.0.0} hasBin: true dependencies: '@npmcli/git': 5.0.7 '@npmcli/installed-package-contents': 2.1.0 + '@npmcli/package-json': 5.2.0 '@npmcli/promise-spawn': 7.0.2 - '@npmcli/run-script': 7.0.4 + '@npmcli/run-script': 8.1.0 cacache: 18.0.3 fs-minipass: 3.0.3 minipass: 7.1.2 npm-package-arg: 11.0.2 npm-packlist: 8.0.2 npm-pick-manifest: 9.0.1 - npm-registry-fetch: 16.2.1 + npm-registry-fetch: 17.1.0 proc-log: 4.2.0 promise-retry: 2.0.1 - read-package-json: 7.0.1 - read-package-json-fast: 3.0.2 sigstore: 2.3.1 ssri: 10.0.6 tar: 6.2.1 @@ -10699,7 +10885,7 @@ packages: agent-base: 7.1.1 debug: 4.3.4(supports-color@8.1.1) http-proxy-agent: 7.0.2 - https-proxy-agent: 7.0.4 + https-proxy-agent: 7.0.5 lru-cache: 7.18.3 pac-proxy-agent: 7.0.1 proxy-from-env: 1.1.0 @@ -10715,7 +10901,7 @@ packages: agent-base: 7.1.1 debug: 4.3.4(supports-color@8.1.1) http-proxy-agent: 7.0.2 - https-proxy-agent: 7.0.4 + https-proxy-agent: 7.0.5 lru-cache: 7.18.3 pac-proxy-agent: 7.0.1 proxy-from-env: 1.1.0 @@ -10755,7 +10941,7 @@ packages: engines: {node: '>=6'} dev: true - /puppeteer-core@20.9.0(typescript@5.4.5): + /puppeteer-core@20.9.0(typescript@5.5.3): resolution: {integrity: sha512-H9fYZQzMTRrkboEfPmf7m3CLDN6JvbxXA3qTtS+dFt27tR+CsFHzPsT6pzp6lYL6bJbAPaR0HaPO6uSi+F94Pg==} engines: {node: '>=16.3.0'} peerDependencies: @@ -10764,12 +10950,12 @@ packages: typescript: optional: true dependencies: - '@puppeteer/browsers': 1.4.6(typescript@5.4.5) + '@puppeteer/browsers': 1.4.6(typescript@5.5.3) chromium-bidi: 0.4.16(devtools-protocol@0.0.1147663) cross-fetch: 4.0.0 debug: 4.3.4(supports-color@8.1.1) devtools-protocol: 0.0.1147663 - typescript: 5.4.5 + typescript: 5.5.3 ws: 8.13.0 transitivePeerDependencies: - bufferutil @@ -10857,25 +11043,6 @@ packages: loose-envify: 1.4.0 dev: false - /read-package-json-fast@3.0.2: - resolution: {integrity: sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - dependencies: - json-parse-even-better-errors: 3.0.2 - npm-normalize-package-bin: 3.0.1 - dev: false - - /read-package-json@7.0.1: - resolution: {integrity: sha512-8PcDiZ8DXUjLf687Ol4BR8Bpm2umR7vhoZOzNRt+uxD9GpBh/K+CAAALVIiYFknmvlmyg7hM7BSNUXPaCCqd0Q==} - engines: {node: ^16.14.0 || >=18.0.0} - deprecated: This package is no longer supported. Please use @npmcli/package-json instead. - dependencies: - glob: 10.4.1 - json-parse-even-better-errors: 3.0.2 - normalize-package-data: 6.0.1 - npm-normalize-package-bin: 3.0.1 - dev: false - /read-pkg-up@10.0.0: resolution: {integrity: sha512-jgmKiS//w2Zs+YbX039CorlkOp8FIVbSAN8r8GJHDsGlmNPXo+VeHkqAwCiQVTTx5/LwLZTcEw59z3DvcLbr0g==} engines: {node: '>=16'} @@ -11579,12 +11746,24 @@ packages: /socks-proxy-agent@8.0.3: resolution: {integrity: sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==} engines: {node: '>= 14'} + dependencies: + agent-base: 7.1.1 + debug: 4.3.4(supports-color@8.1.1) + socks: 2.8.3 + transitivePeerDependencies: + - supports-color + dev: true + + /socks-proxy-agent@8.0.4: + resolution: {integrity: sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==} + engines: {node: '>= 14'} dependencies: agent-base: 7.1.1 debug: 4.3.5 socks: 2.8.3 transitivePeerDependencies: - supports-color + dev: false /socks@2.8.3: resolution: {integrity: sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==} @@ -11678,6 +11857,12 @@ packages: resolution: {integrity: sha512-SWxXDROciuJs9YEYXUBjot5k/cqNGPPbT3QmkInFne4AGc1y+76It+jqU8rfsXKt57RRiunzZn1m9+KfuuNklw==} dev: true + /spacetrim@0.11.36: + resolution: {integrity: sha512-jqv5aAfMLkBnFK+38QUtEGgU7x1KrfpDnCdjX4+W1IEVgA8Kf3tk8K9je8j2nkCSXdIngjda53fuXERr4/61kw==} + requiresBuild: true + dev: true + optional: true + /spawn-command@0.0.2-1: resolution: {integrity: sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==} dev: true @@ -11727,7 +11912,7 @@ packages: bcrypt-pbkdf: 1.0.2 optionalDependencies: cpu-features: 0.0.10 - nan: 2.19.0 + nan: 2.20.0 dev: false /ssri@10.0.6: @@ -11817,7 +12002,7 @@ packages: queue-tick: 1.0.1 text-decoder: 1.1.0 optionalDependencies: - bare-events: 2.4.0 + bare-events: 2.4.2 dev: true /strict-uri-encode@1.1.0: @@ -12134,6 +12319,30 @@ packages: webpack: 5.91.0(webpack-cli@5.1.4) dev: true + /terser-webpack-plugin@5.3.10(webpack@5.92.1): + resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==} + engines: {node: '>= 10.13.0'} + peerDependencies: + '@swc/core': '*' + esbuild: '*' + uglify-js: '*' + webpack: ^5.1.0 + peerDependenciesMeta: + '@swc/core': + optional: true + esbuild: + optional: true + uglify-js: + optional: true + dependencies: + '@jridgewell/trace-mapping': 0.3.25 + jest-worker: 27.5.1 + schema-utils: 3.3.0 + serialize-javascript: 6.0.2 + terser: 5.31.0 + webpack: 5.92.1(webpack-cli@5.1.4) + dev: true + /terser@5.31.0: resolution: {integrity: sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==} engines: {node: '>=10'} @@ -12316,7 +12525,7 @@ packages: engines: {node: '>=14.16'} dev: true - /ts-jest@29.1.2(@babel/core@7.24.6)(jest@29.7.0)(typescript@5.4.5): + /ts-jest@29.1.2(@babel/core@7.24.7)(jest@29.7.0)(typescript@5.4.5): resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==} engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true @@ -12337,7 +12546,7 @@ packages: esbuild: optional: true dependencies: - '@babel/core': 7.24.6 + '@babel/core': 7.24.7 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 jest: 29.7.0(@types/node@18.19.33) @@ -12350,7 +12559,7 @@ packages: yargs-parser: 21.1.1 dev: true - /ts-node@10.9.2(@types/node@18.19.33)(typescript@5.4.5): + /ts-node@10.9.2(@types/node@20.14.10)(typescript@5.5.3): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -12369,14 +12578,14 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 18.19.33 + '@types/node': 20.14.10 acorn: 8.11.3 acorn-walk: 8.3.2 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.4.5 + typescript: 5.5.3 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true @@ -12560,6 +12769,12 @@ packages: hasBin: true dev: true + /typescript@5.5.3: + resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==} + engines: {node: '>=14.17'} + hasBin: true + dev: true + /uc.micro@1.0.6: resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} dev: true @@ -12673,6 +12888,17 @@ packages: picocolors: 1.0.1 dev: true + /update-browserslist-db@1.1.0(browserslist@4.23.1): + resolution: {integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==} + hasBin: true + peerDependencies: + browserslist: '>= 4.21.0' + dependencies: + browserslist: 4.23.1 + escalade: 3.1.2 + picocolors: 1.0.1 + dev: true + /upper-case-first@2.0.2: resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==} dependencies: @@ -12964,7 +13190,7 @@ packages: tmp-promise: 3.0.3 undici: 5.28.4 vscode-uri: 3.0.8 - webdriverio: 8.38.2(typescript@5.4.5) + webdriverio: 8.38.2(typescript@5.5.3) ws: 8.17.0 yargs-parser: 21.1.1 transitivePeerDependencies: @@ -13008,7 +13234,30 @@ packages: - utf-8-validate dev: true - /webdriverio@8.38.2(typescript@5.4.5): + /webdriver@8.39.0: + resolution: {integrity: sha512-Kc3+SfiH4ufyrIht683VT2vnJocx0pfH8rYdyPvEh1b2OYewtFTHK36k9rBDHZiBmk6jcSXs4M2xeFgOuon9Lg==} + engines: {node: ^16.13 || >=18} + requiresBuild: true + dependencies: + '@types/node': 20.14.10 + '@types/ws': 8.5.10 + '@wdio/config': 8.39.0 + '@wdio/logger': 8.38.0 + '@wdio/protocols': 8.38.0 + '@wdio/types': 8.39.0 + '@wdio/utils': 8.39.0 + deepmerge-ts: 5.1.0 + got: 12.6.1 + ky: 0.33.3 + ws: 8.18.0 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: true + optional: true + + /webdriverio@8.38.2(typescript@5.5.3): resolution: {integrity: sha512-r09y5UfivyYh5JOzT2SpJJ1zDmQl/R4OTH12opUqkjvp21BibCQm/uu1mrxGy4lzSHljrvqSVrrcGI+6UA1O8w==} engines: {node: ^16.13 || >=18} peerDependencies: @@ -13036,7 +13285,7 @@ packages: lodash.clonedeep: 4.5.0 lodash.zip: 4.2.0 minimatch: 9.0.4 - puppeteer-core: 20.9.0(typescript@5.4.5) + puppeteer-core: 20.9.0(typescript@5.5.3) query-selector-shadow-dom: 1.0.1 resq: 1.11.0 rgb2hex: 0.2.5 @@ -13050,6 +13299,50 @@ packages: - utf-8-validate dev: true + /webdriverio@8.39.1(typescript@5.5.3): + resolution: {integrity: sha512-dPwLgLNtP+l4vnybz+YFxxH8nBKOP7j6VVzKtfDyTLDQg9rz3U8OA4xMMQCBucnrVXy3KcKxGqlnMa+c4IfWCQ==} + engines: {node: ^16.13 || >=18} + requiresBuild: true + peerDependencies: + devtools: ^8.14.0 + peerDependenciesMeta: + devtools: + optional: true + dependencies: + '@types/node': 20.14.10 + '@wdio/config': 8.39.0 + '@wdio/logger': 8.38.0 + '@wdio/protocols': 8.38.0 + '@wdio/repl': 8.24.12 + '@wdio/types': 8.39.0 + '@wdio/utils': 8.39.0 + archiver: 7.0.1 + aria-query: 5.3.0 + css-shorthand-properties: 1.1.1 + css-value: 0.0.1 + devtools-protocol: 0.0.1302984 + grapheme-splitter: 1.0.4 + import-meta-resolve: 4.1.0 + is-plain-obj: 4.1.0 + jszip: 3.10.1 + lodash.clonedeep: 4.5.0 + lodash.zip: 4.2.0 + minimatch: 9.0.5 + puppeteer-core: 20.9.0(typescript@5.5.3) + query-selector-shadow-dom: 1.0.1 + resq: 1.11.0 + rgb2hex: 0.2.5 + serialize-error: 11.0.3 + webdriver: 8.39.0 + transitivePeerDependencies: + - bufferutil + - encoding + - supports-color + - typescript + - utf-8-validate + dev: true + optional: true + /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} dev: true @@ -13149,6 +13442,47 @@ packages: - uglify-js dev: true + /webpack@5.92.1(webpack-cli@5.1.4): + resolution: {integrity: sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==} + engines: {node: '>=10.13.0'} + hasBin: true + peerDependencies: + webpack-cli: '*' + peerDependenciesMeta: + webpack-cli: + optional: true + dependencies: + '@types/eslint-scope': 3.7.7 + '@types/estree': 1.0.5 + '@webassemblyjs/ast': 1.12.1 + '@webassemblyjs/wasm-edit': 1.12.1 + '@webassemblyjs/wasm-parser': 1.12.1 + acorn: 8.12.1 + acorn-import-attributes: 1.9.5(acorn@8.12.1) + browserslist: 4.23.1 + chrome-trace-event: 1.0.4 + enhanced-resolve: 5.17.0 + es-module-lexer: 1.5.4 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.11 + json-parse-even-better-errors: 2.3.1 + loader-runner: 4.3.0 + mime-types: 2.1.35 + neo-async: 2.6.2 + schema-utils: 3.3.0 + tapable: 2.2.1 + terser-webpack-plugin: 5.3.10(webpack@5.92.1) + watchpack: 2.4.1 + webpack-cli: 5.1.4(webpack@5.91.0) + webpack-sources: 3.2.3 + transitivePeerDependencies: + - '@swc/core' + - esbuild + - uglify-js + dev: true + /whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} dependencies: @@ -13272,6 +13606,21 @@ packages: optional: true dev: true + /ws@8.18.0: + resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==} + engines: {node: '>=10.0.0'} + requiresBuild: true + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: '>=5.0.2' + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + dev: true + optional: true + /xml2js@0.5.0: resolution: {integrity: sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==} engines: {node: '>=4.0.0'} From 0d201d0e005bb5871a4b363c329d6e48a683b5e8 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Mon, 8 Jul 2024 08:13:09 -0400 Subject: [PATCH 10/20] Update braces dep to fix audit check Signed-off-by: Timothy Johnson --- pnpm-lock.yaml | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4bce7f26a4..f9aa6e3ec1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -249,7 +249,7 @@ importers: version: 16.1.3 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.14.10)(typescript@5.5.3) + version: 10.9.2(@types/node@18.19.33)(typescript@5.5.3) wdio-vscode-service: specifier: ^6.0.3 version: 6.0.3(webdriverio@8.38.2) @@ -1915,7 +1915,7 @@ packages: jest-util: 29.7.0 jest-validate: 29.7.0 jest-watcher: 29.7.0 - micromatch: 4.0.5 + micromatch: 4.0.7 pretty-format: 29.7.0 slash: 3.0.0 strip-ansi: 6.0.1 @@ -2081,7 +2081,7 @@ packages: jest-haste-map: 29.7.0 jest-regex-util: 29.6.3 jest-util: 29.7.0 - micromatch: 4.0.5 + micromatch: 4.0.7 pirates: 4.0.6 slash: 3.0.0 write-file-atomic: 4.0.2 @@ -2747,9 +2747,11 @@ packages: /@types/node@20.14.10: resolution: {integrity: sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==} + requiresBuild: true dependencies: undici-types: 5.26.5 dev: true + optional: true /@types/node@20.14.2: resolution: {integrity: sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==} @@ -4409,11 +4411,11 @@ packages: - supports-color dev: true - /braces@3.0.2: - resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} + /braces@3.0.3: + resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} dependencies: - fill-range: 7.0.1 + fill-range: 7.1.1 /browser-stdout@1.3.1: resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==} @@ -4725,7 +4727,7 @@ packages: engines: {node: '>= 8.10.0'} dependencies: anymatch: 3.1.3 - braces: 3.0.2 + braces: 3.0.3 glob-parent: 5.1.2 is-binary-path: 2.1.0 is-glob: 4.0.3 @@ -4740,7 +4742,7 @@ packages: engines: {node: '>= 8.10.0'} dependencies: anymatch: 3.1.3 - braces: 3.0.2 + braces: 3.0.3 glob-parent: 5.1.2 is-binary-path: 2.1.0 is-glob: 4.0.3 @@ -6414,7 +6416,7 @@ packages: optionalDependencies: '@wdio/globals': 8.39.1(typescript@5.5.3) '@wdio/logger': 8.38.0 - webdriverio: 8.38.2(typescript@5.5.3) + webdriverio: 8.39.1(typescript@5.5.3) transitivePeerDependencies: - bufferutil - devtools @@ -6559,7 +6561,7 @@ packages: '@nodelib/fs.walk': 1.2.8 glob-parent: 5.1.2 merge2: 1.4.1 - micromatch: 4.0.5 + micromatch: 4.0.7 /fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} @@ -6746,8 +6748,8 @@ packages: to-regex-range: 2.1.1 dev: true - /fill-range@7.0.1: - resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} + /fill-range@7.1.1: + resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} engines: {node: '>=8'} dependencies: to-regex-range: 5.0.1 @@ -8321,7 +8323,7 @@ packages: jest-runner: 29.7.0 jest-util: 29.7.0 jest-validate: 29.7.0 - micromatch: 4.0.5 + micromatch: 4.0.7 parse-json: 5.2.0 pretty-format: 29.7.0 slash: 3.0.0 @@ -8402,7 +8404,7 @@ packages: jest-regex-util: 29.6.3 jest-util: 29.7.0 jest-worker: 29.7.0 - micromatch: 4.0.5 + micromatch: 4.0.7 walker: 1.0.8 optionalDependencies: fsevents: 2.3.3 @@ -8488,7 +8490,7 @@ packages: '@types/stack-utils': 2.0.3 chalk: 4.1.2 graceful-fs: 4.2.11 - micromatch: 4.0.5 + micromatch: 4.0.7 pretty-format: 29.7.0 slash: 3.0.0 stack-utils: 2.0.6 @@ -8680,7 +8682,7 @@ packages: chalk: 4.1.2 graceful-fs: 4.2.11 is-ci: 2.0.0 - micromatch: 4.0.5 + micromatch: 4.0.7 dev: true /jest-util@29.7.0: @@ -9510,11 +9512,11 @@ packages: - supports-color dev: true - /micromatch@4.0.5: - resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} + /micromatch@4.0.7: + resolution: {integrity: sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==} engines: {node: '>=8.6'} dependencies: - braces: 3.0.2 + braces: 3.0.3 picomatch: 2.3.1 /mime-db@1.52.0: @@ -12559,7 +12561,7 @@ packages: yargs-parser: 21.1.1 dev: true - /ts-node@10.9.2(@types/node@20.14.10)(typescript@5.5.3): + /ts-node@10.9.2(@types/node@18.19.33)(typescript@5.5.3): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -12578,7 +12580,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.14.10 + '@types/node': 18.19.33 acorn: 8.11.3 acorn-walk: 8.3.2 arg: 4.1.3 @@ -13309,7 +13311,7 @@ packages: devtools: optional: true dependencies: - '@types/node': 20.14.10 + '@types/node': 20.14.2 '@wdio/config': 8.39.0 '@wdio/logger': 8.38.0 '@wdio/protocols': 8.38.0 @@ -13327,7 +13329,7 @@ packages: jszip: 3.10.1 lodash.clonedeep: 4.5.0 lodash.zip: 4.2.0 - minimatch: 9.0.5 + minimatch: 9.0.4 puppeteer-core: 20.9.0(typescript@5.5.3) query-selector-shadow-dom: 1.0.1 resq: 1.11.0 From 6eee6dd7c51ce739327ad04bc949ce614eb60067 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Tue, 9 Jul 2024 08:56:30 -0400 Subject: [PATCH 11/20] clean up commented code Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- .../src/profiles/ProfilesCache.ts | 17 ---------------- .../zowe-explorer/src/utils/ProfilesUtils.ts | 20 ------------------- 2 files changed, 37 deletions(-) diff --git a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts index a2e0d97e85..37fbb434ee 100644 --- a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts +++ b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts @@ -356,23 +356,6 @@ export class ProfilesCache { public async convertV1ProfToConfig(deleteV1Profs: boolean = false): Promise { const convertResult = await imperative.ConvertV1Profiles.convert({ deleteV1Profs }); - // const teamConfig = await imperative.Config.load("zowe", { - // homeDir: zoweDir, - // projectDir: false, - // }); - // console.log(convertResult.profilesConverted); - // teamConfig.api.layers.activate(false, true); - // teamConfig.api.layers.merge(convertResult.profilesConverted as any); - // const knownCliConfig: imperative.ICommandProfileTypeConfiguration[] = this.getCoreProfileTypes(); - // knownCliConfig.push(ProfileConstants.BaseProfile); - // this.addToConfigArray(knownCliConfig); - // teamConfig.setSchema(imperative.ConfigSchema.buildSchema(this.getConfigArray())); - // await teamConfig.save(); - // try { - // fs.renameSync(profilesPath, oldProfilesPath); - // } catch (error) { - // warningMsg.push(`Failed to rename profiles directory to ${oldProfilesPath}:\n ${String(error)}`); - // } return convertResult; } diff --git a/packages/zowe-explorer/src/utils/ProfilesUtils.ts b/packages/zowe-explorer/src/utils/ProfilesUtils.ts index 76287e74ad..ee690d46d5 100644 --- a/packages/zowe-explorer/src/utils/ProfilesUtils.ts +++ b/packages/zowe-explorer/src/utils/ProfilesUtils.ts @@ -586,26 +586,6 @@ export class ProfilesUtils { } } let responseMsg = ""; - // console.log(convertResults.v1ScsPluginName); - // if (convertResults.v1ScsPluginName) { - // try { - // imperative.uninstallPlugin(convertResults.v1ScsPluginName); - // const newMsg = new imperative.ConvertMsg( - // imperative.ConvertMsgFmt.REPORT_LINE, - // `Uninstalled plug-in "${convertResults.v1ScsPluginName}"` - // ); - // convertResults.msgs.push(newMsg); - // } catch (error) { - // let newMsg = new imperative.ConvertMsg( - // imperative.ConvertMsgFmt.ERROR_LINE, - // `Failed to uninstall plug-in "${convertResults.v1ScsPluginName}"` - // ); - // convertResults.msgs.push(newMsg); - - // newMsg = new imperative.ConvertMsg(imperative.ConvertMsgFmt.ERROR_LINE | imperative.ConvertMsgFmt.INDENT, error.message); - // convertResults.msgs.push(newMsg); - // } - // } if (convertResults.msgs) { responseMsg += `${convertResults.msgs.map((msg) => msg.msgText).join("")}\n`; } From 1a2a3cdfc5c7ebe1482d08f3ba2d2f4ca9f2d35f Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:23:28 -0400 Subject: [PATCH 12/20] open config after conversion Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/zowe-explorer/src/utils/ProfilesUtils.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/zowe-explorer/src/utils/ProfilesUtils.ts b/packages/zowe-explorer/src/utils/ProfilesUtils.ts index ee690d46d5..27fe6a81c6 100644 --- a/packages/zowe-explorer/src/utils/ProfilesUtils.ts +++ b/packages/zowe-explorer/src/utils/ProfilesUtils.ts @@ -591,6 +591,12 @@ export class ProfilesUtils { } if (successMsg?.length > 0) { responseMsg += `Success: ${successMsg.join("")}\n`; + const document = await vscode.workspace.openTextDocument( + path.join(FileManagement.getZoweDir(), (await this.getProfileInfo()).getTeamConfig().configName) + ); + if (document) { + await Gui.showTextDocument(document); + } } if (warningMsg?.length > 0) { responseMsg += `Warning: ${warningMsg.join("")}\n`; From 8edba0c0613b6f6a9693985dd5dbf16b7ce1ba15 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Thu, 11 Jul 2024 08:52:41 -0400 Subject: [PATCH 13/20] update version in CHANGELOGs Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/zowe-explorer-api/CHANGELOG.md | 2 +- packages/zowe-explorer-ftp-extension/CHANGELOG.md | 1 + packages/zowe-explorer/CHANGELOG.md | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md index d614d22a48..4fe1ce3985 100644 --- a/packages/zowe-explorer-api/CHANGELOG.md +++ b/packages/zowe-explorer-api/CHANGELOG.md @@ -41,7 +41,7 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t - Fixed an issue where the `onProfilesUpdate` event did not fire after secure credentials were updated. [#2822](https://github.com/zowe/zowe-explorer-vscode/issues/2822) - Fixed an issue where `ProfilesCache` may return missing or incorrect profile values when multiple extensions call it during activation. [#2831](https://github.com/zowe/zowe-explorer-vscode/issues/2831) - Removed `handlebars` dependency in favor of `mustache` for technical currency purposes. [#2975](https://github.com/zowe/zowe-explorer-vscode/pull/2975) -- Update Zowe SDKs to `8.0.0-next.202405241828` for technical currency. [#2918](https://github.com/zowe/zowe-explorer-vscode/issues/2918) +- Update Zowe SDKs to `8.0.0-next.202407051717` for technical currency. [#2918](https://github.com/zowe/zowe-explorer-vscode/issues/2918) ## `3.0.0-next.202404242037` diff --git a/packages/zowe-explorer-ftp-extension/CHANGELOG.md b/packages/zowe-explorer-ftp-extension/CHANGELOG.md index e02d8dfdf9..97e02e6eea 100644 --- a/packages/zowe-explorer-ftp-extension/CHANGELOG.md +++ b/packages/zowe-explorer-ftp-extension/CHANGELOG.md @@ -81,6 +81,7 @@ All notable changes to the "zowe-explorer-ftp-extension" extension will be docum ### Bug fixes - Fixed ECONNRESET error when trying to upload or create an empty data set member. [#2350](https://github.com/zowe/vscode-extension-for-zowe/issues/2350) +- Update Zowe SDKs to `8.0.0-next.202407051717` for technical currency. [#2918](https://github.com/zowe/zowe-explorer-vscode/issues/2918) ## 2.16.0 diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md index 38426c7547..84342ac475 100644 --- a/packages/zowe-explorer/CHANGELOG.md +++ b/packages/zowe-explorer/CHANGELOG.md @@ -60,7 +60,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen - Fixed issue where saving changes to favorited PDS member fails when custom temp folder is set on Windows. [#2880](https://github.com/zowe/zowe-explorer-vscode/issues/2880) - Fixed issue where multiple extensions that contribute profiles to a tree view using the Zowe Explorer API may fail to load. [#2888](https://github.com/zowe/zowe-explorer-vscode/issues/2888) - Fixed regression where `getProviderForNode` returned the wrong tree provider after performing an action on a Zowe tree node, causing some commands to fail silently. [#2967](https://github.com/zowe/zowe-explorer-vscode/issues/2967) -- Update Zowe SDKs to `8.0.0-next.202405241828` for technical currency. [#2918](https://github.com/zowe/zowe-explorer-vscode/issues/2918) +- Update Zowe SDKs to `8.0.0-next.202407051717` for technical currency. [#2918](https://github.com/zowe/zowe-explorer-vscode/issues/2918) ## `3.0.0-next.202404242037` From 387894458edcbfdf10eda0dbbf4eaed1bbe9c810 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 12 Jul 2024 17:38:40 -0400 Subject: [PATCH 14/20] Enhance response message for convert v1 profiles Signed-off-by: Timothy Johnson --- .../profiles/ProfilesCache.unit.test.ts | 28 ++++----- .../src/profiles/ProfilesCache.ts | 7 ++- .../__unit__/utils/ProfilesUtils.unit.test.ts | 13 +---- .../zowe-explorer/src/utils/ProfilesUtils.ts | 58 +++++++++---------- 4 files changed, 48 insertions(+), 58 deletions(-) diff --git a/packages/zowe-explorer-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts b/packages/zowe-explorer-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts index cdd2601891..becafa5eea 100644 --- a/packages/zowe-explorer-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts +++ b/packages/zowe-explorer-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts @@ -141,6 +141,7 @@ describe("ProfilesCache", () => { it("getProfileInfo should initialize ProfileInfo API", async () => { const existsSync = jest.spyOn(fs, "existsSync").mockImplementation(); + jest.spyOn(FileManagement, "getZoweDir").mockReturnValue(fakeZoweDir); const profInfo = await new ProfilesCache(fakeLogger as unknown as imperative.Logger, __dirname).getProfileInfo(); expect(readProfilesFromDiskSpy).toHaveBeenCalledTimes(1); expect(defaultCredMgrWithKeytarSpy).toHaveBeenCalledTimes(1); @@ -438,12 +439,8 @@ describe("ProfilesCache", () => { }); describe("convertV1ProfToConfig", () => { - Object.defineProperty(FileManagement, "getZoweDir", { value: jest.fn().mockReturnValue(fakeZoweDir), configurable: true }); - Object.defineProperty(ProfilesCache, "addToConfigArray", { value: jest.fn(), configurable: true }); - Object.defineProperty(fs, "renameSync", { value: jest.fn(), configurable: true }); - Object.defineProperty(ProfilesCache, "getConfigArray", { value: jest.fn(), configurable: true }); it("Should convert v1 profiles to config file", async () => { - const profCache = new ProfilesCache(fakeLogger as unknown as imperative.Logger); + const profInfo = createProfInfoMock([lpar1Profile]); jest.spyOn(imperative.ConvertV1Profiles, "convert").mockImplementationOnce(() => { return { profilesConverted: { zosmf: ["profile1"] }, @@ -451,10 +448,10 @@ describe("ProfilesCache", () => { config: {}, } as any; }); - await expect(profCache.convertV1ProfToConfig()).resolves.not.toThrow(); + await expect(ProfilesCache.convertV1ProfToConfig(profInfo)).resolves.not.toThrow(); }); it("Should convert v1 profiles to config file with profilesFailed", async () => { - const profCache = new ProfilesCache(fakeLogger as unknown as imperative.Logger); + const profInfo = createProfInfoMock([lpar1Profile]); jest.spyOn(imperative.ConvertV1Profiles, "convert").mockImplementationOnce(() => { return { profilesConverted: {}, @@ -462,16 +459,13 @@ describe("ProfilesCache", () => { config: {}, } as any; }); - await expect(profCache.convertV1ProfToConfig()).resolves.not.toThrow(); + await expect(ProfilesCache.convertV1ProfToConfig(profInfo)).resolves.not.toThrow(); }); it("Should convert v1 profiles to config even if rename of profiles directory fails", async () => { - Object.defineProperty(fs, "renameSync", { - value: jest.fn().mockImplementation(() => { - throw new Error("Error renaming file"); - }), - configurable: true, + jest.spyOn(fs, "renameSync").mockImplementationOnce(() => { + throw new Error("Error renaming file"); }); - const profCache = new ProfilesCache(fakeLogger as unknown as imperative.Logger); + const profInfo = createProfInfoMock([lpar1Profile]); jest.spyOn(imperative.ConvertV1Profiles, "convert").mockImplementationOnce(() => { return { profilesConverted: {}, @@ -479,14 +473,14 @@ describe("ProfilesCache", () => { config: {}, } as any; }); - await expect(profCache.convertV1ProfToConfig()).resolves.not.toThrow(); + await expect(ProfilesCache.convertV1ProfToConfig(profInfo)).resolves.not.toThrow(); }); it("Should reject if error thrown other than renaming profiles directory", async () => { - const profCache = new ProfilesCache(fakeLogger as unknown as imperative.Logger); + const profInfo = createProfInfoMock([lpar1Profile]); jest.spyOn(imperative.ConvertV1Profiles, "convert").mockImplementationOnce(() => { throw new Error("Error converting config"); }); - await expect(profCache.convertV1ProfToConfig()).rejects.toThrow("Error converting config"); + await expect(ProfilesCache.convertV1ProfToConfig(profInfo)).rejects.toThrow("Error converting config"); }); }); diff --git a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts index 37fbb434ee..6a577ec381 100644 --- a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts +++ b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts @@ -354,8 +354,11 @@ export class ProfilesCache { }; } - public async convertV1ProfToConfig(deleteV1Profs: boolean = false): Promise { - const convertResult = await imperative.ConvertV1Profiles.convert({ deleteV1Profs }); + public static async convertV1ProfToConfig( + profileInfo: imperative.ProfileInfo, + deleteV1Profs: boolean = false + ): Promise { + const convertResult = await imperative.ConvertV1Profiles.convert({ deleteV1Profs, profileInfo }); return convertResult; } diff --git a/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts index 239170125a..abecba05fe 100644 --- a/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts +++ b/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts @@ -13,7 +13,7 @@ import * as fs from "fs"; import * as path from "path"; import * as util from "util"; import * as vscode from "vscode"; -import { Gui, imperative, ProfilesCache, Validation, ZoweVsCodeExtension } from "@zowe/zowe-explorer-api"; +import { Gui, imperative, ProfilesCache, ZoweVsCodeExtension } from "@zowe/zowe-explorer-api"; import { createAltTypeIProfile, createInstanceOfProfile, createValidIProfile } from "../../__mocks__/mockCreators/shared"; import { Constants } from "../../../src/configuration/Constants"; import { ZoweLogger } from "../../../src/tools/ZoweLogger"; @@ -23,7 +23,6 @@ import { ZoweExplorerExtender } from "../../../src/extending/ZoweExplorerExtende import { FilterItem } from "../../../src/management/FilterManagement"; import { ProfilesUtils } from "../../../src/utils/ProfilesUtils"; import { AuthUtils } from "../../../src/utils/AuthUtils"; -import { ZoweExplorerApiRegister } from "../../../src/extending/ZoweExplorerApiRegister"; jest.mock("../../../src/tools/ZoweLogger"); jest.mock("fs"); @@ -45,9 +44,8 @@ describe("ProfilesUtils unit tests", () => { mockGetDirectValue: jest.fn(), mockFileRead: { overrides: { CredentialManager: "@zowe/cli" } }, zoweDir: path.normalize("__tests__/.zowe/settings/imperative.json"), - profInstance: null, + profInstance: createInstanceOfProfile(createValidIProfile()), }; - newMocks.profInstance = createInstanceOfProfile(createValidIProfile()); Object.defineProperty(Constants, "PROFILES_CACHE", { value: newMocks.profInstance, configurable: true, @@ -352,12 +350,7 @@ describe("ProfilesUtils unit tests", () => { getAllProfiles: jest.fn().mockReturnValue([createValidIProfile(), createAltTypeIProfile()]), } as never); const infoMsgSpy = jest.spyOn(Gui, "infoMessage").mockResolvedValueOnce("Convert Existing Profiles" as any); - Object.defineProperty(mocks.profInstance, "convertV1ProfToConfig", { - value: jest.fn().mockResolvedValue(() => { - return { success: "success string.", warnings: "", convertResult: {} }; - }), - configurable: true, - }); + jest.spyOn(ProfilesCache, "convertV1ProfToConfig").mockResolvedValueOnce({ msgs: [] }); Object.defineProperty(imperative.ProfileInfo, "onlyV1ProfilesExist", { value: true, configurable: true }); await expect(ProfilesUtils.readConfigFromDisk()).resolves.not.toThrow(); diff --git a/packages/zowe-explorer/src/utils/ProfilesUtils.ts b/packages/zowe-explorer/src/utils/ProfilesUtils.ts index 27fe6a81c6..a4f20aa5b6 100644 --- a/packages/zowe-explorer/src/utils/ProfilesUtils.ts +++ b/packages/zowe-explorer/src/utils/ProfilesUtils.ts @@ -565,32 +565,14 @@ export class ProfilesUtils { private static async convertV1Profs(): Promise { const profileInfo = await this.getProfileInfo(); - const convertResults: imperative.IConvertV1ProfResult = await imperative.ConvertV1Profiles.convert({ deleteV1Profs: false, profileInfo }); - ZoweLogger.debug(JSON.stringify(convertResults)); - // await Constants.PROFILES_CACHE.convertV1ProfToConfig(); - const successMsg: string[] = []; - const warningMsg: string[] = []; - if (convertResults.profilesConverted) { - for (const [k, v] of Object.entries(convertResults?.profilesConverted)) { - successMsg.push(`Converted ${k} profile: ${v.join(", ")}\n`); + const convertResult: imperative.IConvertV1ProfResult = await ProfilesCache.convertV1ProfToConfig(profileInfo); + ZoweLogger.debug(JSON.stringify(convertResult)); + if (convertResult.profilesConverted) { + const successMsg: string[] = []; + for (const [k, v] of Object.entries(convertResult.profilesConverted)) { + successMsg.push(`Converted ${k} profile: ${v.join(", ")}`); } - } - if (convertResults?.profilesFailed?.length > 0) { - warningMsg.push(`Failed to convert ${convertResults?.profilesFailed.length} profile(s). See details below\n`); - for (const { name, type, error } of convertResults.profilesFailed) { - if (name != null) { - warningMsg.push(`Failed to load ${type} profile "${name}":\n${String(error)}\n`); - } else { - warningMsg.push(`Failed to find default ${type} profile:\n${String(error)}\n`); - } - } - } - let responseMsg = ""; - if (convertResults.msgs) { - responseMsg += `${convertResults.msgs.map((msg) => msg.msgText).join("")}\n`; - } - if (successMsg?.length > 0) { - responseMsg += `Success: ${successMsg.join("")}\n`; + ZoweLogger.info(successMsg.join("\n")); const document = await vscode.workspace.openTextDocument( path.join(FileManagement.getZoweDir(), (await this.getProfileInfo()).getTeamConfig().configName) ); @@ -598,10 +580,28 @@ export class ProfilesUtils { await Gui.showTextDocument(document); } } - if (warningMsg?.length > 0) { - responseMsg += `Warning: ${warningMsg.join("")}\n`; + if (convertResult.profilesFailed?.length > 0) { + const warningMsg: string[] = []; + warningMsg.push(`Failed to convert ${convertResult.profilesFailed.length} profile(s). See details below`); + for (const { name, type, error } of convertResult.profilesFailed) { + if (name != null) { + warningMsg.push(`Failed to load ${type} profile "${name}":\n${String(error)}`); + } else { + warningMsg.push(`Failed to find default ${type} profile:\n${String(error)}`); + } + } + ZoweLogger.warn(warningMsg.join("\n")); } - ZoweLogger.info(responseMsg); - Gui.infoMessage(responseMsg, { vsCodeOpts: { modal: true } }); + const responseMsg = convertResult.msgs.reduce((msgs: string[], msg: imperative.ConvertMsg) => { + if (msg.msgFormat & imperative.ConvertMsgFmt.PARAGRAPH) { + msgs.push("\n"); + } + if (msg.msgFormat & imperative.ConvertMsgFmt.INDENT) { + msgs.push("\t"); + } + msgs.push(msg.msgText + "\n"); + return msgs; + }, []); + Gui.infoMessage(responseMsg.join(""), { vsCodeOpts: { modal: true } }); } } From 39b1e13c38eda6dbd8626e3836e1679cd2114011 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Wed, 17 Jul 2024 09:38:16 -0400 Subject: [PATCH 15/20] Document static method change in changelog Signed-off-by: Timothy Johnson --- packages/zowe-explorer-api/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md index 4fe1ce3985..30deecb894 100644 --- a/packages/zowe-explorer-api/CHANGELOG.md +++ b/packages/zowe-explorer-api/CHANGELOG.md @@ -35,6 +35,7 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t - Updated the `ProfilesCache.getProfiles` method to return empty list instead of undefined when there are no profiles. [#2947](https://github.com/zowe/zowe-explorer-vscode/pull/2947) - Added PEM certificate support as an authentication method for logging into the API ML. [#2621](https://github.com/zowe/zowe-explorer-vscode/issues/2621) - Deprecated the `getUSSDocumentFilePath` function on the `IZoweTreeNode` interface as Zowe Explorer no longer uses the local file system for storing USS files. **No replacement is planned**; please access data from tree nodes using their [resource URIs](https://github.com/zowe/zowe-explorer-vscode/wiki/FileSystemProvider#operations-for-extenders) instead. [#2968](https://github.com/zowe/zowe-explorer-vscode/pull/2968) +- **Next Breaking:** Changed `ProfilesCache.convertV1ProfToConfig` method to be a static method that requires `ProfileInfo` instance as a parameter. ### Bug fixes From 72e090150290f2bc96fc7a5a6f398c3b2f9b9773 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Thu, 18 Jul 2024 19:04:56 -0400 Subject: [PATCH 16/20] address comment about interface ZeApiConvertResponse Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- .../src/globals/Interfaces.ts | 18 ------------------ .../zowe-explorer-api/src/globals/index.ts | 1 - .../src/profiles/ProfilesCache.ts | 4 ---- 3 files changed, 23 deletions(-) delete mode 100644 packages/zowe-explorer-api/src/globals/Interfaces.ts diff --git a/packages/zowe-explorer-api/src/globals/Interfaces.ts b/packages/zowe-explorer-api/src/globals/Interfaces.ts deleted file mode 100644 index 613b595468..0000000000 --- a/packages/zowe-explorer-api/src/globals/Interfaces.ts +++ /dev/null @@ -1,18 +0,0 @@ -/** - * This program and the accompanying materials are made available under the terms of the - * Eclipse Public License v2.0 which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-v20.html - * - * SPDX-License-Identifier: EPL-2.0 - * - * Copyright Contributors to the Zowe Project. - * - */ - -import * as imperative from "@zowe/imperative"; - -export interface ZeApiConvertResponse { - success: string; - warnings: string; - convertResult: imperative.ConvertV1Profiles; -} diff --git a/packages/zowe-explorer-api/src/globals/index.ts b/packages/zowe-explorer-api/src/globals/index.ts index 62247a00e6..728552914d 100644 --- a/packages/zowe-explorer-api/src/globals/index.ts +++ b/packages/zowe-explorer-api/src/globals/index.ts @@ -12,4 +12,3 @@ export * from "./Constants"; export * from "./Gui"; export * from "./GuiOptions"; -export * from "./Interfaces"; diff --git a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts index 6a577ec381..f8eb13e933 100644 --- a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts +++ b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts @@ -9,17 +9,13 @@ * */ -import * as path from "path"; -import * as fs from "fs"; import * as imperative from "@zowe/imperative"; import type { IRegisterClient } from "../extend/IRegisterClient"; import { FileManagement } from "../utils"; import { Validation } from "./Validation"; -import { ZeApiConvertResponse } from "../globals"; import { ZosmfProfile } from "@zowe/zosmf-for-zowe-sdk"; import { ZosTsoProfile } from "@zowe/zos-tso-for-zowe-sdk"; import { ZosUssProfile } from "@zowe/zos-uss-for-zowe-sdk"; -import { ProfileConstants } from "@zowe/core-for-zowe-sdk"; export class ProfilesCache { public profilesForValidation: Validation.IValidationProfile[] = []; From 309c4928983fb692ae80b6537526eeecc694828a Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:08:16 -0400 Subject: [PATCH 17/20] add codecov Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- .../__unit__/utils/ProfilesUtils.unit.test.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts index abecba05fe..8c681fe27c 100644 --- a/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts +++ b/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts @@ -344,13 +344,18 @@ describe("ProfilesUtils unit tests", () => { it("should prompt user if v1 profiles detected and Convert Existing Profiles chosen", async () => { const mocks = createBlockMocks(); const mockReadProfilesFromDisk = jest.fn(); - const profInfoSpy = jest.spyOn(ProfilesUtils, "getProfileInfo").mockReturnValueOnce({ + const profInfoSpy = jest.spyOn(ProfilesUtils, "getProfileInfo").mockResolvedValue({ readProfilesFromDisk: mockReadProfilesFromDisk, - getTeamConfig: jest.fn().mockReturnValue([]), + getTeamConfig: jest.fn().mockReturnValue({ configName: "zowe.config.json" }), getAllProfiles: jest.fn().mockReturnValue([createValidIProfile(), createAltTypeIProfile()]), } as never); const infoMsgSpy = jest.spyOn(Gui, "infoMessage").mockResolvedValueOnce("Convert Existing Profiles" as any); - jest.spyOn(ProfilesCache, "convertV1ProfToConfig").mockResolvedValueOnce({ msgs: [] }); + jest.spyOn(ProfilesCache, "convertV1ProfToConfig").mockResolvedValueOnce({ + msgs: [], + profilesConverted: { zosmf: ["myzosmf"] }, + profilesFailed: [{ name: "zosmf2", type: "zosmf", error: "failed" as any }], + } as any); + Object.defineProperty(vscode.workspace, "openTextDocument", { value: jest.fn(), configurable: true }); Object.defineProperty(imperative.ProfileInfo, "onlyV1ProfilesExist", { value: true, configurable: true }); await expect(ProfilesUtils.readConfigFromDisk()).resolves.not.toThrow(); From bfdd4b18f424c76ce9a496f998f7f744966e7ca3 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:28:48 -0400 Subject: [PATCH 18/20] more codecov added Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- .../__unit__/utils/ProfilesUtils.unit.test.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts index 8c681fe27c..c0968da3b0 100644 --- a/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts +++ b/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts @@ -351,11 +351,20 @@ describe("ProfilesUtils unit tests", () => { } as never); const infoMsgSpy = jest.spyOn(Gui, "infoMessage").mockResolvedValueOnce("Convert Existing Profiles" as any); jest.spyOn(ProfilesCache, "convertV1ProfToConfig").mockResolvedValueOnce({ - msgs: [], + msgs: [{ msgFormat: 4, msgText: "message text for testing." }], profilesConverted: { zosmf: ["myzosmf"] }, profilesFailed: [{ name: "zosmf2", type: "zosmf", error: "failed" as any }], } as any); Object.defineProperty(vscode.workspace, "openTextDocument", { value: jest.fn(), configurable: true }); + Object.defineProperty(imperative, "ConvertMsgFmt", { + value: jest.fn().mockReturnValue({ + REPORT_LINE: 1, + ERROR_LINE: 2, + PARAGRAPH: 4, + INDENT: 8, + }), + configurable: true, + }); Object.defineProperty(imperative.ProfileInfo, "onlyV1ProfilesExist", { value: true, configurable: true }); await expect(ProfilesUtils.readConfigFromDisk()).resolves.not.toThrow(); From aca74422c25c7dac3f1246e2cf5fe6e534b4dfa3 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:49:11 -0400 Subject: [PATCH 19/20] cover elses in testing Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- .../__unit__/utils/ProfilesUtils.unit.test.ts | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts index c0968da3b0..69a1caf167 100644 --- a/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts +++ b/packages/zowe-explorer/__tests__/__unit__/utils/ProfilesUtils.unit.test.ts @@ -350,12 +350,6 @@ describe("ProfilesUtils unit tests", () => { getAllProfiles: jest.fn().mockReturnValue([createValidIProfile(), createAltTypeIProfile()]), } as never); const infoMsgSpy = jest.spyOn(Gui, "infoMessage").mockResolvedValueOnce("Convert Existing Profiles" as any); - jest.spyOn(ProfilesCache, "convertV1ProfToConfig").mockResolvedValueOnce({ - msgs: [{ msgFormat: 4, msgText: "message text for testing." }], - profilesConverted: { zosmf: ["myzosmf"] }, - profilesFailed: [{ name: "zosmf2", type: "zosmf", error: "failed" as any }], - } as any); - Object.defineProperty(vscode.workspace, "openTextDocument", { value: jest.fn(), configurable: true }); Object.defineProperty(imperative, "ConvertMsgFmt", { value: jest.fn().mockReturnValue({ REPORT_LINE: 1, @@ -365,6 +359,19 @@ describe("ProfilesUtils unit tests", () => { }), configurable: true, }); + jest.spyOn(ProfilesCache, "convertV1ProfToConfig").mockResolvedValueOnce({ + msgs: [ + { msgFormat: imperative.ConvertMsgFmt.PARAGRAPH, msgText: "message text for testing." }, + { msgFormat: imperative.ConvertMsgFmt.INDENT, msgText: "message text for testing." }, + ], + profilesConverted: { zosmf: ["myzosmf"] }, + profilesFailed: [ + { name: "zosmf2", type: "zosmf", error: "failed" as any }, + { name: null, type: "zosmf", error: "failed" as any }, + ], + } as any); + Object.defineProperty(vscode.workspace, "openTextDocument", { value: jest.fn().mockReturnValue({}), configurable: true }); + Object.defineProperty(Gui, "showTextDocument", { value: jest.fn(), configurable: true }); Object.defineProperty(imperative.ProfileInfo, "onlyV1ProfilesExist", { value: true, configurable: true }); await expect(ProfilesUtils.readConfigFromDisk()).resolves.not.toThrow(); From 4f1c8aa2dcd1867dafc1c185357468b2f6d60c14 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Tue, 23 Jul 2024 15:42:02 -0400 Subject: [PATCH 20/20] address comment Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- .../zowe-explorer/src/utils/ProfilesUtils.ts | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/packages/zowe-explorer/src/utils/ProfilesUtils.ts b/packages/zowe-explorer/src/utils/ProfilesUtils.ts index a4f20aa5b6..1893369d4e 100644 --- a/packages/zowe-explorer/src/utils/ProfilesUtils.ts +++ b/packages/zowe-explorer/src/utils/ProfilesUtils.ts @@ -512,24 +512,23 @@ export class ProfilesUtils { ZoweLogger.warn(v1ProfileErrorMsg); const convertButton = vscode.l10n.t("Convert Existing Profiles"); const createButton = vscode.l10n.t("Create New"); - await Gui.infoMessage(v1ProfileErrorMsg, { items: [convertButton, createButton], vsCodeOpts: { modal: true } }).then(async (selection) => { - switch (selection) { - case createButton: { - ZoweLogger.info("Create new team configuration chosen."); - vscode.commands.executeCommand("zowe.ds.addSession", SharedTreeProviders.ds); - break; - } - case convertButton: { - ZoweLogger.info("Convert v1 profiles to team configuration chosen."); - await this.convertV1Profs(); - break; - } - default: { - Gui.infoMessage(vscode.l10n.t("Operation cancelled")); - break; - } + const selection = await Gui.infoMessage(v1ProfileErrorMsg, { items: [convertButton, createButton], vsCodeOpts: { modal: true } }); + switch (selection) { + case createButton: { + ZoweLogger.info("Create new team configuration chosen."); + vscode.commands.executeCommand("zowe.ds.addSession", SharedTreeProviders.ds); + break; } - }); + case convertButton: { + ZoweLogger.info("Convert v1 profiles to team configuration chosen."); + await this.convertV1Profs(); + break; + } + default: { + Gui.infoMessage(vscode.l10n.t("Operation cancelled")); + break; + } + } } /**