Integrate into asar (#6563)

* integrate into asar

* add sql carbon tag

* remove unnecessary edit

* add more ignores

src/bootstrap-window.js

@@ -103,9 +103,6 @@ exports.load = function (modulePaths, resultCallback, options) {
 		nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
 	};
 
-	// {{SQL CARBON EDIT}}
-	require('reflect-metadata');
-	require('chart.js');
 	loaderConfig.nodeModules = loaderConfig.nodeModules.concat([
 		'@angular/common',
 		'@angular/core',
@@ -115,7 +112,13 @@ exports.load = function (modulePaths, resultCallback, options) {
 		'@angular/router',
 		'rxjs/Observable',
 		'rxjs/Subject',
-		'rxjs/Observer'
+		'rxjs/Observer',
+		'slickgrid/lib/jquery.event.drag-2.3.0',
+		'slickgrid/lib/jquery-ui-1.9.2',
+		'slickgrid/slick.core',
+		'slickgrid/slick.grid',
+		'slickgrid/slick.editors',
+		'slickgrid/slick.dataview'
 	]);
 	// {{SQL CARBON EDIT}} - End
 

src/sql/setup.js

@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+define(["require", "exports"], function (require) {
+	const jquerylib = require.__$__nodeRequire('jquery');
+
+	window['jQuery'] = jquerylib;
+	window['$'] = jquerylib;
+
+	require.__$__nodeRequire('slickgrid/lib/jquery.event.drag-2.3.0');
+	require.__$__nodeRequire('slickgrid/lib/jquery-ui-1.9.2');
+	const underscore = require.__$__nodeRequire('underscore');
+	window['_'] = underscore;
+	require.__$__nodeRequire('slickgrid/slick.core');
+	require.__$__nodeRequire('slickgrid/slick.grid');
+	require.__$__nodeRequire('slickgrid/slick.editors');
+	require.__$__nodeRequire('slickgrid/slick.dataview');
+	require.__$__nodeRequire('reflect-metadata');
+	require.__$__nodeRequire('zone.js');
+	require.__$__nodeRequire('chart.js');
+});

src/vs/code/electron-browser/workbench/workbench.js

@@ -14,25 +14,6 @@ const bootstrapWindow = require('../../../../bootstrap-window');
 // Setup shell environment
 process['lazyEnv'] = getLazyEnv();
 
-// {{SQL CARBON EDIT}}
-
-/* eslint-disable */
-
-// SQL global imports
-const jQuery = require('jquery');
-const $ = jQuery;
-require('slickgrid/lib/jquery.event.drag-2.3.0');
-require('slickgrid/lib/jquery-ui-1.9.2');
-const _ = require('underscore')._;
-require('slickgrid/slick.core');
-const Slick = window.Slick;
-require('slickgrid/slick.grid');
-require('slickgrid/slick.editors');
-require('slickgrid/slick.dataview');
-require('reflect-metadata');
-require('zone.js');
-// {{SQL CARBON EDIT}} - End
-
 // Load workbench main
 bootstrapWindow.load([
 	'vs/workbench/workbench.main',

src/vs/workbench/workbench.main.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 //#region --- workbench/editor core
-
+import 'sql/setup'; // {{SQL CARBON EDIT}}
 import 'vs/editor/editor.all';
 
 import 'vs/workbench/api/browser/extensionHost.contribution';