Move underscore to dev only (#9566)

* moev underscore to dev only

* distro

* build files

* distro

build/lib/rollup.js

@@ -4,7 +4,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rollupAngular = exports.rollupAngularSlickgrid = void 0;
+exports.rollupAngular = void 0;
 const fs = require("fs");
 const rollup = require("rollup");
 const path = require("path");
@@ -54,21 +54,6 @@ async function rollupModule(options) {
         };
     }
 }
-function rollupAngularSlickgrid(root) {
-    return new Promise(async (resolve, reject) => {
-        const result = await rollupModule({
-            moduleName: 'angular2-slickgrid',
-            inputFile: path.resolve(root, 'node_modules', 'angular2-slickgrid', 'out', 'index.js'),
-            outputDirectory: path.resolve(root, 'node_modules', 'angular2-slickgrid', 'out', 'bundles'),
-            outputFileName: 'angular2-slickgrid.umd.js'
-        });
-        if (!result.result) {
-            return reject(`angular2-slickgrid failed to bundle - ${result.exception}`);
-        }
-        resolve();
-    });
-}
-exports.rollupAngularSlickgrid = rollupAngularSlickgrid;
 function rollupAngular(root) {
     return new Promise(async (resolve, reject) => {
         const modules = ['core', 'animations', 'common', 'compiler', 'forms', 'platform-browser', 'platform-browser-dynamic', 'router'];

build/lib/rollup.ts

@@ -70,22 +70,6 @@ async function rollupModule(options: IRollupOptions) {
 	}
 }
 
-export function rollupAngularSlickgrid(root: string): Promise<void> {
-	return new Promise(async (resolve, reject) => {
-		const result = await rollupModule({
-			moduleName: 'angular2-slickgrid',
-			inputFile: path.resolve(root, 'node_modules', 'angular2-slickgrid', 'out', 'index.js'),
-			outputDirectory: path.resolve(root, 'node_modules', 'angular2-slickgrid', 'out', 'bundles'),
-			outputFileName: 'angular2-slickgrid.umd.js'
-		});
-
-		if (!result.result) {
-			return reject(`angular2-slickgrid failed to bundle - ${result.exception}`);
-		}
-		resolve();
-	});
-}
-
 export function rollupAngular(root: string): Promise<void> {
 	return new Promise(async (resolve, reject) => {
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "azuredatastudio",
   "version": "1.16.0",
-  "distro": "aa5c02599a277af144bc51757ce9e2f6d625a628",
+  "distro": "0478ec063514685435df24dd700d641eafe225dd",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -71,7 +71,6 @@
     "slickgrid": "github:anthonydresser/SlickGrid#2.3.32",
     "spdlog": "^0.11.1",
     "sudo-prompt": "9.1.1",
-    "underscore": "^1.8.2",
     "v8-inspect-profiler": "^0.0.20",
     "vscode-minimist": "^1.2.2",
     "vscode-nsfw": "1.2.8",
@@ -181,6 +180,7 @@
     "typemoq": "^0.3.2",
     "typescript": "3.9.0-dev.20200304",
     "typescript-formatter": "7.1.0",
+    "underscore": "^1.8.2",
     "vinyl": "^2.0.0",
     "vinyl-fs": "^3.0.0",
     "vsce": "1.48.0",

remote/package.json

@@ -12,7 +12,6 @@
     "@angular/router": "~4.1.3",
     "applicationinsights": "1.0.8",
     "angular2-grid": "2.0.6",
-    "angular2-slickgrid": "github:Microsoft/angular2-slickgrid#1.4.6",
     "ansi_up": "^3.0.0",
     "chart.js": "^2.6.0",
     "chokidar": "3.2.3",

remote/web/package.json

@@ -11,7 +11,6 @@
     "@angular/platform-browser-dynamic": "~4.1.3",
     "@angular/router": "~4.1.3",
     "angular2-grid": "2.0.6",
-    "angular2-slickgrid": "github:Microsoft/angular2-slickgrid#1.4.6",
     "ansi_up": "^3.0.0",
     "chart.js": "^2.6.0",
     "html-query-plan": "git://github.com/anthonydresser/html-query-plan.git#2.6",

remote/web/yarn.lock

@@ -47,10 +47,6 @@ angular2-grid@2.0.6:
   resolved "https://registry.yarnpkg.com/angular2-grid/-/angular2-grid-2.0.6.tgz#01fe225dc13b2822370b6c61f9a6913b3a26f989"
   integrity sha1-Af4iXcE7KCI3C2xh+aaROzom+Yk=
 
-"angular2-slickgrid@github:Microsoft/angular2-slickgrid#1.4.6":
-  version "1.4.6"
-  resolved "https://codeload.github.com/Microsoft/angular2-slickgrid/tar.gz/09579fdc90b1ec469578ec1040d1515585ce2a11"
-
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"

remote/yarn.lock

@@ -68,10 +68,6 @@ angular2-grid@2.0.6:
   resolved "https://registry.yarnpkg.com/angular2-grid/-/angular2-grid-2.0.6.tgz#01fe225dc13b2822370b6c61f9a6913b3a26f989"
   integrity sha1-Af4iXcE7KCI3C2xh+aaROzom+Yk=
 
-"angular2-slickgrid@github:Microsoft/angular2-slickgrid#1.4.6":
-  version "1.4.6"
-  resolved "https://codeload.github.com/Microsoft/angular2-slickgrid/tar.gz/09579fdc90b1ec469578ec1040d1515585ce2a11"
-
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"

src/sql/setup.js

@@ -10,8 +10,6 @@ define(['require', 'exports'], function (require) {
 
 	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');