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

Formattted everything with prettier #1879

Merged
merged 10 commits into from
Jun 30, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Added error message to prettier check
  • Loading branch information
Chillee committed Jun 29, 2017
commit 3bfb27f696fe6a455e66a1c24d5249034b5d3265
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ install:

script:
- git ls-tree -r master --name-only | grep ".*.[t|j]s$" | xargs ./node_modules/prettier/bin/prettier.js --write --print-width 100 --single-quote --trailing-comma es5
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could have called the gulp task here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking that we should be checking all the files to see if any of them haven't been prettified.

I think I set up gulp prettier to only prettify files that have changed since the last commit.

Come to think of it, I think this workflow can be improved...

- git diff-index --quiet HEAD -- || exit 1
- git diff-index --quiet HEAD -- || { echo "Compile with gulp first before pushing!"; exit 1; }
- gulp
- npm test --silent;

Expand Down
1 change: 0 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ gulp.task('tslint', function() {
return merge(srcs, tests);
});


gulp.task(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mainly because that package isn't maintained, and it's missing the "es5" trailing commas option.

'prettier',
shell.task([
Expand Down