diff --git a/.editorconfig b/.editorconfig index 5ce86bc41..87eabc131 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,8 +13,8 @@ max_line_length = 80 [*.md] trim_trailing_whitespace = false -[*.{css,html,js,jsx,json,rb,erb}] +[*.{css,html,js,json,rb,erb}] charset = utf-8 -[*.{html,jsx,erb,json}] +[*.{html,erb,json}] max_line_length = 160 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 87f9c7d4a..3374e6913 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -29,11 +29,11 @@ jobs: with: eslint: true eslint_dir: src - eslint_extensions: js,ts,jsx,tsx + eslint_extensions: js,ts,tsx eslint_auto_fix: false prettier: true prettier_dir: src - prettier_extensions: js,ts,jsx,tsx + prettier_extensions: js,ts,tsx prettier_auto_fix: false # Cypress disabled until tests rewritten to use new SB paths # - name: Cypress diff --git a/.prettierrc.json b/.prettierrc.json index e2b9a9442..de2d6fea1 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,7 +1,7 @@ { "overrides": [ { - "files": ["*.html", "*.jsx"], + "files": ["*.html"], "options": { "printWidth": 160, "htmlWhitespaceSensitivity": "strict" diff --git a/tailwind.config.js b/tailwind.config.js index 32da0d6a9..1e4f05f49 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,5 +1,5 @@ module.exports = { - content: ["./src/**/*.{jsx,js,json,css,ts,tsx,mdx}"], + content: ["./src/**/*.{js,json,css,ts,tsx,mdx}"], safelist: [ "w-1/2", "w-1/3",