honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
angular.io/karma.conf.js
View File

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

2
angular.io/package.json
View File

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

599
angular.io/yarn.lock
View File

File diff suppressed because it is too large Load Diff