Skip to content

Commit 94f5466

Browse files
author
pigr2
committed
upgrade to 2.0 as per official docs
1 parent 806faad commit 94f5466

File tree

3 files changed

+51
-35
lines changed

3 files changed

+51
-35
lines changed

package.json

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,33 @@
1414
"typings": "typings"
1515
},
1616
"dependencies": {
17-
"@angular/common": "2.0.0-rc.2",
18-
"@angular/compiler": "2.0.0-rc.2",
19-
"@angular/core": "2.0.0-rc.2",
20-
"@angular/http": "2.0.0-rc.2",
21-
"@angular/platform-browser": "2.0.0-rc.2",
22-
"@angular/platform-browser-dynamic": "2.0.0-rc.2",
17+
"@angular/common": "2.0.0",
18+
"@angular/compiler": "2.0.0",
19+
"@angular/core": "2.0.0",
20+
"@angular/forms": "2.0.0",
21+
"@angular/http": "2.0.0",
22+
"@angular/platform-browser": "2.0.0",
23+
"@angular/platform-browser-dynamic": "2.0.0",
24+
"@angular/router": "3.0.0",
25+
"@angular/upgrade": "2.0.0",
26+
27+
"core-js": "^2.4.1",
28+
"reflect-metadata": "^0.1.3",
29+
"rxjs": "5.0.0-beta.12",
30+
"systemjs": "0.19.27",
31+
"zone.js": "^0.6.23",
32+
2333
"@ngrx/core": "~1.0.1",
2434
"@ngrx/store": "~2.0.1",
2535
"es6-shim": "^0.35.0",
26-
"systemjs": "0.19.27",
27-
"reflect-metadata": "^0.1.3",
28-
"rxjs": "5.0.0-beta.6",
29-
"zone.js": "^0.6.12"
36+
37+
"angular2-in-memory-web-api": "0.0.20",
38+
"bootstrap": "^3.3.6"
3039
},
3140
"devDependencies": {
32-
"concurrently": "^2.0.0",
33-
"lite-server": "^2.2.0",
34-
"typescript": "^1.8.10",
35-
"typings":"^0.8.1"
41+
"concurrently": "^2.2.0",
42+
"lite-server": "^2.2.2",
43+
"typescript": "^2.0.2",
44+
"typings":"^1.3.2"
3645
}
3746
}

systemjs.config.js

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
11
(function(global) {
2+
var paths = {
3+
// paths serve as alias
4+
'npm:': 'node_modules/'
5+
};
26
// map tells the System loader where to look for things
37
var map = {
48
'app': 'dist',
5-
'@angular': 'node_modules/@angular',
6-
'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api',
7-
'rxjs': 'node_modules/rxjs',
8-
'@ngrx': 'node_modules/@ngrx'
9+
10+
// angular bundles
11+
'@angular/core': 'npm:@angular/core/bundles/core.umd.js',
12+
'@angular/common': 'npm:@angular/common/bundles/common.umd.js',
13+
'@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
14+
'@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
15+
'@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
16+
'@angular/http': 'npm:@angular/http/bundles/http.umd.js',
17+
'@angular/router': 'npm:@angular/router/bundles/router.umd.js',
18+
'@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
19+
20+
'angular2-in-memory-web-api': 'npm:angular2-in-memory-web-api',
21+
'rxjs': 'npm:rxjs',
22+
'@ngrx': 'npm:@ngrx'
923
};
1024
// packages tells the System loader how to load when no filename and/or no extension
1125
var packages = {
1226
'app': { main: 'main.js', defaultExtension: 'js' },
13-
'rxjs': { defaultExtension: 'js' }
27+
'rxjs': { defaultExtension: 'js' },
28+
'angular2-in-memory-web-api': { main: './index.js', defaultExtension: 'js' },
29+
'@ngrx/core': { main: 'index.js', defaultExtension: 'js' },
30+
'@ngrx/store': { main: 'index.js', defaultExtension: 'js' }
1431
};
15-
var packageNames = [
16-
'@angular/common',
17-
'@angular/compiler',
18-
'@angular/core',
19-
'@angular/http',
20-
'@angular/platform-browser',
21-
'@angular/platform-browser-dynamic',
22-
'@angular/testing',
23-
'@angular/upgrade',
24-
'@ngrx/core',
25-
'@ngrx/store'
26-
];
27-
// add package entries for angular packages in the form '@angular/common': { main: 'index.js', defaultExtension: 'js' }
28-
packageNames.forEach(function(pkgName) {
29-
packages[pkgName] = { main: 'index.js', defaultExtension: 'js' };
30-
});
3132
var config = {
33+
paths: paths,
3234
map: map,
3335
packages: packages
3436
};

typings.json

100644100755
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
{
2+
"globalDependencies": {
3+
"core-js": "registry:dt/core-js#0.0.0+20160725163759",
4+
"jasmine": "registry:dt/jasmine#2.2.0+20160621224255",
5+
"node": "registry:dt/node#6.0.0+20160909174046"
6+
},
27
"ambientDependencies": {
38
"es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654",
49
"jasmine": "registry:dt/jasmine#2.2.0+20160412134438",

0 commit comments

Comments
 (0)