mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-28 17:50:01 +01:00
d7d102e68f
Conflicts: - `.prettierignore`: Upstream removed it, replaced by `.oxfmtrc.json`. We had glitch-specific files in there. Updated `.oxfmtrc.json` accordingly and removed `.prettierignore`. - `config/formatjs-formatter.js`: Upstream switched to `oxfmt` from `prettier`, and some rules are slightly different. Glitch-soc had extra code in there. Reformatted appropriately. - `eslint.config.mjs`: Upstream moved some configuration from `eslint.config.mjs` to `.oxfmtrc.json` where glitch-soc had slightly different configuration. Removed it from `eslint.config.mjs` as well and updated `.oxfmtrc.json` accordingly. - `package.json`: Upstream changed script definitions textually adjacent to one that we have modified. Applied upstream's change, keeping the textually adjacent modified script intact.
100 lines
2.6 KiB
JSON
100 lines
2.6 KiB
JSON
{
|
|
"$schema": "./node_modules/oxfmt/configuration_schema.json",
|
|
"singleQuote": true,
|
|
"jsxSingleQuote": true,
|
|
"printWidth": 80,
|
|
"ignorePatterns": [
|
|
"/tmp",
|
|
"/coverage",
|
|
"/public/assets",
|
|
"/public/emoji",
|
|
"/public/packs",
|
|
"/public/packs-test",
|
|
"/public/system",
|
|
"/public/vite*",
|
|
|
|
"*.html",
|
|
"docker-compose.override.yml",
|
|
|
|
// Ignore config YAML files that include ERB/ruby code
|
|
"config/email.yml",
|
|
|
|
// Vendored CSS
|
|
"app/javascript/styles/mastodon/reset.scss",
|
|
"app/javascript/flavours/glitch/styles/reset.scss",
|
|
|
|
// Automatically generated
|
|
"/app/javascript/mastodon/features/emoji/emoji_map.json",
|
|
"/app/javascript/mastodon/features/emoji/emoji_data.json",
|
|
"AUTHORS.md",
|
|
"/app/javascript/mastodon/locales/*.json",
|
|
"/config/locales",
|
|
".storybook/static/mockServiceWorker.js",
|
|
|
|
// Automatically generated (glitch-soc)
|
|
"/app/javascript/flavours/glitch/features/emoji/emoji_map.json",
|
|
"/app/javascript/flavours/glitch/features/emoji/emoji_data.json",
|
|
"/app/javascript/flavours/glitch/locales/*.json",
|
|
"/config/locales-glitch",
|
|
|
|
// do not reformat JS files as this will change too many files and cause merge conflicts with open PRs and forks
|
|
"app/javascript/**/*.js",
|
|
"app/javascript/**/*.jsx",
|
|
"streaming/**/*.js"
|
|
],
|
|
"experimentalSortPackageJson": false,
|
|
"experimentalSortImports": {
|
|
"groups": [
|
|
["builtin"],
|
|
["react"],
|
|
["react-intl"],
|
|
["react-utils"],
|
|
["redux"],
|
|
["external", "type-external"],
|
|
["internal", "type-internal"],
|
|
["mastodon-internals"],
|
|
["parent", "type-parent"],
|
|
["sibling", "type-sibling", "index", "type-index"],
|
|
["side_effect"]
|
|
],
|
|
"customGroups": [
|
|
{
|
|
"groupName": "react",
|
|
"elementNamePattern": [
|
|
"react",
|
|
"react-dom",
|
|
"react-dom/client",
|
|
"prop-types"
|
|
]
|
|
},
|
|
{
|
|
"groupName": "react-intl",
|
|
"elementNamePattern": ["react-intl", "intl-messageformat"]
|
|
},
|
|
{
|
|
"groupName": "react-utils",
|
|
"elementNamePattern": [
|
|
"classnames",
|
|
"react-helmet",
|
|
"react-router",
|
|
"react-router-dom"
|
|
]
|
|
},
|
|
{
|
|
"groupName": "redux",
|
|
"elementNamePattern": [
|
|
"immutable",
|
|
"@reduxjs/toolkit",
|
|
"react-redux",
|
|
"react-immutable-proptypes",
|
|
"react-immutable-pure-component"
|
|
]
|
|
},
|
|
{
|
|
"groupName": "mastodon-internals",
|
|
"elementNamePattern": ["mastodon/**", "flavours/glitch/**", "@/**"]
|
|
}
|
|
]
|
|
}
|
|
}
|