Merge branch 'main' into ftp-error

zowe · Jul 14, 2023 · 9543828 · 9543828
2 parents 93ba464 + 955a738
commit 9543828
Show file tree

Hide file tree

Showing 23 changed files with 500 additions and 379 deletions.
diff --git a/package.json b/package.json
@@ -46,7 +46,9 @@
     "yarn": "1.22.19"
   },
   "resolutions": {
-    "**/json5": "^2.2.2"
+    "**/json5": "^2.2.2",
+    "**/optionator": "^0.9.3",
+    "**/semver": "^7.5.2"
   },
   "scripts": {
     "clean": "yarn workspaces run clean",

diff --git a/packages/eslint-plugin-zowe-explorer/CHANGELOG.md b/packages/eslint-plugin-zowe-explorer/CHANGELOG.md
@@ -6,6 +6,12 @@ All notable changes to the "eslint-plugin-zowe-explorer" package will be documen
 
 ### Bug fixes
 
+## `2.9.1`
+
+### New features and enhancements
+
+### Bug fixes
+
 ## `2.9.0`
 
 ### New features and enhancements

diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md
@@ -6,12 +6,19 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
 
 ### New features and enhancements
 
+### Bug fixes
+
+## `2.9.1`
+
+### New features and enhancements
+
 - Added optional `profile` parameter to `IPromptCredentialsOptions` so developers can choose to skip rebuilding the profile with ProfilesCache.
-- Fixed error when an extender's extension attempts to access the keyring in a remote VSCode session [#324](https://github.com/zowe/vscode-extension-for-cics/issues/324).
 
 ### Bug fixes
 
-- Fixed issue where profiles with authentication tokens were breaking functionality for direct-to-service profiles after user interaction. [#2111](https://github.com/zowe/vscode-extension-for-zowe/issues/2111)
+- Fixed error when an extender's extension attempts to access the keyring in a remote VSCode session [#324](https://github.com/zowe/vscode-extension-for-cics/issues/324).
+- Fixed issue where profiles with authentication tokens were breaking functionality for direct-to-service profiles after user interaction. [#2330](https://github.com/zowe/vscode-extension-for-zowe/issues/2330)
+- Updated dependencies for security audits.
 
 ## `2.9.0`
 

diff --git a/packages/zowe-explorer-api/package.json b/packages/zowe-explorer-api/package.json
@@ -13,11 +13,11 @@
     "lib"
   ],
   "devDependencies": {
-    "@types/semver": "^7.3.6"
+    "@types/semver": "^7.5.0"
   },
   "dependencies": {
     "@zowe/cli": "^7.16.2",
-    "semver": "^7.3.5"
+    "semver": "^7.5.3"
   },
   "scripts": {
     "build": "yarn check-cli && yarn clean && tsc -p ./ && yarn license",

diff --git a/packages/zowe-explorer-ftp-extension/CHANGELOG.md b/packages/zowe-explorer-ftp-extension/CHANGELOG.md
@@ -8,6 +8,12 @@ All notable changes to the "zowe-explorer-ftp-extension" extension will be docum
 
 ### Bug fixes
 
+## `2.9.1`
+
+### Bug fixes
+
+- Updated dependencies for security audits.
+
 ## `2.9.0`
 
 ### Bug fixes

diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md
@@ -8,6 +8,15 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 
 ### Bug fixes
 
+## `2.9.1`
+
+### Bug fixes
+
+- Optimized fetching and caching of child nodes across the primary tree views (Data Sets, Unix System Services, Jobs). [#2347](https://github.com/zowe/vscode-extension-for-zowe/issues/2347)
+- Fixed issue where profiles with authentication tokens were breaking functionality for direct-to-service profiles after user interaction. [#2330](https://github.com/zowe/vscode-extension-for-zowe/issues/2330)
+- Fixed profile watcher for browser based environments. [#2211](https://github.com/zowe/vscode-extension-for-zowe/issues/2211)
+- Updated dependencies for security audits.
+
 ## `2.9.0`
 
 ### New features and enhancements