Skip to content

Commit

Permalink
Merge branch 'master' into selectors
Browse files Browse the repository at this point in the history
  • Loading branch information
pjf committed Oct 5, 2019
2 parents ebda1eb + f7090dc commit 8f4a4e2
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ Explain value.
## Checklist

- [ ] My code follows the style guidelines of this project
- [ ] Checks (StandardRB & Prettier) are passing
- [ ] Checks (StandardRB & Prettier-Standard) are passing
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Prettier
name: Prettier-Standard

on:
pull_request:
Expand All @@ -10,7 +10,7 @@ on:

jobs:
prettier:
name: Prettier Check Action
name: Prettier-Standard Check Action
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
Expand All @@ -20,5 +20,5 @@ jobs:
version: '12.x'
- run: yarn
working-directory: javascript/
- run: yarn run prettier-check
- run: yarn run prettier-standard-check
working-directory: javascript/
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Lines of Code](http://img.shields.io/badge/lines_of_code-375-brightgreen.svg?style=flat)](http://blog.codinghorror.com/the-best-code-is-no-code-at-all/)
[![Maintainability](https://api.codeclimate.com/v1/badges/2b24fdbd1ae37a24bedb/maintainability)](https://codeclimate.com/github/hopsoft/stimulus_reflex/maintainability)
![Prettier](https://github.com/hopsoft/stimulus_reflex/workflows/Prettier/badge.svg)
![Prettier-Standard](https://github.com/hopsoft/stimulus_reflex/workflows/Prettier-Standard/badge.svg)
![StandardRB](https://github.com/hopsoft/stimulus_reflex/workflows/StandardRB/badge.svg)
![Tests](https://github.com/hopsoft/stimulus_reflex/workflows/Tests/badge.svg)

Expand All @@ -26,7 +26,8 @@ Everyone interacting with StimulusReflex is expected to follow the [Code of Cond
### Coding Standards

This project uses [Standard](https://github.com/testdouble/standard)
and [Prettier](https://github.com/prettier/prettier) to minimize bike shedding related to code formatting.
and [Prettier-Standard](https://github.com/sheerun/prettier-standard) to minimize bike shedding related to code formatting.

Please run `./bin/standardize` prior submitting pull requests.

View the [wiki](https://github.com/hopsoft/stimulus_reflex/wiki/Editor-Configuration) to see recommendations for configuring your editor to work best with the project.
Expand Down
2 changes: 1 addition & 1 deletion javascript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"main": "./stimulus_reflex.js",
"scripts": {
"test": "yarn run mocha --require @babel/register",
"prettier-check": "yarn run prettier-standard --check ./**/*.js"
"prettier-standard-check": "yarn run prettier-standard --check ./**/*.js"
},
"repository": {
"type": "git",
Expand Down

0 comments on commit 8f4a4e2

Please sign in to comment.