diff --git a/.babelrc b/.babelrc index 4ec1041613..3c732dd1bc 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,5 @@ { "presets": ["@babel/preset-env"], - "plugins": ["@babel/plugin-transform-runtime", "lodash", "@vue/babel-plugin-jsx"], - "comments": true + "plugins": ["@babel/plugin-transform-runtime", "lodash", "@vue/babel-plugin-transform-vue-jsx"], + "comments": false } diff --git a/.eslintrc.js b/.eslintrc.js index 361cff5f2b..3c48baa893 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { root: true, parserOptions: { - parser: '@babel/eslint-parser', + parser: 'babel-eslint', sourceType: 'module' }, // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style @@ -21,7 +21,6 @@ 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/multi-word-component-names': 0 + 'vue/require-prop-types': 0 } } diff --git a/.gitignore b/.gitignore index 4df5ec8386..479d57c408 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ test/e2e/reports selenium-debug.log .idea/ config/local.json -static/emoji.json diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 60de6263be..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[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 5397c87fab..b26a34e470 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -16.18.1 +7.2.1 diff --git a/.stylelintrc.json b/.stylelintrc.json deleted file mode 100644 index d6689cc015..0000000000 --- a/.stylelintrc.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "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" - ] - } - ] - } -}