Merge branch 'main' of https://github.com/zowe/zowe-explorer-vscode i…

…nto chore/update-2v3 Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com>
zowe · Sep 27, 2024 · 0e461e1 · 0e461e1
2 parents a3c3c1c + 4c55d12
commit 0e461e1
Show file tree

Hide file tree

Showing 14 changed files with 66 additions and 56 deletions.
diff --git a/.github/release.config.js b/.github/release.config.js
@@ -17,6 +17,7 @@ module.exports = {
  },
  {
  name: "release/3.*",
+ channel: "next",
  prerelease: true,
  }
  ],

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
- "version": "3.0.0-next-SNAPSHOT",
+ "version": "3.0.0-SNAPSHOT",
  "command": {
  "version": {
  "forcePublish": true,

diff --git a/packages/eslint-plugin-zowe-explorer/CHANGELOG.md b/packages/eslint-plugin-zowe-explorer/CHANGELOG.md
@@ -6,11 +6,9 @@ All notable changes to the "eslint-plugin-zowe-explorer" package will be documen
 
 ### Bug fixes
 
-## `3.0.0-next.202409132122`
-
-### New features and enhancements
+## `3.0.0-next.202409251932`
 
-### Bug fixes
+## `3.0.0-next.202409132122`
 
 ## `3.0.0-next.202409091409`
 

diff --git a/packages/eslint-plugin-zowe-explorer/package.json b/packages/eslint-plugin-zowe-explorer/package.json
@@ -1,6 +1,6 @@
 {
  "name": "eslint-plugin-zowe-explorer",
- "version": "3.0.0-next-SNAPSHOT",
+ "version": "3.0.0-SNAPSHOT",
  "description": "Custom ESLint Rules for ZOWE Explorer",
  "keywords": [
  "eslint",

diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md
@@ -6,6 +6,12 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
 
 ### New features and enhancements
 
+### Bug fixes
+
+## `3.0.0-next.202409251932`
+
+### New features and enhancements
+
 - Added the `BaseProfileAuthOptions` interface to define base profile authentication options for SSO login and logout. [#3076](https://github.com/zowe/zowe-explorer-vscode/pull/3076)
 - Deprecated the methods `ZoweVsCodeExtension.loginWithBaseProfile` and `ZoweVsCodeExtension.logoutWithBaseProfile`. Use `ZoweVsCodeExtension.ssoLogin` and `ZoweVsCodeExtension.ssoLogout` instead, which use the `BaseProfileAuthOptions` interface and allow you to choose whether the token value in the base profile should have precedence in case there are conflicts. [#3076](https://github.com/zowe/zowe-explorer-vscode/pull/3076)
 - Fixed bug in `ProfilesCache` class where old profiles were still accessible after deleting a Team configuration file. [#3124](https://github.com/zowe/zowe-explorer-vscode/issues/3124)

diff --git a/packages/zowe-explorer-api/package.json b/packages/zowe-explorer-api/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zowe/zowe-explorer-api",
- "version": "3.0.0-next-SNAPSHOT",
+ "version": "3.0.0-SNAPSHOT",
  "description": "Extensibility API for Zowe Explorer.",
  "publisher": "Zowe",
  "author": "Zowe",

diff --git a/packages/zowe-explorer-ftp-extension/CHANGELOG.md b/packages/zowe-explorer-ftp-extension/CHANGELOG.md
@@ -8,17 +8,16 @@ All notable changes to the "zowe-explorer-ftp-extension" extension will be docum
 
 - Update Zowe SDKs to `8.0.0` for technical currency.
 - Update z/OS FTP Plug-in for Zowe CLI dependency to `3.0.0`.
-- Removed popup notification of successful registration with Zowe Explorer and log the success instead. [#2862](https://github.com/zowe/zowe-explorer-vscode/issues/2862)
 
-## `3.0.0-next.202409132122`
-
-### New features and enhancements
+## `3.0.0-next.202409251932`
 
 ### Bug fixes
 
-## `3.0.0-next.202409091409`
+- Removed popup notification of successful registration with Zowe Explorer and log the success instead. [#2862](https://github.com/zowe/zowe-explorer-vscode/issues/2862)
 
-### New features and enhancements
+## `3.0.0-next.202409132122`
+
+## `3.0.0-next.202409091409`
 
 ### Bug fixes
 

diff --git a/packages/zowe-explorer-ftp-extension/package.json b/packages/zowe-explorer-ftp-extension/package.json
@@ -5,7 +5,7 @@
  "author": "Zowe",
  "license": "EPL-2.0",
  "description": "Adds zFTP support to Zowe Explorer demonstrating how to extend the Zowe Explorer using its extensibility API.",
- "version": "3.0.0-next-SNAPSHOT",
+ "version": "3.0.0-SNAPSHOT",
  "icon": "resources/zowe-ftp-color.png",
  "repository": {
  "url": "https://github.com/zowe/zowe-explorer-vscode"
@@ -55,7 +55,7 @@
  "@zowe/zos-files-for-zowe-sdk": "^8.0.0",
  "@zowe/zos-ftp-for-zowe-cli": "^3.0.0",
  "@zowe/zos-jobs-for-zowe-sdk": "^8.0.0",
- "@zowe/zowe-explorer-api": "3.0.0-next-SNAPSHOT",
+ "@zowe/zowe-explorer-api": "3.0.0-SNAPSHOT",
  "tmp": "0.2.3"
  },
  "devDependencies": {

diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md
@@ -6,6 +6,12 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 
 ### New features and enhancements
 
+### Bug fixes
+
+## `3.0.0-next.202409251932`
+
+### New features and enhancements
+
 - Users can now follow a prompt to create a new Zowe client configuration. The prompt displays when VS Code is opened with Zowe Explorer installed, but the user does not have any Zowe client configurations. [#3148](https://github.com/zowe/zowe-explorer-vscode/pull/3148)
 
 ### Bug fixes

diff --git a/packages/zowe-explorer/l10n/bundle.l10n.json b/packages/zowe-explorer/l10n/bundle.l10n.json
@@ -171,6 +171,32 @@
  "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"
+ ]
+ },
+ "No error details given": "No error details given",
+ "Error fetching destination {0} for paste action: {1}/USS pathError message": {
+ "message": "Error fetching destination {0} for paste action: {1}",
+ "comment": [
+ "USS path",
+ "Error message"
+ ]
+ },
  "Downloaded: {0}/Download time": {
  "message": "Downloaded: {0}",
  "comment": [
@@ -241,32 +267,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"
- ]
- },
- "No error details given": "No error details given",
- "Error fetching destination {0} for paste action: {1}/USS pathError message": {
- "message": "Error fetching destination {0} for paste action: {1}",
- "comment": [
- "USS path",
- "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
@@ -491,6 +491,14 @@
  "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}": "",
+ "No error details given": "",
+ "Error fetching destination {0} for paste action: {1}": "",
  "Downloaded: {0}": "",
  "Encoding: {0}": "",
  "Binary": "",
@@ -519,14 +527,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}": "",
- "No error details given": "",
- "Error fetching destination {0} for paste action: {1}": "",
  "{0} location": "",
  "Choose a location to create the {0}": "",
  "Name of file or directory": "",

diff --git a/packages/zowe-explorer/package.json b/packages/zowe-explorer/package.json
@@ -2,7 +2,7 @@
  "name": "vscode-extension-for-zowe",
  "displayName": "%displayName%",
  "description": "%description%",
- "version": "3.0.0-next-SNAPSHOT",
+ "version": "3.0.0-SNAPSHOT",
  "publisher": "Zowe",
  "author": "Zowe",
  "license": "EPL-2.0",
@@ -1816,7 +1816,7 @@
  "@wdio/spec-reporter": "^8.40.3",
  "@wdio/types": "^8.40.3",
  "chalk": "^2.4.1",
- "eslint-plugin-zowe-explorer": "3.0.0-next-SNAPSHOT",
+ "eslint-plugin-zowe-explorer": "3.0.0-SNAPSHOT",
  "expect-webdriverio": "^4.15.4",
  "glob": "^7.1.6",
  "jest-silent-reporter": "^0.5.0",
@@ -1835,7 +1835,7 @@
  "@zowe/zos-files-for-zowe-sdk": "^8.0.0",
  "@zowe/zos-jobs-for-zowe-sdk": "^8.0.0",
  "@zowe/zosmf-for-zowe-sdk": "^8.0.0",
- "@zowe/zowe-explorer-api": "3.0.0-next-SNAPSHOT",
+ "@zowe/zowe-explorer-api": "3.0.0-SNAPSHOT",
  "dayjs": "^1.11.10",
  "fs-extra": "8.0.1",
  "isbinaryfile": "4.0.4",

diff --git a/packages/zowe-explorer/src/webviews/package.json b/packages/zowe-explorer/src/webviews/package.json
@@ -2,7 +2,7 @@
  "name": "webviews",
  "private": true,
  "type": "module",
- "version": "3.0.0-next-SNAPSHOT",
+ "version": "3.0.0-SNAPSHOT",
  "main": "index.js",
  "license": "EPL-2.0",
  "scripts": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml