Skip to content

Commit

Permalink
update for ng2 rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherthielen committed May 13, 2016
1 parent 660ea81 commit bfa8c97
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 18 deletions.
7 changes: 3 additions & 4 deletions ng1-to-ng2.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
import * as angular from "angular";
import {provide, ElementRef, Component, Inject, ComponentMetadata} from "angular2/core";
import {provide, ElementRef, Component, Inject, ComponentMetadata} from "@angular/core";
import {UpgradeAdapter} from "@angular/upgrade";
import {
UiView, UIRouter, TransitionService, StateService, UIRouterGlobals, UIROUTER_DIRECTIVES, forEach, extend,
UrlRouter, ViewService, StateRegistry, UrlMatcherFactory, Ng2ViewDeclaration, Ng2ViewConfig, Node
} from "ui-router-ng2";
import {CORE_DIRECTIVES} from "angular2/common";
import {UpgradeAdapter} from "angular2/upgrade";
import {Ng1ViewConfig} from "angular-ui-router";

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

@Component({
selector: 'ui-view-ng-upgrade',
template: `<ui-view></ui-view>`,
directives: [CORE_DIRECTIVES, UIROUTER_DIRECTIVES],
directives: [UIROUTER_DIRECTIVES],
viewProviders: [ provide(UiView.PARENT_INJECT, {useValue: { } }) ],
})
/**
Expand Down
33 changes: 19 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ui-router-ng1-to-ng2",
"version": "1.0.4",
"version": "1.0.5",
"scripts": {
"build": "npm run clean && npm run tsc",
"clean": "rm -f *.d.ts *.js *.js.map",
Expand All @@ -10,29 +10,34 @@
"license": "MIT",
"peerDependencies": {
"angular": "^1.5.0",
"angular2": "^2.0.0-beta.13",
"@angular/core": "^2.0.0-rc.1",
"@angular/upgrade": "^2.0.0-rc.1",
"angular-ui-router": "^1.0.0-alpha.5",
"ui-router-ng2": "^1.0.0-alpha.4"
"ui-router-ng2": "^1.0.0-alpha.5"
},
"devDependencies": {
"@angular/common": "^2.0.0-rc.1",
"@angular/compiler": ">=2.0.0-rc.1",
"@angular/core": ">=2.0.0-rc.1",
"@angular/platform-browser": ">=2.0.0-rc.1",
"@angular/upgrade": ">=2.0.0-rc.1",
"angular": "1.5.3",
"angular2": "2.0.0-beta.13",
"angular-ui-router": "1.0.0-alpha.5",
"angular-ui-router": ">=1.0.0-alpha.5",
"concurrently": "^2.0.0",
"es6-shim": "^0.35.0",
"lite-server": "^2.1.0",
"reflect-metadata": "0.1.2",
"rxjs": "5.0.0-beta.2",
"rxjs": "^5.0.0-beta.6",
"systemjs": "0.19.25",
"ui-router-ng2": ">=1.0.0-alpha.3",
"zone.js": "0.6.6",
"concurrently": "^2.0.0",
"lite-server": "^2.1.0",
"typescript": "^1.8.9",
"typings": "^0.7.11"
"typings": "^0.7.11",
"ui-router-ng2": ">=1.0.0-alpha.5",
"zone.js": "0.6.6"
},
"main": "ng1-to-ng2",
"typings": "ng1-to-ng2.d.ts",
"repository" : {
"type" : "git",
"url" : "https://github.com/ui-router/ng1-to-ng2.git"
"repository": {
"type": "git",
"url": "https://github.com/ui-router/ng1-to-ng2.git"
}
}

0 comments on commit bfa8c97

Please sign in to comment.