build(aio): switch local angular-cli to @angular/cli

karma.conf merge with angular cli change
This commit is contained in:
Ward Bell 2017-02-02 16:04:25 -08:00 committed by Igor Minar
parent 6e2c9cb586
commit 20a7e26d1e
3 changed files with 175 additions and 432 deletions

View File

@ -3,18 +3,18 @@
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', 'angular-cli'],
frameworks: ['jasmine', '@angular/cli'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-remap-istanbul'),
require('angular-cli/plugins/karma')
require('@angular/cli/plugins/karma')
],
files: [
{ pattern: './src/test.ts', watched: false }
],
preprocessors: {
'./src/test.ts': ['angular-cli']
'./src/test.ts': ['@angular/cli']
},
mime: {
'text/x-typescript': ['ts','tsx']

View File

@ -20,6 +20,7 @@
},
"private": true,
"dependencies": {
"@angular/cli": "^1.0.0-beta.29",
"@angular/common": "^2.3.1",
"@angular/compiler": "^2.3.1",
"@angular/core": "^2.3.1",
@ -38,7 +39,6 @@
"@angular/compiler-cli": "^2.3.1",
"@types/jasmine": "2.5.38",
"@types/node": "^6.0.42",
"angular-cli": "1.0.0-beta.26",
"codelyzer": "~2.0.0-beta.1",
"firebase-tools": "^3.2.1",
"jasmine-core": "2.5.2",

File diff suppressed because it is too large Load Diff