angular-cli
Advanced tools
Comparing version 0.0.12 to 0.0.13
@@ -1,2 +0,2 @@ | ||
import {Component} from 'angular2/angular2'; | ||
import {Component} from 'angular2/core'; | ||
@@ -16,2 +16,2 @@ | ||
} | ||
} |
@@ -7,3 +7,3 @@ { | ||
"systemjs": "0.19.4", | ||
"angular2": "2.0.0-alpha.46" | ||
"angular2": "2.0.0-alpha.47" | ||
}, | ||
@@ -13,4 +13,8 @@ "devDependencies": { | ||
"angular-cli-github-pages": "^0.2.0", | ||
"ember-cli-inject-live-reload": "^1.3.0" | ||
"ember-cli-inject-live-reload": "^1.3.0", | ||
"jasmine-core": "^2.3.4", | ||
"karma": "^0.13.15", | ||
"karma-chrome-launcher": "^0.2.1", | ||
"karma-jasmine": "^0.3.6" | ||
} | ||
} |
@@ -1,2 +0,5 @@ | ||
import {bootstrap} from 'angular2/angular2'; | ||
/// <reference path="node_modules/angular2/manual_typings/globals-es6.d.ts"/> | ||
// this should be remove after fixing https://github.com/angular/angular/issues/5596 | ||
import {bootstrap} from 'angular2/platform/browser'; | ||
import {<%= jsComponentName %>App} from './app/<%= htmlComponentName %>'; | ||
@@ -3,0 +6,0 @@ |
@@ -1,2 +0,2 @@ | ||
import {Component, bootstrap} from 'angular2/angular2'; | ||
import {Component} from 'angular2/core'; | ||
@@ -12,5 +12,7 @@ | ||
export class <%= jsComponentName %>App { | ||
constructor() {} | ||
defaultMeaning: number = 42; | ||
meaningOfLife(meaning) { | ||
return `The meaning of life is ${meaning || this.defaultMeaning}`; | ||
} | ||
} |
@@ -18,9 +18,9 @@ import { | ||
beforeEachProviders(() => []); | ||
beforeEachProviders(() => [<%= classifiedModuleName%>]); | ||
it('should ...', inject([<%= classifiedModuleName %>], (pipe:<%= classifiedModuleName %>) => { | ||
expect(pipe.transform(true)).toBe(false); | ||
it('should transform the input', inject([<%= classifiedModuleName %>], (pipe:<%= classifiedModuleName %>) => { | ||
expect(pipe.transform(true)).toBe(null); | ||
})); | ||
}); |
@@ -1,2 +0,2 @@ | ||
import {Pipe} from 'angular2/angular2'; | ||
import {Pipe} from 'angular2/core'; | ||
@@ -10,5 +10,5 @@ | ||
transform(value, args?) { | ||
return value; | ||
return null; | ||
} | ||
} | ||
} |
@@ -18,3 +18,3 @@ import { | ||
beforeEachProviders(() => []); | ||
beforeEachProviders(() => [<%= classifiedModuleName %>]); | ||
@@ -21,0 +21,0 @@ |
@@ -1,2 +0,2 @@ | ||
import {Injectable} from 'angular2/angular2'; | ||
import {Injectable} from 'angular2/core'; | ||
@@ -9,2 +9,2 @@ | ||
} | ||
} |
@@ -35,2 +35,5 @@ /// <reference path="broccoli.d.ts" /> | ||
} | ||
exports["default"] = stabilizeTree; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.default = stabilizeTree; | ||
//# sourceMappingURL=broccoli-tree-stabilizer.js.map |
@@ -7,3 +7,2 @@ /// <reference path="../typings/node/node.d.ts" /> | ||
var diffing_broccoli_plugin_1 = require('./diffing-broccoli-plugin'); | ||
var ts_config_converter_1 = require('./ts-config-converter'); | ||
var FS_OPTS = { | ||
@@ -37,3 +36,10 @@ encoding: 'utf-8' | ||
} | ||
this.tsOpts = ts_config_converter_1.convertTsConfig(options); | ||
// in tsc 1.7.x this api was renamed to parseJsonConfigFileContent | ||
// the conversion is a bit awkward, see https://github.com/Microsoft/TypeScript/issues/5276 | ||
this.tsOpts = ts.parseConfigFile({ compilerOptions: options, files: [] }, null, null).options; | ||
// TODO: the above turns rootDir set to './' into an empty string - looks like a tsc bug | ||
// check back when we upgrade to 1.7.x | ||
if (this.tsOpts.rootDir === '') { | ||
this.tsOpts.rootDir = './'; | ||
} | ||
this.tsOpts.outDir = this.cachePath; | ||
@@ -199,2 +205,5 @@ this.tsServiceHost = new CustomLanguageServiceHost(this.tsOpts, this.rootFilePaths, this.fileRegistry, this.inputPath); | ||
} | ||
else if (tsFilePath.match(/^@reactivex/)) { | ||
absoluteTsFilePath = path.resolve('node_modules', tsFilePath); | ||
} | ||
else { | ||
@@ -221,2 +230,2 @@ absoluteTsFilePath = path.join(this.treeInputPath, tsFilePath); | ||
//# sourceMappingURL=../broccoli/broccoli-typescript.js.map | ||
//# sourceMappingURL=broccoli-typescript.js.map |
{ | ||
"name": "angular-cli", | ||
"version": "0.0.12", | ||
"version": "0.0.13", | ||
"description": "", | ||
@@ -18,2 +18,5 @@ "main": "lib/cli/index.js", | ||
}, | ||
"engines": { | ||
"node": ">= 4.1.0" | ||
}, | ||
"author": "Angular Authors", | ||
@@ -20,0 +23,0 @@ "contributors": [ |
@@ -12,2 +12,6 @@ # Angular-CLI | ||
## Prerequisites | ||
The generated project has dependencies that require **Node 4 or greater**. | ||
## Installation | ||
@@ -62,2 +66,18 @@ | ||
### Running tests | ||
Before running the tests make sure that the project is built. To build the | ||
project once you can use: | ||
```bash | ||
ng build | ||
``` | ||
With the project built in the `dist/` folder you can just run: `karma start`. | ||
Karma will run the tests and keep the browser open waiting to run again. | ||
This will be easier when the command | ||
[ng test](https://github.com/angular/angular-cli/issues/70) is implemented. | ||
### Deploying the app via GitHub Pages | ||
@@ -83,3 +103,3 @@ | ||
- On Windows you need to run the `build` and `serve` commands with Admin permissions otherwise the performance really sucks. | ||
- [Karma](http://karma-runner.github.io/) and [Protractor](https://angular.github.io/protractor/) integrations are missing. | ||
- [Protractor](https://angular.github.io/protractor/) integration is missing. | ||
- The initial installation as well as `ng new` take too long because of lots of npm dependencies. | ||
@@ -86,0 +106,0 @@ - "ember" branding leaks through many error messages and help text. |
@@ -127,15 +127,20 @@ 'use strict'; | ||
it('init an already init\'d folder', function() { | ||
return ng([ | ||
'init', | ||
'--skip-npm', | ||
'--skip-bower' | ||
]) | ||
.then(function(){ | ||
// ignore the favicon file for the the unit test since it breaks at ember-cli level | ||
// when trying to re-init | ||
Blueprint.ignoredFiles.push('favicon.ico'); | ||
}) | ||
.then(function() { | ||
return ng([ | ||
'init', | ||
'--skip-npm', | ||
'--skip-bower' | ||
]) | ||
.then(function() { | ||
return ng([ | ||
'init', | ||
'--skip-npm', | ||
'--skip-bower' | ||
]); | ||
}) | ||
.then(confirmBlueprinted); | ||
'init', | ||
'--skip-npm', | ||
'--skip-bower' | ||
]); | ||
}) | ||
.then(confirmBlueprinted); | ||
}); | ||
@@ -142,0 +147,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
153915
67
1928
144