Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit 3b7452c

Browse files
filipesilvafilipesilva
authored
chore: update to rc6 (#202)
chore: update to rc6
1 parent 1c78664 commit 3b7452c

File tree

4 files changed

+75
-75
lines changed

4 files changed

+75
-75
lines changed

‎CHANGELOG.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
<a name="0.2.5"></a>
1+
<a name="0.2.7"></a>
2+
# 0.2.7 (2016-08-31)
3+
* Angular 2 RC6 version
4+
* Updated new forms, router, angular2-in-memory-web-api, karma, core-js, rxjs and zone.js packages
5+
* Removed router-deprecated package
6+
* Updated karma.conf.js and systemjs.config.js
7+
8+
<a name="0.2.6"></a>
29
# 0.2.6 (2016-08-09)
310
* Angular 2 RC5 version
411
* Updated new forms, router and angular2-in-memory-web-api

‎karma.conf.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ module.exports = function(config) {
3030
// Reflect and Zone.js
3131
'node_modules/reflect-metadata/Reflect.js',
3232
'node_modules/zone.js/dist/zone.js',
33+
'node_modules/zone.js/dist/long-stack-trace-zone.js',
34+
'node_modules/zone.js/dist/proxy.js',
35+
'node_modules/zone.js/dist/sync-test.js',
36+
'node_modules/zone.js/dist/jasmine-patch.js',
3337
'node_modules/zone.js/dist/async-test.js',
3438
'node_modules/zone.js/dist/fake-async-test.js',
35-
'node_modules/zone.js/dist/sync-test.js',
36-
'node_modules/zone.js/dist/proxy.js',
3739

3840
// RxJs.
3941
{ pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false },

‎package.json

+14-15
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,23 @@
2222
"author": "",
2323
"license": "ISC",
2424
"dependencies": {
25-
"@angular/common": "2.0.0-rc.5",
26-
"@angular/compiler": "2.0.0-rc.5",
27-
"@angular/core": "2.0.0-rc.5",
28-
"@angular/forms": "0.3.0",
29-
"@angular/http": "2.0.0-rc.5",
30-
"@angular/platform-browser": "2.0.0-rc.5",
31-
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
32-
"@angular/router": "3.0.0-rc.1",
33-
"@angular/router-deprecated": "2.0.0-rc.2",
34-
"@angular/upgrade": "2.0.0-rc.5",
25+
"@angular/common": "2.0.0-rc.6",
26+
"@angular/compiler": "2.0.0-rc.6",
27+
"@angular/core": "2.0.0-rc.6",
28+
"@angular/forms": "2.0.0-rc.6",
29+
"@angular/http": "2.0.0-rc.6",
30+
"@angular/platform-browser": "2.0.0-rc.6",
31+
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
32+
"@angular/router": "3.0.0-rc.2",
33+
"@angular/upgrade": "2.0.0-rc.6",
3534

3635
"systemjs": "0.19.27",
37-
"core-js": "^2.4.0",
36+
"core-js": "^2.4.1",
3837
"reflect-metadata": "^0.1.3",
39-
"rxjs": "5.0.0-beta.6",
40-
"zone.js": "^0.6.12",
38+
"rxjs": "5.0.0-beta.11",
39+
"zone.js": "^0.6.17",
4140

42-
"angular2-in-memory-web-api": "0.0.15",
41+
"angular2-in-memory-web-api": "0.0.18",
4342
"bootstrap": "^3.3.6"
4443
},
4544
"devDependencies": {
@@ -53,7 +52,7 @@
5352
"tslint": "^3.7.4",
5453
"lodash": "^4.11.1",
5554
"jasmine-core": "~2.4.1",
56-
"karma": "^0.13.22",
55+
"karma": "^1.2.0",
5756
"karma-chrome-launcher": "^0.2.3",
5857
"karma-cli": "^0.1.2",
5958
"karma-htmlfile-reporter": "^0.2.2",

‎systemjs.config.js

+49-57
Original file line numberDiff line numberDiff line change
@@ -2,61 +2,53 @@
22
* System configuration for Angular 2 samples
33
* Adjust as necessary for your application needs.
44
*/
5-
(function(global) {
6-
7-
// map tells the System loader where to look for things
8-
var map = {
9-
'app': 'app', // 'dist',
10-
11-
'@angular': 'node_modules/@angular',
12-
'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api',
13-
'rxjs': 'node_modules/rxjs'
14-
};
15-
16-
// packages tells the System loader how to load when no filename and/or no extension
17-
var packages = {
18-
'app': { main: 'main.js', defaultExtension: 'js' },
19-
'rxjs': { defaultExtension: 'js' },
20-
'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
21-
};
22-
23-
var ngPackageNames = [
24-
'common',
25-
'compiler',
26-
'core',
27-
'forms',
28-
'http',
29-
'platform-browser',
30-
'platform-browser-dynamic',
31-
'router',
32-
'router-deprecated',
33-
'upgrade',
34-
];
35-
36-
// Individual files (~300 requests):
37-
function packIndex(pkgName) {
38-
packages['@angular/'+pkgName] = { main: 'index.js', defaultExtension: 'js' };
39-
}
40-
41-
// Bundled (~40 requests):
42-
function packUmd(pkgName) {
43-
packages['@angular/'+pkgName] = { main: '/bundles/' + pkgName + '.umd.js', defaultExtension: 'js' };
44-
}
45-
46-
// Most environments should use UMD; some (Karma) need the individual index files
47-
var setPackageConfig = System.packageWithIndex ? packIndex : packUmd;
48-
49-
// Add package entries for angular packages
50-
ngPackageNames.forEach(setPackageConfig);
51-
52-
// No umd for router yet
53-
packages['@angular/router'] = { main: 'index.js', defaultExtension: 'js' };
54-
55-
var config = {
56-
map: map,
57-
packages: packages
58-
};
59-
60-
System.config(config);
61-
5+
(function (global) {
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+
16+
// angular bundles
17+
'@angular/core': 'npm:@angular/core/bundles/core.umd.js',
18+
'@angular/common': 'npm:@angular/common/bundles/common.umd.js',
19+
'@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
20+
'@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
21+
'@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
22+
'@angular/http': 'npm:@angular/http/bundles/http.umd.js',
23+
'@angular/router': 'npm:@angular/router/bundles/router.umd.js',
24+
'@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
25+
26+
// angular testing umd bundles
27+
'@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js',
28+
'@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js',
29+
'@angular/compiler/testing': 'npm:@angular/compiler/bundles/compiler-testing.umd.js',
30+
'@angular/platform-browser/testing': 'npm:@angular/platform-browser/bundles/platform-browser-testing.umd.js',
31+
'@angular/platform-browser-dynamic/testing': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
32+
'@angular/http/testing': 'npm:@angular/http/bundles/http-testing.umd.js',
33+
'@angular/router/testing': 'npm:@angular/router/bundles/router-testing.umd.js',
34+
'@angular/forms/testing': 'npm:@angular/forms/bundles/forms-testing.umd.js',
35+
36+
// other libraries
37+
'rxjs': 'npm:rxjs',
38+
'angular2-in-memory-web-api': 'npm:angular2-in-memory-web-api',
39+
},
40+
// packages tells the System loader how to load when no filename and/or no extension
41+
packages: {
42+
app: {
43+
main: './main.js',
44+
defaultExtension: 'js'
45+
},
46+
rxjs: {
47+
defaultExtension: 'js'
48+
},
49+
'angular2-in-memory-web-api': {
50+
defaultExtension: 'js'
51+
}
52+
}
53+
});
6254
})(this);

0 commit comments

Comments
 (0)