Skip to content

Commit 29a65b3

Browse files
authored
Merge branch 'main' into lunny/refactor-issue
2 parents 3d3d6c4 + 22c4599 commit 29a65b3

File tree

736 files changed

+19184
-10908
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

736 files changed

+19184
-10908
lines changed

.eslintrc.yaml

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ parserOptions:
1616
parser: "@typescript-eslint/parser" # for vue plugin - https://eslint.vuejs.org/user-guide/#how-to-use-a-custom-parser
1717

1818
settings:
19-
import/extensions: [".js", ".ts"]
20-
import/parsers:
19+
import-x/extensions: [".js", ".ts"]
20+
import-x/parsers:
2121
"@typescript-eslint/parser": [".js", ".ts"]
22-
import/resolver:
22+
import-x/resolver:
2323
typescript: true
2424

2525
plugins:
@@ -28,7 +28,7 @@ plugins:
2828
- "@typescript-eslint/eslint-plugin"
2929
- eslint-plugin-array-func
3030
- eslint-plugin-github
31-
- eslint-plugin-i
31+
- eslint-plugin-import-x
3232
- eslint-plugin-no-jquery
3333
- eslint-plugin-no-use-extend-native
3434
- eslint-plugin-regexp
@@ -58,15 +58,15 @@ overrides:
5858
no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, locationbar, menubar, moveBy, moveTo, name, onblur, onerror, onfocus, onload, onresize, onunload, open, opener, opera, outerHeight, outerWidth, pageXOffset, pageYOffset, parent, print, removeEventListener, resizeBy, resizeTo, screen, screenLeft, screenTop, screenX, screenY, scroll, scrollbars, scrollBy, scrollTo, scrollX, scrollY, status, statusbar, stop, toolbar, top]
5959
- files: ["*.config.*"]
6060
rules:
61-
i/no-unused-modules: [0]
61+
import-x/no-unused-modules: [0]
6262
- files: ["**/*.d.ts"]
6363
rules:
64-
i/no-unused-modules: [0]
64+
import-x/no-unused-modules: [0]
6565
"@typescript-eslint/consistent-type-definitions": [0]
6666
"@typescript-eslint/consistent-type-imports": [0]
6767
- files: ["web_src/js/types.ts"]
6868
rules:
69-
i/no-unused-modules: [0]
69+
import-x/no-unused-modules: [0]
7070
- files: ["**/*.test.*", "web_src/js/test/setup.ts"]
7171
env:
7272
vitest-globals/env: true
@@ -394,49 +394,49 @@ rules:
394394
id-blacklist: [0]
395395
id-length: [0]
396396
id-match: [0]
397-
i/consistent-type-specifier-style: [0]
398-
i/default: [0]
399-
i/dynamic-import-chunkname: [0]
400-
i/export: [2]
401-
i/exports-last: [0]
402-
i/extensions: [2, always, {ignorePackages: true}]
403-
i/first: [2]
404-
i/group-exports: [0]
405-
i/max-dependencies: [0]
406-
i/named: [2]
407-
i/namespace: [0]
408-
i/newline-after-import: [0]
409-
i/no-absolute-path: [0]
410-
i/no-amd: [2]
411-
i/no-anonymous-default-export: [0]
412-
i/no-commonjs: [2]
413-
i/no-cycle: [2, {ignoreExternal: true, maxDepth: 1}]
414-
i/no-default-export: [0]
415-
i/no-deprecated: [0]
416-
i/no-dynamic-require: [0]
417-
i/no-empty-named-blocks: [2]
418-
i/no-extraneous-dependencies: [2]
419-
i/no-import-module-exports: [0]
420-
i/no-internal-modules: [0]
421-
i/no-mutable-exports: [0]
422-
i/no-named-as-default-member: [0]
423-
i/no-named-as-default: [0]
424-
i/no-named-default: [0]
425-
i/no-named-export: [0]
426-
i/no-namespace: [0]
427-
i/no-nodejs-modules: [0]
428-
i/no-relative-packages: [0]
429-
i/no-relative-parent-imports: [0]
430-
i/no-restricted-paths: [0]
431-
i/no-self-import: [2]
432-
i/no-unassigned-import: [0]
433-
i/no-unresolved: [2, {commonjs: true, ignore: ["\\?.+$"]}]
434-
i/no-unused-modules: [2, {unusedExports: true}]
435-
i/no-useless-path-segments: [2, {commonjs: true}]
436-
i/no-webpack-loader-syntax: [2]
437-
i/order: [0]
438-
i/prefer-default-export: [0]
439-
i/unambiguous: [0]
397+
import-x/consistent-type-specifier-style: [0]
398+
import-x/default: [0]
399+
import-x/dynamic-import-chunkname: [0]
400+
import-x/export: [2]
401+
import-x/exports-last: [0]
402+
import-x/extensions: [2, always, {ignorePackages: true}]
403+
import-x/first: [2]
404+
import-x/group-exports: [0]
405+
import-x/max-dependencies: [0]
406+
import-x/named: [2]
407+
import-x/namespace: [0]
408+
import-x/newline-after-import: [0]
409+
import-x/no-absolute-path: [0]
410+
import-x/no-amd: [2]
411+
import-x/no-anonymous-default-export: [0]
412+
import-x/no-commonjs: [2]
413+
import-x/no-cycle: [2, {ignoreExternal: true, maxDepth: 1}]
414+
import-x/no-default-export: [0]
415+
import-x/no-deprecated: [0]
416+
import-x/no-dynamic-require: [0]
417+
import-x/no-empty-named-blocks: [2]
418+
import-x/no-extraneous-dependencies: [2]
419+
import-x/no-import-module-exports: [0]
420+
import-x/no-internal-modules: [0]
421+
import-x/no-mutable-exports: [0]
422+
import-x/no-named-as-default-member: [0]
423+
import-x/no-named-as-default: [0]
424+
import-x/no-named-default: [0]
425+
import-x/no-named-export: [0]
426+
import-x/no-namespace: [0]
427+
import-x/no-nodejs-modules: [0]
428+
import-x/no-relative-packages: [0]
429+
import-x/no-relative-parent-imports: [0]
430+
import-x/no-restricted-paths: [0]
431+
import-x/no-self-import: [2]
432+
import-x/no-unassigned-import: [0]
433+
import-x/no-unresolved: [2, {commonjs: true, ignore: ["\\?.+$"]}]
434+
import-x/no-unused-modules: [2, {unusedExports: true}]
435+
import-x/no-useless-path-segments: [2, {commonjs: true}]
436+
import-x/no-webpack-loader-syntax: [2]
437+
import-x/order: [0]
438+
import-x/prefer-default-export: [0]
439+
import-x/unambiguous: [0]
440440
init-declarations: [0]
441441
line-comment-position: [0]
442442
logical-assignment-operators: [0]
@@ -524,6 +524,7 @@ rules:
524524
no-jquery/no-data: [0]
525525
no-jquery/no-deferred: [2]
526526
no-jquery/no-delegate: [2]
527+
no-jquery/no-done-fail: [2]
527528
no-jquery/no-each-collection: [0]
528529
no-jquery/no-each-util: [0]
529530
no-jquery/no-each: [0]
@@ -538,6 +539,7 @@ rules:
538539
no-jquery/no-find-util: [2]
539540
no-jquery/no-find: [0]
540541
no-jquery/no-fx-interval: [2]
542+
no-jquery/no-fx: [2]
541543
no-jquery/no-global-eval: [2]
542544
no-jquery/no-global-selector: [0]
543545
no-jquery/no-grep: [2]
@@ -816,7 +818,7 @@ rules:
816818
unicorn/consistent-destructuring: [2]
817819
unicorn/consistent-empty-array-spread: [2]
818820
unicorn/consistent-existence-index-check: [0]
819-
unicorn/consistent-function-scoping: [2]
821+
unicorn/consistent-function-scoping: [0]
820822
unicorn/custom-error-definition: [0]
821823
unicorn/empty-brace-spaces: [2]
822824
unicorn/error-message: [0]

