diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 794100c412..b836466d0f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -25,5 +25,3 @@ jobs: run: yarn lint:ci - name: Prettier Code run: yarn format:diff - - name: Prettier Docs - run: yarn format-docs:diff diff --git a/examples/facebook/.prettierrc b/examples/facebook/.prettierrc index 1fa957ff2d..34cf084519 100644 --- a/examples/facebook/.prettierrc +++ b/examples/facebook/.prettierrc @@ -1,7 +1,7 @@ { "arrowParens": "always", + "bracketSameLine": true, "bracketSpacing": false, - "jsxBracketSameLine": true, "printWidth": 80, "proseWrap": "never", "singleQuote": true, diff --git a/package.json b/package.json index aa8994fd05..fbdc791b77 100644 --- a/package.json +++ b/package.json @@ -40,10 +40,8 @@ "changelog": "lerna-changelog", "postinstall": "yarn lock:update && yarn build:packages", "prepare": "husky install", - "format": "prettier --config .prettierrc --write \"**/*.{js,jsx,ts,tsx,json,mjs}\"", - "format:diff": "prettier --config .prettierrc --list-different \"**/*.{js,jsx,ts,tsx,json,mjs}\"", - "format-docs": "prettier --config .prettierrc --write \"**/*.{md,mdx}\"", - "format-docs:diff": "prettier --config .prettierrc --list-different \"**/*.{md,mdx}\"", + "format": "prettier --write .", + "format:diff": "prettier --list-different .", "lint": "yarn lint:js && yarn lint:style", "lint:ci": "yarn lint:js --quiet && yarn lint:style", "lint:js": "eslint --cache --report-unused-disable-directives \"**/*.{js,jsx,ts,tsx,mjs}\"", @@ -100,7 +98,7 @@ "jest": "^26.6.3", "lerna": "^4.0.0", "lerna-changelog": "^1.0.1", - "lint-staged": "^10.5.4", + "lint-staged": "^12.1.7", "netlify-cli": "^8.0.5", "nodemon": "^2.0.13", "prettier": "^2.5.1", @@ -115,12 +113,14 @@ "typescript": "^4.5.2" }, "lint-staged": { - "*.{js,jsx,ts,tsx}": [ - "eslint --fix", - "prettier --config .prettierrc --write" + "*.{js,jsx,ts,tsx,mjs}": [ + "eslint --fix" ], - "*.{md,mdx}": [ - "prettier --config .prettierrc --write" + "*.css": [ + "stylelint --fix" + ], + "*": [ + "prettier --ignore-unknown --write" ] }, "engines": { diff --git a/packages/create-docusaurus/templates/facebook/.prettierrc b/packages/create-docusaurus/templates/facebook/.prettierrc index 1fa957ff2d..34cf084519 100644 --- a/packages/create-docusaurus/templates/facebook/.prettierrc +++ b/packages/create-docusaurus/templates/facebook/.prettierrc @@ -1,7 +1,7 @@ { "arrowParens": "always", + "bracketSameLine": true, "bracketSpacing": false, - "jsxBracketSameLine": true, "printWidth": 80, "proseWrap": "never", "singleQuote": true, diff --git a/packages/docusaurus-plugin-debug/src/theme/DebugRoutes/styles.module.css b/packages/docusaurus-plugin-debug/src/theme/DebugRoutes/styles.module.css index 2c0ff2f038..e1f2756898 100644 --- a/packages/docusaurus-plugin-debug/src/theme/DebugRoutes/styles.module.css +++ b/packages/docusaurus-plugin-debug/src/theme/DebugRoutes/styles.module.css @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ - .list { +.list { padding: 0; } diff --git a/packages/docusaurus-theme-classic/src/theme/Footer/styles.module.css b/packages/docusaurus-theme-classic/src/theme/Footer/styles.module.css index f68a4f9f7a..16b1a2eaf4 100644 --- a/packages/docusaurus-theme-classic/src/theme/Footer/styles.module.css +++ b/packages/docusaurus-theme-classic/src/theme/Footer/styles.module.css @@ -7,7 +7,8 @@ .footerLogoLink { opacity: 0.5; - transition: opacity var(--ifm-transition-fast) var(--ifm-transition-timing-default); + transition: opacity var(--ifm-transition-fast) + var(--ifm-transition-timing-default); } .footerLogoLink:hover { diff --git a/website/_dogfooding/clientModuleCSS.css b/website/_dogfooding/clientModuleCSS.css index f67bf88354..186521a954 100644 --- a/website/_dogfooding/clientModuleCSS.css +++ b/website/_dogfooding/clientModuleCSS.css @@ -7,5 +7,5 @@ /* Used to test CSS insertion order */ .test-marker-site-client-module { - content: "site-client-module"; + content: 'site-client-module'; } diff --git a/website/docs/guides/markdown-features/markdown-features-react.module.css b/website/docs/guides/markdown-features/markdown-features-react.module.css index 8d9f5bcbf5..4414169ef0 100644 --- a/website/docs/guides/markdown-features/markdown-features-react.module.css +++ b/website/docs/guides/markdown-features/markdown-features-react.module.css @@ -12,6 +12,6 @@ vertical-align: top; } -.wrappingBlock code[class^=codeBlockLines] { +.wrappingBlock code[class^='codeBlockLines'] { white-space: pre-wrap; } diff --git a/website/docs/guides/markdown-features/markdown-features-tabs-styles.module.css b/website/docs/guides/markdown-features/markdown-features-tabs-styles.module.css index 9e75491e62..524f54cd07 100644 --- a/website/docs/guides/markdown-features/markdown-features-tabs-styles.module.css +++ b/website/docs/guides/markdown-features/markdown-features-tabs-styles.module.css @@ -8,20 +8,20 @@ .red { color: red; } -.red[aria-selected="true"] { +.red[aria-selected='true'] { border-bottom-color: red; } .orange { color: orange; } -.orange[aria-selected="true"] { +.orange[aria-selected='true'] { border-bottom-color: orange; } .yellow { color: yellow; } -.yellow[aria-selected="true"] { +.yellow[aria-selected='true'] { border-bottom-color: yellow; } diff --git a/website/src/css/custom.css b/website/src/css/custom.css index 9dad43f6f5..20933f4de9 100644 --- a/website/src/css/custom.css +++ b/website/src/css/custom.css @@ -179,7 +179,7 @@ html[data-theme='dark'] img[src$='#gh-light-mode-only'] { /* Used to test CSS insertion order */ .test-marker-site-custom-css-unique-rule { - content: "site-custom-css-unique-rule"; + content: 'site-custom-css-unique-rule'; } .test-marker-site-custom-css-shared-rule { max-width: 100%; diff --git a/website/src/pages/styles.module.css b/website/src/pages/styles.module.css index 76c8e98728..ea097ee149 100644 --- a/website/src/pages/styles.module.css +++ b/website/src/pages/styles.module.css @@ -156,5 +156,5 @@ /* Used to test CSS insertion order */ .test-marker-site-index-page { - content: "site-index-page"; + content: 'site-index-page'; } diff --git a/website/src/theme/Layout/styles.module.css b/website/src/theme/Layout/styles.module.css index c3c0ab8bdb..f84cd4c47e 100644 --- a/website/src/theme/Layout/styles.module.css +++ b/website/src/theme/Layout/styles.module.css @@ -7,6 +7,5 @@ /* Used to test CSS insertion order */ .test-marker-theme-layout { - content: "theme-layout"; + content: 'theme-layout'; } - diff --git a/website/versioned_docs/version-2.0.0-beta.14/guides/markdown-features/markdown-features-tabs-styles.module.css b/website/versioned_docs/version-2.0.0-beta.14/guides/markdown-features/markdown-features-tabs-styles.module.css index 9e75491e62..524f54cd07 100644 --- a/website/versioned_docs/version-2.0.0-beta.14/guides/markdown-features/markdown-features-tabs-styles.module.css +++ b/website/versioned_docs/version-2.0.0-beta.14/guides/markdown-features/markdown-features-tabs-styles.module.css @@ -8,20 +8,20 @@ .red { color: red; } -.red[aria-selected="true"] { +.red[aria-selected='true'] { border-bottom-color: red; } .orange { color: orange; } -.orange[aria-selected="true"] { +.orange[aria-selected='true'] { border-bottom-color: orange; } .yellow { color: yellow; } -.yellow[aria-selected="true"] { +.yellow[aria-selected='true'] { border-bottom-color: yellow; } diff --git a/yarn.lock b/yarn.lock index f2115a81af..da011bf2d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6039,6 +6039,14 @@ cli-truncate@^2.1.0: slice-ansi "^3.0.0" string-width "^4.2.0" +cli-truncate@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389" + integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA== + dependencies: + slice-ansi "^5.0.0" + string-width "^5.0.0" + cli-width@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" @@ -6279,11 +6287,6 @@ commander@^5.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== -commander@^6.2.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" - integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== - commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" @@ -7021,7 +7024,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: dependencies: ms "2.0.0" -debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3: +debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3: version "4.3.3" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== @@ -7735,7 +7738,7 @@ enhanced-resolve@^5.8.3: graceful-fs "^4.2.4" tapable "^2.2.0" -enquirer@^2.3.5, enquirer@^2.3.6: +enquirer@^2.3.5: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== @@ -8311,7 +8314,7 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^4.0.0, execa@^4.0.2, execa@^4.1.0: +execa@^4.0.0, execa@^4.0.2: version "4.1.0" resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== @@ -11804,7 +11807,7 @@ libnpmpublish@^4.0.0: semver "^7.1.3" ssri "^8.0.1" -lilconfig@^2.0.3: +lilconfig@2.0.4, lilconfig@^2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== @@ -11814,26 +11817,24 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== -lint-staged@^10.5.4: - version "10.5.4" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.4.tgz#cd153b5f0987d2371fc1d2847a409a2fe705b665" - integrity sha512-EechC3DdFic/TdOPgj/RB3FicqE6932LTHCUm0Y2fsD9KGlLB+RwJl2q1IYBIvEsKzDOgn0D4gll+YxG5RsrKg== +lint-staged@^12.1.7: + version "12.1.7" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.1.7.tgz#fe9137992ac18a456422bb8484dd30be0140629f" + integrity sha512-bltv/ejiLWtowExpjU+s5z8j1Byjg9AlmaAjMmqNbIicY69u6sYIwXGg0dCn0TlkrrY2CphtHIXAkbZ+1VoWQQ== dependencies: - chalk "^4.1.0" - cli-truncate "^2.1.0" - commander "^6.2.0" - cosmiconfig "^7.0.0" - debug "^4.2.0" - dedent "^0.7.0" - enquirer "^2.3.6" - execa "^4.1.0" - listr2 "^3.2.2" - log-symbols "^4.0.0" - micromatch "^4.0.2" + cli-truncate "^3.1.0" + colorette "^2.0.16" + commander "^8.3.0" + debug "^4.3.3" + execa "^5.1.1" + lilconfig "2.0.4" + listr2 "^3.13.5" + micromatch "^4.0.4" normalize-path "^3.0.0" - please-upgrade-node "^3.2.0" - string-argv "0.3.1" - stringify-object "^3.3.0" + object-inspect "^1.11.1" + string-argv "^0.3.1" + supports-color "^9.2.1" + yaml "^1.10.2" listr-silent-renderer@^1.1.1: version "1.1.1" @@ -11864,7 +11865,7 @@ listr-verbose-renderer@^0.5.0: date-fns "^1.27.2" figures "^2.0.0" -listr2@^3.2.2: +listr2@^3.13.5: version "3.14.0" resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e" integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g== @@ -13656,7 +13657,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.11.0, object-inspect@^1.9.0: +object-inspect@^1.11.0, object-inspect@^1.11.1, object-inspect@^1.9.0: version "1.12.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== @@ -14456,13 +14457,6 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" -please-upgrade-node@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" - integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== - dependencies: - semver-compare "^1.0.0" - pngjs@^3.0.0, pngjs@^3.3.3: version "3.4.0" resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" @@ -16406,11 +16400,6 @@ selfsigned@^2.0.0: dependencies: node-forge "^1.2.0" -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= - semver-diff@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" @@ -17124,7 +17113,7 @@ strict-uri-encode@^2.0.0: resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY= -string-argv@0.3.1: +string-argv@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== @@ -17177,7 +17166,7 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^5.0.1: +string-width@^5.0.0, string-width@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.0.tgz#5ab00980cfb29f43e736b113a120a73a0fb569d3" integrity sha512-7x54QnN21P+XL/v8SuNKvfgsUre6PXpN7mc77N3HlZv+f1SBRGmjxtOud2Z6FZ8DmdkD/IdjCaf9XXbnqmTZGQ== @@ -17522,6 +17511,11 @@ supports-color@^8.0.0, supports-color@^8.1.0, supports-color@^8.1.1: dependencies: has-flag "^4.0.0" +supports-color@^9.2.1: + version "9.2.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-9.2.1.tgz#599dc9d45acf74c6176e0d880bab1d7d718fe891" + integrity sha512-Obv7ycoCTG51N7y175StI9BlAXrmgZrFhZOb0/PyjHBher/NmsdBgbbQ1Inhq+gIhz6+7Gb+jWF2Vqi7Mf1xnQ== + supports-hyperlinks@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"