Skip to content

Commit 7ff5c7c

Browse files
cornflourbluecornflourblue
committed
Updated to RC.6
1 parent 683a830 commit 7ff5c7c

File tree

5 files changed

+62
-68
lines changed

5 files changed

+62
-68
lines changed

‎app/_services/authentication.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Injectable } from '@angular/core';
22
import { Http, Headers, Response } from '@angular/http';
3-
import { Observable } from 'rxjs/Observable';
3+
import { Observable } from 'rxjs';
4+
import 'rxjs/add/operator/map'
45

56
@Injectable()
67
export class AuthenticationService {

‎app/_services/user.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Injectable } from '@angular/core';
22
import { Http, Headers, RequestOptions, Response } from '@angular/http';
3-
import { Observable } from 'rxjs/Observable';
3+
import { Observable } from 'rxjs';
4+
import 'rxjs/add/operator/map'
45

56
import { AuthenticationService } from './index';
67
import { User } from '../_models/index';

‎package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,28 @@
1111
},
1212
"license": "ISC",
1313
"dependencies": {
14-
"@angular/common": "2.0.0-rc.5",
15-
"@angular/compiler": "2.0.0-rc.5",
16-
"@angular/core": "2.0.0-rc.5",
17-
"@angular/forms": "0.3.0",
18-
"@angular/http": "2.0.0-rc.5",
19-
"@angular/platform-browser": "2.0.0-rc.5",
20-
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
21-
"@angular/router": "3.0.0-rc.1",
22-
"@angular/router-deprecated": "2.0.0-rc.2",
23-
"@angular/upgrade": "2.0.0-rc.5",
24-
"systemjs": "0.19.27",
25-
"core-js": "^2.4.0",
14+
"@angular/common": "2.0.0-rc.6",
15+
"@angular/compiler": "2.0.0-rc.6",
16+
"@angular/compiler-cli": "0.6.0",
17+
"@angular/core": "2.0.0-rc.6",
18+
"@angular/forms": "2.0.0-rc.6",
19+
"@angular/http": "2.0.0-rc.6",
20+
"@angular/platform-browser": "2.0.0-rc.6",
21+
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
22+
"@angular/router": "3.0.0-rc.2",
23+
"@angular/upgrade": "2.0.0-rc.6",
24+
"core-js": "^2.4.1",
2625
"reflect-metadata": "^0.1.3",
27-
"rxjs": "5.0.0-beta.6",
28-
"zone.js": "^0.6.12",
29-
"angular2-in-memory-web-api": "0.0.15",
26+
"rxjs": "5.0.0-beta.11",
27+
"systemjs": "0.19.27",
28+
"zone.js": "^0.6.17",
29+
"angular2-in-memory-web-api": "0.0.18",
3030
"bootstrap": "^3.3.6"
3131
},
3232
"devDependencies": {
33-
"concurrently": "^2.0.0",
34-
"lite-server": "^2.2.0",
33+
"concurrently": "^2.2.0",
34+
"lite-server": "^2.2.2",
3535
"typescript": "^1.8.10",
36-
"typings": "^1.0.4"
36+
"typings": "^1.3.2"
3737
}
3838
}

‎systemjs.config.js

Lines changed: 38 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,42 @@
33
* Adjust as necessary for your application needs.
44
*/
55
(function (global) {
6-
// map tells the System loader where to look for things
7-
var map = {
8-
'app': 'app', // 'dist',
9-
'@angular': 'node_modules/@angular',
10-
'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api',
11-
'rxjs': 'node_modules/rxjs'
12-
};
13-
// packages tells the System loader how to load when no filename and/or no extension
14-
var packages = {
15-
'app': { main: 'main.js', defaultExtension: 'js' },
16-
'rxjs': { defaultExtension: 'js' },
17-
'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
18-
};
19-
var ngPackageNames = [
20-
'common',
21-
'compiler',
22-
'core',
23-
'forms',
24-
'http',
25-
'platform-browser',
26-
'platform-browser-dynamic',
27-
'router',
28-
'router-deprecated',
29-
'upgrade',
30-
];
31-
// Individual files (~300 requests):
32-
function packIndex(pkgName) {
33-
packages['@angular/' + pkgName] = { main: 'index.js', defaultExtension: 'js' };
34-
}
35-
// Bundled (~40 requests):
36-
function packUmd(pkgName) {
37-
packages['@angular/' + pkgName] = { main: '/bundles/' + pkgName + '.umd.js', defaultExtension: 'js' };
38-
}
39-
40-
// Most environments should use UMD; some (Karma) need the individual index files
41-
// var setPackageConfig = System.packageWithIndex ? packIndex : packUmd;
42-
// use packIndex as workaround for bug with MockBackend.createConnection method - https://github.com/angular/angular/issues/9170#issuecomment-225708113
43-
var setPackageConfig = packIndex;
44-
45-
// Add package entries for angular packages
46-
ngPackageNames.forEach(setPackageConfig);
47-
var config = {
48-
map: map,
49-
packages: packages
50-
};
51-
System.config(config);
6+
System.config({
7+
paths: {
8+
// paths serve as alias
9+
'npm:': 'node_modules/'
10+
},
11+
// map tells the System loader where to look for things
12+
map: {
13+
// our app is within the app folder
14+
app: 'app',
15+
// angular bundles
16+
'@angular/core': 'npm:@angular/core/bundles/core.umd.js',
17+
'@angular/common': 'npm:@angular/common/bundles/common.umd.js',
18+
'@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
19+
'@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
20+
'@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
21+
'@angular/http': 'npm:@angular/http/bundles/http.umd.js',
22+
'@angular/http/testing': 'npm:@angular/http/bundles/http-testing.umd.js',
23+
'@angular/router': 'npm:@angular/router/bundles/router.umd.js',
24+
'@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
25+
// other libraries
26+
'rxjs': 'npm:rxjs',
27+
'angular2-in-memory-web-api': 'npm:angular2-in-memory-web-api',
28+
},
29+
// packages tells the System loader how to load when no filename and/or no extension
30+
packages: {
31+
app: {
32+
main: './main.js',
33+
defaultExtension: 'js'
34+
},
35+
rxjs: {
36+
defaultExtension: 'js'
37+
},
38+
'angular2-in-memory-web-api': {
39+
main: './index.js',
40+
defaultExtension: 'js'
41+
}
42+
}
43+
});
5244
})(this);

‎typings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"globalDependencies": {
3-
"core-js": "registry:dt/core-js#0.0.0+20160602141332",
3+
"core-js": "registry:dt/core-js#0.0.0+20160725163759",
44
"jasmine": "registry:dt/jasmine#2.2.0+20160621224255",
5-
"node": "registry:dt/node#6.0.0+20160621231320"
5+
"node": "registry:dt/node#6.0.0+20160831021119"
66
}
77
}

0 commit comments

Comments
 (0)