Revert "Revert "Revert "allows zone.js to cleanup error stacktraces (m…

…icrosoft#7203)" (microsoft#7499)" (microsoft#7500)" (microsoft#7501) This reverts commit 263d342.
PoeBlu · Oct 3, 2019 · 080d9bb · 080d9bb
1 parent 263d342
commit 080d9bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/sql/setup.js b/src/sql/setup.js
@@ -2,7 +2,7 @@
  *  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", "vs/base/common/errors"], function (require, errors) {
+define(["require", "exports"], function (require) {
 	const jquerylib = require.__$__nodeRequire('jquery');
 
 	window['jQuery'] = jquerylib;
@@ -18,10 +18,6 @@ define(["require", "exports", "vs/base/common/errors"], function (require, error
 	require.__$__nodeRequire('slickgrid/slick.dataview');
 	require.__$__nodeRequire('slickgrid/plugins/slick.cellrangedecorator');
 	require.__$__nodeRequire('reflect-metadata');
-	require.__$__nodeRequire('zone.js/dist/zone');
-	require.__$__nodeRequire('zone.js/dist/zone-error');
+	require.__$__nodeRequire('zone.js');
 	require.__$__nodeRequire('chart.js');
-
-	window["Zone"]["__zone_symbol__ignoreConsoleErrorUncaughtError"] = true;
-	window["Zone"]["__zone_symbol__unhandledPromiseRejectionHandler"] = errors.onUnexpectedError;
 });
diff --git a/test/electron/renderer.js b/test/electron/renderer.js
@@ -13,7 +13,7 @@ const util = require('util');
 const bootstrap = require('../../src/bootstrap');
 const coverage = require('../coverage');
 
-require('../../src/sql/setup'); // {{SQL CARBON EDIT}}
+require('reflect-metadata'); // {{SQL CARBON EDIT}}
 
 // Disabled custom inspect. See #38847
 if (util.inspect && util.inspect['defaultOptions']) {