Merge branch 'hotfix/v2.5.5'

Author: ivankravets

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release Notes
 
+## 2.5.5 (2022-10-31)
+
+- Inherit VSCode Proxy configuration for PlatformIO Core (requires PlatformIO Core 6.1.5+)
+- Fixed an issue with passing VSCode environment variables to the terminal processes (issue [#3287](https://github.com/platformio/platformio-vscode-ide/issues/3287))
+
 ## 2.5.4 (2022-09-03)
 
 - Keep using legacy API for calling VSCode tasks

package.json

@@ -1,6 +1,6 @@
 {
   "name": "platformio-ide",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "publisher": "platformio",
   "engines": {
     "vscode": "^1.63.0"
@@ -627,22 +627,22 @@
   },
   "dependencies": {
     "fs-plus": "~3.1.1",
-    "platformio-node-helpers": "~9.6.0",
+    "platformio-node-helpers": "~9.6.1",
     "platformio-vscode-debug": "~1.4.1"
   },
   "devDependencies": {
-    "@babel/core": "~7.18.13",
-    "@babel/eslint-parser": "~7.18.9",
+    "@babel/core": "~7.19.6",
+    "@babel/eslint-parser": "~7.19.1",
     "@babel/plugin-proposal-class-properties": "~7.18.6",
-    "@babel/preset-env": "~7.18.10",
+    "@babel/preset-env": "~7.19.4",
     "@types/node": "~14",
     "@types/vscode": "~1.63.0",
     "babel-loader": "~8.2.5",
-    "eslint": "~8.23.0",
+    "eslint": "~8.26.0",
     "eslint-import-resolver-webpack": "~0.13.2",
     "eslint-plugin-import": "~2.26.0",
     "prettier": "~2.7.1",
-    "vsce": "~2.11.0",
+    "vsce": "~2.13.0",
     "webpack": "~5.74.0",
     "webpack-cli": "~4.10.0"
   },

src/main.js

@@ -132,13 +132,12 @@ class PlatformIOVSCodeExtension {
     if (http_proxy && !process.env.HTTP_PROXY && !process.env.http_proxy) {
       extraVars['HTTP_PROXY'] = http_proxy;
     }
-    if (!vscode.workspace.getConfiguration('http').get('proxyStrictSSL')) {
-      // https://stackoverflow.com/questions/48391750/disable-python-requests-ssl-validation-for-an-imported-module
-      extraVars['CURL_CA_BUNDLE'] = '';
-    }
     if (http_proxy && !process.env.HTTPS_PROXY && !process.env.https_proxy) {
       extraVars['HTTPS_PROXY'] = http_proxy;
     }
+    if (!vscode.workspace.getConfiguration('http').get('proxyStrictSSL')) {
+      extraVars['PLATFORMIO_SETTING_ENABLE_PROXY_STRICT_SSL'] = 'false';
+    }
     if (this.getSetting('customPyPiIndexUrl')) {
       extraVars['PIP_INDEX_URL'] = this.getSetting('customPyPiIndexUrl');
     }

src/project/tasks.js

@@ -109,7 +109,7 @@ export default class ProjectTaskManager {
   }
 
   toVSCodeTask(projectTask) {
-    const envClone = Object.create(process.env);
+    const envClone = Object.assign({}, process.env);
     if (process.env.PLATFORMIO_PATH) {
       envClone.PATH = process.env.PLATFORMIO_PATH;
       envClone.Path = process.env.PLATFORMIO_PATH;

src/terminal.js

@@ -14,7 +14,7 @@ export default class PIOTerminal {
   }
 
   new() {
-    const envClone = Object.create(process.env);
+    const envClone = Object.assign({}, process.env);
     if (process.env.PLATFORMIO_PATH) {
       envClone.PATH = process.env.PLATFORMIO_PATH;
       envClone.Path = process.env.PLATFORMIO_PATH;