mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-13 17:22:15 -05:00
Import "fromPromise" so Observables work correctly (#9034)
* Import "fromPromise" so Observables work correctly * Bump distro guid * Fix unit test missing file error * Bump distro to pick up latest changes
This commit is contained in:
@@ -43,6 +43,7 @@ const nodeModules = [
|
||||
'electron',
|
||||
'original-fs',
|
||||
'rxjs/Observable',
|
||||
'rxjs/add/observable/fromPromise',
|
||||
'rxjs/Subject',
|
||||
'rxjs/Observer',
|
||||
'slickgrid/lib/jquery.event.drag-2.3.0',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "azuredatastudio",
|
||||
"version": "1.15.0",
|
||||
"distro": "b71b4af5016533d971958cc37e25b43b9c3754a5",
|
||||
"distro": "922d292f69c5d36ab6f0dbbd94a63c81219afaaf",
|
||||
"author": {
|
||||
"name": "Microsoft Corporation"
|
||||
},
|
||||
|
||||
1
src/bootstrap-window.js
vendored
1
src/bootstrap-window.js
vendored
@@ -111,6 +111,7 @@ exports.load = function (modulePaths, resultCallback, options) {
|
||||
'@angular/platform-browser-dynamic',
|
||||
'@angular/router',
|
||||
'rxjs/Observable',
|
||||
'rxjs/add/observable/fromPromise',
|
||||
'rxjs/Subject',
|
||||
'rxjs/Observer',
|
||||
'slickgrid/lib/jquery.event.drag-2.3.0',
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
ComponentFactoryResolver, ViewChild, ChangeDetectorRef, Injector
|
||||
} from '@angular/core';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import 'rxjs/add/observable/fromPromise';
|
||||
|
||||
import { DashboardWidget, IDashboardWidget, WIDGET_CONFIG, WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget';
|
||||
import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
/* Node Modules */
|
||||
import { Injectable, Inject } from '@angular/core';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import 'rxjs/add/observable/fromPromise';
|
||||
|
||||
/* SQL imports */
|
||||
import { IDefaultComponentParams, IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams';
|
||||
|
||||
@@ -63,6 +63,7 @@ function main() {
|
||||
'angular2-grid',
|
||||
'ng2-charts',
|
||||
'rxjs/add/observable/of',
|
||||
'rxjs/add/observable/fromPromise',
|
||||
'rxjs/Observable',
|
||||
'rxjs/Subject',
|
||||
'rxjs/Observer'
|
||||
|
||||
@@ -51,6 +51,7 @@ function initLoader(opts) {
|
||||
'angular2-grid',
|
||||
'ng2-charts',
|
||||
'rxjs/add/observable/of',
|
||||
'rxjs/add/observable/fromPromise',
|
||||
'rxjs/Observable',
|
||||
'rxjs/Subject',
|
||||
'rxjs/Observer'
|
||||
|
||||
Reference in New Issue
Block a user