update dependencies to latest version

espressif · May 15, 2020 · 79d1856 · 79d1856
1 parent 7cf0c55
commit 79d1856
Show file tree

Hide file tree

Showing 10 changed files with 1,103 additions and 853 deletions.
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "theme": "dark"
   },
   "engines": {
-    "vscode": "^1.30.0"
+    "vscode": "^1.45.0"
   },
   "repository": {
     "type": "git",
@@ -544,82 +544,84 @@
     "webpack": "webpack --mode production"
   },
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.9.0",
-    "@fortawesome/fontawesome-svg-core": "^1.2.21",
-    "@fortawesome/free-solid-svg-icons": "^5.10.1",
-    "@fortawesome/vue-fontawesome": "^0.1.6",
+    "@fortawesome/fontawesome-free": "^5.13.0",
+    "@fortawesome/fontawesome-svg-core": "^1.2.28",
+    "@fortawesome/free-solid-svg-icons": "^5.13.0",
+    "@fortawesome/vue-fontawesome": "^0.1.9",
     "@types/follow-redirects": "^1.8.0",
-    "@types/fs-extra": "^8.0.1",
+    "@types/fs-extra": "^8.1.0",
     "@types/glob": "^7.1.1",
-    "@types/mocha": "^5.2.7",
-    "@types/nock": "^9.3.1",
-    "@types/node": "^7.10.9",
-    "@types/tmp": "0.0.33",
-    "@types/vscode": "^1.30.0",
+    "@types/mocha": "^7.0.2",
+    "@types/nock": "^11.1.0",
+    "@types/node": "^14.0.1",
+    "@types/tmp": "0.2.0",
+    "@types/vscode": "^1.45.0",
     "@types/yauzl": "^2.9.1",
-    "@vue/component-compiler-utils": "^3.0.0",
-    "bulma": "^0.7.5",
-    "css-loader": "^3.1.0",
-    "file-loader": "^4.0.0",
-    "glob": "^7.1.4",
+    "@vue/component-compiler-utils": "^3.1.2",
+    "bulma": "^0.8.2",
+    "css-loader": "^3.5.3",
+    "file-loader": "^6.0.0",
+    "glob": "^7.1.6",
     "gulp": "^4.0.2",
-    "gulp-cli": "^2.0.1",
-    "gulp-typescript": "^5.0.0-alpha.3",
-    "html-webpack-plugin": "^3.2.0",
-    "husky": "^2.5.0",
-    "mini-css-extract-plugin": "^0.7.0",
-    "mocha": "^7.1.1",
+    "gulp-cli": "^2.2.0",
+    "gulp-typescript": "^6.0.0-alpha.1",
+    "html-webpack-plugin": "^4.3.0",
+    "husky": "^4.2.5",
+    "mini-css-extract-plugin": "^0.9.0",
+    "mocha": "^7.1.2",
     "mocha-junit-reporter": "^1.23.3",
-    "nock": "^10.0.6",
-    "node-sass": "^4.13.0",
-    "prettier": "2.0.2",
+    "nock": "^12.0.3",
+    "node-sass": "^4.14.1",
+    "prettier": "2.0.5",
     "pretty-quick": "^2.0.1",
     "reflect-metadata": "^0.1.13",
-    "sass-loader": "^7.1.0",
-    "style-loader": "^0.23.1",
-    "ts-loader": "^6.0.4",
-    "tslint": "^5.18.0",
+    "sass-loader": "^8.0.2",
+    "style-loader": "^1.2.1",
+    "ts-loader": "^7.0.4",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0",
-    "tslint-plugin-prettier": "^2.2.0",
+    "tslint-plugin-prettier": "^2.3.0",
     "tslint-webpack-plugin": "^2.1.0",
-    "typescript": "^2.9.2",
-    "typescript-tslint-plugin": "^0.3.1",
-    "vsce": "^1.52.0",
+    "typescript": "^3.9.2",
+    "typescript-tslint-plugin": "^0.5.5",
+    "vsce": "^1.75.0",
     "vscode-nls-dev": "^3.3.1",
