Skip to content

Commit bfa8c97

Browse files
update for ng2 rc.1
1 parent 660ea81 commit bfa8c97

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

ng1-to-ng2.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
import * as angular from "angular";
2-
import {provide, ElementRef, Component, Inject, ComponentMetadata} from "angular2/core";
2+
import {provide, ElementRef, Component, Inject, ComponentMetadata} from "@angular/core";
3+
import {UpgradeAdapter} from "@angular/upgrade";
34
import {
45
UiView, UIRouter, TransitionService, StateService, UIRouterGlobals, UIROUTER_DIRECTIVES, forEach, extend,
56
UrlRouter, ViewService, StateRegistry, UrlMatcherFactory, Ng2ViewDeclaration, Ng2ViewConfig, Node
67
} from "ui-router-ng2";
7-
import {CORE_DIRECTIVES} from "angular2/common";
8-
import {UpgradeAdapter} from "angular2/upgrade";
98
import {Ng1ViewConfig} from "angular-ui-router";
109

1110
export let upgradeModule = angular.module('ui.router.upgrade', ['ui.router']);
1211

1312
@Component({
1413
selector: 'ui-view-ng-upgrade',
1514
template: `<ui-view></ui-view>`,
16-
directives: [CORE_DIRECTIVES, UIROUTER_DIRECTIVES],
15+
directives: [UIROUTER_DIRECTIVES],
1716
viewProviders: [ provide(UiView.PARENT_INJECT, {useValue: { } }) ],
1817
})
1918
/**

package.json

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ui-router-ng1-to-ng2",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"scripts": {
55
"build": "npm run clean && npm run tsc",
66
"clean": "rm -f *.d.ts *.js *.js.map",
@@ -10,29 +10,34 @@
1010
"license": "MIT",
1111
"peerDependencies": {
1212
"angular": "^1.5.0",
13-
"angular2": "^2.0.0-beta.13",
13+
"@angular/core": "^2.0.0-rc.1",
14+
"@angular/upgrade": "^2.0.0-rc.1",
1415
"angular-ui-router": "^1.0.0-alpha.5",
15-
"ui-router-ng2": "^1.0.0-alpha.4"
16+
"ui-router-ng2": "^1.0.0-alpha.5"
1617
},
1718
"devDependencies": {
19+
"@angular/common": "^2.0.0-rc.1",
20+
"@angular/compiler": ">=2.0.0-rc.1",
21+
"@angular/core": ">=2.0.0-rc.1",
22+
"@angular/platform-browser": ">=2.0.0-rc.1",
23+
"@angular/upgrade": ">=2.0.0-rc.1",
1824
"angular": "1.5.3",
19-
"angular2": "2.0.0-beta.13",
20-
"angular-ui-router": "1.0.0-alpha.5",
25+
"angular-ui-router": ">=1.0.0-alpha.5",
26+
"concurrently": "^2.0.0",
2127
"es6-shim": "^0.35.0",
28+
"lite-server": "^2.1.0",
2229
"reflect-metadata": "0.1.2",
23-
"rxjs": "5.0.0-beta.2",
30+
"rxjs": "^5.0.0-beta.6",
2431
"systemjs": "0.19.25",
25-
"ui-router-ng2": ">=1.0.0-alpha.3",
26-
"zone.js": "0.6.6",
27-
"concurrently": "^2.0.0",
28-
"lite-server": "^2.1.0",
2932
"typescript": "^1.8.9",
30-
"typings": "^0.7.11"
33+
"typings": "^0.7.11",
34+
"ui-router-ng2": ">=1.0.0-alpha.5",
35+
"zone.js": "0.6.6"
3136
},
3237
"main": "ng1-to-ng2",
3338
"typings": "ng1-to-ng2.d.ts",
34-
"repository" : {
35-
"type" : "git",
36-
"url" : "https://github.com/ui-router/ng1-to-ng2.git"
39+
"repository": {
40+
"type": "git",
41+
"url": "https://github.com/ui-router/ng1-to-ng2.git"
3742
}
3843
}

0 commit comments

Comments
 (0)