Skip to content

Commit

Permalink
chore: remove prettier-eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
bryceosterhaus committed Oct 11, 2019
1 parent a934b3b commit 817d5e0
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 273 deletions.
13 changes: 8 additions & 5 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
*.d.ts
bower_components
build
clay-css
clayui.com
build
copyright.js
coverage
lib
next.clayui.com/public
next.clayui.com/static
node_modules
package-lock.json
packages/generator-clay-component/app/templates
copyright.js
next.clayui.com/static
next.clayui.com/public
*.d.ts
yarn.lock
10 changes: 8 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
clayui.com
*.d.ts
bower_components
build
clay-css
clayui.com
copyright.js
coverage
lib
next.clayui.com/public
next.clayui.com/static
node_modules
package-lock.json
yarn.lock
packages/generator-clay-component/app/templates
yarn.lock
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,4 @@ node_js:
- '10'

script:
- yarn run checkFormat
- yarn run lint
- yarn run test
- yarn ci
14 changes: 9 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,20 @@
"scripts": {
"build": "lerna run build && lerna run build:types",
"compile": "lerna run compile",
"checkFormat": "npm run prettier -- --list-different",
"ci": "yarn lint && yarn format:check && yarn test",
"coveralls": "node node_modules/coveralls/bin/coveralls.js < coverage/lcov.info",
"format": "npm run prettier -- --write",
"format:all": "yarn lint:fix && yarn format",
"lerna": "lerna bootstrap -- --no-optional --no-package-lock",
"link": "lerna run link",
"format": "prettier --write -- '**/*.{js,ts,tsx}'",
"format:changed": "git ls-files -mz '**/*.js' '**/*.ts' '**/*.tsx' | xargs -0 prettier --write --",
"format:check": "prettier --list-different -- '**/*.{js,ts,tsx}'",
"lint": "eslint '**/*.{js,ts,tsx}'",
"prettier": "prettier-eslint '**/*.{js,ts,tsx}'",
"lint:changed": "git ls-files -mz '**/*.js' '**/*.ts' '**/*.tsx' | xargs -0 eslint",
"lint:fix": "eslint --fix '**/*.{js,ts,tsx}'",
"lint:quiet": "eslint --quiet '**/*.{js,ts,tsx}'",
"test": "jest",
"site": "cd next.clayui.com && npm run build && npm run serve",
"site": "cd next.clayui.com && yarn build && yarn serve",
"storybook": "start-storybook -p 8888",
"storybook:build": "build-storybook -c .storybook -o .storybook-static"
},
Expand Down Expand Up @@ -54,7 +59,6 @@
"jest-fetch-mock": "^2.0.1",
"lerna": "^3.4.0",
"node-sass": "^4.12.0",
"prettier-eslint-cli": "^5.0.0",
"raf": "^3.4.1",
"react": "^16.9.0",
"react-dom": "^16.9.0",
Expand Down
Loading

0 comments on commit 817d5e0

Please sign in to comment.