Skip to content

Commit dee16c9

Browse files
sumitarorasumitarora
committed
Merge branch 'master' into superhero-problem
2 parents 86e014e + fbebfde commit dee16c9

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Augury is a Google Chrome Dev Tools extension for debugging Angular 2 applicatio
1010

1111
## Supported Version
1212

13-
Currently works with applications built in [Angular 2.0.0-beta.15](https://github.com/angular/angular/blob/master/CHANGELOG.md#200-beta15-2016-04-13) with _limited backward compatibility_, which will change once Angular 2 stabilizes.
13+
Currently works with applications built in [Angular 2.0.0-beta.16](https://github.com/angular/angular/blob/master/CHANGELOG.md#200-beta16-2016-04-26) with _limited backward compatibility_, which will change once Angular 2 stabilizes.
1414

1515
## Join Our Slack Team
1616

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"pack": "./crxmake.sh"
3232
},
3333
"dependencies": {
34-
"angular2": "2.0.0-beta.15",
34+
"angular2": "2.0.0-beta.16",
3535
"basscss": "^7.0.4",
3636
"core-js": "^2.2.2",
3737
"crypto": "0.0.3",
@@ -59,11 +59,11 @@
5959
"tape": "^4.2.2",
6060
"tape-run": "^2.1.3",
6161
"ts-loader": "^0.8.1",
62-
"tslint-loader": "^1.0.2",
62+
"tslint-loader": "^2.1.4",
6363
"typescript": "^1.8.9",
64-
"typings": "^0.7.12",
64+
"typings": "^0.8.1",
6565
"url-loader": "^0.5.7",
66-
"webpack": "1.12.15",
66+
"webpack": "1.13.0",
6767
"webpack-dev-server": "1.14.1"
6868
}
6969
}

‎src/backend/adapters/angular2.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,12 @@ declare var getAllAngularRootElements: Function;
2020
declare var Reflect: { getOwnMetadata: Function };
2121

2222
import { ChangeDetectionStrategy } from 'angular2/core';
23-
import { DirectiveProvider } from 'angular2/src/core/linker/element';
2423
import { Observable } from 'rxjs/Observable';
2524
import { Subject } from 'rxjs/Subject';
2625

2726
import { TreeNode, BaseAdapter } from './base';
2827
import { Description } from '../utils/description';
2928
import { ParseRouter } from '../utils/parse-router';
30-
import { DirectiveResolver } from '../directive-resolver';
3129

3230
export class Angular2Adapter extends BaseAdapter {
3331
_tree: any = {};

‎src/frontend/actions/backend-actions/backend-actions.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import * as test from 'tape';
2-
import {Injector, provide} from 'angular2/core';
2+
import {ReflectiveInjector, provide} from 'angular2/core';
33
import {Dispatcher} from '../../dispatcher/dispatcher';
44
import {BackendActions} from '../backend-actions/backend-actions';
55
import {BackendActionType} from '../action-constants.ts';
66

77
test('frontend/backend-actions: component tree changed', t => {
88

99
const mockDispatcher = new Dispatcher();
10-
const injector = Injector.resolveAndCreate([
10+
const injector = ReflectiveInjector.resolveAndCreate([
1111
BackendActions,
1212
provide(Dispatcher, {useValue: mockDispatcher})
1313
]);

‎src/frontend/stores/component-data/component-data-store.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import * as test from 'tape';
2-
import {Injector, provide} from 'angular2/core';
2+
import {ReflectiveInjector, provide} from 'angular2/core';
33
import {ComponentDataStore} from '../component-data/component-data-store';
44
import {Dispatcher} from '../../dispatcher/dispatcher';
55
import {BackendActionType, UserActionType} from '../../actions/action-constants';
66

77
test('frontend/component-data-store: component changes', t => {
88

99
const mockDispatcher = new Dispatcher();
10-
const injector = Injector.resolveAndCreate([
10+
const injector = ReflectiveInjector.resolveAndCreate([
1111
ComponentDataStore,
1212
provide(Dispatcher, {useValue: mockDispatcher})
1313
]);
@@ -45,7 +45,7 @@ test('frontend/component-data-store: component changes', t => {
4545
test('frontend/component-data-store: user selects tree node', t => {
4646

4747
const mockDispatcher = new Dispatcher();
48-
const injector = Injector.resolveAndCreate([
48+
const injector = ReflectiveInjector.resolveAndCreate([
4949
ComponentDataStore,
5050
provide(Dispatcher, {useValue: mockDispatcher})
5151
]);

0 commit comments

Comments
 (0)