-    "vscode-test": "^1.0.0",
-    "vue-class-component": "^7.1.0",
-    "vue-hot-reload-api": "^2.3.2",
-    "vue-loader": "^15.7.1",
-    "vue-property-decorator": "^8.2.1",
-    "vue-router": "^3.0.2",
+    "vscode-test": "^1.3.0",
+    "vue-class-component": "^7.2.3",
+    "vue-hot-reload-api": "^2.3.4",
+    "vue-loader": "^15.9.2",
+    "vue-property-decorator": "^8.4.2",
+    "vue-router": "^3.1.6",
     "vue-style-loader": "^4.1.2",
-    "vue-template-compiler": "^2.6.10",
+    "vue-template-compiler": "^2.6.11",
     "vuex-class": "^0.3.2",
-    "webpack": "^4.42.0",
+    "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   },
   "dependencies": {
-    "ansi-to-html": "^0.6.11",
-    "del": "^4.1.1",
-    "es6-promisify": "^6.0.0",
-    "follow-redirects": "^1.6.1",
-    "fs-extra": "^8.1.0",
-    "https-proxy-agent": "^3.0.0",
-    "marked": "^0.7.0",
-    "plotly.js-dist": "^1.49.3",
-    "tar-fs": "^2.0.0",
+    "ansi-to-html": "^0.6.14",
+    "del": "^5.1.0",
+    "es6-promisify": "^6.1.1",
+    "follow-redirects": "^1.11.0",
+    "fs-extra": "^9.0.0",
+    "https-proxy-agent": "^5.0.0",
+    "marked": "^1.0.0",
+    "plotly.js-dist": "^1.54.1",
+    "tar-fs": "^2.1.0",
     "tree-kill": "^1.2.2",
-    "vscode-debugadapter": "^1.33.0",
-    "vscode-debugadapter-testsupport": "^1.34.0",
-    "vscode-debugprotocol": "^1.33.0",
-    "vscode-languageclient": "^5.2.1",
-    "vscode-languageserver": "^5.2.1",
-    "vscode-nls": "^4.0.0",
-    "vue": "^2.6.10",
-    "vue-scroll": "^2.1.12",
+    "vscode-debugadapter": "^1.40.0",
+    "vscode-debugadapter-testsupport": "^1.40.3",
+    "vscode-debugprotocol": "^1.40.0",
+    "vscode-languageclient": "^6.1.3",
+    "vscode-languageserver": "^6.1.1",
+    "vscode-languageserver-textdocument": "^1.0.1",
+    "vscode-nls": "^4.1.2",
+    "vue": "^2.6.11",
+    "vue-scroll": "^2.1.13",
     "vue-the-mask": "^0.11.1",
-    "vuex": "^3.1.1",
-    "winston": "^2.3.1",
+    "vuex": "^3.4.0",
+    "winston": "^3.2.1",
+    "winston-transport": "^4.3.0",
     "yauzl": "^2.10.0"
   },
   "alias": {

diff --git a/src/downloadManager.ts b/src/downloadManager.ts
@@ -260,13 +260,13 @@ export class DownloadManager {
             );
 
             fileStream.on("error", (e) => {
-              this.appendChannel(e);
+              this.appendChannel(e.message);
               return reject(
                 new PackageError(
                   "Error creating file",
                   "DownloadPackage",
                   e,
-                  e.code
+                  e.name
                 )
               );
             });

diff --git a/src/espIdf/apptrace/tree/appTraceArchiveTreeDataProvider.ts b/src/espIdf/apptrace/tree/appTraceArchiveTreeDataProvider.ts
@@ -51,7 +51,7 @@ export class AppTraceArchiveTreeDataProvider
     return this.appTraceArchives;
   }
   public refresh() {
-    this.OnDidChangeTreeData.fire();
+    this.OnDidChangeTreeData.fire(null);
   }
 
   public populateArchiveTree() {

diff --git a/src/espIdf/apptrace/tree/appTraceTreeDataProvider.ts b/src/espIdf/apptrace/tree/appTraceTreeDataProvider.ts
@@ -133,6 +133,6 @@ export class AppTraceTreeDataProvider
     return [this.appTraceStartButton];
   }
   public refresh() {
-    this.OnDidChangeTreeData.fire();
+    this.OnDidChangeTreeData.fire(null);
   }
 }
