From a0a1ff813bba88158cf69b1d56dfa32d2c0f1afb Mon Sep 17 00:00:00 2001 From: Your New SJW Waifu Date: Fri, 10 Feb 2023 21:37:50 +0000 Subject: [PATCH] Revert "Fixing things" This reverts commit d3d651a9dc91e635fa86b34d0ce86efd61ea8304 --- .babelrc | 4 ++-- .eslintrc.js | 5 +++-- .gitignore | 1 + .gitmodules | 3 +++ .node-version | 2 +- .stylelintrc.json | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 .gitmodules create mode 100644 .stylelintrc.json diff --git a/.babelrc b/.babelrc index 3c732dd1bc..4ec1041613 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,5 @@ { "presets": ["@babel/preset-env"], - "plugins": ["@babel/plugin-transform-runtime", "lodash", "@vue/babel-plugin-transform-vue-jsx"], - "comments": false + "plugins": ["@babel/plugin-transform-runtime", "lodash", "@vue/babel-plugin-jsx"], + "comments": true } diff --git a/.eslintrc.js b/.eslintrc.js index 3c48baa893..361cff5f2b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { root: true, parserOptions: { - parser: 'babel-eslint', + parser: '@babel/eslint-parser', sourceType: 'module' }, // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style @@ -21,6 +21,7 @@ module.exports = { 'generator-star-spacing': 0, // allow debugger during development 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0, - 'vue/require-prop-types': 0 + 'vue/require-prop-types': 0, + 'vue/multi-word-component-names': 0 } } diff --git a/.gitignore b/.gitignore index 479d57c408..4df5ec8386 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ test/e2e/reports selenium-debug.log .idea/ config/local.json +static/emoji.json diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..60de6263be --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "instance/pleroma-mods/pleroma-mod-catify"] + path = instance/pleroma-mods/pleroma-mod-catify + url = https://git.pleroma.social/absturztaube/pleroma-mod-catify.git diff --git a/.node-version b/.node-version index b26a34e470..5397c87fab 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -7.2.1 +16.18.1 diff --git a/.stylelintrc.json b/.stylelintrc.json new file mode 100644 index 0000000000..d6689cc015 --- /dev/null +++ b/.stylelintrc.json @@ -0,0 +1,41 @@ +{ + "extends": [ + "stylelint-rscss/config", + "stylelint-config-standard", + "stylelint-config-recommended-scss", + "stylelint-config-html", + "stylelint-config-recommended-vue/scss" + ], + "rules": { + "declaration-no-important": true, + "rscss/no-descendant-combinator": false, + "rscss/class-format": [ + false, + { + "component": "pascal-case", + "variant": "^-[a-z]\\w+", + "element": "^[a-z]\\w+" + } + ], + "selector-class-pattern": null, + "import-notation": null, + "custom-property-pattern": null, + "keyframes-name-pattern": null, + "scss/operator-no-newline-after": null, + "declaration-block-no-redundant-longhand-properties": [ + true, + { + "ignoreShorthands": [ + "grid-template", + "margin", + "padding", + "border", + "border-width", + "border-style", + "border-color", + "border-radius" + ] + } + ] + } +}