Skip to content

Commit 8dd3f59

Browse files
vsavkinvsavkin
committed
chore(router): changes the router setup to align with other modules
1 parent c9d2849 commit 8dd3f59

24 files changed

Lines changed: 199 additions & 187 deletions

‎build.sh‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ for PACKAGE in \
4949
platform-browser-dynamic \
5050
platform-server \
5151
http \
52+
router \
5253
router-deprecated \
5354
upgrade \
5455
compiler-cli
@@ -93,25 +94,27 @@ do
9394
echo "====== BUNDLING: ${SRCDIR} ====="
9495
mkdir ${DESTDIR}/bundles
9596

96-
(
97-
cd ${SRCDIR}
98-
echo "..." # here just to have grep match something and not exit with 1
99-
../../../node_modules/.bin/rollup -c rollup.config.js
100-
) 2>&1 | grep -v "as external dependency"
97+
if [[ ${PACKAGE} != router ]]; then
98+
(
99+
cd ${SRCDIR}
100+
echo "..." # here just to have grep match something and not exit with 1
101+
../../../node_modules/.bin/rollup -c rollup.config.js
102+
) 2>&1 | grep -v "as external dependency"
101103

102-
$(npm bin)/tsc \
103-
--out ${UMD_ES5_PATH} \
104-
--target es5 \
105-
--lib "es6,dom" \
106-
--allowJs \
107-
${UMD_ES6_PATH}
104+
$(npm bin)/tsc \
105+
--out ${UMD_ES5_PATH} \
106+
--target es5 \
107+
--lib "es6,dom" \
108+
--allowJs \
109+
${UMD_ES6_PATH}
108110

109-
rm ${UMD_ES6_PATH}
111+
rm ${UMD_ES6_PATH}
110112

111-
cat ./modules/@angular/license-banner.txt > ${UMD_ES5_PATH}.tmp
112-
cat ${UMD_ES5_PATH} >> ${UMD_ES5_PATH}.tmp
113-
mv ${UMD_ES5_PATH}.tmp ${UMD_ES5_PATH}
113+
cat ./modules/@angular/license-banner.txt > ${UMD_ES5_PATH}.tmp
114+
cat ${UMD_ES5_PATH} >> ${UMD_ES5_PATH}.tmp
115+
mv ${UMD_ES5_PATH}.tmp ${UMD_ES5_PATH}
114116

115-
$(npm bin)/uglifyjs -c --screw-ie8 -o ${UMD_ES5_MIN_PATH} ${UMD_ES5_PATH}
117+
$(npm bin)/uglifyjs -c --screw-ie8 -o ${UMD_ES5_MIN_PATH} ${UMD_ES5_PATH}
118+
fi
116119
fi
117120
done

‎modules/@angular/router/index.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎modules/@angular/router/index.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import {RouterLink} from './src/directives/router_link';
2+
import {RouterLinkActive} from './src/directives/router_link_active';
3+
import {RouterOutlet} from './src/directives/router_outlet';
4+
5+
export {ExtraOptions} from './src/common_router_providers';
6+
export {Route, RouterConfig} from './src/config';
7+
export {CanActivate, CanDeactivate} from './src/interfaces';
8+
export {Event, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, Router, RoutesRecognized} from './src/router';
9+
export {RouterOutletMap} from './src/router_outlet_map';
10+
export {provideRouter} from './src/router_providers';
11+
export {ActivatedRoute, ActivatedRouteSnapshot, RouterState, RouterStateSnapshot} from './src/router_state';
12+
export {PRIMARY_OUTLET, Params} from './src/shared';
13+
export {DefaultUrlSerializer, UrlSerializer} from './src/url_serializer';
14+
export {UrlPathWithParams, UrlTree} from './src/url_tree';
15+
16+
export const ROUTER_DIRECTIVES = [RouterOutlet, RouterLink, RouterLinkActive];

‎modules/@angular/router/karma-test-shim.js‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/*global jasmine, __karma__, window*/
2-
Error.stackTraceLimit = Infinity;
2+
Error.stackTraceLimit = 10;
33
jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
44

55
__karma__.loaded = function () {
66
};
77

