diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index c52b3eefea..e8dc2c1e0f 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -52,7 +52,7 @@ const nodeModules = [ 'rxjs/Observable', 'rxjs/Subject', 'rxjs/Observer', - 'ng2-charts/ng2-charts'] + 'ng2-charts'] .concat(Object.keys(product.dependencies || {})) .concat(_.uniq(productionDependencies.map(d => d.name))) .concat(baseModules); diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js index a36f511335..32303e3c43 100644 --- a/src/bootstrap-window.js +++ b/src/bootstrap-window.js @@ -117,7 +117,7 @@ exports.load = function (modulePaths, resultCallback, options) { 'ansi_up', 'pretty-data', 'html-query-plan', - 'ng2-charts/ng2-charts', + 'ng2-charts', 'rxjs/Observable', 'rxjs/Subject', 'rxjs/Observer', diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index 4c7ae4f00a..8e85486d86 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -459,7 +459,6 @@ import 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution'; import 'sql/platform/accounts/browser/accountManagement.contribution'; // dashboard -import 'sql/workbench/parts/dashboard/dashboard.contribution'; import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution'; import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.contribution'; import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.contribution'; @@ -470,6 +469,7 @@ import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/timeSe import 'sql/workbench/parts/dashboard/widgets/insights/views/countInsight.contribution'; import 'sql/workbench/parts/dashboard/widgets/insights/views/imageInsight.contribution'; import 'sql/workbench/parts/dashboard/widgets/insights/views/tableInsight.contribution'; +import 'sql/workbench/parts/dashboard/dashboard.contribution'; /* Tasks */ import 'sql/workbench/common/actions.contribution'; /* Widgets */ diff --git a/test/all.js b/test/all.js index 4b0789ea28..a2183621bb 100644 --- a/test/all.js +++ b/test/all.js @@ -71,7 +71,7 @@ function main() { '@angular/platform-browser-dynamic', '@angular/router', 'angular2-grid', - 'ng2-charts/ng2-charts', + 'ng2-charts', 'rxjs/add/observable/of', 'rxjs/Observable', 'rxjs/Subject', diff --git a/test/electron/renderer.js b/test/electron/renderer.js index 63f68868e6..82e98d4379 100644 --- a/test/electron/renderer.js +++ b/test/electron/renderer.js @@ -60,7 +60,7 @@ function initLoader(opts) { '@angular/platform-browser-dynamic', '@angular/router', 'angular2-grid', - 'ng2-charts/ng2-charts', + 'ng2-charts', 'rxjs/add/observable/of', 'rxjs/Observable', 'rxjs/Subject',