Skip to content

Commit

Permalink
update to latest cli over rc0
Browse files Browse the repository at this point in the history
  • Loading branch information
jelbourn committed May 4, 2016
1 parent 722a455 commit ca1dbfa
Show file tree
Hide file tree
Showing 8 changed files with 171 additions and 193 deletions.
23 changes: 11 additions & 12 deletions angular-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,24 @@ module.exports = function(defaults) {
'src/core/style'
]
},
vendorNpmFiles: []
vendorNpmFiles: [
'systemjs/dist/system-polyfills.js',
'systemjs/dist/system.src.js',
'zone.js/dist/*.js',
'es6-shim/es6-shim.js',
'reflect-metadata/*.js',
'rxjs/**/*.js',
'@angular/**/*.js',
]
});

const ngTree = angularAppTree.toTree();
const ngNewPackagesRelease = new Funnel('node_modules/@angular', {destDir: '@angular'});
const rxjs = new Funnel('node_modules/rxjs', {destDir: 'rxjs'});
const zonejs = new Funnel('node_modules/zone.js', {destDir: 'zonejs'});
const reflectMetadata = new Funnel('node_modules/reflect-metadata', {destDir: 'reflect-metadata'});
const cssAutoprefixed = autoPrefixerTree(new Funnel(ngTree, {
const cssAutoprefixed = autoPrefixerTree(new Funnel(angularAppTree, {
include: [ '**/*.css' ]
}));

return new MergeTree([
new Funnel('src', { include: ['**/*.scss']}),
angularAppTree.toTree(),
angularAppTree,
cssAutoprefixed,
ngNewPackagesRelease,
rxjs,
zonejs,
reflectMetadata,
], { overwrite: true });
};
25 changes: 25 additions & 0 deletions angular-cli.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"project": {
"version": "0.0.37",
"name": "material2"
},
"apps": [
{"main": "src/main.ts", "tsconfig": "src/tsconfig.json"}
],
"addons": [],
"packages": [],
"e2e": {
"protractor": {
"config": "test/protractor.conf.js"
}
},
"test": {
"karma": {
"config": "test/karma.conf.js"
}
},
"defaults": {
"prefix": "",
"sourceDir": "src"
}
}
17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,45 +32,44 @@
"@angular/http": "2.0.0-rc.0",
"@angular/platform-browser": "2.0.0-rc.0",
"@angular/platform-browser-dynamic": "2.0.0-rc.0",

"es6-promise": "^3.0.2",
"es6-shim": "^0.35.0",
"reflect-metadata": "0.1.2",
"reflect-metadata": "0.1.3",
"rxjs": "5.0.0-beta.6",
"systemjs": "0.19.26",
"zone.js": "0.6.12"
},
"devDependencies": {
"add-stream": "^1.0.0",
"angular-cli": "^0.0.31",
"angular-cli": "0.0.37",
"broccoli-autoprefixer": "^4.1.0",
"broccoli-funnel": "^1.0.1",
"broccoli-merge-trees": "^1.1.1",
"browserstacktunnel-wrapper": "^1.4.2",
"conventional-changelog": "^1.1.0",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-inject-live-reload": "^1.4.0",
"firebase-tools": "^2.2.1",
"fs-extra": "^0.26.5",
"glob": "^6.0.4",
"gulp": "^3.9.1",
"gulp-inline-ng2-template": "^1.1.2",
"jasmine-core": "^2.3.4",
"jasmine-core": "^2.4.1",
"js-yaml": "^3.5.2",
"karma": "^0.13.15",
"karma-browserstack-launcher": "^0.1.7",
"karma-chrome-launcher": "^0.2.1",
"karma-chrome-launcher": "^0.2.3",
"karma-firefox-launcher": "^0.1.7",
"karma-jasmine": "^0.3.6",
"karma-jasmine": "^0.3.8",
"karma-sauce-launcher": "^0.2.14",
"node-sass": "^3.4.2",
"protractor": "^3.1.1",
"protractor": "^3.3.0",
"sass": "^0.5.0",
"strip-ansi": "^3.0.0",
"symlink-or-copy": "^1.0.1",
"ts-node": "^0.5.5",
"tslint": "^3.5.0",
"typescript": "^1.8.0",
"typings": "^0.6.8",
"typings": "^0.8.1",
"which": "^1.2.4"
}
}
Empty file added public/empty-placeholder
Empty file.
68 changes: 10 additions & 58 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,78 +5,30 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Material2</title>
<base href="/">
<script src="vendor/es6-shim/es6-shim.js"></script>
<script src="vendor/systemjs/dist/system-polyfills.js"></script>
<script src="zonejs/dist/zone.js"></script>
<script src="reflect-metadata/Reflect.js"></script>
{{content-for 'head'}}
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="main.css" rel="stylesheet">

