Skip to content

Commit

Permalink
Re-ran Prettier on source files again, with some more ignores (palant…
Browse files Browse the repository at this point in the history 
…ir#4270)

* Re-ran Prettier on source files again, with some more ignores

Continues on palantir#4214 - I either merged incorrectly or missed some file exclusions that were needed.

* Fixed up introduced linting errors
  • Loading branch information
Josh Goldberg authored Nov 5, 2018
1 parent 7aff4e5 commit 85d87d1
Show file tree
Hide file tree
Showing 200 changed files with 6,407 additions and 3,953 deletions.
324 changes: 162 additions & 162 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -1,167 +1,167 @@
version: 2
jobs:
build:
docker:
- image: circleci/node:latest
steps:
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run:
name: Install dependencies
command: yarn
- save_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
paths:
- node_modules
- run: yarn compile
- persist_to_workspace:
root: '.'
paths:
- lib
- build
- yarn.lock
lint:
docker:
- image: circleci/node:latest
steps:
- checkout
- attach_workspace:
at: '.'
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn lint
test:
docker:
- image: circleci/node:8
steps:
- checkout
- attach_workspace:
at: '.'
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn test
test2.1:
docker:
- image: circleci/node:4
steps:
- checkout
- attach_workspace:
at: '.'
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@2.1
- run: yarn test
test2.4:
docker:
- image: circleci/node:6
steps:
- checkout
- attach_workspace:
at: '.'
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@2.4
- run: yarn test
test2.7:
docker:
- image: circleci/node:6
steps:
- checkout
- attach_workspace:
at: '.'
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@2.7
- run: yarn test
test2.8:
docker:
- image: circleci/node:6
steps:
- checkout
- attach_workspace:
at: '.'
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@2.8
- run: yarn test
test2.9:
docker:
- image: circleci/node:6
steps:
- checkout
- attach_workspace:
at: '.'
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@2.9
- run: yarn test
test3.0:
docker:
- image: circleci/node:6
steps:
- checkout
- attach_workspace:
at: '.'
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@3.0.1
- run: yarn test
testRc:
docker:
- image: circleci/node:6
steps:
- checkout
- attach_workspace:
at: '.'
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@rc
- run: yarn test
testNext:
docker:
- image: circleci/node:latest
steps:
- checkout
- attach_workspace:
at: '.'
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@next
- run: yarn test
build:
docker:
- image: circleci/node:latest
steps:
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run:
name: Install dependencies
command: yarn
- save_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
paths:
- node_modules
- run: yarn compile
- persist_to_workspace:
root: "."
paths:
- lib
- build
- yarn.lock
lint:
docker:
- image: circleci/node:latest
steps:
- checkout
- attach_workspace:
at: "."
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn lint
test:
docker:
- image: circleci/node:8
steps:
- checkout
- attach_workspace:
at: "."
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn test
test2.1:
docker:
- image: circleci/node:4
steps:
- checkout
- attach_workspace:
at: "."
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@2.1
- run: yarn test
test2.4:
docker:
- image: circleci/node:6
steps:
- checkout
- attach_workspace:
at: "."
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@2.4
- run: yarn test
test2.7:
docker:
- image: circleci/node:6
steps:
- checkout
- attach_workspace:
at: "."
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@2.7
- run: yarn test
test2.8:
docker:
- image: circleci/node:6
steps:
- checkout
- attach_workspace:
at: "."
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@2.8
- run: yarn test
test2.9:
docker:
- image: circleci/node:6
steps:
- checkout
- attach_workspace:
at: "."
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@2.9
- run: yarn test
test3.0:
docker:
- image: circleci/node:6
steps:
- checkout
- attach_workspace:
at: "."
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@3.0.1
- run: yarn test
testRc:
docker:
- image: circleci/node:6
steps:
- checkout
- attach_workspace:
at: "."
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@rc
- run: yarn test
testNext:
docker:
- image: circleci/node:latest
steps:
- checkout
- attach_workspace:
at: "."
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn add typescript@next
- run: yarn test

workflows:
version: 2
build_lint_test:
jobs:
- build
- lint:
requires:
- build
- test:
requires:
- build
- test2.1:
requires:
- build
- test2.4:
requires:
- build
- test2.7:
requires:
- build
- test2.8:
requires:
- build
- test2.9:
requires:
- build
- test3.0:
requires:
- build
- testRc:
requires:
- build
- testNext:
requires:
version: 2
build_lint_test:
jobs:
- build
- lint:
requires:
- build
- test:
requires:
- build
- test2.1:
requires:
- build
- test2.4:
requires:
- build
- test2.7:
requires:
- build
- test2.8:
requires:
- build
- test2.9:
requires:
- build
- test3.0:
requires:
- build
- testRc:
requires:
- build
- testNext:
requires:
- build
9 changes: 9 additions & 0 deletions .prettierignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,25 @@
# dependencies
/node_modules

# docs
.github
/docs

# testing
/coverage
/test/external/
/test/files/
/test/rules/

# production
/build
/lib

# ide
/.idea

# npm
package.json
package-lock.json

# misc
Expand Down
16 changes: 15 additions & 1 deletion .prettierrc.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
{
"tabWidth": 4,
"printWidth": 100,
"trailingComma": "all"
"trailingComma": "all",
"overrides": [
{
"files": "*.json",
"options": {
"parser": "json"
}
},
{
"files": "*.scss",
"options": {
"parser": "scss"
}
}
]
}
Loading

0 comments on commit 85d87d1

Please sign in to comment.