diff --git a/client/app/components/components.js b/client/app/components/components.js index 65a41f47..c001313f 100644 --- a/client/app/components/components.js +++ b/client/app/components/components.js @@ -1,12 +1,10 @@ import angular from 'angular'; import Home from './home/home'; import About from './about/about'; -import Test from './test/test'; let componentModule = angular.module('app.components', [ Home, - About, - Test + About ]) .name; diff --git a/karma.conf.js b/karma.conf.js index f40c1c6c..d20e60d0 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -31,8 +31,8 @@ module.exports = function (config) { module: { loaders: [ { test: /\.js/, exclude: [/app\/lib/, /node_modules/], loader: 'babel' }, - { test: /\.html/, loader: 'raw' }, - { test: /\.styl$/, loader: 'style!css!stylus' }, + { test: /\.html$/, loader: 'raw' }, + { test: /\.(scss|sass)$/, loader: 'style!css!sass' }, { test: /\.css$/, loader: 'style!css' } ] } diff --git a/package.json b/package.json index 36d3c485..033294b1 100644 --- a/package.json +++ b/package.json @@ -40,8 +40,10 @@ "mocha": "^2.3.0", "ng-annotate-loader": "0.0.10", "node-libs-browser": "^0.5.0", + "node-sass": "^3.13.0", "raw-loader": "^0.5.1", "run-sequence": "^1.1.0", + "sass-loader": "^4.0.2", "style-loader": "^0.12.2", "supports-color": "^3.1.2", "webpack": "^1.13.3",