Skip to content

Commit f23bce3

Browse files
jelbournjelbourn
committed
update to latest cli over rc0
1 parent 722a455 commit f23bce3

7 files changed

+171
-193
lines changed

‎angular-cli-build.js

+11-12
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,24 @@ module.exports = function(defaults) {
2020
'src/core/style'
2121
]
2222
},
23-
vendorNpmFiles: []
23+
vendorNpmFiles: [
24+
'systemjs/dist/system-polyfills.js',
25+
'systemjs/dist/system.src.js',
26+
'zone.js/dist/*.js',
27+
'es6-shim/es6-shim.js',
28+
'reflect-metadata/*.js',
29+
'rxjs/**/*.js',
30+
'@angular/**/*.js',
31+
]
2432
});
2533

26-
const ngTree = angularAppTree.toTree();
27-
const ngNewPackagesRelease = new Funnel('node_modules/@angular', {destDir: '@angular'});
28-
const rxjs = new Funnel('node_modules/rxjs', {destDir: 'rxjs'});
29-
const zonejs = new Funnel('node_modules/zone.js', {destDir: 'zonejs'});
30-
const reflectMetadata = new Funnel('node_modules/reflect-metadata', {destDir: 'reflect-metadata'});
31-
const cssAutoprefixed = autoPrefixerTree(new Funnel(ngTree, {
34+
const cssAutoprefixed = autoPrefixerTree(new Funnel(angularAppTree, {
3235
include: [ '**/*.css' ]
3336
}));
3437

3538
return new MergeTree([
3639
new Funnel('src', { include: ['**/*.scss']}),
37-
angularAppTree.toTree(),
40+
angularAppTree,
3841
cssAutoprefixed,
39-
ngNewPackagesRelease,
40-
rxjs,
41-
zonejs,
42-
reflectMetadata,
4342
], { overwrite: true });
4443
};

‎angular-cli.json

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"project": {
3+
"version": "0.0.37",
4+
"name": "material2"
5+
},
6+
"apps": [
7+
{"main": "src/main.ts", "tsconfig": "src/tsconfig.json"}
8+
],
9+
"addons": [],
10+
"packages": [],
11+
"e2e": {
12+
"protractor": {
13+
"config": "test/protractor.conf.js"
14+
}
15+
},
16+
"test": {
17+
"karma": {
18+
"config": "test/karma.conf.js"
19+
}
20+
},
21+
"defaults": {
22+
"prefix": "",
23+
"sourceDir": "src"
24+
}
25+
}

‎package.json

+8-9
Original file line numberDiff line numberDiff line change
@@ -32,45 +32,44 @@
3232
"@angular/http": "2.0.0-rc.0",
3333
"@angular/platform-browser": "2.0.0-rc.0",
3434
"@angular/platform-browser-dynamic": "2.0.0-rc.0",
35-
3635
"es6-promise": "^3.0.2",
3736
"es6-shim": "^0.35.0",
38-
"reflect-metadata": "0.1.2",
37+
"reflect-metadata": "0.1.3",
3938
"rxjs": "5.0.0-beta.6",
4039
"systemjs": "0.19.26",
4140
"zone.js": "0.6.12"
4241
},
4342
"devDependencies": {
4443
"add-stream": "^1.0.0",
45-
"angular-cli": "^0.0.31",
44+
"angular-cli": "0.0.37",
4645
"broccoli-autoprefixer": "^4.1.0",
4746
"broccoli-funnel": "^1.0.1",
4847
"broccoli-merge-trees": "^1.1.1",
4948
"browserstacktunnel-wrapper": "^1.4.2",
5049
"conventional-changelog": "^1.1.0",
51-
"ember-cli-inject-live-reload": "^1.3.0",
50+
"ember-cli-inject-live-reload": "^1.4.0",
5251
"firebase-tools": "^2.2.1",
5352
"fs-extra": "^0.26.5",
5453
"glob": "^6.0.4",
5554
"gulp": "^3.9.1",
5655
"gulp-inline-ng2-template": "^1.1.2",
57-
"jasmine-core": "^2.3.4",
56+
"jasmine-core": "^2.4.1",
5857
"js-yaml": "^3.5.2",
5958
"karma": "^0.13.15",
6059
"karma-browserstack-launcher": "^0.1.7",
61-
"karma-chrome-launcher": "^0.2.1",
60+
"karma-chrome-launcher": "^0.2.3",
6261
"karma-firefox-launcher": "^0.1.7",
63-
"karma-jasmine": "^0.3.6",
62+
"karma-jasmine": "^0.3.8",
6463
"karma-sauce-launcher": "^0.2.14",
6564
"node-sass": "^3.4.2",
66-
"protractor": "^3.1.1",
65+
"protractor": "^3.3.0",
6766
"sass": "^0.5.0",
6867
"strip-ansi": "^3.0.0",
6968
"symlink-or-copy": "^1.0.1",
7069
"ts-node": "^0.5.5",
7170
"tslint": "^3.5.0",
7271
"typescript": "^1.8.0",
73-
"typings": "^0.6.8",
72+
"typings": "^0.8.1",
7473
"which": "^1.2.4"
7574
}
7675
}

