Update deps (TypeScript, grpc-js & others) (#725)

* Update deps * Fix linting * Don't transform proto-loader imports to fix the build * Fix linting * Update npm-package deps * Lock down vscode types
microsoft · Oct 3, 2020 · 528ae7d · 528ae7d
1 parent c24d56c
commit 528ae7d
Show file tree

Hide file tree

Showing 9 changed files with 2,607 additions and 2,754 deletions.
diff --git a/extension/package-lock.json b/extension/package-lock.json
diff --git a/extension/package.json b/extension/package.json
@@ -723,7 +723,7 @@
     "lint:prettier": "prettier --check \"**/*.{ts,js,json,svg,md,yml}\"",
     "lint:eslint": "eslint . --ext .js,.ts",
     "lint:fix": "npm run lint:fix:prettier && npm run lint:eslint -- --fix",
-    "lint:fix:prettier": "prettier --write '**/*.{json,svg,md,yml}'",
+    "lint:fix:prettier": "prettier --write '**/*.{ts,js,json,svg,md,yml}'",
     "compile": "rollup -c rollup.config.js",
     "compile:test": "tsc -p ./",
     "install:ext": "code --install-extension vscode-gradle-0.0.0.vsix --force",
@@ -732,40 +732,40 @@
     "prepare": "npm run snyk-protect"
   },
   "devDependencies": {
-    "@grpc/grpc-js": "^1.1.3",
-    "@rollup/plugin-commonjs": "^15.0.0",
+    "@grpc/grpc-js": "^1.1.7",
+    "@rollup/plugin-commonjs": "^15.1.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^9.0.0",
-    "@rollup/plugin-typescript": "^5.0.2",
+    "@rollup/plugin-typescript": "^6.0.0",
     "@types/fs-extra": "^9.0.1",
     "@types/glob": "^7.1.3",
     "@types/google-protobuf": "^3.7.3",
-    "@types/mocha": "^8.0.2",
+    "@types/mocha": "^8.0.3",
     "@types/node": "^12.12.39",
-    "@types/sinon": "^9.0.4",
-    "@types/vscode": "^1.45.0",
-    "@typescript-eslint/eslint-plugin": "^3.10.1",
-    "@typescript-eslint/parser": "^3.10.1",
-    "eslint": "^7.6.0",
-    "eslint-config-prettier": "^6.11.0",
+    "@types/sinon": "^9.0.7",
+    "@types/vscode": "1.45.0",
+    "@typescript-eslint/eslint-plugin": "^4.3.0",
+    "@typescript-eslint/parser": "^4.3.0",
+    "eslint": "^7.10.0",
+    "eslint-config-prettier": "^6.12.0",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-sonarjs": "^0.5.0",
     "fs-extra": "^9.0.1",
     "get-port": "^5.1.1",
-    "google-protobuf": "^3.12.4",
+    "google-protobuf": "^3.13.0",
     "grpc-tools": "^1.9.1",
     "minimatch": "^3.0.4",
-    "mocha": "^8.1.1",
-    "prettier": "^2.0.5",
-    "rollup": "^2.25.0",
-    "rollup-plugin-terser": "^7.0.0",
-    "sinon": "^9.0.3",
-    "snyk": "^1.366.2",
+    "mocha": "^8.1.3",
+    "prettier": "^2.1.2",
+    "rollup": "^2.28.2",
+    "rollup-plugin-terser": "^7.0.2",
+    "sinon": "^9.1.0",
+    "snyk": "^1.406.0",
     "string-argv": "^0.3.1",
     "tree-kill": "^1.2.2",
     "ts-protoc-gen": "^0.13.0",
-    "typescript": "^3.9.7",
-    "vsce": "^1.77.0",
+    "typescript": "^4.0.3",
+    "vsce": "^1.81.0",
     "vscode-test": "^1.4.0"
   },
   "snyk": true

diff --git a/extension/resources/dark/loading.svg b/extension/resources/dark/loading.svg
diff --git a/extension/resources/light/loading.svg b/extension/resources/light/loading.svg
diff --git a/extension/rollup.config.js b/extension/rollup.config.js
@@ -21,10 +21,12 @@ export default [
       plugins: outputPlugins,
     },
     plugins: [
+      resolve({ preferBuiltins: true }),
       typescript({ module: 'ES2015', outDir: 'dist', declaration: true }),
-      commonjs({ ignore: ['encoding', 'google-auth-library'] }),
+      commonjs({
+        ignore: ['encoding', 'google-auth-library', '@grpc/proto-loader'],
+      }),
       json(),
-      resolve({ preferBuiltins: true }),
     ],
   },
 ];
diff --git a/extension/src/decorators/decorators.ts b/extension/src/decorators/decorators.ts
@@ -29,7 +29,7 @@ export interface DebounceReducer<T> {
   (previousValue: T, ...args: any[]): T;
 }
 
-export function debounce<T>(delay: number): Function {
+export function debounce(delay: number): Function {
   return createDecorator((fn, key) => {
     const timerKey = `$debounce$${key}`;
     return function (this: any, ...args: any[]): void {

diff --git a/extension/src/views/gradleDaemons/GradleDaemonTreeItem.ts b/extension/src/views/gradleDaemons/GradleDaemonTreeItem.ts
@@ -15,6 +15,7 @@ const daemonStatusEnumMapByValue: StatusEnumMapByValue = Object.assign(
 );
 
 export class GradleDaemonTreeItem extends vscode.TreeItem {
+  private status: string;
   constructor(
     private readonly context: vscode.ExtensionContext,
     public readonly label: string,
@@ -30,19 +31,10 @@ export class GradleDaemonTreeItem extends vscode.TreeItem {
         path.join('resources', 'dark', iconName)
       ),
     };
+    this.status = daemonStatusEnumMapByValue[daemonInfo.getStatus()];
+    this.description = this.status;
     this.contextValue = this.status.toLowerCase();
-  }
-
-  public get tooltip(): string {
-    return `${this.status} - ${this.daemonInfo.getInfo()}`;
-  }
-
-  private get status(): string {
-    return daemonStatusEnumMapByValue[this.daemonInfo.getStatus()];
-  }
-
-  public get description(): string {
-    return this.status;
+    this.tooltip = `${this.status} - ${daemonInfo.getInfo()}`;
   }
 
   public get pid(): string {