Fix Gridstack DD import (#15573)

* Gridstack dd native import fix

* Add gridstack package to remote

* Include gridstack to workbench.html and workbench-dev.html

remote/package.json

@@ -18,6 +18,7 @@
     "chokidar": "3.5.1",
     "cookie": "^0.4.0",
     "graceful-fs": "4.2.3",
+    "gridstack": "^3.1.3",
     "html-query-plan": "git://github.com/kburtram/html-query-plan.git#2.6",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.3",

remote/web/package.json

@@ -14,6 +14,7 @@
 		"angular2-grid": "2.0.6",
 		"ansi_up": "^3.0.0",
 		"chart.js": "^2.9.4",
+    "gridstack": "^3.1.3",
 		"html-query-plan": "git://github.com/kburtram/html-query-plan.git#2.6",
 		"iconv-lite-umd": "0.6.8",
 		"jschardet": "2.2.1",

remote/web/yarn.lock

@@ -166,6 +166,11 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+gridstack@^3.1.3:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/gridstack/-/gridstack-3.3.0.tgz#e324de1acbe59b812293117783c398ca83e2d1ca"
+  integrity sha512-xF8EF/CvUYRSaq0KRHA6ROHRuAxObqAVByBLyZfOPWOJBJTbg5GvPUj8HABEBYZWKxQeFkONcZwNflZLhHEi4g==
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"

remote/yarn.lock

@@ -341,6 +341,11 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
+gridstack@^3.1.3:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/gridstack/-/gridstack-3.3.0.tgz#e324de1acbe59b812293117783c398ca83e2d1ca"
+  integrity sha512-xF8EF/CvUYRSaq0KRHA6ROHRuAxObqAVByBLyZfOPWOJBJTbg5GvPUj8HABEBYZWKxQeFkONcZwNflZLhHEi4g==
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"

src/sql/setup.js

@@ -15,6 +15,7 @@ define(['require', 'exports'], function (require) {
 	require.__$__nodeRequire('slickgrid/slick.editors');
 	require.__$__nodeRequire('slickgrid/slick.dataview');
 	require.__$__nodeRequire('slickgrid/plugins/slick.cellrangedecorator');
+	require.__$__nodeRequire('gridstack/dist/h5/gridstack-dd-native');
 	require.__$__nodeRequire('reflect-metadata');
 	require.__$__nodeRequire('zone.js/dist/zone');
 	require.__$__nodeRequire('zone.js/dist/zone-error');

src/sql/workbench/contrib/notebook/browser/notebookViews/notebookViewsGrid.component.ts

@@ -9,7 +9,6 @@ import { NotebookViewsCardComponent } from 'sql/workbench/contrib/notebook/brows
 import { ICellModel } from 'sql/workbench/services/notebook/browser/models/modelInterfaces';
 import { NotebookModel } from 'sql/workbench/services/notebook/browser/models/notebookModel';
 import { GridStack, GridStackEvent, GridStackNode } from 'gridstack';
-import 'gridstack/dist/h5/gridstack-dd-native';
 import { localize } from 'vs/nls';
 import { NotebookViewsExtension } from 'sql/workbench/services/notebook/browser/notebookViews/notebookViewsExtension';
 import { CellChangeEvent, INotebookViewCell } from 'sql/workbench/services/notebook/browser/notebookViews/notebookViews';

src/vs/code/browser/workbench/workbench-dev.html

@@ -89,7 +89,8 @@
 				'iconv-lite-umd': `${window.location.origin}/static/remote/web/node_modules/iconv-lite-umd/lib/iconv-lite-umd.js`,
 				'jschardet': `${window.location.origin}/static/remote/web/node_modules/jschardet/dist/jschardet.min.js`,
 				'turndown': `${window.location.origin}/static/remote/web/node_modules/turndown/lib/turndown.browser.umd.js`,
-				'mark.js': `${window.location.origin}/static/remote/web/node_modules/mark.js/dist/mark.min.js`
+				'mark.js': `${window.location.origin}/static/remote/web/node_modules/mark.js/dist/mark.min.js`,
+				'gridstack': `${window.location.origin}/static/node_modules/gridstack/dist/gridstack-h5.js`
 			}
 		};
 	</script>

src/vs/code/browser/workbench/workbench.html

@@ -75,7 +75,8 @@
 				'iconv-lite-umd': `${window.location.origin}/static/node_modules/iconv-lite-umd/lib/iconv-lite-umd.js`,
 				'jschardet': `${window.location.origin}/static/node_modules/jschardet/dist/jschardet.min.js`,
 				'turndown': `${window.location.origin}/static/node_modules/turndown/lib/turndown.browser.umd.js`,
-				'mark.js': `${window.location.origin}/static/node_modules/mark.js/dist/mark.min.js`
+				'mark.js': `${window.location.origin}/static/node_modules/mark.js/dist/mark.min.js`,
+				'gridstack': `${window.location.origin}/static/node_modules/gridstack/dist/gridstack-h5.js`
 			}
 		};
 	</script>