Skip to content

Commit 5c7e867

Browse files
committed
ci(format): format from root and format everything
(not just src files)
1 parent a9c3d2b commit 5c7e867

File tree

16 files changed

+25
-62
lines changed

16 files changed

+25
-62
lines changed

.husky/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
npx lint-staged && npx lerna exec --concurrency 1 --stream lint-staged
1+
npx lerna exec --concurrency 1 --stream lint-staged && npx lint-staged

.lintstagedrc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
./package.json:
22
- npx sort-package-json
3+
4+
'*':
5+
- npm run format:staged

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dist/

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
"scripts": {
1212
"build:ci": "lerna run build",
1313
"build:lint:ci": "lerna run build --scope @shiftcode/eslint-plugin-rules && lerna run build --scope @shiftcode/eslint-config-recommended",
14-
"format": "lerna run format",
15-
"format:ci": "lerna run format:ci",
14+
"format": "prettier --write .",
15+
"format:ci": "prettier --check .",
16+
"format:staged": "prettier --write --ignore-unknown",
1617
"lint:ci": "lerna run lint:ci",
1718
"prepare": "husky",
1819
"publish-libs": "node packages/publish-helper/dist/publish-lib",
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# Reformat all .ts / .js
2-
"**/*.(t|j)s":
3-
- npm run format:staged
1+
'{src,test}/**/*.(t|j)s':
42
- npm run lint:staged
53

6-
# sort package.json keys
7-
./package.json:
8-
- sort-package-json
4+
'./package.json':
5+
- sort-package-json

packages/branch-utilities/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
"scripts": {
1717
"prebuild": "rm -rf ./dist",
1818
"build": "tsc",
19-
"format": "npm run format:base -- --write",
20-
"format:base": "prettier --config ../../.prettierrc.yml '{src,e2e,test}/**/*.ts'",
21-
"format:ci": "npm run format:base -- --check",
22-
"format:staged": "prettier --write --config ../../.prettierrc.yml",
2319
"lint": "eslint --fix --cache ./src",
2420
"lint:ci": "eslint ./src",
2521
"lint:staged": "eslint --fix --cache",
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# Reformat all .ts / .js
2-
"**/*.(t|j)s":
3-
- npm run format:staged
1+
'{src,test}/**/*.(t|j)s':
42
- npm run lint:staged
53

6-
# sort package.json keys
7-
./package.json:
4+
'./package.json':
85
- sort-package-json

packages/eslint-config-recommended/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
"prebuild": "rm -rf ./dist",
2222
"build": "tsc",
2323
"build:lint:ci": "npm run build",
24-
"format": "npm run format:base -- --write",
25-
"format:base": "prettier --config ../../.prettierrc.yml '{src,e2e,test}/**/*.ts'",
26-
"format:ci": "npm run format:base -- --check",
27-
"format:staged": "prettier --write --config ../../.prettierrc.yml",
2824
"lint": "eslint --fix --cache ./src",
2925
"lint:ci": "eslint ./src",
3026
"lint:staged": "eslint --fix --cache",
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# Reformat all .ts / .js
2-
"**/*.(t|j)s":
3-
- npm run format:staged
1+
'{src,test}/**/*.(t|j)s':
42
- npm run lint:staged
53

6-
# sort package.json keys
7-
./package.json:
8-
- sort-package-json
4+
'./package.json':
5+
- sort-package-json

packages/eslint-plugin-rules/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
"prebuild": "rm -rf ./dist",
1818
"build": "tsc",
1919
"build:lint:ci": "npm run build",
20-
"format": "npm run format:base -- --write",
21-
"format:base": "prettier --config ../../.prettierrc.yml '{src,e2e,test}/**/*.ts'",
22-
"format:ci": "npm run format:base -- --check",
23-
"format:staged": "prettier --write --config ../../.prettierrc.yml",
2420
"lint": "eslint --fix --cache ./src",
2521
"lint:ci": "eslint ./src",
2622
"lint:staged": "eslint --fix --cache",

0 commit comments

Comments
 (0)