diff --git a/src/extension.ts b/src/extension.ts
@@ -1297,6 +1297,7 @@ function createIdfTerminal() {
       name: "ESP-IDF Terminal",
       env: modifiedEnv,
       cwd: workspaceRoot.fsPath || modifiedEnv.IDF_PATH || process.cwd(),
+      strictEnv: true,
     });
     espIdfTerminal.show();
     const envSetCmd =

diff --git a/src/idfComponentsDataProvider.ts b/src/idfComponentsDataProvider.ts
@@ -38,19 +38,10 @@ export class IdfTreeDataProvider implements TreeDataProvider<IdfComponent> {
 
   public refresh(projectDescriptionPath: string): void {
     this.projectDescriptionJsonPath = projectDescriptionPath;
-    this.OnDidChangeTreeData.fire();
+    this.OnDidChangeTreeData.fire(null);
   }
 
   public getTreeItem(element: IdfComponent): TreeItem {
-    /* return {
-            resourceUri: element.uri,
-            collapsibleState: element.isDirectory ? vscode.TreeItemCollapsibleState.Collapsed : void 0,
-            command: element.isDirectory ? void 0 : {
-                command: 'extension.openComponent',
-                arguments: [element.uri],
-                title: 'Open IDF component'
-            }
-        }; */
     return element;
   }
 

diff --git a/src/kconfig/server.ts b/src/kconfig/server.ts
@@ -21,15 +21,17 @@ import {
   DidChangeConfigurationNotification,
   InitializeParams,
   ProposedFeatures,
-  TextDocument,
   TextDocumentPositionParams,
+  TextDocumentSyncKind,
   TextDocuments,
 } from "vscode-languageserver";
 import { Stack } from "../stack";
 
+import { TextDocument } from "vscode-languageserver-textdocument";
+
 const connection = createConnection(ProposedFeatures.all);
 
-const documents: TextDocuments = new TextDocuments();
+const documents: TextDocuments<TextDocument> = new TextDocuments(TextDocument);
 
 let hasConfigCapability: boolean = false;
 let hasWorkspaceFolderCapability: boolean = false;
@@ -58,7 +60,7 @@ connection.onInitialize((params: InitializeParams) => {
       completionProvider: {
         resolveProvider: true,
       },
-      textDocumentSync: documents.syncKind,
+      textDocumentSync: TextDocumentSyncKind.Incremental,
     },
   };
 });

diff --git a/src/userNotificationManager/userNotificationManager.ts b/src/userNotificationManager/userNotificationManager.ts
@@ -18,28 +18,27 @@
 
 import * as vscode from "vscode";
 import * as winston from "winston";
+import Transport from "winston-transport";
 
