Merge branch 'main' into joh/swc

1 files changed, 20 insertions, 18 deletions

diff --git a/package.json b/package.json
index 3454e5a9899..681aa928280 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
-  "version": "1.70.0",
-  "distro": "1a72c46622967eab6ea48516a2153c55d7e18e53",
+  "version": "1.71.0",
+  "distro": "09ef05a5cdb8e4fdee2f19133b54a1389b98cdf5",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -56,7 +56,8 @@
     "minify-vscode-reh-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode-reh-web",
     "hygiene": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js hygiene",
     "core-ci": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js core-ci",
-    "extensions-ci": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js extensions-ci"
+    "extensions-ci": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js extensions-ci",
+    "webview-generate-csp-hash": "npx github:apaatsio/csp-hash-from-html csp-hash ./src/vs/workbench/contrib/webview/browser/pre/index.html"
   },
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.2",
@@ -85,18 +86,19 @@
     "vscode-proxy-agent": "^0.12.0",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "7.0.1",
-    "xterm": "4.20.0-beta.13",
-    "xterm-addon-search": "0.10.0-beta.2",
-    "xterm-addon-serialize": "0.8.0-beta.2",
-    "xterm-addon-unicode11": "0.4.0-beta.3",
-    "xterm-addon-webgl": "0.13.0-beta.7",
-    "xterm-headless": "4.20.0-beta.13",
+    "xterm": "5.0.0-beta.35",
+    "xterm-addon-canvas": "0.2.0-beta.17",
+    "xterm-addon-search": "0.10.0-beta.5",
+    "xterm-addon-serialize": "0.8.0-beta.5",
+    "xterm-addon-unicode11": "0.4.0-beta.5",
+    "xterm-addon-webgl": "0.13.0-beta.36",
+    "xterm-headless": "5.0.0-beta.5",
     "yauzl": "^2.9.2",
     "yazl": "^2.4.3"
   },
   "devDependencies": {
     "7zip": "0.0.6",
-    "@playwright/test": "1.21.0",
+    "@playwright/test": "1.24.2",
     "@swc/cli": "0.1.57",
     "@swc/core": "1.2.218",
     "@types/cookie": "^0.3.3",
@@ -125,8 +127,8 @@
     "@types/yazl": "^2.4.2",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
-    "@vscode/telemetry-extractor": "^1.9.6",
-    "@vscode/test-web": "^0.0.22",
+    "@vscode/telemetry-extractor": "^1.9.8",
+    "@vscode/test-web": "^0.0.29",
     "ansi-colors": "^3.2.3",
     "asar": "^3.0.3",
     "chromium-pickle-js": "^0.2.0",
@@ -137,7 +139,7 @@
     "cssnano": "^4.1.11",
     "debounce": "^1.0.0",
     "deemon": "^1.4.0",
-    "electron": "18.3.5",
+    "electron": "19.0.12",
     "eslint": "8.7.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "^39.3.2",
@@ -170,11 +172,11 @@
     "husky": "^0.13.1",
     "innosetup": "6.0.5",
     "is": "^3.1.0",
-    "istanbul-lib-coverage": "^3.0.0",
-    "istanbul-lib-instrument": "^4.0.0",
+    "istanbul-lib-coverage": "^3.2.0",
+    "istanbul-lib-instrument": "^5.2.0",
     "istanbul-lib-report": "^3.0.0",
-    "istanbul-lib-source-maps": "^4.0.0",
-    "istanbul-reports": "^3.0.0",
+    "istanbul-lib-source-maps": "^4.0.1",
+    "istanbul-reports": "^3.1.5",
     "lazy.js": "^0.4.2",
     "merge-options": "^1.0.1",
     "mime": "^1.4.1",
@@ -201,7 +203,7 @@
     "style-loader": "^1.3.0",
     "ts-loader": "^9.2.7",
     "tsec": "0.1.4",
-    "typescript": "^4.8.0-dev.20220711",
+    "typescript": "^4.9.0-dev.20220811",
     "typescript-formatter": "7.1.0",
     "underscore": "^1.12.1",
     "util": "^0.12.4",