mirror of
https://codeberg.org/davrot/forgejo.git
synced 2025-06-21 20:00:02 +02:00
chore: migrate to @stylistic/eslint-plugin (#8216)
- The JS variant is deprecated, move to the unified package. `[@stylistic/eslint-plugin-js] This package is deprecated in favor of the unified @stylistic/eslint-plugin, please consider migrating to the main package` is logged when running `make lint-frontend`. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8216 Reviewed-by: floss4good <floss4good@noreply.codeberg.org> Reviewed-by: Otto <otto@codeberg.org> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-committed-by: Gusted <postmaster@gusted.xyz>
This commit is contained in:
Gusted
Earl Warren
parent
5fa37539de
commit
e7eca7f36c
5 changed files with 92 additions and 76 deletions
|
|
@ -1,5 +1,5 @@
|
|||
import eslintCommunityEslintPluginEslintComments from '@eslint-community/eslint-plugin-eslint-comments';
|
||||
import stylisticEslintPluginJs from '@stylistic/eslint-plugin-js';
|
||||
import stylisticEslintPlugin from '@stylistic/eslint-plugin';
|
||||
import vitest from '@vitest/eslint-plugin';
|
||||
import arrayFunc from 'eslint-plugin-array-func';
|
||||
import eslintPluginImportX from 'eslint-plugin-import-x';
|
||||
|
|
@ -26,7 +26,7 @@ export default tseslint.config(
|
|||
{
|
||||
plugins: {
|
||||
'@eslint-community/eslint-comments': eslintCommunityEslintPluginEslintComments,
|
||||
'@stylistic/js': stylisticEslintPluginJs,
|
||||
'@stylistic': stylisticEslintPlugin,
|
||||
'@vitest': vitest,
|
||||
'array-func': arrayFunc,
|
||||
'no-jquery': noJquery,
|
||||
|
|
@ -69,62 +69,62 @@ export default tseslint.config(
|
|||
'@eslint-community/eslint-comments/no-unused-enable': [2],
|
||||
'@eslint-community/eslint-comments/no-use': [0],
|
||||
'@eslint-community/eslint-comments/require-description': [0],
|
||||
'@stylistic/js/array-bracket-newline': [0],
|
||||
'@stylistic/js/array-bracket-spacing': [2, 'never'],
|
||||
'@stylistic/js/array-element-newline': [0],
|
||||
'@stylistic/js/arrow-parens': [2, 'always'],
|
||||
'@stylistic/array-bracket-newline': [0],
|
||||
'@stylistic/array-bracket-spacing': [2, 'never'],
|
||||
'@stylistic/array-element-newline': [0],
|
||||
'@stylistic/arrow-parens': [2, 'always'],
|
||||
|
||||
'@stylistic/js/arrow-spacing': [2, {
|
||||
'@stylistic/arrow-spacing': [2, {
|
||||
before: true,
|
||||
after: true,
|
||||
}],
|
||||
|
||||
'@stylistic/js/block-spacing': [0],
|
||||
'@stylistic/block-spacing': [0],
|
||||
|
||||
'@stylistic/js/brace-style': [2, '1tbs', {
|
||||
'@stylistic/brace-style': [2, '1tbs', {
|
||||
allowSingleLine: true,
|
||||
}],
|
||||
|
||||
'@stylistic/js/comma-dangle': [2, 'always-multiline'],
|
||||
'@stylistic/comma-dangle': [2, 'always-multiline'],
|
||||
|
||||
'@stylistic/js/comma-spacing': [2, {
|
||||
'@stylistic/comma-spacing': [2, {
|
||||
before: false,
|
||||
after: true,
|
||||
}],
|
||||
|
||||
'@stylistic/js/comma-style': [2, 'last'],
|
||||
'@stylistic/js/computed-property-spacing': [2, 'never'],
|
||||
'@stylistic/js/dot-location': [2, 'property'],
|
||||
'@stylistic/js/eol-last': [2],
|
||||
'@stylistic/js/function-call-spacing': [2, 'never'],
|
||||
'@stylistic/js/function-call-argument-newline': [0],
|
||||
'@stylistic/js/function-paren-newline': [0],
|
||||
'@stylistic/js/generator-star-spacing': [0],
|
||||
'@stylistic/js/implicit-arrow-linebreak': [0],
|
||||
'@stylistic/comma-style': [2, 'last'],
|
||||
'@stylistic/computed-property-spacing': [2, 'never'],
|
||||
'@stylistic/dot-location': [2, 'property'],
|
||||
'@stylistic/eol-last': [2],
|
||||
'@stylistic/function-call-spacing': [2, 'never'],
|
||||
'@stylistic/function-call-argument-newline': [0],
|
||||
'@stylistic/function-paren-newline': [0],
|
||||
'@stylistic/generator-star-spacing': [0],
|
||||
'@stylistic/implicit-arrow-linebreak': [0],
|
||||
|
||||
'@stylistic/js/indent': [2, 2, {
|
||||
'@stylistic/indent': [2, 2, {
|
||||
ignoreComments: true,
|
||||
SwitchCase: 1,
|
||||
}],
|
||||
|
||||
'@stylistic/js/key-spacing': [2],
|
||||
'@stylistic/js/keyword-spacing': [2],
|
||||
'@stylistic/js/linebreak-style': [2, 'unix'],
|
||||
'@stylistic/js/lines-around-comment': [0],
|
||||
'@stylistic/js/lines-between-class-members': [0],
|
||||
'@stylistic/js/max-len': [0],
|
||||
'@stylistic/js/max-statements-per-line': [0],
|
||||
'@stylistic/js/multiline-ternary': [0],
|
||||
'@stylistic/js/new-parens': [2],
|
||||
'@stylistic/js/newline-per-chained-call': [0],
|
||||
'@stylistic/js/no-confusing-arrow': [0],
|
||||
'@stylistic/js/no-extra-parens': [0],
|
||||
'@stylistic/js/no-extra-semi': [2],
|
||||
'@stylistic/js/no-floating-decimal': [0],
|
||||
'@stylistic/js/no-mixed-operators': [0],
|
||||
'@stylistic/js/no-mixed-spaces-and-tabs': [2],
|
||||
'@stylistic/key-spacing': [2],
|
||||
'@stylistic/keyword-spacing': [2],
|
||||
'@stylistic/linebreak-style': [2, 'unix'],
|
||||
'@stylistic/lines-around-comment': [0],
|
||||
'@stylistic/lines-between-class-members': [0],
|
||||
'@stylistic/max-len': [0],
|
||||
'@stylistic/max-statements-per-line': [0],
|
||||
'@stylistic/multiline-ternary': [0],
|
||||
'@stylistic/new-parens': [2],
|
||||
'@stylistic/newline-per-chained-call': [0],
|
||||
'@stylistic/no-confusing-arrow': [0],
|
||||
'@stylistic/no-extra-parens': [0],
|
||||
'@stylistic/no-extra-semi': [2],
|
||||
'@stylistic/no-floating-decimal': [0],
|
||||
'@stylistic/no-mixed-operators': [0],
|
||||
'@stylistic/no-mixed-spaces-and-tabs': [2],
|
||||
|
||||
'@stylistic/js/no-multi-spaces': [2, {
|
||||
'@stylistic/no-multi-spaces': [2, {
|
||||
ignoreEOLComments: true,
|
||||
|
||||
exceptions: {
|
||||
|
|
@ -132,60 +132,60 @@ export default tseslint.config(
|
|||
},
|
||||
}],
|
||||
|
||||
'@stylistic/js/no-multiple-empty-lines': [2, {
|
||||
'@stylistic/no-multiple-empty-lines': [2, {
|
||||
max: 1,
|
||||
maxEOF: 0,
|
||||
maxBOF: 0,
|
||||
}],
|
||||
|
||||
'@stylistic/js/no-tabs': [2],
|
||||
'@stylistic/js/no-trailing-spaces': [2],
|
||||
'@stylistic/js/no-whitespace-before-property': [2],
|
||||
'@stylistic/js/nonblock-statement-body-position': [2],
|
||||
'@stylistic/js/object-curly-newline': [0],
|
||||
'@stylistic/js/object-curly-spacing': [2, 'never'],
|
||||
'@stylistic/js/object-property-newline': [0],
|
||||
'@stylistic/js/one-var-declaration-per-line': [0],
|
||||
'@stylistic/js/operator-linebreak': [2, 'after'],
|
||||
'@stylistic/js/padded-blocks': [2, 'never'],
|
||||
'@stylistic/js/padding-line-between-statements': [0],
|
||||
'@stylistic/js/quote-props': [0],
|
||||
'@stylistic/no-tabs': [2],
|
||||
'@stylistic/no-trailing-spaces': [2],
|
||||
'@stylistic/no-whitespace-before-property': [2],
|
||||
'@stylistic/nonblock-statement-body-position': [2],
|
||||
'@stylistic/object-curly-newline': [0],
|
||||
'@stylistic/object-curly-spacing': [2, 'never'],
|
||||
'@stylistic/object-property-newline': [0],
|
||||
'@stylistic/one-var-declaration-per-line': [0],
|
||||
'@stylistic/operator-linebreak': [2, 'after'],
|
||||
'@stylistic/padded-blocks': [2, 'never'],
|
||||
'@stylistic/padding-line-between-statements': [0],
|
||||
'@stylistic/quote-props': [0],
|
||||
|
||||
'@stylistic/js/quotes': [2, 'single', {
|
||||
'@stylistic/quotes': [2, 'single', {
|
||||
avoidEscape: true,
|
||||
allowTemplateLiterals: true,
|
||||
}],
|
||||
|
||||
'@stylistic/js/rest-spread-spacing': [2, 'never'],
|
||||
'@stylistic/rest-spread-spacing': [2, 'never'],
|
||||
|
||||
'@stylistic/js/semi': [2, 'always', {
|
||||
'@stylistic/semi': [2, 'always', {
|
||||
omitLastInOneLineBlock: true,
|
||||
}],
|
||||
|
||||
'@stylistic/js/semi-spacing': [2, {
|
||||
'@stylistic/semi-spacing': [2, {
|
||||
before: false,
|
||||
after: true,
|
||||
}],
|
||||
|
||||
'@stylistic/js/semi-style': [2, 'last'],
|
||||
'@stylistic/js/space-before-blocks': [2, 'always'],
|
||||
'@stylistic/semi-style': [2, 'last'],
|
||||
'@stylistic/space-before-blocks': [2, 'always'],
|
||||
|
||||
'@stylistic/js/space-before-function-paren': [2, {
|
||||
'@stylistic/space-before-function-paren': [2, {
|
||||
anonymous: 'ignore',
|
||||
named: 'never',
|
||||
asyncArrow: 'always',
|
||||
}],
|
||||
|
||||
'@stylistic/js/space-in-parens': [2, 'never'],
|
||||
'@stylistic/js/space-infix-ops': [2],
|
||||
'@stylistic/js/space-unary-ops': [2],
|
||||
'@stylistic/js/spaced-comment': [2, 'always'],
|
||||
'@stylistic/js/switch-colon-spacing': [2],
|
||||
'@stylistic/js/template-curly-spacing': [2, 'never'],
|
||||
'@stylistic/js/template-tag-spacing': [2, 'never'],
|
||||
'@stylistic/js/wrap-iife': [2, 'inside'],
|
||||
'@stylistic/js/wrap-regex': [0],
|
||||
'@stylistic/js/yield-star-spacing': [2, 'after'],
|
||||
'@stylistic/space-in-parens': [2, 'never'],
|
||||
'@stylistic/space-infix-ops': [2],
|
||||
'@stylistic/space-unary-ops': [2],
|
||||
'@stylistic/spaced-comment': [2, 'always'],
|
||||
'@stylistic/switch-colon-spacing': [2],
|
||||
'@stylistic/template-curly-spacing': [2, 'never'],
|
||||
'@stylistic/template-tag-spacing': [2, 'never'],
|
||||
'@stylistic/wrap-iife': [2, 'inside'],
|
||||
'@stylistic/wrap-regex': [0],
|
||||
'@stylistic/yield-star-spacing': [2, 'after'],
|
||||
'accessor-pairs': [2],
|
||||
|
||||
'array-callback-return': [2, {
|
||||
|
|
|
|||
26
package-lock.json
generated
26
package-lock.json
generated
|
|
@ -64,7 +64,7 @@
|
|||
"@eslint-community/eslint-plugin-eslint-comments": "4.5.0",
|
||||
"@playwright/test": "1.53.0",
|
||||
"@stoplight/spectral-cli": "6.15.0",
|
||||
"@stylistic/eslint-plugin-js": "4.4.1",
|
||||
"@stylistic/eslint-plugin": "4.4.1",
|
||||
"@stylistic/stylelint-plugin": "3.1.2",
|
||||
"@vitejs/plugin-vue": "5.2.4",
|
||||
"@vitest/coverage-v8": "3.2.3",
|
||||
|
|
@ -3011,15 +3011,18 @@
|
|||
"node": "^12.20 || >=14.13"
|
||||
}
|
||||
},
|
||||
"node_modules/@stylistic/eslint-plugin-js": {
|
||||
"node_modules/@stylistic/eslint-plugin": {
|
||||
"version": "4.4.1",
|
||||
"resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-4.4.1.tgz",
|
||||
"integrity": "sha512-eLisyHvx7Sel8vcFZOEwDEBGmYsYM1SqDn81BWgmbqEXfXRf8oe6Rwp+ryM/8odNjlxtaaxp0Ihmt86CnLAxKg==",
|
||||
"resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-4.4.1.tgz",
|
||||
"integrity": "sha512-CEigAk7eOLyHvdgmpZsKFwtiqS2wFwI1fn4j09IU9GmD4euFM4jEBAViWeCqaNLlbX2k2+A/Fq9cje4HQBXuJQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@typescript-eslint/utils": "^8.32.1",
|
||||
"eslint-visitor-keys": "^4.2.0",
|
||||
"espree": "^10.3.0"
|
||||
"espree": "^10.3.0",
|
||||
"estraverse": "^5.3.0",
|
||||
"picomatch": "^4.0.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||
|
|
@ -3028,6 +3031,19 @@
|
|||
"eslint": ">=9.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@stylistic/eslint-plugin/node_modules/picomatch": {
|
||||
"version": "4.0.2",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
|
||||
"integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/jonschlinkert"
|
||||
}
|
||||
},
|
||||
"node_modules/@stylistic/stylelint-plugin": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/@stylistic/stylelint-plugin/-/stylelint-plugin-3.1.2.tgz",
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
"@eslint-community/eslint-plugin-eslint-comments": "4.5.0",
|
||||
"@playwright/test": "1.53.0",
|
||||
"@stoplight/spectral-cli": "6.15.0",
|
||||
"@stylistic/eslint-plugin-js": "4.4.1",
|
||||
"@stylistic/eslint-plugin": "4.4.1",
|
||||
"@stylistic/stylelint-plugin": "3.1.2",
|
||||
"@vitejs/plugin-vue": "5.2.4",
|
||||
"@vitest/coverage-v8": "3.2.3",
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ test.describe('Pull: Toggle WIP', () => {
|
|||
test('Issue: Labels', async ({page}, workerInfo) => {
|
||||
test.skip(workerInfo.project.name === 'Mobile Safari', 'Unable to get tests working on Safari Mobile, see https://codeberg.org/forgejo/forgejo/pulls/3445#issuecomment-1789636');
|
||||
|
||||
async function submitLabels({page}: { page: Page }) {
|
||||
async function submitLabels({page}: {page: Page}) {
|
||||
const submitted = page.waitForResponse('/user2/repo1/issues/labels');
|
||||
await page.locator('textarea').first().click(); // close via unrelated element
|
||||
await submitted;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ const reviewTeamUrl = '/org/org17/teams/review_team';
|
|||
const ownersUrl = '/org/org17/teams/owners';
|
||||
const adminUrl = '/org/org17/teams/super-user';
|
||||
|
||||
const cases: Record<string, { read?: Unit[], write?: Unit[] }> = {
|
||||
const cases: Record<string, {read?: Unit[], write?: Unit[]}> = {
|
||||
[testTeamUrl]: {write: ['Issues']},
|
||||
[reviewTeamUrl]: {read: ['Code']},
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue