Merge branch 'main' into feat/authSwitch

zowe · Jul 17, 2024 · 8457c99 · 8457c99
2 parents c781f13 + adf0f28
commit 8457c99
Show file tree

Hide file tree

Showing 7 changed files with 1,095 additions and 84 deletions.
diff --git a/package.json b/package.json
@@ -16,16 +16,19 @@
  "vscode": "^1.53.2"
  },
  "dependencies": {
- "@zowe/cli": "7.26.1",
+ "@zowe/cli": "7.27.0",
  "vscode-nls": "4.1.2"
  },
  "devDependencies": {
+ "@babel/core": "^7.24.9",
+ "@babel/preset-env": "^7.24.8",
  "@types/jest": "^29.2.3",
  "@types/mocha": "^10.0.1",
  "@types/node": "^14.18.12",
  "@types/vscode": "^1.53.2",
  "@typescript-eslint/eslint-plugin": "^5.53.0",
  "@typescript-eslint/parser": "^5.53.0",
+ "babel-loader": "^8.3.0",
  "eslint": "^8.34.0",
  "eslint-config-prettier": "^8.6.0",
  "eslint-plugin-prettier": "^4.2.1",

diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md
@@ -6,6 +6,8 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
 
 ### New features and enhancements
 
+- Updated the `@zowe/cli` dependency to 7.27.0 to support proxy environment variables [#3003](https://github.com/zowe/zowe-explorer-vscode/issues/3003)
+
 ### Bug fixes
 
 - Removed `handlebars` dependency in favor of `mustache` for technical currency purposes. [#2974](https://github.com/zowe/zowe-explorer-vscode/pull/2974)

diff --git a/packages/zowe-explorer-api/package.json b/packages/zowe-explorer-api/package.json
@@ -22,7 +22,7 @@
  },
  "dependencies": {
  "@types/vscode": "^1.53.2",
- "@zowe/cli": "7.26.1",
+ "@zowe/cli": "7.27.0",
  "@zowe/secrets-for-zowe-sdk": "7.18.6",
  "mustache": "^4.2.0",
  "semver": "^7.5.3"

diff --git a/packages/zowe-explorer-ftp-extension/webpack.config.js b/packages/zowe-explorer-ftp-extension/webpack.config.js
@@ -82,6 +82,16 @@ const config = {
  },
  ],
  },
+ {
+ test: /\.js$/,
+ include: /agent-base|https?-proxy-agent/,
+ use: {
+ loader: "babel-loader",
+ options: {
+ presets: ["@babel/preset-env"],
+ },
+ },
+ },
  {
  test: /\.mjs$/,
  include: /markdown-it/,

diff --git a/packages/zowe-explorer/webpack.config.js b/packages/zowe-explorer/webpack.config.js
@@ -84,6 +84,16 @@ const config = {
  },
  ],
  },
+ {
+ test: /\.js$/,
+ include: /agent-base|https?-proxy-agent/,
+ use: {
+ loader: "babel-loader",
+ options: {
+ presets: ["@babel/preset-env"],
+ },
+ },
+ },
  {
  test: /\.mjs$/,
  include: /markdown-it/,

diff --git a/samples/uss-profile-sample/package.json b/samples/uss-profile-sample/package.json
@@ -33,7 +33,7 @@
  "watch": "tsc -watch -p ./"
  },
  "dependencies": {
- "@zowe/cli": "7.26.1",
+ "@zowe/cli": "7.27.0",
  "@zowe/zowe-explorer-api": "file:../../packages/zowe-explorer-api",
  "ssh2-sftp-client": "^9.1.0"
  },