maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'main' into joh/webpack5

Browse source
This commit is contained in:
Johannes Rieken 2021-07-02 16:19:48 +02:00
parent a76db8bb7e adb243550a
commit 99bac2dac6
No known key found for this signature in database
GPG key ID: 96634B5AF12F8798
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{
"name": "code-oss-dev",
"version": "1.59.0",
"distro": "e14b9729b4534e76e19b294a34080f45b912a3b9",
"distro": "11a4ffb5d3ab4615937d307cd3ab58fcdd1d36ea",
"author": {
"name": "Microsoft Corporation"
},

4
src/tsec.exemptions.json
View file

@ -1,7 +1,7 @@
{
"ban-eval-calls": [
"vs/workbench/api/worker/extHostExtensionService.ts",
"vs/base/worker/workerMain",
"vs/base/worker/workerMain"
],
"ban-function-calls": [
"vs/workbench/api/worker/extHostExtensionService.ts",
@ -24,7 +24,7 @@
"vs/workbench/api/worker/extHostExtensionService.ts",
"vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts",
"vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts",
"vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts",
"vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts"
],
"ban-worker-calls": [
"vs/base/worker/defaultWorkerFactory.ts",