‎src/index.html

+10-58
Original file line numberDiff line numberDiff line change
@@ -5,78 +5,30 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1">
66
<title>Material2</title>
77
<base href="/">
8-
<script src="vendor/es6-shim/es6-shim.js"></script>
9-
<script src="vendor/systemjs/dist/system-polyfills.js"></script>
10-
<script src="zonejs/dist/zone.js"></script>
11-
<script src="reflect-metadata/Reflect.js"></script>
128
{{content-for 'head'}}
139
<link rel="icon" type="image/x-icon" href="favicon.ico">
1410
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
1511
<link href="main.css" rel="stylesheet">
12+
1613
<!-- FontAwesome for md-icon demo. -->
1714
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
1815
</head>
1916
<body>
2017
<demo-app>Loading...</demo-app>
2118

19+
<script src="vendor/es6-shim/es6-shim.js"></script>
20+
<script src="vendor/reflect-metadata/Reflect.js"></script>
21+
<script src="vendor/systemjs/dist/system-polyfills.js"></script>
22+
<script src="vendor/zone.js/dist/zone.js"></script>
2223
<script src="vendor/systemjs/dist/system.src.js"></script>
23-
<script src="rxjs/bundles/Rx.js"></script>
2424

25+
<!-- HammerJS for gestures -->
2526
<script src="https://ajax.googleapis.com/ajax/libs/hammerjs/2.0.8/hammer.min.js"></script>
27+
2628
<script>
27-
System.config({
28-
packages: {
29-
'demo-app': {
30-
format: 'cjs',
31-
defaultExtension: 'js'
32-
},
33-
'components': {
34-
format: 'cjs',
35-
defaultExtension: 'js'
36-
},
37-
'core': {
38-
format: 'cjs',
39-
defaultExtension: 'js'
40-
},
41-
'@angular/core': {
42-
format: 'cjs',
43-
defaultExtension: 'js',
44-
main: 'index.js'
45-
},
46-
'@angular/compiler': {
47-
format: 'cjs',
48-
defaultExtension: 'js',
49-
main: 'index.js'
50-
},
51-
'@angular/common': {
52-
format: 'cjs',
53-
defaultExtension: 'js',
54-
main: 'index.js'
55-
},
56-
'@angular/platform-browser': {
57-
format: 'cjs',
58-
defaultExtension: 'js',
59-
main: 'index.js'
60-
},
61-
'@angular/platform-browser-dynamic': {
62-
format: 'cjs',
63-
defaultExtension: 'js',
64-
main: 'index.js'
65-
},
66-
'@angular/http': {
67-
format: 'cjs',
68-
defaultExtension: 'js',
69-
main: 'http.js',
70-
main: 'index.js'
71-
},
72-
'@angular/router': {
73-
format: 'cjs',
74-
defaultExtension: 'js',
75-
main: 'index.js'
76-
}
77-
}
78-
});
79-
System.import('main.js').then(null, console.error.bind(console));
29+
System.import('system-config.js').then(function () {
30+
System.import('main');
31+
}).catch(console.error.bind(console));
8032
</script>
8133
</body>
8234
</html>

‎src/system-config.ts

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/***********************************************************************************************
2+
* User Configuration.
3+
**********************************************************************************************/
4+
/** Map relative paths to URLs. */
5+
const map: any = {
6+
};
7+
8+
/** User packages configuration. */
9+
const packages: any = {
10+
'demo-app': {
11+
format: 'cjs',
12+
defaultExtension: 'js'
13+
},
14+
'components': {
15+
format: 'cjs',
16+
defaultExtension: 'js'
17+
},
18+
'core': {
19+
format: 'cjs',
20+
defaultExtension: 'js'
21+
},
22+
};
23+
24+
////////////////////////////////////////////////////////////////////////////////////////////////
25+
/***********************************************************************************************
26+
* Everything underneath this line is managed by the CLI.
27+
**********************************************************************************************/
28+
const barrels: string[] = [
29+
// Angular specific barrels.
30+
'@angular/core',
31+
'@angular/common',
32+
'@angular/compiler',
33+
'@angular/http',
34+
'@angular/router',
35+
'@angular/platform-browser',
36+
'@angular/platform-browser-dynamic',
37+
38+
// Thirdparty barrels.
39+
'rxjs',
40+
41+
// App specific barrels.
42+
'app',
43+
'app/shared',
44+
/** @cli-barrel */
45+
];
46+
47+
const _cliSystemConfig = {};
48+
barrels.forEach((barrelName: string) => {
49+
(<any> _cliSystemConfig)[barrelName] = { main: 'index' };
50+
});
51+
52+
/** Type declaration for ambient System. */
53+
declare var System: any;
54+
55+
// Apply the CLI SystemJS configuration.
56+
System.config({
57+
map: {
58+
'@angular': 'vendor/@angular',
59+
'rxjs': 'vendor/rxjs',
60+
'main': 'main.js'
61+
},
62+
packages: _cliSystemConfig
63+
});
64+
65+
// Apply the user's configuration.
66+
System.config({ map, packages });

0 commit comments

Comments
 (0)