Skip to content

Commit 6b06e86

Browse files
feat(hybrid): rename npm package to @uirouter/angular-hybrid. Update project to use latest @uirouter scoped packages
BREAKING CHANGE: Project name switched from `ui-router-ng1-to-ng2` to `@uirouter/angular-hybrid` bundle moved to `_bundles/ui-router-angular-hybrid.js`
1 parent abfbe9e commit 6b06e86

File tree

6 files changed

+329
-145
lines changed

6 files changed

+329
-145
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
*.ipr
1010
*.iml
1111
*.iws
12+
.*
13+
stats.html
1214

1315
# Logs
1416
logs

package.json

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,56 @@
11
{
2-
"name": "ui-router-ng1-to-ng2",
2+
"name": "@uirouter/angular-hybrid",
33
"version": "2.0.0",
44
"scripts": {
5-
"all": "npm run clean && npm run build && npm run bundle",
6-
"clean": "rm -rf ng1-to-ng2.d.ts ng1-to-ng2*.js ng1-to-ng2*.js.map build",
7-
"build": "npm run clean && npm run tsc",
8-
"bundle": "webpack",
9-
"tsc": "tsc",
10-
"tsc:w": "tsc -w",
11-
"prepublish": "npm run all"
5+
"clean": "shx rm -rf lib lib-esm _bundles",
6+
"build": "npm run clean && tsc && tsc -m es6 --outDir lib-esm",
7+
"package": "npm run build && rollup -c && rollup -c --environment MINIFY",
8+
"prepare": "npm run package"
129
},
1310
"license": "MIT",
11+
"dependencies": {
12+
"@uirouter/angular": "git://github.com/ui-router/angular#1.0.0-beta.6+hybrid-2.0.0",
13+
"@uirouter/angularjs": "git://github.com/angular-ui/ui-router#1.0.3+hybrid-2.0.0",
14+
"@uirouter/core": "=5.0.3"
15+
},
1416
"peerDependencies": {
15-
"@angular/core": "^2.0.1",
16-
"@angular/upgrade": "^2.0.1",
17+
"@angular/core": "^4.0.0",
18+
"@angular/upgrade": "^4.0.0",
1719
"angular": "^1.5.0",
1820
"rxjs": "^5.0.0",
19-
"zone.js": "~0.6.21"
21+
"zone.js": "^0.8.0"
2022
},
2123
"devDependencies": {
22-
"@angular/common": "~2.0.1",
23-
"@angular/compiler": "~2.0.1",
24-
"@angular/core": "~2.0.1",
25-
"@angular/platform-browser": "~2.0.1",
26-
"@angular/platform-browser-dynamic": "~2.0.1",
27-
"@angular/upgrade": "~2.0.1",
24+
"@angular/common": "^4.0.0",
25+
"@angular/compiler": "^4.0.0",
26+
"@angular/core": "^4.0.0",
27+
"@angular/platform-browser": "^4.0.0",
28+
"@angular/platform-browser-dynamic": "^4.0.0",
29+
"@angular/upgrade": "^4.0.0",
2830
"@types/angular": "~1.6.1",
2931
"@types/jquery": "^1.10.31",
3032
"angular": "~1.6.1",
31-
"angular-ui-router": "angular-ui/ui-router#1.0.0-rc.1-artifacts",
3233
"awesome-typescript-loader": "^3.0.0",
3334
"readline-sync": "^1.4.7",
35+
"rollup": "^0.41.6",
36+
"rollup-plugin-commonjs": "^8.0.2",
37+
"rollup-plugin-node-resolve": "^3.0.0",
38+
"rollup-plugin-progress": "^0.2.1",
39+
"rollup-plugin-sourcemaps": "^0.4.2",
40+
"rollup-plugin-uglify": "^1.0.2",
41+
"rollup-plugin-visualizer": "^0.2.1",
3442
"rxjs": "^5.0.0",
3543
"shx": "^0.2.2",
3644
"systemjs": "0.19.25",
3745
"typescript": "^2.1.5",
38-
"ui-router-core": "=5.0.0-pre.1",
39-
"ui-router-ng2": "ui-router/ng2#1.0.0-beta.5-artifacts",
4046
"webpack": "^1.13.1",
4147
"zone.js": "~0.6.21"
4248
},
43-
"main": "ng1-to-ng2.min.js",
44-
"typings": "ng1-to-ng2.d.ts",
49+
"main": "lib/index.js",
50+
"module": "lib-esm/index.js",
51+
"typings": "lib/index.d.ts",
4552
"repository": {
4653
"type": "git",
47-
"url": "https://github.com/ui-router/ng1-to-ng2.git"
54+
"url": "https://github.com/ui-router/angular-hybrid.git"
4855
}
4956
}

ng1-to-ng2.ts renamed to src/angular-hybrid.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import * as angular from 'angular';
22

3-
import { $InjectorLike, Ng1ViewConfig, StateObject, StateProvider } from 'angular-ui-router';
3+
import { $InjectorLike, Ng1ViewConfig, StateObject, StateProvider } from '@uirouter/angularjs';
44

55
import {
66
_UIROUTER_SERVICE_PROVIDERS, applyModuleConfig, forEach, NATIVE_INJECTOR_TOKEN, Ng2ViewConfig, Ng2ViewDeclaration,
77
ParentUIViewInject, PathNode, Resolvable, StateRegistry, StatesModule, UIRouter, UIROUTER_MODULE_TOKEN,
88
UIROUTER_ROOT_MODULE, UIRouterModule, UIView, ViewConfig, ViewService, ng2LazyLoadBuilder
9-
} from 'ui-router-ng2';
9+
} from '@uirouter/angular';
1010

11-
import { UIRouterRx } from "ui-router-rx";
11+
import { UIRouterRx } from "@uirouter/rx";
1212

1313
import { Component, ElementRef, Inject, Injector, Input, NgModule } from '@angular/core';
1414
import { UpgradeAdapter } from '@angular/upgrade';
@@ -62,7 +62,7 @@ export let ng1InitModule = angular.module('ui.router.init');
6262
* <div ui-view> <!-- custom template references the downgraded component -->
6363
* <ui-view-ng-upgrade> <!-- ng2 component adapter downgraded to ng1-->
6464
* <ui-view> <!-- pure ng2 ui-view -->
65-
* </ui-view>
65+
* </ui-view>
6666
* </ui-view-ng-upgrade>
6767
* </div>
6868
* ```

src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './angular-hybrid';

tsconfig.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"compilerOptions": {
3+
"rootDir": "src",
4+
"outDir": "lib",
35
"target": "es5",
46
"module": "commonjs",
57
"moduleResolution": "node",
@@ -15,5 +17,5 @@
1517
"suppressExcessPropertyErrors": true,
1618
"suppressImplicitAnyIndexErrors": true
1719
},
18-
"exclude": [ "node_modules" ]
20+
"files": [ "src/index.ts" ]
1921
}

0 commit comments

Comments
 (0)