From 6abee4880f8ab1e19d9e97a9e16456189866efd7 Mon Sep 17 00:00:00 2001 From: Sasha <118575614+weboko@users.noreply.github.com> Date: Mon, 3 Apr 2023 23:39:59 +0200 Subject: [PATCH] chore: use root .prettierignore (#1285) * use root .prettierignore for fix and check --- .prettierignore | 9 +++++++++ package.json | 9 ++++++--- packages/build-utils/package.json | 4 +--- packages/core/.prettierignore | 5 ----- packages/core/package.json | 2 -- packages/create/.prettierignore | 5 ----- packages/create/package.json | 2 -- packages/dns-discovery/.prettierignore | 5 ----- packages/dns-discovery/package.json | 2 -- packages/enr/.prettierignore | 5 ----- packages/enr/package.json | 2 -- packages/interfaces/.prettierignore | 5 ----- packages/interfaces/package.json | 2 -- packages/message-encryption/.prettierignore | 5 ----- packages/message-encryption/package.json | 2 -- packages/peer-exchange/.prettierignore | 5 ----- packages/peer-exchange/package.json | 2 -- packages/proto/.prettierignore | 5 ----- packages/proto/package.json | 4 +--- packages/tests/.prettierignore | 4 ---- packages/tests/package.json | 2 -- packages/utils/.prettierignore | 5 ----- packages/utils/package.json | 2 -- 23 files changed, 17 insertions(+), 76 deletions(-) create mode 100644 .prettierignore delete mode 100644 packages/core/.prettierignore delete mode 100644 packages/create/.prettierignore delete mode 100644 packages/dns-discovery/.prettierignore delete mode 100644 packages/enr/.prettierignore delete mode 100644 packages/interfaces/.prettierignore delete mode 100644 packages/message-encryption/.prettierignore delete mode 100644 packages/peer-exchange/.prettierignore delete mode 100644 packages/proto/.prettierignore delete mode 100644 packages/tests/.prettierignore delete mode 100644 packages/utils/.prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000000..de10982721 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,9 @@ +.github +.husky +.vscode +nwaku +*/**/build +*/**/bundle +*/**/dist +*/**/node_modules +*/**/CHANGELOG.md diff --git a/package.json b/package.json index 26b5c95396..1769c58488 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,12 @@ "build": "npm run build --workspaces --if-present", "build:esm": "npm run build:esm --workspaces --if-present", "size": "npm run build && size-limit", - "fix": "npm run fix --workspaces --if-present", - "fix:lint": "npm run fix:lint --workspaces --if-present", - "check": "npm run check --workspaces --if-present", + "fix": "run-s fix:*", + "fix:workspaces": "npm run fix --workspaces --if-present", + "fix:prettier": "prettier ./packages --write", + "check": "run-s check:*", + "check:workspaces": "npm run check --workspaces --if-present", + "check:prettier": "prettier ./packages --list-different", "check:ws": "[ $(ls -1 ./packages|wc -l) -eq $(cat package.json | jq '.workspaces | length') ] || exit 1 # check no packages left behind", "test": "npm run test --workspaces --if-present", "test:browser": "npm run test:browser --workspaces --if-present", diff --git a/packages/build-utils/package.json b/packages/build-utils/package.json index 6fdd60157b..70dc3d659a 100644 --- a/packages/build-utils/package.json +++ b/packages/build-utils/package.json @@ -9,10 +9,8 @@ "scripts": { "fix": "run-s fix:*", "fix:lint": "eslint . --fix", - "fix:prettier": "prettier . --write", "check": "run-s check:*", - "check:lint": "eslint .", - "check:prettier": "prettier . --list-different" + "check:lint": "eslint ." }, "repository": { "type": "git", diff --git a/packages/core/.prettierignore b/packages/core/.prettierignore deleted file mode 100644 index d8763f9fc7..0000000000 --- a/packages/core/.prettierignore +++ /dev/null @@ -1,5 +0,0 @@ -build -bundle -dist -node_modules -CHANGELOG.md diff --git a/packages/core/package.json b/packages/core/package.json index af0e601810..8251cd2673 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -56,7 +56,6 @@ "build:esm": "tsc", "build:bundle": "rollup --config rollup.config.js", "fix": "run-s fix:*", - "fix:prettier": "prettier . --write", "fix:lint": "eslint src *.js --fix", "pretest": "run-s pretest:*", "pretest:1-init-git-submodules": "[ -f '../../nwaku/build/wakunode2' ] || git submodule update --init --recursive", @@ -66,7 +65,6 @@ "check": "run-s check:*", "check:tsc": "tsc -p tsconfig.dev.json", "check:lint": "eslint src *.js", - "check:prettier": "prettier . --list-different", "check:spelling": "cspell \"{README.md,src/**/*.ts}\"", "test": "run-s test:*", "test:node": "TS_NODE_PROJECT=./tsconfig.dev.json mocha", diff --git a/packages/create/.prettierignore b/packages/create/.prettierignore deleted file mode 100644 index d8763f9fc7..0000000000 --- a/packages/create/.prettierignore +++ /dev/null @@ -1,5 +0,0 @@ -build -bundle -dist -node_modules -CHANGELOG.md diff --git a/packages/create/package.json b/packages/create/package.json index ba4d732b92..28396d7313 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -36,11 +36,9 @@ "build:esm": "tsc", "build:bundle": "rollup --config rollup.config.js", "fix": "run-s fix:*", - "fix:prettier": "prettier . --write", "fix:lint": "eslint src *.js --fix", "check": "run-s check:*", "check:lint": "eslint src *.js", - "check:prettier": "prettier . --list-different", "check:spelling": "cspell \"{README.md,src/**/*.ts}\"", "check:tsc": "tsc -p tsconfig.dev.json", "prepublish": "npm run build", diff --git a/packages/dns-discovery/.prettierignore b/packages/dns-discovery/.prettierignore deleted file mode 100644 index d8763f9fc7..0000000000 --- a/packages/dns-discovery/.prettierignore +++ /dev/null @@ -1,5 +0,0 @@ -build -bundle -dist -node_modules -CHANGELOG.md diff --git a/packages/dns-discovery/package.json b/packages/dns-discovery/package.json index f3703b074d..b6f030b075 100644 --- a/packages/dns-discovery/package.json +++ b/packages/dns-discovery/package.json @@ -43,11 +43,9 @@ "build:esm": "tsc", "build:bundle": "rollup --config rollup.config.js", "fix": "run-s fix:*", - "fix:prettier": "prettier . --write", "fix:lint": "eslint src *.js --fix", "check": "run-s check:*", "check:lint": "eslint src --ext .ts", - "check:prettier": "prettier . --list-different", "check:spelling": "cspell \"{README.md,src/**/*.ts}\"", "check:tsc": "tsc -p tsconfig.dev.json", "prepublish": "npm run build", diff --git a/packages/enr/.prettierignore b/packages/enr/.prettierignore deleted file mode 100644 index d8763f9fc7..0000000000 --- a/packages/enr/.prettierignore +++ /dev/null @@ -1,5 +0,0 @@ -build -bundle -dist -node_modules -CHANGELOG.md diff --git a/packages/enr/package.json b/packages/enr/package.json index 513d0d6065..c3c60a7c89 100644 --- a/packages/enr/package.json +++ b/packages/enr/package.json @@ -36,11 +36,9 @@ "build:esm": "tsc", "build:bundle": "rollup --config rollup.config.js", "fix": "run-s fix:*", - "fix:prettier": "prettier . --write", "fix:lint": "eslint src *.js --fix", "check": "run-s check:*", "check:lint": "eslint src --ext .ts", - "check:prettier": "prettier . --list-different", "check:spelling": "cspell \"{README.md,src/**/*.ts}\"", "check:tsc": "tsc -p tsconfig.dev.json", "test": "run-s test:*", diff --git a/packages/interfaces/.prettierignore b/packages/interfaces/.prettierignore deleted file mode 100644 index d8763f9fc7..0000000000 --- a/packages/interfaces/.prettierignore +++ /dev/null @@ -1,5 +0,0 @@ -build -bundle -dist -node_modules -CHANGELOG.md diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json index 51e8ba945c..7d60aad763 100644 --- a/packages/interfaces/package.json +++ b/packages/interfaces/package.json @@ -35,11 +35,9 @@ "build": "run-s build:**", "build:esm": "tsc", "fix": "run-s fix:*", - "fix:prettier": "prettier . --write", "fix:lint": "eslint src --fix", "check": "run-s check:*", "check:lint": "eslint src", - "check:prettier": "prettier . --list-different", "check:spelling": "cspell \"{README.md,src/**/*.ts}\"", "check:tsc": "tsc -p tsconfig.dev.json", "prepublish": "npm run build", diff --git a/packages/message-encryption/.prettierignore b/packages/message-encryption/.prettierignore deleted file mode 100644 index d8763f9fc7..0000000000 --- a/packages/message-encryption/.prettierignore +++ /dev/null @@ -1,5 +0,0 @@ -build -bundle -dist -node_modules -CHANGELOG.md diff --git a/packages/message-encryption/package.json b/packages/message-encryption/package.json index cb62a555b8..50226f8ef1 100644 --- a/packages/message-encryption/package.json +++ b/packages/message-encryption/package.json @@ -53,11 +53,9 @@ "build:esm": "tsc", "build:bundle": "rollup --config rollup.config.js", "fix": "run-s fix:*", - "fix:prettier": "prettier . --write", "fix:lint": "eslint src *.js --fix", "check": "run-s check:*", "check:lint": "eslint src *.js", - "check:prettier": "prettier . --list-different", "check:spelling": "cspell \"{README.md,src/**/*.ts}\"", "check:tsc": "tsc -p tsconfig.dev.json", "test": "run-s test:*", diff --git a/packages/peer-exchange/.prettierignore b/packages/peer-exchange/.prettierignore deleted file mode 100644 index d8763f9fc7..0000000000 --- a/packages/peer-exchange/.prettierignore +++ /dev/null @@ -1,5 +0,0 @@ -build -bundle -dist -node_modules -CHANGELOG.md diff --git a/packages/peer-exchange/package.json b/packages/peer-exchange/package.json index 76ff91df62..51dde35bab 100644 --- a/packages/peer-exchange/package.json +++ b/packages/peer-exchange/package.json @@ -36,11 +36,9 @@ "build:esm": "tsc", "build:bundle": "rollup --config rollup.config.js", "fix": "run-s fix:*", - "fix:prettier": "prettier . --write", "fix:lint": "eslint src *.js --fix", "check": "run-s check:*", "check:lint": "eslint src *.js", - "check:prettier": "prettier . --list-different", "check:spelling": "cspell \"{README.md,src/**/*.ts}\"", "check:tsc": "tsc -p tsconfig.dev.json", "prepublish": "npm run build", diff --git a/packages/proto/.prettierignore b/packages/proto/.prettierignore deleted file mode 100644 index d8763f9fc7..0000000000 --- a/packages/proto/.prettierignore +++ /dev/null @@ -1,5 +0,0 @@ -build -bundle -dist -node_modules -CHANGELOG.md diff --git a/packages/proto/package.json b/packages/proto/package.json index 56a5c8f776..f6dc011748 100644 --- a/packages/proto/package.json +++ b/packages/proto/package.json @@ -38,9 +38,7 @@ "proto": "rimraf src/lib/*.ts; protons src/lib/*.proto", "check:tsc": "tsc -p tsconfig.dev.json", "prepublish": "npm run build", - "reset-hard": "git clean -dfx -e .idea && git reset --hard && npm i && npm run build", - "fix": "run-s fix:*", - "fix:prettier": "prettier . --write" + "reset-hard": "git clean -dfx -e .idea && git reset --hard && npm i && npm run build" }, "engines": { "node": ">=16" diff --git a/packages/tests/.prettierignore b/packages/tests/.prettierignore deleted file mode 100644 index fecb37a393..0000000000 --- a/packages/tests/.prettierignore +++ /dev/null @@ -1,4 +0,0 @@ -build -bundle -dist -node_modules diff --git a/packages/tests/package.json b/packages/tests/package.json index e5b5c31a04..297eee24e4 100644 --- a/packages/tests/package.json +++ b/packages/tests/package.json @@ -36,7 +36,6 @@ "build": "run-s build:**", "build:esm": "tsc", "fix": "run-s fix:*", - "fix:prettier": "prettier . --write", "fix:lint": "eslint src tests --fix", "pretest": "run-s pretest:*", "pretest:1-init-git-submodules": "[ -f '../../nwaku/build/wakunode2' ] || git submodule update --init --recursive", @@ -44,7 +43,6 @@ "nwaku:build": "(PROC=$(nproc --all 2>/dev/null || echo 2); cd ../../nwaku; make -j$PROC update; NIMFLAGS=\"-d:chronicles_colors=off\" make -j$PROC wakunode2)", "nwaku:force-build": "(cd ../../nwaku && rm -rf ./build/ ./vendor) && run-s nwaku:build", "check": "run-s check:*", - "check:prettier": "prettier . --list-different", "check:lint": "eslint src tests", "check:spelling": "cspell \"{README.md,{tests,src}/**/*.ts}\"", "check:tsc": "tsc -p tsconfig.dev.json", diff --git a/packages/utils/.prettierignore b/packages/utils/.prettierignore deleted file mode 100644 index d8763f9fc7..0000000000 --- a/packages/utils/.prettierignore +++ /dev/null @@ -1,5 +0,0 @@ -build -bundle -dist -node_modules -CHANGELOG.md diff --git a/packages/utils/package.json b/packages/utils/package.json index 984125987d..895774c591 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -53,11 +53,9 @@ "build:esm": "tsc", "build:bundle": "rollup --config rollup.config.js", "fix": "run-s fix:*", - "fix:prettier": "prettier . --write", "fix:lint": "eslint src *.js --fix", "check": "run-s check:*", "check:lint": "eslint src *.js", - "check:prettier": "prettier . --list-different", "check:spelling": "cspell \"{README.md,src/**/*.ts}\"", "check:tsc": "tsc -p tsconfig.dev.json", "prepublish": "npm run build",