Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 9d5bbfc

Browse files
wardbellwardbell
committed
chore: update systemjs.configs and plunker-builder/indexHtmlTranslator for RC6
1 parent 050ef86 commit 9d5bbfc

File tree

7 files changed

+268
-255
lines changed

7 files changed

+268
-255
lines changed

‎public/docs/_examples/package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"dependencies": {
2828
"@angular/common": "2.0.0-rc.6",
2929
"@angular/compiler": "2.0.0-rc.6",
30+
"@angular/compiler-cli": "0.6.0",
3031
"@angular/core": "2.0.0-rc.6",
3132
"@angular/forms": "2.0.0-rc.6",
3233
"@angular/http": "2.0.0-rc.6",
@@ -54,14 +55,14 @@
5455
"html-webpack-plugin": "^2.16.1",
5556
"http-server": "^0.9.0",
5657
"jasmine-core": "^2.4.1",
57-
"karma": "^0.13.22",
58-
"karma-chrome-launcher": "^1.0.1",
59-
"karma-cli": "^1.0.0",
60-
"karma-htmlfile-reporter": "^0.3.1",
58+
"karma": "^1.2.0",
59+
"karma-chrome-launcher": "^2.0.0",
60+
"karma-cli": "^1.0.1",
61+
"karma-htmlfile-reporter": "^0.3.4",
6162
"karma-jasmine": "^1.0.2",
62-
"karma-phantomjs-launcher": "^1.0.0",
63+
"karma-phantomjs-launcher": "^1.0.2",
6364
"karma-sourcemap-loader": "^0.3.7",
64-
"karma-webpack": "^1.7.0",
65+
"karma-webpack": "^1.8.0",
6566
"lite-server": "^2.2.2",
6667
"lodash": "^4.13.1",
6768
"null-loader": "^0.1.1",

‎public/docs/_examples/quickstart/ts/package.1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"dependencies": {
1414
"@angular/common": "2.0.0-rc.6",
1515
"@angular/compiler": "2.0.0-rc.6",
16-
"@angular/compiler-cli": "0.5.0",
16+
"@angular/compiler-cli": "0.6.0",
1717
"@angular/core": "2.0.0-rc.6",
1818
"@angular/forms": "2.0.0-rc.6",
1919
"@angular/http": "2.0.0-rc.6",

‎public/docs/_examples/quickstart/ts/systemjs.config.1.js

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

‎public/docs/_examples/systemjs.config.js

Lines changed: 50 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,54 @@
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' };
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-
var config = {
53-
map: map,
54-
packages: packages
55-
};
56-
57-
System.config(config);
58-
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+
main: './index.js',
51+
defaultExtension: 'js'
52+
}
53+
}
54+
});
5955
})(this);

0 commit comments

Comments
 (0)