Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 14:31:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ben/lazy-onigasm

Browse Source
This commit is contained in:
Alex Dima
2019-09-10 22:13:16 +02:00
parent 8bd809ffc9 7d8c2f6857
commit a2ada859d3
126 changed files with 2417 additions and 1180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/code/browser/workbench/workbench.html
View File

@@ -37,7 +37,6 @@
<!-- Prefetch to avoid waterfall -->
<link rel="prefetch" href="./static/node_modules/semver-umd/lib/semver-umd.js">
<link rel="prefetch" href="./static/out/vs/code/browser/workbench/web.main.js"> <!--TODO@ben: Why is it not built -->
<link rel="prefetch" href="./static/node_modules/@microsoft/applicationinsights-web/dist/applicationinsights-web.js">
</head>
@@ -63,7 +62,7 @@
<script src="./static/out/vs/loader.js"></script>
<script src="./static/out/vs/workbench/workbench.web.api.nls.js"></script>
<script src="./static/out/vs/workbench/workbench.web.api.js"></script>
<!-- <script src="./static/out/vs/code/browser/workbench/web.main.js"></script> TODO@ben: Why is it not built-->
<script src="./static/out/vs/code/browser/workbench/web.main.js"></script>
<script>
require(['vs/code/browser/workbench/web.main'], function (web) {
web.main();