From 7f0dd5ac1d387187a5d4ca567732daef6705194e Mon Sep 17 00:00:00 2001
From: Karl Burtram <karlb@microsoft.com>
Date: Mon, 24 Oct 2022 09:00:55 -0700
Subject: [PATCH] Load angular prior to loader.js (#20934)

* Load angular prior to loader.js

* Bump distro
---
 package.json                                 |  2 +-
 src/vs/code/browser/workbench/workbench.html | 25 +++++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 40a92526cb..ee6151482d 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "azuredatastudio",
   "version": "1.40.0",
-  "distro": "ab25a6d17792123a8c68700923ccc0a5cc3f4f4e",
+  "distro": "97a42096c8e31ea70ebc1776b670a584d858073e",
   "author": {
     "name": "Microsoft Corporation"
   },
diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
index 9f7373483c..fd2e24759f 100644
--- a/src/vs/code/browser/workbench/workbench.html
+++ b/src/vs/code/browser/workbench/workbench.html
@@ -33,6 +33,18 @@
 	</body>
 
 	<!-- Startup (do not modify order of script tags!) -->
+	<!-- {{SQL CARBON EDIT}} - preload modules that don't work with vscode module loader -->
+	<script src="{{WORKBENCH_WEB_BASE_URL}}/node_modules/jquery/dist/jquery.min.js"></script>
+	<script src="{{WORKBENCH_WEB_BASE_URL}}/node_modules/slickgrid/lib/jquery.event.drag-2.3.0.js"></script>
+	<script src="{{WORKBENCH_WEB_BASE_URL}}/node_modules/slickgrid/lib/jquery-ui-1.9.2.js"></script>
+	<script src="{{WORKBENCH_WEB_BASE_URL}}/node_modules/reflect-metadata/Reflect.js"></script>
+	<script src="{{WORKBENCH_WEB_BASE_URL}}/node_modules/slickgrid/slick.core.js"></script>
+	<script src="{{WORKBENCH_WEB_BASE_URL}}/node_modules/slickgrid/slick.grid.js"></script>
+	<script src="{{WORKBENCH_WEB_BASE_URL}}/node_modules/slickgrid/slick.dataview.js"></script>
+	<script src="{{WORKBENCH_WEB_BASE_URL}}/node_modules/slickgrid/slick.editors.js"></script>
+	<script src="{{WORKBENCH_WEB_BASE_URL}}/node_modules/slickgrid/plugins/slick.cellrangedecorator.js"></script>
+	<script src="{{WORKBENCH_WEB_BASE_URL}}/node_modules/zone.js/dist/zone.min.js"></script>
+
 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
 	<script>
@@ -95,17 +107,8 @@
 			}
 		};
 	</script>
-	<script src="./static/node_modules/jquery/dist/jquery.min.js"></script>
-	<script src="./static/node_modules/slickgrid/lib/jquery.event.drag-2.3.0.js"></script>
-	<script src="./static/node_modules/slickgrid/lib/jquery-ui-1.9.2.js"></script>
-	<script src="./static/node_modules/slickgrid/slick.core.js"></script>
-	<script src="./static/node_modules/slickgrid/slick.grid.js"></script>
-	<script src="./static/node_modules/slickgrid/slick.dataview.js"></script>
-	<script src="./static/node_modules/slickgrid/slick.editors.js"></script>
-	<script src="./static/node_modules/slickgrid/plugins/slick.cellrangedecorator.js"></script>
-	<script src="./static/node_modules/zone.js/dist/zone.min.js"></script>
-	<script src="./static/node_modules/reflect-metadata/Reflect.js"></script>
-	<script src="./static/out/vs/loader.js"></script>
+
+
 	<script>
 		performance.mark('code/willLoadWorkbenchMain');
 	</script>