diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000000..9abc840911a6
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,35 @@
+## Always follow the [upgrade guide](https://github.com/angular/angular-cli/blob/master/CHANGELOG.md#updating-angular-cli) when upgrading to a new version. The changelog does not list breaking changes that are fixed via the update procedure.
+
+
+# 1.0.0-beta.6 (2016-06-13)
+
+### Features
+- Admin elevation no longer required on Windows (https://github.com/angular/angular-cli/pull/905).
+- Automatically add SASS/Stylus if project is initialized with `--style={sass|scss|styl}` (https://github.com/angular/angular-cli/pull/998).
+- Allow any number of env files (https://github.com/angular/angular-cli/pull/913).
+
+### Bug Fixes
+- Fix adding 3rd party libs without package format (https://github.com/angular/angular-cli/pull/1028/commits/065e98f40384f8b28dcaf84028c411043697ff11).
+- Fix github deploy deep links (https://github.com/angular/angular-cli/pull/1020).
+- Fix `ng e2e` exit code (https://github.com/angular/angular-cli/pull/1025).
+- Fix missing vendor file (https://github.com/angular/angular-cli/pull/972).
+- Fix github user pages base href (https://github.com/angular/angular-cli/pull/965).
+
+### BREAKING CHANGES
+- `AppComponent` is now simply `AppComponent`, and it's selector is now `app-root` (https://github.com/angular/angular-cli/pull/1042).
+
+- Route generation is temporarily disabled while we move to the [recently announce router](http://angularjs.blogspot.ie/2016/06/improvements-coming-for-routing-in.html)(https://github.com/angular/angular-cli/pull/992). It is recommended that users manually move to this router in all new projects.
+
+
+# 1.0.0-beta.5 (2016-05-19)
+
+### Known Issues
+
+- `ng new -mobile` fails npm install (https://github.com/angular/angular-cli/issues/958).
+- Adding 3rd party libs without SystemJS package format breaks prod mode (https://github.com/angular/angular-cli/issues/951).
+- Deep links do not work on Github pages deploys (https://github.com/angular/angular-cli/issues/995).
+- `ng e2e` doesn't return error exit code on test failures (https://github.com/angular/angular-cli/issues/1017).
+- `ng build -prod` fails on mobile projects due to missing vendor file (https://github.com/angular/angular-cli/issues/847).
+- Github deploy to user pages doesn't use correct base href (https://github.com/angular/angular-cli/pull/965).
+- `ng test` on windows hits the file discriptor limit (https://github.com/angular/angular-cli/issues/977).
+- `ng serve/build/test` need admin elevation on Windows (https://github.com/angular/angular-cli/issues/641).
\ No newline at end of file
diff --git a/README.md b/README.md
index 3245da797bbe..7fb9e7f58cb6 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,10 @@ The generated project has dependencies that require **Node 4 or greater**.
* [Installation](#installation)
* [Usage](#usage)
* [Generating a New Project](#generating-and-serving-an-angular2-project-via-a-development-server)
-* [Generating Components, Directives, Pipes and Services](#generating-other-scaffolds)
+* [Generating Components, Directives, Pipes and Services](#generating-components-directives-pipes-and-services)
* [Generating a Route](#generating-a-route)
* [Creating a Build](#creating-a-build)
+* [Environments](#environments)
* [Running Unit Tests](#running-unit-tests)
* [Running End-to-End Tests](#running-end-to-end-tests)
* [Deploying the App via GitHub Pages](#deploying-the-app-via-github-pages)
@@ -36,7 +37,9 @@ The generated project has dependencies that require **Node 4 or greater**.
* [Commands autocompletion](#commands-autocompletion)
* [CSS preprocessor integration](#css-preprocessor-integration)
* [3rd Party Library Installation](#3rd-party-library-installation)
+* [Updating angular-cli](#updating-angular-cli)
* [Known Issues](#known-issues)
+* [Development Hints for hacking on angular-cli](#development-hints-for-hacking-on-angular-cli)
## Installation
@@ -66,7 +69,7 @@ You can configure the default HTTP port and the one used by the LiveReload serve
ng serve --port 4201 --live-reload-port 49153
```
-### Generating other scaffolds
+### Generating Components, Directives, Pipes and Services
You can use the `ng generate` (or just `ng g`) command to generate Angular components:
@@ -90,6 +93,9 @@ Component | `ng g component my-new-component`
Directive | `ng g directive my-new-directive`
Pipe | `ng g pipe my-new-pipe`
Service | `ng g service my-new-service`
+Class | `ng g class my-new-class`
+Interface | `ng g interface my-new-interface`
+Enum | `ng g enum my-new-enum`
### Generating a route
@@ -130,6 +136,10 @@ current cli environment.
Environment defaults to `dev`, but you can generate a production build via
the `-prod` flag in either `ng build -prod` or `ng serve -prod`.
+You can also add your own env files other than `dev` and `prod` by creating a
+`src/client/app/environment.{NAME}.ts` and use them by using the `--env=NAME`
+flag on the build/serve commands.
+
### Running unit tests
```bash
@@ -237,6 +247,33 @@ The `Angular2App`'s options argument has `sassCompiler`, `lessCompiler`, `stylus
The installation of 3rd party libraries are well described at our [Wiki Page](https://github.com/angular/angular-cli/wiki/3rd-party-libs)
+### Updating angular-cli
+
+To update `angular-cli` to a new version, you must update both the global package and your project's local package.
+
+Global package:
+```
+npm uninstall -g angular-cli
+npm cache clean
+npm install -g angular-cli@latest
+```
+
+Local project package:
+```
+rm -rf node_modules dist tmp
+npm install --save-dev angular-cli@latest
+ng init
+```
+
+Running `ng init` will check for changes in all the auto-generated files created by `ng new` and allow you to update yours. You are offered four choices for each changed file: `y` (overwrite), `n` (don't overwrite), `d` (show diff between your file and the updated file) and `h` (help).
+
+Carefully read the diffs for each code file, and either accept the changes or incorporate them manually after `ng init` finishes.
+
+**The main cause of errors after an update is failing to incorporate these updates into your code**.
+
+You can find more details about changes between versions in [CHANGELOG.md](https://github.com/angular/angular-cli/blob/master/CHANGELOG.md).
+
+
## Known issues
This project is currently a prototype so there are many known issues. Just to mention a few:
diff --git a/addon/ng2/blueprints/class/files/__path__/__name__.spec.ts b/addon/ng2/blueprints/class/files/__path__/__name__.spec.ts
index 1ae0adbbe88d..9515b600bd66 100644
--- a/addon/ng2/blueprints/class/files/__path__/__name__.spec.ts
+++ b/addon/ng2/blueprints/class/files/__path__/__name__.spec.ts
@@ -1,9 +1,10 @@
+/* tslint:disable:no-unused-variable */
+
import {
- describe,
- ddescribe,
- expect,
- iit,
- it
+ beforeEach, beforeEachProviders,
+ describe, xdescribe,
+ expect, it, xit,
+ async, inject
} from '@angular/core/testing';
import {<%= classifiedModuleName %>} from './<%= fileName %>';
diff --git a/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts b/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts
index 24d58e75d3f2..bc928721d088 100644
--- a/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts
+++ b/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts
@@ -1,46 +1,20 @@
+/* tslint:disable:no-unused-variable */
+
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
+
import {
- beforeEach,
- beforeEachProviders,
- describe,
- expect,
- it,
- inject
+ beforeEach, beforeEachProviders,
+ describe, xdescribe,
+ expect, it, xit,
+ async, inject
} from '@angular/core/testing';
-import { ComponentFixture, TestComponentBuilder } from '@angular/compiler/testing';
-import { Component } from '@angular/core';
-import { By } from '@angular/platform-browser';
+
import { <%= classifiedModuleName %>Component } from './<%= dasherizedModuleName %>.component';
describe('Component: <%= classifiedModuleName %>', () => {
- let builder: TestComponentBuilder;
-
- beforeEachProviders(() => [<%= classifiedModuleName %>Component]);
- beforeEach(inject([TestComponentBuilder], function (tcb: TestComponentBuilder) {
- builder = tcb;
- }));
-
- it('should inject the component', inject([<%= classifiedModuleName %>Component],
- (component: <%= classifiedModuleName %>Component) => {
+ it('should create an instance', () => {
+ let component = new <%= classifiedModuleName %>Component();
expect(component).toBeTruthy();
- }));
-
- it('should create the component', inject([], () => {
- return builder.createAsync(<%= classifiedModuleName %>ComponentTestController)
- .then((fixture: ComponentFixture) => {
- let query = fixture.debugElement.query(By.directive(<%= classifiedModuleName %>Component));
- expect(query).toBeTruthy();
- expect(query.componentInstance).toBeTruthy();
- });
- }));
+ });
});
-
-@Component({
- selector: 'test',
- template: `
- <<%= selector %>><%= selector %>>
- `,
- directives: [<%= classifiedModuleName %>Component]
-})
-class <%= classifiedModuleName %>ComponentTestController {
-}
-
diff --git a/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts b/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts
index d46fc539725b..77719aee9e5e 100644
--- a/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts
+++ b/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts
@@ -1,29 +1,16 @@
+/* tslint:disable:no-unused-variable */
+
import {
- async,
- beforeEachProviders,
- describe,
- ddescribe,
- expect,
- iit,
- it,
- inject
+ beforeEach, beforeEachProviders,
+ describe, xdescribe,
+ expect, it, xit,
+ async, inject
} from '@angular/core/testing';
-import { ComponentFixture, TestComponentBuilder } from '@angular/compiler/testing';
-import { provide, Component } from '@angular/core';
import { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.directive';
-@Component({
- selector: 'test-component',
- template: `>
`
-})
-class TestComponent {}
-
describe('<%= classifiedModuleName %> Directive', () => {
- beforeEachProviders((): any[] => []);
-
- it('should ...', async(inject([TestComponentBuilder], (tcb:TestComponentBuilder) => {
- return tcb.createAsync(TestComponent).then((fixture: ComponentFixture) => {
- fixture.detectChanges();
- });
- })));
+ it('should create an instance', () => {
+ let directive = new <%= classifiedModuleName %>();
+ expect(directive).toBeTruthy();
+ });
});
diff --git a/addon/ng2/blueprints/ng2/files/.editorconfig b/addon/ng2/blueprints/ng2/files/.editorconfig
index 20380c701c90..f3526162d642 100644
--- a/addon/ng2/blueprints/ng2/files/.editorconfig
+++ b/addon/ng2/blueprints/ng2/files/.editorconfig
@@ -1,4 +1,4 @@
-# http://editorconfig.org
+# Editor configuration, see http://editorconfig.org
root = true
[*]
diff --git a/addon/ng2/blueprints/ng2/files/README.md b/addon/ng2/blueprints/ng2/files/README.md
new file mode 100755
index 000000000000..33838bbe3127
--- /dev/null
+++ b/addon/ng2/blueprints/ng2/files/README.md
@@ -0,0 +1,31 @@
+# <%= jsComponentName %>
+
+This project was generated with [angular-cli](https://github.com/angular/angular-cli) version <%= version %>.
+
+## Development server
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive/pipe/service/route/class`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+Before running the tests make sure you are serving the app via `ng serve`.
+
+## Deploying to Github Pages
+
+Run `ng github-pages:deploy` to deploy to Github Pages.
+
+## Further help
+
+To get more help on the `angular-cli` use `ng --help` or go check out the [Angular-CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/app.component.spec.ts b/addon/ng2/blueprints/ng2/files/__path__/app/app.component.spec.ts
index e5a8e63a4d96..9a352dff75a0 100644
--- a/addon/ng2/blueprints/ng2/files/__path__/app/app.component.spec.ts
+++ b/addon/ng2/blueprints/ng2/files/__path__/app/app.component.spec.ts
@@ -1,9 +1,10 @@
+/* tslint:disable:no-unused-variable */
+
import {
- beforeEachProviders,
- describe,
- expect,
- it,
- inject
+ beforeEach, beforeEachProviders,
+ describe, xdescribe,
+ expect, it, xit,
+ async, inject
} from '@angular/core/testing';
import { AppComponent } from './app.component';
diff --git a/addon/ng2/blueprints/ng2/files/__path__/system-config.ts b/addon/ng2/blueprints/ng2/files/__path__/system-config.ts
index cc549606a2a4..36e6f9403836 100644
--- a/addon/ng2/blueprints/ng2/files/__path__/system-config.ts
+++ b/addon/ng2/blueprints/ng2/files/__path__/system-config.ts
@@ -1,3 +1,7 @@
+// SystemJS configuration file, see links for more information
+// https://github.com/systemjs/systemjs
+// https://github.com/systemjs/systemjs/blob/master/docs/config-api.md
+
/***********************************************************************************************
* User Configuration.
**********************************************************************************************/
diff --git a/addon/ng2/blueprints/ng2/files/__path__/typings.d.ts b/addon/ng2/blueprints/ng2/files/__path__/typings.d.ts
index df29a85ca4a3..a58a428505dd 100644
--- a/addon/ng2/blueprints/ng2/files/__path__/typings.d.ts
+++ b/addon/ng2/blueprints/ng2/files/__path__/typings.d.ts
@@ -1,2 +1,6 @@
+// Typings reference file, see links for more information
+// https://github.com/typings/typings
+// https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html
+
///
<% if(!isMobile) { %>declare var module: { id: string };<% } %>
diff --git a/addon/ng2/blueprints/ng2/files/angular-cli-build.js b/addon/ng2/blueprints/ng2/files/angular-cli-build.js
index daa7a4b54124..bd905df03188 100644
--- a/addon/ng2/blueprints/ng2/files/angular-cli-build.js
+++ b/addon/ng2/blueprints/ng2/files/angular-cli-build.js
@@ -1,3 +1,7 @@
+// Angular-CLI build configuration
+// This file lists all the node_modules files that will be used in a build
+// Also see https://github.com/angular/angular-cli/wiki/3rd-party-libs
+
/* global require, module */
var Angular2App = require('angular-cli/lib/broccoli/angular2-app');
diff --git a/addon/ng2/blueprints/ng2/files/config/environment.js b/addon/ng2/blueprints/ng2/files/config/environment.js
index 4fa28880da9f..bb2170b8b1f7 100644
--- a/addon/ng2/blueprints/ng2/files/config/environment.js
+++ b/addon/ng2/blueprints/ng2/files/config/environment.js
@@ -1,3 +1,6 @@
+// Angular-CLI server configuration
+// Unrelated to environment.dev|prod.ts
+
/* jshint node: true */
module.exports = function(environment) {
diff --git a/addon/ng2/blueprints/ng2/files/config/karma-test-shim.js b/addon/ng2/blueprints/ng2/files/config/karma-test-shim.js
index 05ffa152eb4d..3bbadb4952f8 100644
--- a/addon/ng2/blueprints/ng2/files/config/karma-test-shim.js
+++ b/addon/ng2/blueprints/ng2/files/config/karma-test-shim.js
@@ -1,3 +1,5 @@
+// Test shim for Karma, needed to load files via SystemJS
+
/*global jasmine, __karma__, window*/
Error.stackTraceLimit = Infinity;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000;
diff --git a/addon/ng2/blueprints/ng2/files/config/karma.conf.js b/addon/ng2/blueprints/ng2/files/config/karma.conf.js
index 91485a627372..ef294ceea32f 100644
--- a/addon/ng2/blueprints/ng2/files/config/karma.conf.js
+++ b/addon/ng2/blueprints/ng2/files/config/karma.conf.js
@@ -1,3 +1,6 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/0.13/config/configuration-file.html
+
module.exports = function (config) {
config.set({
basePath: '..',
diff --git a/addon/ng2/blueprints/ng2/files/config/protractor.conf.js b/addon/ng2/blueprints/ng2/files/config/protractor.conf.js
index 39dd0ee64cc5..3019efc23d5b 100644
--- a/addon/ng2/blueprints/ng2/files/config/protractor.conf.js
+++ b/addon/ng2/blueprints/ng2/files/config/protractor.conf.js
@@ -1,3 +1,6 @@
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/docs/referenceConf.js
+
/*global jasmine */
var SpecReporter = require('jasmine-spec-reporter');
diff --git a/addon/ng2/blueprints/ng2/files/gitignore b/addon/ng2/blueprints/ng2/files/gitignore
old mode 100644
new mode 100755
index 3422917e0af7..fccc4d9fb92c
--- a/addon/ng2/blueprints/ng2/files/gitignore
+++ b/addon/ng2/blueprints/ng2/files/gitignore
@@ -10,6 +10,10 @@
# IDEs and editors
/.idea
+.project
+.classpath
+*.launch
+.settings/
# misc
/.sass-cache
diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json
index f477c2e6d1f1..a0bc9b676b58 100644
--- a/addon/ng2/blueprints/ng2/files/package.json
+++ b/addon/ng2/blueprints/ng2/files/package.json
@@ -19,34 +19,34 @@
"@angular/http": "2.0.0-rc.1",
"@angular/platform-browser": "2.0.0-rc.1",
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
- "@angular/router": "2.0.0-rc.1",
- "es6-shim": "^0.35.0",
+ "@angular/router": "3.0.0-alpha.3",
+ "es6-shim": "0.35.1",
"reflect-metadata": "0.1.3",
"rxjs": "5.0.0-beta.6",
"systemjs": "0.19.26",
- "zone.js": "^0.6.12"
+ "zone.js": "0.6.12"
},
"devDependencies": {<% if(isMobile) { %>
"@angular/platform-server": "2.0.0-rc.1",
"@angular/router-deprecated": "2.0.0-rc.1",
- "@angular/service-worker": "^0.2.0",
- "@angular/app-shell": "^0.0.0",
- "angular2-broccoli-prerender": "^0.11.0",
+ "@angular/service-worker": "0.2.0",
+ "@angular/app-shell": "0.0.0",
+ "angular2-broccoli-prerender": "0.11.0",
"angular2-universal":"0.101.5",
- "angular2-universal-polyfills": "^0.4.1",
- "preboot": "^2.0.10",<% } %>
- "angular-cli": "^<%= version %>",
+ "angular2-universal-polyfills": "0.4.1",
+ "preboot": "2.0.10",<% } %>
+ "angular-cli": "<%= version %>",
"codelyzer": "0.0.20",
- "ember-cli-inject-live-reload": "^1.4.0",
- "jasmine-core": "^2.4.1",
- "jasmine-spec-reporter": "^2.4.0",
- "karma": "^0.13.15",
- "karma-chrome-launcher": "^0.2.3",
- "karma-jasmine": "^0.3.8",
- "protractor": "^3.3.0",
- "ts-node": "^0.5.5",
- "tslint": "^3.6.0",
- "typescript": "^1.8.10",
- "typings": "^0.8.1"
+ "ember-cli-inject-live-reload": "1.4.0",
+ "jasmine-core": "2.4.1",
+ "jasmine-spec-reporter": "2.5.0",
+ "karma": "0.13.22",
+ "karma-chrome-launcher": "0.2.3",
+ "karma-jasmine": "0.3.8",
+ "protractor": "3.3.0",
+ "ts-node": "0.5.5",
+ "tslint": "3.11.0",
+ "typescript": "1.8.10",
+ "typings": "0.8.1"<%= stylePackage %>
}
}
diff --git a/addon/ng2/blueprints/ng2/index.js b/addon/ng2/blueprints/ng2/index.js
index 146ef7c50023..827a95b443e0 100644
--- a/addon/ng2/blueprints/ng2/index.js
+++ b/addon/ng2/blueprints/ng2/index.js
@@ -2,6 +2,7 @@ const Blueprint = require('ember-cli/lib/models/blueprint');
const path = require('path');
const stringUtils = require('ember-cli-string-utils');
const getFiles = Blueprint.prototype.files;
+const EOL = require('os').EOL;
module.exports = {
description: '',
@@ -28,6 +29,17 @@ module.exports = {
const fullAppName = stringUtils.dasherize(options.entity.name)
.replace(/-(.)/g, (_, l) => ' ' + l.toUpperCase())
.replace(/^./, (l) => l.toUpperCase());
+
+ var stylePackage = '';
+ switch(options.style.toLowerCase()) {
+ case 'sass':
+ case 'scss':
+ stylePackage = `,${EOL} "node-sass": "3.7.0"`;
+ break;
+ case 'styl':
+ stylePackage = `,${EOL} "stylus": "0.54.5"`;
+ break;
+ }
return {
htmlComponentName: stringUtils.dasherize(options.entity.name),
@@ -38,7 +50,8 @@ module.exports = {
prefix: options.prefix,
styleExt: this.styleExt,
refToTypings: refToTypings,
- isMobile: options.mobile
+ isMobile: options.mobile,
+ stylePackage: stylePackage
};
},
diff --git a/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts b/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts
index dad56f4101ee..04a888b0884c 100644
--- a/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts
+++ b/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts
@@ -1,16 +1,16 @@
+/* tslint:disable:no-unused-variable */
+
import {
- beforeEachProviders,
- describe,
- expect,
- inject,
- it
+ beforeEach, beforeEachProviders,
+ describe, xdescribe,
+ expect, it, xit,
+ async, inject
} from '@angular/core/testing';
import { <%= classifiedModuleName %>Pipe } from './<%= dasherizedModuleName %>.pipe';
describe('Pipe: <%= classifiedModuleName %>', () => {
- beforeEachProviders(() => [<%= classifiedModuleName%>Pipe]);
-
- it('should transform the input', inject([<%= classifiedModuleName %>Pipe], (pipe: <%= classifiedModuleName %>Pipe) => {
- expect(pipe.transform(true)).toBe(null);
- }));
+ it('create an instance', () => {
+ let pipe = new <%= classifiedModuleName %>Pipe();
+ expect(pipe).toBeTruthy();
+ });
});
diff --git a/addon/ng2/blueprints/route/index.js b/addon/ng2/blueprints/route/index.js
index 81ee056e4d51..9b3d9554bb67 100644
--- a/addon/ng2/blueprints/route/index.js
+++ b/addon/ng2/blueprints/route/index.js
@@ -2,6 +2,6 @@ module.exports = {
description: '',
install: function () {
- throw 'Due to changes in the router, route generation has been temporarily disabled';
+ throw 'Due to changes in the router, route generation has been temporarily disabled. You can find more information about the new router here: http://victorsavkin.com/post/145672529346/angular-router';
}
};
diff --git a/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts b/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts
index 22388d3435ec..08b55740bad8 100644
--- a/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts
+++ b/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts
@@ -1,9 +1,10 @@
+/* tslint:disable:no-unused-variable */
+
import {
- beforeEachProviders,
- it,
- describe,
- expect,
- inject
+ beforeEach, beforeEachProviders,
+ describe, xdescribe,
+ expect, it, xit,
+ async, inject
} from '@angular/core/testing';
import { <%= classifiedModuleName %>Service } from './<%= dasherizedModuleName %>.service';
diff --git a/package.json b/package.json
index 2e40130cc93a..da14efca3de7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "angular-cli",
- "version": "1.0.0-beta.5",
+ "version": "1.0.0-beta.6",
"description": "CLI tool for Angular",
"main": "lib/cli/index.js",
"trackingCode": "UA-8594346-19",
@@ -52,7 +52,7 @@
"shelljs": "^0.7.0",
"silent-error": "^1.0.0",
"symlink-or-copy": "^1.0.3",
- "systemjs-builder": "0.15.17",
+ "systemjs-builder": "0.15.20",
"typescript": "^1.8.10",
"typings": "^0.8.1"
},