.github/actionlint.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ self-hosted-runner:
33
- actuated-4cpu-8gb
44
- actuated-4cpu-16gb
55
- nscloud
6+
- namespace-profile-gitea-release-docker
7+
- namespace-profile-gitea-release-binary

.github/workflows/release-nightly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ concurrency:
1010

1111
jobs:
1212
nightly-binary:
13-
runs-on: nscloud
13+
runs-on: namespace-profile-gitea-release-binary
1414
steps:
1515
- uses: actions/checkout@v4
1616
# fetch all commits instead of only the last as some branches are long lived and could have many between versions
@@ -58,7 +58,7 @@ jobs:
5858
run: |
5959
aws s3 sync dist/release s3://${{ secrets.AWS_S3_BUCKET }}/gitea/${{ steps.clean_name.outputs.branch }} --no-progress
6060
nightly-docker-rootful:
61-
runs-on: ubuntu-latest
61+
runs-on: namespace-profile-gitea-release-docker
6262
steps:
6363
- uses: actions/checkout@v4
6464
# fetch all commits instead of only the last as some branches are long lived and could have many between versions
@@ -95,7 +95,7 @@ jobs:
9595
push: true
9696
tags: gitea/gitea:${{ steps.clean_name.outputs.branch }}
9797
nightly-docker-rootless:
98-
runs-on: ubuntu-latest
98+
runs-on: namespace-profile-gitea-release-docker
9999
steps:
100100
- uses: actions/checkout@v4
101101
# fetch all commits instead of only the last as some branches are long lived and could have many between versions

