Skip to content
This repository was archived by the owner on Sep 3, 2022. It is now read-only.

Commit b6cf07c

Browse files
committed
Add prettier-eslint
1 parent 64c5df9 commit b6cf07c

File tree

7 files changed

+1489
-48
lines changed

7 files changed

+1489
-48
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
test:
44
docker:
5-
- image: circleci/node:4-browsers
5+
- image: circleci/node:8-browsers
66
steps:
77
- checkout
88
- run: npm config set "//registry.npmjs.org/:_authToken" $NPM_AUTH
@@ -18,7 +18,7 @@ jobs:
1818
path: junit-reports
1919
publish:
2020
docker:
21-
- image: circleci/node:4-browsers
21+
- image: circleci/node:8-browsers
2222
steps:
2323
- checkout
2424
- attach_workspace: { at: . }

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"extends": "@segment/eslint-config/browser/legacy"
2+
"extends": ["@segment/eslint-config/browser/legacy", "prettier"]
33
}

.prettierrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"singleQuote": true
3+
}

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,13 @@ distclean: clean
5858

5959
# Lint JavaScript source files.
6060
lint: install
61-
@$(ESLINT) $(ALL_FILES)
61+
yarn lint
62+
6263
.PHONY: lint
6364

6465
# Attempt to fix linting errors.
6566
fmt: install
66-
@$(ESLINT) --fix $(ALL_FILES)
67+
yarn format
6768
.PHONY: fmt
6869

6970
# Run browser unit tests in a browser.

package.json

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,18 @@
1111
],
1212
"main": "lib/index.js",
1313
"scripts": {
14-
"test": "make test"
14+
"test": "make test",
15+
"lint": "eslint \"./{lib,test}/**/*.js\"",
16+
"format": "prettier-eslint --write --list-different \"./{lib,test}/**/*.{js,json,md}\"",
17+
"precommit": "lint-staged"
18+
},
19+
"lint-staged": {
20+
"linters": {
21+
"*.{js,json,md}": [
22+
"prettier-eslint --write",
23+
"git add"
24+
]
25+
}
1526
},
1627
"repository": {
1728
"type": "git",
@@ -38,26 +49,26 @@
3849
"@segment/isodate": "^1.0.2",
3950
"@segment/isodate-traverse": "^1.0.1",
4051
"@segment/prevent-default": "^1.0.0",
52+
"@segment/send-json": "^3.0.0",
4153
"@segment/store": "^1.3.20",
4254
"@segment/top-domain": "^3.0.0",
4355
"bind-all": "^1.0.0",
44-
"extend": "3.0.1",
4556
"component-cookie": "^1.1.2",
4657
"component-emitter": "^1.2.1",
4758
"component-event": "^0.1.4",
4859
"component-querystring": "^2.0.0",
4960
"component-type": "^1.2.1",
5061
"component-url": "^0.2.1",
5162
"debug": "^0.7.4",
63+
"extend": "3.0.1",
5264
"inherits": "^2.0.1",
5365
"install": "^0.7.3",
5466
"is": "^3.1.0",
5567
"json3": "^3.3.2",
5668
"new-date": "^1.0.0",
5769
"next-tick": "^0.2.2",
5870
"segmentio-facade": "^3.0.2",
59-
"uuid": "^2.0.2",
60-
"@segment/send-json": "^3.0.0"
71+
"uuid": "^2.0.2"
6172
},
6273
"devDependencies": {
6374
"@segment/analytics.js-integration": "^3.2.1",
@@ -66,8 +77,10 @@
6677
"compat-trigger-event": "^1.0.0",
6778
"component-each": "^0.2.6",
6879
"eslint": "^2.9.0",
80+
"eslint-config-prettier": "^2.9.0",
6981
"eslint-plugin-mocha": "^2.2.0",
7082
"eslint-plugin-require-path-exists": "^1.1.5",
83+
"husky": "^0.14.3",
7184
"jquery": "^3.2.1",
7285
"karma": "1.3.0",
7386
"karma-browserify": "^5.0.4",
@@ -79,8 +92,10 @@
7992
"karma-sauce-launcher": "^1.0.0",
8093
"karma-spec-reporter": "0.0.26",
8194
"karma-summary-reporter": "^1.5.0",
95+
"lint-staged": "^7.2.0",
8296
"mocha": "^2.2.5",
8397
"phantomjs-prebuilt": "^2.1.7",
98+
"prettier-eslint-cli": "^4.7.1",
8499
"proclaim": "^3.4.1",
85100
"sinon": "^1.7.3",
86101
"watchify": "^3.7.0"

test/.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"extends": "@segment/eslint-config/mocha"
2+
"extends": ["@segment/eslint-config/mocha", "prettier"]
33
}

0 commit comments

Comments
 (0)