<!-- FontAwesome for md-icon demo. -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
</head>
<body>
<demo-app>Loading...</demo-app>

<script src="vendor/es6-shim/es6-shim.js"></script>
<script src="vendor/reflect-metadata/Reflect.js"></script>
<script src="vendor/systemjs/dist/system-polyfills.js"></script>
<script src="vendor/zone.js/dist/zone.js"></script>
<script src="vendor/systemjs/dist/system.src.js"></script>
<script src="rxjs/bundles/Rx.js"></script>

<!-- HammerJS for gestures -->
<script src="https://ajax.googleapis.com/ajax/libs/hammerjs/2.0.8/hammer.min.js"></script>

<script>
System.config({
packages: {
'demo-app': {
format: 'cjs',
defaultExtension: 'js'
},
'components': {
format: 'cjs',
defaultExtension: 'js'
},
'core': {
format: 'cjs',
defaultExtension: 'js'
},
'@angular/core': {
format: 'cjs',
defaultExtension: 'js',
main: 'index.js'
},
'@angular/compiler': {
format: 'cjs',
defaultExtension: 'js',
main: 'index.js'
},
'@angular/common': {
format: 'cjs',
defaultExtension: 'js',
main: 'index.js'
},
'@angular/platform-browser': {
format: 'cjs',
defaultExtension: 'js',
main: 'index.js'
},
'@angular/platform-browser-dynamic': {
format: 'cjs',
defaultExtension: 'js',
main: 'index.js'
},
'@angular/http': {
format: 'cjs',
defaultExtension: 'js',
main: 'http.js',
main: 'index.js'
},
'@angular/router': {
format: 'cjs',
defaultExtension: 'js',
main: 'index.js'
}
}
});
System.import('main.js').then(null, console.error.bind(console));
System.import('system-config.js').then(function () {
System.import('main');
}).catch(console.error.bind(console));
</script>
</body>
</html>
66 changes: 66 additions & 0 deletions src/system-config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/***********************************************************************************************
* User Configuration.
**********************************************************************************************/
/** Map relative paths to URLs. */
const map: any = {
};

/** User packages configuration. */
const packages: any = {
'demo-app': {
format: 'cjs',
defaultExtension: 'js'
},
'components': {
format: 'cjs',
defaultExtension: 'js'
},
'core': {
format: 'cjs',
defaultExtension: 'js'
},
};

////////////////////////////////////////////////////////////////////////////////////////////////
/***********************************************************************************************
* Everything underneath this line is managed by the CLI.
**********************************************************************************************/
const barrels: string[] = [
// Angular specific barrels.
'@angular/core',
'@angular/common',
'@angular/compiler',
'@angular/http',
'@angular/router',
'@angular/platform-browser',
'@angular/platform-browser-dynamic',

// Thirdparty barrels.
'rxjs',

// App specific barrels.
'app',
'app/shared',
/** @cli-barrel */
];

const _cliSystemConfig = {};
barrels.forEach((barrelName: string) => {
(<any> _cliSystemConfig)[barrelName] = { main: 'index' };
});

/** Type declaration for ambient System. */
declare var System: any;

// Apply the CLI SystemJS configuration.
System.config({
map: {
'@angular': 'vendor/@angular',
'rxjs': 'vendor/rxjs',
'main': 'main.js'
},
packages: _cliSystemConfig
});

// Apply the user's configuration.
System.config({ map, packages });
Loading

0 comments on commit ca1dbfa

Please sign in to comment.