Merge branch 'release/v2.1.2'

Author: ivankravets

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Release Notes
 
-## 2.1.1 (2020-10-??)
+## 2.1.2 (2020-10-16)
+
+- Do not propagate PlatformIO CLI to a default VSCode's terminal. If you need PlatformIO Core CLI, please open "Left Activity Bar > PlatformIO (icon) > Quick Access > Miscellaneous > PlatformIO Core CLI")
+- Fixed a bug with "Cannot find module 'os-tmpdir'"
+
+## 2.1.1 (2020-10-16)
 
 - Do not patch the global environment PATH with PlatformIO (issues [#2045](https://github.com/platformio/platformio-vscode-ide/issues/2045), [#2046](https://github.com/platformio/platformio-vscode-ide/issues/2046))
 - Fixed an issue with "Webview is disposed" (issue [#2126](https://github.com/platformio/platformio-vscode-ide/issues/2126))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "platformio-ide",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "publisher": "platformio",
   "engines": {
     "vscode": "^1.44.0"
@@ -626,7 +626,7 @@
   },
   "dependencies": {
     "fs-plus": "~3.1.1",
-    "platformio-node-helpers": "~8.0.0",
+    "platformio-node-helpers": "~8.0.1",
     "platformio-vscode-debug": "~1.2.11"
   },
   "extensionDependencies": [

src/main.js

@@ -59,7 +59,6 @@ class PlatformIOVSCodeExtension {
 
     this.patchOSEnviron();
     await this.startInstaller();
-    PIOTerminal.patchGlobalEnv(this.context);
     this.subscriptions.push(this.handleUseDevelopmentPIOCoreConfiguration());
 
     vscode.commands.executeCommand('setContext', 'pioCoreReady', true);

src/terminal.js

@@ -9,33 +9,6 @@
 import vscode from 'vscode';
 
 export default class PIOTerminal {
-  static patchGlobalEnv(context) {
-    const envCollection = context.environmentVariableCollection;
-    if (!envCollection) {
-      return;
-    }
-    const names = [
-      'PLATFORMIO_CALLER',
-      'PLATFORMIO_IDE',
-      'PATH',
-      'Path',
-      'HTTP_PROXY',
-      'HTTPS_PROXY',
-      'NO_PROXY',
-      'CURL_CA_BUNDLE',
-    ];
-    for (const name of names) {
-      if (process.env[name]) {
-        envCollection.replace(
-          name,
-          process.env.PLATFORMIO_PATH && ['PATH', 'Path'].includes(name)
-            ? process.env.PLATFORMIO_PATH
-            : process.env[name]
-        );
-      }
-    }
-  }
-
   constructor() {
     this._instance = undefined;
   }