From 2fedfb67b7dc2f43f06207fcdc51a1611b949074 Mon Sep 17 00:00:00 2001 From: Wilco Fiers Date: Wed, 28 Apr 2021 21:25:32 +0200 Subject: [PATCH] chore: Convert all tabs to spaces (#2887) * chore: Convert ALL tabs to spaces * chore: process feedback --- .huskyrc | 5 ----- .jsdoc.json | 32 ++++++++++++++++---------------- .prettierrc | 10 ---------- .prettierrc.json | 10 ++++++++++ package-lock.json | 5 +++++ package.json | 4 ++-- 6 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 .huskyrc delete mode 100644 .prettierrc create mode 100644 .prettierrc.json diff --git a/.huskyrc b/.huskyrc deleted file mode 100644 index 398c198c18..0000000000 --- a/.huskyrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "hooks": { - "pre-commit": "grunt configure && lint-staged" - } -} diff --git a/.jsdoc.json b/.jsdoc.json index d4359bdc4f..4d7c51274b 100644 --- a/.jsdoc.json +++ b/.jsdoc.json @@ -1,18 +1,18 @@ { - "tags": { - "allowUnknownTags": true, - "dictionaries": ["jsdoc"] - }, - "source": { - "include": ["lib", "README.md"], - "includePattern": ".js$", - "excludePattern": "(node_modules/|doc/api)" - }, - "opts": { - "destination": "./doc/api", - "encoding": "utf8", - "recurse": true, - "template": "./node_modules/minami" - }, - "plugins": ["plugins/markdown"] + "tags": { + "allowUnknownTags": true, + "dictionaries": ["jsdoc"] + }, + "source": { + "include": ["lib", "README.md"], + "includePattern": ".js$", + "excludePattern": "(node_modules/|doc/api)" + }, + "opts": { + "destination": "./doc/api", + "encoding": "utf8", + "recurse": true, + "template": "./node_modules/minami" + }, + "plugins": ["plugins/markdown"] } diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 2cc42a6191..0000000000 --- a/.prettierrc +++ /dev/null @@ -1,10 +0,0 @@ -{ - "printWidth": 80, - "useTabs": false, - "tabWidth": 2, - "semi": true, - "singleQuote": true, - "trailingComma": "none", - "bracketSpacing": true, - "arrowParens": "avoid" -} diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 0000000000..9b7252d766 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,10 @@ +{ + "printWidth": 80, + "useTabs": false, + "tabWidth": 2, + "semi": true, + "singleQuote": true, + "trailingComma": "none", + "bracketSpacing": true, + "arrowParens": "avoid" +} diff --git a/package-lock.json b/package-lock.json index aa88182070..c77b165378 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6444,6 +6444,7 @@ "resolved": "https://registry.npmjs.org/husky/-/husky-3.1.0.tgz", "integrity": "sha512-FJkPoHHB+6s4a+jwPqBudBDvYZsoQW5/HBuMSehC8qDiCe50kpcxeqFoDSlow+9I6wg47YxBoT3WxaURlrDIIQ==", "dev": true, + "hasInstallScript": true, "dependencies": { "chalk": "^2.4.2", "ci-info": "^2.0.0", @@ -6463,6 +6464,10 @@ }, "engines": { "node": ">=8.6.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/husky" } }, "node_modules/husky/node_modules/chalk": { diff --git a/package.json b/package.json index 3ae654a34c..9113fc8456 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "next-release": "standard-version --scripts.prebump=./build/next-version.js --skip.commit=true --skip.tag=true", "sri-update": "grunt build && node build/sri-update && git add sri-history.json", "sri-validate": "node build/sri-update --validate", - "fmt": "prettier --write *.{json,md,js} **/*.ts './{.github,build,doc,lib,test}/**/*.{json,md,js,ts,html}'" + "fmt": "prettier --write .*.json *.{json,md,js} **/*.ts './{.circleci,.github,build,doc,lib,locales,test,typings}/**/*.{json,md,js,ts,html}'" }, "devDependencies": { "@babel/core": "^7.5.4", @@ -160,7 +160,7 @@ }, "husky": { "hooks": { - "pre-commit": "lint-staged" + "pre-commit": "grunt configure && lint-staged" } }, "lint-staged": {