build: separate demo-app in its own directory.

Author: hansl

.gitignore

@@ -25,6 +25,7 @@
 /.idea
 
 # misc
+.DS_Store
 /.sass-cache
 /connect.lock
 /coverage/*

angular-cli-build.js

@@ -5,16 +5,56 @@ const path = require('path');
 // Import the require hook. Enables us to require TS files natively.
 require('ts-node/register');
 
-
 const Angular2App = require('angular-cli/lib/broccoli/angular2-app');
 const Funnel = require('broccoli-funnel');
 const MergeTree = require('broccoli-merge-trees');
 const autoPrefixerTree = require('broccoli-autoprefixer');
 
 
 module.exports = function(defaults) {
-  var angularAppTree = new Angular2App(defaults, {
-    sourceDir: 'src/',
+  // The Angular Application tree.
+  const appTree = _buildAppTree(defaults);
+
+  // The CSS tree that is auto prefixed with browser support.
+  const cssAutoprefixed = autoPrefixerTree(new Funnel(appTree, {
+    include: [ '**/*.css' ]
+  }));
+
+  return new MergeTree([appTree, cssAutoprefixed], { overwrite: true });
+};
+
+
+/**
+ * Build the Broccoli Tree containing all the files used as the input to the Angular2App.
+ */
+function _buildDemoAppInputTree() {
+  return new MergeTree([
+    new Funnel('typings', {
+      destDir: 'typings'
+    }),
+    new Funnel('src', {
+      include: ['components/**/*', 'core/**/*'],
+      destDir: 'src/demo-app'
+    }),
+    new Funnel('src/demo-app', {
+      destDir: 'src/demo-app'
+    })
+  ]);
+}
+
+/**
+ * Build the Broccoli Tree that contains the Angular2 App. This picks between E2E, Example or Demo
+ * app.
+ * @param defaults The default objects from AngularCLI (deprecated).
+ * @returns {Angular2App}
+ */
+function _buildAppTree(defaults) {
+  let inputNode = _buildDemoAppInputTree();
+
+  return new Angular2App(defaults, inputNode, {
+    sourceDir: 'src/demo-app',
+    tsCompiler: {
+    },
     sassCompiler: {
       includePaths: [
         'src/core/style'
@@ -27,17 +67,7 @@ module.exports = function(defaults) {
       'es6-shim/es6-shim.js',
       'reflect-metadata/*.js',
       'rxjs/**/*.js',
-      '@angular/**/*.js',
+      '@angular/**/*.js'
     ]
   });
-
-  const cssAutoprefixed = autoPrefixerTree(new Funnel(angularAppTree, {
-    include: [ '**/*.css' ]
-  }));
-
-  return new MergeTree([
-    new Funnel('src', { include: ['**/*.scss']}),
-    angularAppTree,
-    cssAutoprefixed,
-  ], { overwrite: true });
-};
+}

config/environment.dev.ts

@@ -0,0 +1,3 @@
+export const environment = {
+  production: false
+};

config/environment.prod.ts

@@ -0,0 +1,3 @@
+export const environment = {
+  production: true
+};

package.json

@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "add-stream": "^1.0.0",
-    "angular-cli": "0.0.37",
+    "angular-cli": "^1.0.0-beta.4",
     "broccoli-autoprefixer": "^4.1.0",
     "broccoli-funnel": "^1.0.1",
     "broccoli-merge-trees": "^1.1.1",
@@ -68,7 +68,7 @@
     "symlink-or-copy": "^1.0.1",
     "ts-node": "^0.5.5",
     "tslint": "^3.5.0",
-    "typescript": "^1.8.0",
+    "typescript": "^1.9.0-dev",
     "typings": "^0.8.1",
     "which": "^1.2.4"
   }

src/components/button/button.ts

@@ -14,6 +14,7 @@ import {
 
 
 @Component({
+  moduleId: module.id,
   selector: 'button[md-button], button[md-raised-button], button[md-icon-button], ' +
             'button[md-fab], button[md-mini-fab]',
   inputs: ['color'],
@@ -23,8 +24,8 @@ import {
     '(focus)': 'setKeyboardFocus()',
     '(blur)': 'removeKeyboardFocus()',
   },
-  templateUrl: './components/button/button.html',
-  styleUrls: ['./components/button/button.css'],
+  templateUrl: 'button.html',
+  styleUrls: ['button.css'],
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
@@ -81,6 +82,7 @@ export class MdButton {
 }
 
 @Component({
+  moduleId: module.id,
   selector: 'a[md-button], a[md-raised-button], a[md-icon-button], a[md-fab], a[md-mini-fab]',
   inputs: ['color'],
   host: {
@@ -90,8 +92,8 @@ export class MdButton {
     '(blur)': 'removeKeyboardFocus()',
     '(click)': 'haltDisabledEvents($event)',
   },
-  templateUrl: './components/button/button.html',
-  styleUrls: ['./components/button/button.css'],
+  templateUrl: 'button.html',
+  styleUrls: ['button.css'],
   encapsulation: ViewEncapsulation.None
 })
 export class MdAnchor extends MdButton {

src/components/card/card.ts

@@ -21,9 +21,10 @@ it also provides a number of preset styles for common card sections, including:
 */
 
 @Component({
+  moduleId: module.id,
   selector: 'md-card',
-  templateUrl: './components/card/card.html',
-  styleUrls: ['./components/card/card.css'],
+  templateUrl: 'card.html',
+  styleUrls: ['card.css'],
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
@@ -45,8 +46,9 @@ TODO(kara): update link to demo site when it exists
 */
 
 @Component({
+  moduleId: module.id,
   selector: 'md-card-header',
-  templateUrl: './components/card/card-header.html',
+  templateUrl: 'card-header.html',
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
@@ -64,8 +66,9 @@ TODO(kara): update link to demo site when it exists
 */
 
 @Component({
+  moduleId: module.id,
   selector: 'md-card-title-group',
-  templateUrl: './components/card/card-title-group.html',
+  templateUrl: 'card-title-group.html',
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })

src/components/checkbox/checkbox.spec.ts

@@ -4,7 +4,7 @@ import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'
 import {Component, DebugElement} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {MdCheckbox} from './checkbox';
-import {PromiseCompleter} from '../../core/async/promise-completer';
+import {PromiseCompleter} from '@angular2-material/core/async/promise-completer';
 
 // TODO: Implement E2E tests for spacebar/click behavior for checking/unchecking
 

src/components/checkbox/checkbox.ts

@@ -53,9 +53,10 @@ enum TransitionCheckState {
  * See: https://www.google.com/design/spec/components/selection-controls.html
  */
 @Component({
+  moduleId: module.id,
   selector: 'md-checkbox',
-  templateUrl: './components/checkbox/checkbox.html',
-  styleUrls: ['./components/checkbox/checkbox.css'],
+  templateUrl: 'checkbox.html',
+  styleUrls: ['checkbox.css'],
   host: {
     '[class.md-checkbox-indeterminate]': 'indeterminate',
     '[class.md-checkbox-checked]': 'checked',

src/components/grid-list/grid-list-errors.ts

@@ -1,4 +1,4 @@
-import {MdError} from '../../core/errors/error';
+import {MdError} from '@angular2-material/core/errors/error';
 
 /**
  * Exception thrown when cols property is missing from grid-list