8-
98
function isJsFile(path) {
109
return path.slice(-3) == '.js';
1110
}
@@ -32,14 +31,9 @@ System.config(
3231
{
3332
map: {
3433
'rxjs': 'node_modules/rxjs',
35-
'@angular': 'node_modules/@angular',
36-
'app': 'dist'
34+
'@angular': 'dist/all/@angular'
3735
},
3836
packages: {
39-
'app': {
40-
main: 'main.js',
41-
defaultExtension: 'js'
42-
},
4337
'@angular/core': {
4438
main: 'index.js',
4539
defaultExtension: 'js'
@@ -60,6 +54,10 @@ System.config(
6054
main: 'index.js',
6155
defaultExtension: 'js'
6256
},
57+
'@angular/router': {
58+
main: 'index.js',
59+
defaultExtension: 'js'
60+
},
6361
'rxjs': {
6462
main: 'Rx.js',
6563
defaultExtension: 'js'

‎modules/@angular/router/karma.conf.js‎

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1+
var browserProvidersConf = require('../../../browser-providers.conf.js');
2+
13
// Karma configuration
24
module.exports = function(config) {
35
config.set({
46

5-
basePath: '',
7+
basePath: '../../../',
68

79
frameworks: ['jasmine'],
810

911
files: [
1012
// Polyfills.
1113
'node_modules/es6-shim/es6-shim.js',
12-
1314
'node_modules/reflect-metadata/Reflect.js',
1415

1516
// System.js for module loading
@@ -27,17 +28,42 @@ module.exports = function(config) {
2728
{ pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false },
2829
{ pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false },
2930

31+
// shim
32+
{pattern: 'modules/@angular/router/karma-test-shim.js', included: true, watched: true },
33+
34+
// Angular modules
35+
{pattern: 'dist/all/@angular/core/*.js', included: false, watched: false},
36+
{pattern: 'dist/all/@angular/core/src/**/*.js', included: false, watched: false},
37+
{pattern: 'dist/all/@angular/core/testing/**/*.js', included: false, watched: false},
38+
39+
{pattern: 'dist/all/@angular/common/*.js', included: false, watched: false},
40+
{pattern: 'dist/all/@angular/common/src/**/*.js', included: false, watched: false},
41+
{pattern: 'dist/all/@angular/common/testing/**/*.js', included: false, watched: false},
3042

31-
{pattern: 'karma-test-shim.js', included: true, watched: true},
32-
{pattern: 'built/test/matchers.js', included: true, watched: true},
43+
{pattern: 'dist/all/@angular/compiler/*.js', included: false, watched: false},
44+
{pattern: 'dist/all/@angular/compiler/src/**/*.js', included: false, watched: false},
45+
{pattern: 'dist/all/@angular/compiler/testing/**/*.js', included: false, watched: false},
46+
47+
{pattern: 'dist/all/@angular/platform-browser/*.js', included: false, watched: false},
48+
{pattern: 'dist/all/@angular/platform-browser/src/**/*.js', included: false, watched: false},
49+
{pattern: 'dist/all/@angular/platform-browser/testing/**/*.js', included: false, watched: false},
50+
51+
{pattern: 'dist/all/@angular/platform-browser-dynamic/*.js', included: false, watched: false},
52+
{pattern: 'dist/all/@angular/platform-browser-dynamic/src/**/*.js', included: false, watched: false},
53+
{pattern: 'dist/all/@angular/platform-browser-dynamic/testing/**/*.js', included: false, watched: false},
54+
55+
// Router
56+
{pattern: 'dist/all/@angular/router/**/*.js', included: false, watched: false}
57+
],
3358

34-
// paths loaded via module imports
35-
// Angular itself
36-
{pattern: 'node_modules/@angular/**/*.js', included: false, watched: true},
37-
{pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: true},
59+
customLaunchers: browserProvidersConf.customLaunchers,
3860

39-
{pattern: 'dist/**/*.js', included: false, watched: true},
40-
{pattern: 'dist/**/*.js.map', included: false, watched: false}
61+
plugins: [
62+
'karma-jasmine',
63+
'karma-browserstack-launcher',
64+
'karma-sauce-launcher',
65+
'karma-chrome-launcher',
66+
'karma-sourcemap-loader'
4167
],
4268

4369
preprocessors: {

‎modules/@angular/router/package.json‎

Lines changed: 10 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,8 @@
22
"name": "@angular/router",
33
"version": "3.0.0-alpha.7",
44
"description": "",
5-
"main": "./dist/index.js",
6-
"jsnext:main": "./dist/esm/index.js",
7-
"scripts": {
8-
"karma": "karma start",
9-
"test": "npm run build; karma start",
10-
"build_watch": "rm -rf dist; tsc -w",
11-
"build": "rm -rf dist; tsc",
12-
"build_npm": "rm -rf dist && tsc -p tsconfig.publish.es5.json && tsc -p tsconfig.publish.esm.json",
13-
"postbuild_npm": "cp package.json README.md dist/ && npm run rewrite_npm_package",
14-
"devsetup": "typings install",
15-
"rewrite_npm_package": "node --harmony_destructuring tools/rewrite-published-package.js",
16-
"build_bundle": "cp -r src router && tsc typings/index.d.ts src/router.ts --rootDir . --module system -t es5 --outFile dist/bundles/router.js --moduleResolution node --emitDecoratorMetadata --experimentalDecorators",
17-
},
5+
"main": "index.js",
6+
"jsnext:main": "esm/index.js",
187
"keywords": [
198
"angular2",
209
"angular",
@@ -24,49 +13,19 @@
2413
"type": "git",
2514
"url": "git+https://github.com/angular/angular.git"
2615
},
27-
"author": "vsavkin",
16+
"author": "angular",
2817
"license": "MIT",
2918
"bugs": {
3019
"url": "https://github.com/angular/angular/issues"
3120
},
3221
"homepage": "https://github.com/angular/angular#readme",
33-
"dependencies": {
34-
"@angular/common": "^2.0.0-rc.2",
35-
"@angular/compiler": "^2.0.0-rc.2",
36-
"@angular/core": "^2.0.0-rc.2",
37-
"@angular/platform-browser": "^2.0.0-rc.2",
38-
"@angular/platform-browser-dynamic": "^2.0.0-rc.2",
22+
"peerDependencies": {
23+
"@angular/core": "0.0.0-PLACEHOLDER",
24+
"@angular/compiler": "0.0.0-PLACEHOLDER",
25+
"@angular/common": "0.0.0-PLACEHOLDER",
26+
"@angular/platform-browser": "0.0.0-PLACEHOLDER",
27+
"@angular/platform-browser-dynamic": "0.0.0-PLACEHOLDER",
3928
"rxjs": "5.0.0-beta.6"
4029
},
41-
"devDependencies": {
42-
"es6-module-loader": "^0.17.10",
43-
"es6-shim": "^0.35.0",
44-
"gulp": "^3.9.0",
45-
"gulp-jasmine": "^2.2.1",
46-
"gulp-typescript": "^2.10.0",
47-
"http-server": "^0.8.5",
48-
"jasmine": "^2.4.1",
49-
"jasmine-core": "^2.4.1",
50-
"json": "^9.0.3",
51-
"karma": "^0.13.19",
52-
"karma-chrome-launcher": "^0.2.2",
53-
"karma-firefox-launcher": "^0.1.7",
54-
"karma-jasmine": "^0.3.6",
55-
"karma-systemjs": "^0.10.0",
56-
"karma-sourcemap-loader": "~0.3",
57-
"parse5": "^1.3.2",
58-
"protractor": "3.0.0",
59-
"reflect-metadata": "0.1.2",
60-
"systemjs": "^0.19.16",
61-
"systemjs-builder": "^0.15.7",
62-
"traceur": "0.0.96",
63-
"tsd": "^0.6.5",
64-
"typescript": "^1.8.10",
65-
"typings": "^1.0.4",
66-
"zone.js": "^0.6.6",
67-
"clang-format": "^1.0.35",
68-
"tslint": "^3.6.0",
69-
"codelyzer": "0.0.14"
70-
},
71-
"typings": "dist/index.d.ts"
30+
"typings": "index.d.ts"
7231
}

‎modules/@angular/router/rollup.config.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
export default {
2+
entry: '../../../dist/packages-dist/router/esm/index.js',
3+
dest: '../../../dist/packages-dist/router/esm/router.umd.js',
4+
format: 'umd',
5+
moduleName: 'ng.router',
6+
globals: {
7+
'@angular/core': 'ng.core',
8+
'@angular/common': 'ng.common',
9+
'@angular/compiler': 'ng.compiler',
10+
'@angular/platform-browser': 'ng.platformBrowser',
11+
'@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic',
12+
13+
'rxjs/Observable': 'Rx',
14+
'rxjs/Subject': 'Rx',
15+
'rxjs/BehaviorSubject': 'Rx',
16+
'rxjs/Observer': 'Rx',
17+
'rxjs/Subscription': 'Rx',
18+
19+
'rxjs/observable/PromiseObservable': 'Rx', // this is wrong, but this stuff has changed in rxjs b.6 so we need to fix it when we update.
20+
'rxjs/operator/toPromise': 'Rx.Observable.prototype',
21+
'rxjs/operator/map': 'Rx.Observable.prototype',
22+
'rxjs/operator/mergeMap': 'Rx.Observable.prototype',
23+
'rxjs/operator/mergeAll': 'Rx.Observable.prototype',
24+
'rxjs/operator/every': 'Rx.Observable.prototype',
25+
},
26+
plugins: [
27+
// nodeResolve({ jsnext: true, main: true }),
28+
]
29+
}

‎modules/@angular/router/scripts/build.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
3+
set -e -o pipefail
4+
../../../node_modules/.bin/tsc -w

‎modules/@angular/router/scripts/karma.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env bash
2+
../../../node_modules/.bin/karma start

‎modules/@angular/router/src/index.ts‎

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

0 commit comments

Comments
 (0)