.github/workflows/release-tag-rc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ concurrency:
1111

1212
jobs:
1313
binary:
14-
runs-on: nscloud
14+
runs-on: namespace-profile-gitea-release-binary
1515
steps:
1616
- uses: actions/checkout@v4
1717
# fetch all commits instead of only the last as some branches are long lived and could have many between versions
@@ -68,7 +68,7 @@ jobs:
6868
env:
6969
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
7070
docker-rootful:
71-
runs-on: ubuntu-latest
71+
runs-on: namespace-profile-gitea-release-docker
7272
steps:
7373
- uses: actions/checkout@v4
7474
# fetch all commits instead of only the last as some branches are long lived and could have many between versions
@@ -99,7 +99,7 @@ jobs:
9999
tags: ${{ steps.meta.outputs.tags }}
100100
labels: ${{ steps.meta.outputs.labels }}
101101
docker-rootless:
102-
runs-on: ubuntu-latest
102+
runs-on: namespace-profile-gitea-release-docker
103103
steps:
104104
- uses: actions/checkout@v4
105105
# fetch all commits instead of only the last as some branches are long lived and could have many between versions

.github/workflows/release-tag-version.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313

1414
jobs:
1515
binary:
16-
runs-on: nscloud
16+
runs-on: namespace-profile-gitea-release-binary
1717
steps:
1818
- uses: actions/checkout@v4
1919
# fetch all commits instead of only the last as some branches are long lived and could have many between versions
@@ -70,7 +70,7 @@ jobs:
7070
env:
7171
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
7272
docker-rootful:
73-
runs-on: ubuntu-latest
73+
runs-on: namespace-profile-gitea-release-docker
7474
steps:
7575
- uses: actions/checkout@v4
7676
# fetch all commits instead of only the last as some branches are long lived and could have many between versions
@@ -105,7 +105,7 @@ jobs:
105105
tags: ${{ steps.meta.outputs.tags }}
106106
labels: ${{ steps.meta.outputs.labels }}
107107
docker-rootless:
108-
runs-on: ubuntu-latest
108+
runs-on: namespace-profile-gitea-release-docker
109109
steps:
110110
- uses: actions/checkout@v4
111111
# fetch all commits instead of only the last as some branches are long lived and could have many between versions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ _testmain.go
2828
*.exe
2929
*.test
3030
*.prof
31+
*.tsbuildinfo
3132

3233
*coverage.out
3334
coverage.all

.golangci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ linters:
1919
- revive
2020
- staticcheck
2121
- stylecheck
22+
- tenv
23+
- testifylint
2224
- typecheck
2325
- unconvert
2426
- unused
@@ -34,6 +36,10 @@ output:
3436
show-stats: true
3537

3638
linters-settings:
39+
testifylint:
40+
disable:
41+
- go-require
42+
- require-error
3743
stylecheck:
3844
checks: ["all", "-ST1005", "-ST1003"]
3945
nakedret:

0 commit comments

Comments
 (0)