Adopt latest loader (which is snapshot-friendly)

microsoft · Feb 16, 2018 · dbd76d9 · dbd76d9
1 parent 6831fb4
commit dbd76d9
Show file tree

Hide file tree

Showing 6 changed files with 225 additions and 204 deletions.
diff --git a/src/vs/code/electron-browser/issue/issueReporter.js b/src/vs/code/electron-browser/issue/issueReporter.js
@@ -146,6 +146,8 @@ function main() {
 	// In the bundled version the nls plugin is packaged with the loader so the NLS Plugins
 	// loads as soon as the loader loads. To be able to have pseudo translation
 	createScript(rootUrl + '/vs/loader.js', function () {
+		var define = global.define;
+		global.define = undefined;
 		define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
 
 		window.MonacoEnvironment = {};

diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
@@ -131,6 +131,8 @@ function main() {
 	// In the bundled version the nls plugin is packaged with the loader so the NLS Plugins
 	// loads as soon as the loader loads. To be able to have pseudo translation
 	createScript(rootUrl + '/vs/loader.js', function () {
+		var define = global.define;
+		global.define = undefined;
 		define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
 
 		window.MonacoEnvironment = {};

diff --git a/src/vs/css.js b/src/vs/css.js
@@ -20,7 +20,7 @@ var CSSLoaderPlugin;
      * Known issue:
      * - In IE there is no way to know if the CSS file loaded successfully or not.
      */
-    var BrowserCSSLoader = (function () {
+    var BrowserCSSLoader = /** @class */ (function () {
         function BrowserCSSLoader() {
             this._pendingLoads = 0;
         }
@@ -93,7 +93,7 @@ var CSSLoaderPlugin;
         return BrowserCSSLoader;
     }());
     // ------------------------------ Finally, the plugin
-    var CSSPlugin = (function () {
+    var CSSPlugin = /** @class */ (function () {
         function CSSPlugin() {
             this._cssLoader = new BrowserCSSLoader();
         }
@@ -110,12 +110,5 @@ var CSSLoaderPlugin;
         return CSSPlugin;
     }());
     CSSLoaderPlugin.CSSPlugin = CSSPlugin;
-    function init() {
-        define('vs/css', new CSSPlugin());
-    }
-    CSSLoaderPlugin.init = init;
-    ;
-    if (typeof doNotInitLoader === 'undefined') {
-        init();
-    }
+    define('vs/css', new CSSPlugin());
 })(CSSLoaderPlugin || (CSSLoaderPlugin = {}));