chore(vscode): update to 1.53.2

These conflicts will be resolved in the following commits. We do it this way so that PR review is possible.
2021-02-25 11:27:27 -07:00
parent db3a13ba06 89b6e0164f
commit eae5d8c807
1900 changed files with 83066 additions and 64589 deletions
--- a/lib/vscode/extensions/merge-conflict/package.json
+++ b/lib/vscode/extensions/merge-conflict/package.json
@@ -14,7 +14,7 @@
    "Other"
  ],
  "activationEvents": [
-    "*"
+    "onStartupFinished"
  ],
  "main": "./out/mergeConflictMain",
  "browser": "./dist/browser/mergeConflictMain",
@@ -139,6 +139,6 @@
    "vscode-nls": "^4.0.0"
  },
  "devDependencies": {
-    "@types/node": "^12.11.7"
+    "@types/node": "^12.19.9"
  }
 }