Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: rebranding changes #4602

Merged
merged 1 commit into from
Feb 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ with NPM 3 or higher.

* [Installation](#installation)
* [Usage](#usage)
* [Generating a New Project](#generating-and-serving-an-angular2-project-via-a-development-server)
* [Generating a New Project](#generating-and-serving-an-angular-project-via-a-development-server)
* [Generating Components, Directives, Pipes and Services](#generating-components-directives-pipes-and-services)
* [Updating Angular CLI](#updating-angular-cli)
* [Development Hints for hacking on Angular CLI](#development-hints-for-hacking-on-angular-cli)
Expand All @@ -54,7 +54,7 @@ npm install -g @angular/cli
ng help
```

### Generating and serving an Angular2 project via a development server
### Generating and serving an Angular project via a development server

```bash
ng new PROJECT_NAME
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ import 'core-js/es7/reflect';
/***************************************************************************************************
* Zone JS is required by Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular-CLI.
import 'zone.js/dist/zone'; // Included with Angular CLI.



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ exports.config = {
defaultTimeoutInterval: 30000,
print: function() {}
},
useAllAngular2AppRoots: true,
beforeLaunch: function() {
require('ts-node').register({
project: 'e2e'
Expand Down
2 changes: 1 addition & 1 deletion packages/@angular/cli/models/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function getUserHome() {

export class CliConfig extends CliConfigBase<ConfigInterface> {
static configFilePath(projectPath?: string): string {
// Find the configuration, either where specified, in the angular-cli project
// Find the configuration, either where specified, in the Angular CLI project
// (if it's in node_modules) or from the current process.
return (projectPath && _findUp(CLI_CONFIG_FILE_NAME, projectPath))
|| (projectPath && _findUp(CLI_CONFIG_FILE_NAME_ALT, projectPath))
Expand Down
3 changes: 2 additions & 1 deletion packages/@angular/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
},
"keywords": [
"angular",
"angular-cli"
"angular-cli",
"Angular CLI"
],
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion plugins/karma.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file is necessary when using a linked angular-cli to this repo, meaning that
// This file is necessary when using a linked @angular/cli to this repo, meaning that
// require('@angular/cli/plugins/karma') will load this file, and we just forward to
// the actual published file.
module.exports = require('../packages/@angular/cli/plugins/karma');