Skip to content

Commit 94cb1d0

Browse files
chore(build): Organize repo as only ng2 code, with a dependency on ui-router-core code.
- Remove "packages" from mono-repo - Remove typedoctheme (pull from ui-router-typedoc-themes) - Build documentation for only the ng2 + core code
1 parent 722e3ce commit 94cb1d0

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

+102
-2073
lines changed

.gitignore

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
# master only
2-
build
3-
build_packages
4-
site
5-
61
# common
72
node_modules
8-
bower_components
93
.DS_Store
104
*~
115
.tscache
@@ -18,5 +12,7 @@ idea-out
1812
*.ipr
1913
*.iws
2014

21-
# generate doc to _doc; copy to proper gh-pages dir
2215
_doc
16+
_bundles
17+
lib
18+
lib-esm

.npmignore

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
# Any hidden files
22
**/.*
33

4-
# Build related stuff
5-
/build
6-
/config
7-
/lib
8-
/ngdoc_assets
9-
/sample
10-
/test
11-
/bower_components
12-
/node_modules
13-
Gruntfile.js
14-
files.js
4+
src
5+
config
6+
test
157

16-
# Package managers
17-
bower.json
18-
component.json
8+
node_modules
9+
10+
tslint.json
11+
tsconfig.json
12+
tsconfig.**.json
13+
webpack.config.js
14+
15+
*.iml
16+
*.ipr
17+
*.iws

package.json

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
"description": "State-based routing for Angular 2",
44
"version": "1.0.0-beta.4",
55
"scripts": {
6-
"build": "node ./scripts/package.js ng2",
6+
"clean": "shx rm -rf lib lib-esm _bundles _doc",
7+
"build": "npm run clean && tsc && tsc -p tsconfig.esm.json && webpack",
78
"test": "karma start config/karma.ng2.js",
8-
"docs": "./scripts/docs.sh"
9+
"docs": "typedoc --tsconfig tsconfig.typedoc.json --readme README.md --name 'ui-router-ng2' --theme node_modules/ui-router-typedoc-themes/bin/default --out _doc --external-aliases internalapi,external --navigation-label-globals ui-router-ng2",
10+
"prepublish": "npm run build"
911
},
1012
"homepage": "https://ui-router.github.io/ng2",
1113
"contributors": [
@@ -44,18 +46,20 @@
4446
"node": ">4"
4547
},
4648
"license": "MIT",
49+
"jsnext:main": "lib-esm/ng2.js",
4750
"main": "lib/ng2.js",
4851
"typings": "lib/ng2.d.ts",
4952
"dependencies": {
50-
"ui-router-core": "latest"
53+
"ui-router-core": "=1.0.0"
5154
},
5255
"peerDependencies": {
5356
"@angular/core": "^2.0.0",
5457
"@angular/common": "^2.0.0"
5558
},
5659
"devDependencies": {
60+
"@angular/common": "^2.0.0",
5761
"@angular/compiler": "^2.0.0",
58-
"@angular/compiler-cli": "^0.6.2",
62+
"@angular/core": "^2.0.0",
5963
"@angular/platform-browser": "^2.0.0",
6064
"@angular/platform-browser-dynamic": "^2.0.0",
6165
"@angular/platform-server": "^2.0.0",
@@ -74,11 +78,15 @@
7478
"karma-systemjs": "^0.7.2",
7579
"rxjs": "5.0.0-beta.12",
7680
"shelljs": "^0.7.0",
81+
"shx": "^0.1.4",
7782
"systemjs": "^0.18.4",
7883
"tslint": "=2.5.0",
79-
"typedoc": "github:jasongrout/typedoc#ts2",
84+
"typedoc": "~0.5.0",
8085
"typedoc-plugin-external-module-name": "^1.0.2",
86+
"typedoc-plugin-internal-external": "^1.0.0",
87+
"typedoc-plugin-ui-router": "^1.0.0",
8188
"typescript": "~2.0.3",
89+
"ui-router-typedoc-themes": "^1.0.0",
8290
"webpack": "1.x",
8391
"webpack-dev-server": "1.x",
8492
"zone.js": "^0.6.21"

packages/core/npmignore

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

packages/core/package.json

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

packages/core/sources.json

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

packages/core/tsconfig.json

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

packages/core/webpack.config.js

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

packages/ng1-bower/bower.json

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

packages/ng1-bower/gitignore

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

0 commit comments

Comments
 (0)