-export default class UserNotificationManagerTransport extends winston.Transport {
+export default class UserNotificationManagerTransport extends Transport {
   constructor(options: any) {
     super(options);
   }
 
-  protected log(
-    level: string,
-    message: string,
-    metadata?: any,
+  log(
+    info: { level: string; message: string; user?: boolean },
     callback?: (arg1, arg2) => void
   ) {
-    if (metadata && metadata.user) {
-      if (level === "info") {
-        vscode.window.showInformationMessage(message);
-      } else if (level === "warn") {
-        vscode.window.showWarningMessage(message);
-      } else if (level === "error") {
-        vscode.window.showErrorMessage(message);
+    if (info.user) {
+      if (info.level === "info") {
+        vscode.window.showInformationMessage(info.message);
+      } else if (info.level === "warn") {
+        vscode.window.showWarningMessage(info.message);
+      } else if (info.level === "error") {
+        vscode.window.showErrorMessage(info.message);
       } else {
         winston.error(
-          `Invalid error level '${level}' for user notification. ${message}`
+          `Invalid error level '${info.level}' for user notification. ${info.message}`
         );
       }
     }

diff --git a/src/utils.ts b/src/utils.ts
@@ -334,7 +334,7 @@ export async function getToolsJsonPath(newIdfPath: string) {
   return jsonToUse;
 }
 
-export function getHttpsProxyAgent(): HttpsProxyAgent {
+export function getHttpsProxyAgent(): HttpsProxyAgent.HttpsProxyAgent {
   let proxy: string = vscode.workspace.getConfiguration().get("http.proxy");
   if (!proxy) {
     proxy =
@@ -355,13 +355,13 @@ export function getHttpsProxyAgent(): HttpsProxyAgent {
   const strictProxy: any = vscode.workspace
     .getConfiguration()
     .get("http.proxyStrictSSL", true);
-  const proxyOptions: any = {
+  const proxyOptions: HttpsProxyAgent.HttpsProxyAgentOptions = {
     auth: proxyUrl.auth,
     host: proxyUrl.hostname,
     port: parseInt(proxyUrl.port, 10),
     rejectUnauthorized: strictProxy,
   };
-  return new HttpsProxyAgent(proxyOptions);
+  return new HttpsProxyAgent.HttpsProxyAgent(proxyOptions);
 }
 
 export function readDirPromise(dirPath) {
@@ -562,25 +562,26 @@ export function appendIdfAndToolsToPath() {
     "partition_table"
   )}`;
 
+  let pathNameInEnv: string;
   if (process.platform === "win32") {
-    modifiedEnv.Path =
-      path.join(modifiedEnv.IDF_PATH, "tools") +
-      path.delimiter +
-      modifiedEnv.Path;
-    if (modifiedEnv.Path && !modifiedEnv.Path.includes(extraPaths)) {
-      modifiedEnv.Path = extraPaths + path.delimiter + modifiedEnv.Path;
-    }
-    modifiedEnv.Path = `${IDF_ADD_PATHS_EXTRAS}${path.delimiter}${modifiedEnv.Path}`;
+    pathNameInEnv = "Path";
   } else {
-    modifiedEnv.PATH =
-      path.join(modifiedEnv.IDF_PATH, "tools") +
-      path.delimiter +
-      modifiedEnv.PATH;
-    if (modifiedEnv.PATH && !modifiedEnv.PATH.includes(extraPaths)) {
-      modifiedEnv.PATH = extraPaths + path.delimiter + modifiedEnv.PATH;
-    }
-    modifiedEnv.PATH = `${IDF_ADD_PATHS_EXTRAS}${path.delimiter}${modifiedEnv.PATH}`;
+    pathNameInEnv = "PATH";
+  }
+  modifiedEnv[pathNameInEnv] =
+    path.join(modifiedEnv.IDF_PATH, "tools") +
+    path.delimiter +
+    modifiedEnv[pathNameInEnv];
+  if (
+    modifiedEnv[pathNameInEnv] &&
+    !modifiedEnv[pathNameInEnv].includes(extraPaths)
+  ) {
+    modifiedEnv[pathNameInEnv] =
+      extraPaths + path.delimiter + modifiedEnv[pathNameInEnv];
   }
+  modifiedEnv[
+    pathNameInEnv
+  ] = `${IDF_ADD_PATHS_EXTRAS}${path.delimiter}${modifiedEnv[pathNameInEnv]}`;
 
   const idfTarget = idfConf.readParameter("idf.adapterTargetName");
   modifiedEnv.IDF_TARGET = idfTarget || process.env.IDF_TARGET;