Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,7 @@ To ensure consistency throughout the source code, keep these rules in mind as yo
* All features or bug fixes **must be tested** by one or more specs (unit-tests).
* All public API methods **must be documented**. (Details TBC).
* We follow [Google's JavaScript Style Guide][js-style-guide], but wrap all code at
**100 characters**. An automated formatter is available, see
[DEVELOPER.md](DEVELOPER.md#clang-format).
**100 characters**.

## <a name="commit"></a> Commit Message Guidelines

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ of pushing to `gh-pages`, since user and organization pages require this.

### Linting and formatting code

You can lint or format your app code by running `ng lint` or `ng format` respectively.
This will use the `lint`/`format` npm script that in generated projects uses `tslint`/`clang-format`.
You can lint your app code by running `ng lint`.
This will use the `lint` npm script that in generated projects uses `tslint`.

You can modify the these scripts in `package.json` to run whatever tool you prefer.

Expand Down
2 changes: 0 additions & 2 deletions addon/ng2/blueprints/ng2/files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"start": "ng server",
"postinstall": "typings install",
"lint": "tslint \"<%= sourceDir %>/**/*.ts\"",
"format": "clang-format -i -style=file --glob=<%= sourceDir %>/**/*.ts",
"test": "ng test",
"pree2e": "webdriver-manager update",
"e2e": "protractor"
Expand Down Expand Up @@ -36,7 +35,6 @@
"angular2-universal-polyfills": "^0.4.1",
"preboot": "^2.0.10",<% } %>
"angular-cli": "^<%= version %>",
"clang-format": "^1.0.35",
"codelyzer": "0.0.14",
"ember-cli-inject-live-reload": "^1.4.0",
"jasmine-core": "^2.4.1",
Expand Down
21 changes: 0 additions & 21 deletions addon/ng2/commands/format.js

This file was deleted.

1 change: 0 additions & 1 deletion addon/ng2/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module.exports = {
'test': require('./commands/test'),
'e2e': require('./commands/e2e'),
'lint': require('./commands/lint'),
'format': require('./commands/format'),
'version': require('./commands/version'),
'completion': require('./commands/completion'),
'doc': require('./commands/doc'),
Expand Down
22 changes: 0 additions & 22 deletions addon/ng2/tasks/format.js

This file was deleted.

2 changes: 1 addition & 1 deletion addon/ng2/utilities/completion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Installation: ng completion >> ~/.bashrc (or ~/.zshrc)
#

ng_opts='new init build serve generate autocomplete e2e format lint test version'
ng_opts='new init build serve generate autocomplete e2e lint test version'
init_opts='--dry-run --verbose --blueprint --skip-npm --skip-bower --name'
new_opts='--dry-run --verbose --blueprint --skip-npm --skip-bower --skip-git --directory'
build_opts='--environment --output-path --watch --watcher'
Expand Down
2 changes: 1 addition & 1 deletion docs/design/ngConfig.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Since the data is static, we only need to keep it in a static store somewhere.

One solution would be to keep the data in the `package.json`. Unfortunately, the metadata contains too much data and the `package.json` file would become unmanageable.

Instead of polluting the package file, a `angular-cli.json` file will be created that contains all the values. Access to that file will be allowed to the user if he knows the structure of the file (unknown keys will be kept but ignored), and it's easy to read and write. We can also keep the file formatted.
Instead of polluting the package file, a `angular-cli.json` file will be created that contains all the values. Access to that file will be allowed to the user if he knows the structure of the file (unknown keys will be kept but ignored), and it's easy to read and write.


## Fallback
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
},
"devDependencies": {
"chai": "^3.5.0",
"clang-format": "^1.0.38",
"eslint": "^2.8.0",
"exists-sync": "0.0.3",
"minimatch": "^3.0.0",
Expand Down