Skip to content

Commit 9776544

Browse files
Merge pull request #2595 from angular-ui/monolithic-repo
Monolithic repo tooling for core, ng1, and ng2
2 parents 25e0c04 + a01b952 commit 9776544

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2092
-4606
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# master only
22
build
3+
build_packages
34
site
45

56
# common

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ before_script:
77
- sh -e /etc/init.d/xvfb start
88
- npm install -g karma
99
- npm install -g grunt-cli
10-
- npm install -g bower
11-
- bower install
1210
- ./nodeserver.sh > /dev/null &
1311

1412
script:

CHANGELOG.md

Lines changed: 1552 additions & 0 deletions
Large diffs are not rendered by default.

ngdoc_assets/StateGoExamples.png

-58.9 KB
Binary file not shown.

ngdoc_assets/docnav.html

Lines changed: 0 additions & 6 deletions
This file was deleted.

ngdoc_assets/example.png

-5.29 KB
Binary file not shown.

ngdoc_assets/incomplete.png

-4.98 KB
Binary file not shown.

ngdoc_assets/so.png

-5.58 KB
Binary file not shown.

ngdoc_assets/uirouter-docs.css

Lines changed: 0 additions & 4 deletions
This file was deleted.

package.json

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
2-
"name": "angular-ui-router",
3-
"description": "State-based routing for AngularJS",
4-
"version": "1.0.0alpha0",
5-
"homepage": "http://angular-ui.github.com/",
2+
"name": "ui-router",
3+
"description": "State-based routing for Javascript",
4+
"version": "1.0.0-alpha.1",
5+
"scripts": {},
6+
"homepage": "http://angular-ui.github.com/ui-router",
67
"contributors": [
78
{
89
"name": "Nate Abele",
@@ -13,11 +14,6 @@
1314
"name": "Chris Thielen",
1415
"web": "https://github.com/christopherthielen"
1516
},
16-
{
17-
"name": "Chris Thielen",
18-
"email": "[email protected]",
19-
"web": "https://github.com/christopherthielen"
20-
},
2117
{
2218
"name": "Tim Kindberg",
2319
"web": "https://github.com/timkindberg"
@@ -40,19 +36,15 @@
4036
"bugs": {
4137
"url": "https://github.com/angular-ui/ui-router/issues"
4238
},
43-
"license": "MIT",
44-
"licenses": [
45-
{
46-
"type": "MIT",
47-
"url": "https://github.com/angular-ui/ui-router/blob/master/LICENSE"
48-
}
49-
],
50-
"dependencies": {
51-
"angular": "^1.2"
39+
"engines": {
40+
"node": ">4"
5241
},
42+
"license": "MIT",
5343
"devDependencies": {
5444
"angular2": "^2.0.0-beta.1",
5545
"babel-core": "^5.8.14",
46+
"conventional-changelog": "^1.1.0",
47+
"conventional-changelog-cli": "^1.1.1",
5648
"es6-module-loader": "^0.17.3",
5749
"es6-promise": "^3.0.2",
5850
"es6-shim": "^0.33.13",
@@ -77,17 +69,19 @@
7769
"karma-script-launcher": "~0.1.0",
7870
"karma-systemjs": "^0.7.2",
7971
"load-grunt-tasks": "~0.4.0",
72+
"lodash": "^4.5.1",
8073
"phantomjs-polyfill": "0.0.1",
8174
"reflect-metadata": "=0.1.2",
8275
"rxjs": "^5.0.0-beta.0",
83-
"shelljs": "~0.2.6",
76+
"shelljs": "~0.6.0",
8477
"systemjs": "^0.18.4",
78+
"ts-loader": "^0.8.1",
8579
"tslint": "=2.5.0",
8680
"typedoc": "git://github.com/christopherthielen/typedoc.git#v0.3-uirouter",
87-
"typescript": "=1.7.3",
81+
"typescript": "~1.8.0",
8882
"webpack": "1.x",
8983
"webpack-dev-server": "1.x",
84+
"yargs": "^4.2.0",
9085
"zone.js": "^0.5.10"
91-
},
92-
"main": "release/angular-ui-router.js"
86+
}
9387
}

0 commit comments

Comments
 (0)