build: upgrade material to latest version of angular-cli

angular-cli-build.js

@@ -0,0 +1,36 @@
+'use strict';
+const fs = require('fs');
+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/',
+    sassCompiler: {
+      includePaths: [
+        'src/core/style'
+      ]
+    },
+    vendorNpmFiles: []
+  });
+
+  const ngTree = angularAppTree.toTree();
+  const cssAutoprefixed = autoPrefixerTree(new Funnel(ngTree, {
+    include: [ '**/*.css' ]
+  }));
+
+  return new MergeTree([
+    new Funnel('src', { include: ['**/*.scss']}),
+    angularAppTree.toTree(),
+    cssAutoprefixed
+  ], { overwrite: true });
+};

e2e/tsconfig.json

@@ -3,6 +3,7 @@
     "declaration": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "inlineSources": true,
     "mapRoot": "",
     "module": "commonjs",
     "moduleResolution": "node",
@@ -11,10 +12,10 @@
     "outDir": "../dist/e2e/",
     "rootDir": ".",
     "sourceMap": true,
-    "sourceRoot": "/",
     "target": "es5"
   },
   "files": [
+    "index.e2e.ts",
     "e2e.d.ts"
   ]
 }

package.json

@@ -34,14 +34,9 @@
   },
   "devDependencies": {
     "add-stream": "^1.0.0",
-    "angular-cli": "^0.0.28",
-    "angular-cli-github-pages": "^0.2.0",
+    "angular-cli": "^0.0.31",
     "broccoli-autoprefixer": "^4.1.0",
-    "broccoli-caching-writer": "^2.2.1",
     "broccoli-funnel": "^1.0.1",
-    "broccoli-merge-trees": "^1.1.1",
-    "broccoli-sass": "^0.7.0",
-    "broccoli-source": "^1.1.0",
     "browserstacktunnel-wrapper": "^1.4.2",
     "conventional-changelog": "^1.1.0",
     "ember-cli-inject-live-reload": "^1.3.0",
@@ -57,7 +52,9 @@
     "karma-firefox-launcher": "^0.1.7",
     "karma-jasmine": "^0.3.6",
     "karma-sauce-launcher": "^0.2.14",
+    "node-sass": "^3.4.2",
     "protractor": "^3.1.1",
+    "sass": "^0.5.0",
     "strip-ansi": "^3.0.0",
     "symlink-or-copy": "^1.0.1",
     "ts-node": "^0.5.5",

src/core/style/_elevation.scss

@@ -1,3 +1,5 @@
+@import "variables";
+
 /**
  * A collection of mixins and CSS classes that can be used to apply elevation to a material
  * element.