Permalink
Browse files

switched to angular cli 1.0.0-beta.6

  • Loading branch information...
1 parent c054e9e commit 2729ddb016c1ecb4e5888b2218345214a200aa2f @mseemann committed Jun 16, 2016
View
@@ -1,4 +1,4 @@
-# http://editorconfig.org
+# Editor configuration, see http://editorconfig.org
root = true
[*]
@@ -15,6 +15,9 @@ function _buildE2EAppInputTree() {
new Funnel('src', {
include: ['components/**/*'],
destDir: 'src'
+ }),
+ new Funnel('src/e2e-app', {
+ destDir: 'src/e2e-app'
})
]);
}
@@ -36,7 +39,7 @@ module.exports = function(defaults) {
'systemjs/dist/system.src.js',
'zone.js/dist/**/*.+(js|js.map)',
'es6-shim/es6-shim.js',
- 'reflect-metadata/**/*.+(js|js.map)',
+ 'reflect-metadata/**/*.+(ts|js|js.map)',
'rxjs/**/*.+(js|js.map)',
'@angular/**/*.+(js|js.map)'
]
View
@@ -1,6 +1,6 @@
{
"project": {
- "version": "1.0.0-beta.5",
+ "version": "1.0.0-beta.6",
"name": "angular2-mdl"
},
"apps": [
@@ -26,6 +26,7 @@
"prefix": "app",
"sourceDir": "src",
"styleExt": "css",
- "prefixInterfaces": false
+ "prefixInterfaces": false,
+ "lazyRoutePrefix": "+"
}
}
@@ -1,3 +1,6 @@
+// Angular-CLI server configuration
+// Unrelated to environment.dev|prod.ts
+
/* jshint node: true */
module.exports = function(environment) {
@@ -46,6 +46,7 @@ System.import('system-config.js').then(function() {
// This will run the tests directly.
return Promise.all(
allSpecFiles.map(function (moduleName) {
+ console.log(moduleName);
return System.import(moduleName);
}));
}).then(__karma__.start, __karma__.error);
View
@@ -32,7 +32,7 @@
"zone.js": "^0.6.12"
},
"devDependencies": {
- "angular-cli": "^1.0.0-beta.5",
+ "angular-cli": "^1.0.0-beta.6",
"broccoli-funnel": "^1.0.1",
"broccoli-merge-trees": "^1.1.1",
"codelyzer": "0.0.19",
@@ -6,7 +6,7 @@ import {
inject
} from '@angular/core/testing';
-import { Angular2MdlAppComponent } from './angular2-mdl.component';
+import { Angular2MdlAppComponent } from './app.component';
import { APP_ROUTER_PROVIDERS } from './app.routes';
beforeEachProviders(() => [Angular2MdlAppComponent, ...APP_ROUTER_PROVIDERS]);
@@ -38,9 +38,9 @@ export const AppRoutes = [
@Component({
moduleId: module.id,
- selector: 'angular2-mdl-app',
- templateUrl: 'angular2-mdl.component.html',
- styleUrls: ['angular2-mdl.component.css'],
+ selector: 'root-app',
+ templateUrl: 'app.component.html',
+ styleUrls: ['app.component.css'],
directives: [
ROUTER_DIRECTIVES,
MDL_DIRECTIVES
@@ -1,6 +1,6 @@
import { provideRouter, RouterConfig } from '@angular/router';
-import { AppRoutes } from './angular2-mdl.component';
+import { AppRoutes } from './app.component';
const routes: RouterConfig = [
...AppRoutes
View
@@ -1,3 +1,3 @@
export * from './environment';
-export * from './angular2-mdl.component';
+export * from './app.component';
export * from './app.routes';
View
@@ -13,7 +13,7 @@
<link rel="icon" type="image/x-icon" href="favicon.ico">
</head>
<body>
- <angular2-mdl-app>Loading...</angular2-mdl-app>
+ <root-app>Loading...</root-app>
{{#each scripts.polyfills}}<script src="{{.}}"></script>{{/each}}

0 comments on commit 2729ddb

Please sign in to comment.