Skip to content

Commit 3637bd0

Browse files
committed
Merge branch 'release/3.1.13'
2 parents e6765f2 + 5de6b67 commit 3637bd0

File tree

5 files changed

+129
-110
lines changed

5 files changed

+129
-110
lines changed

.gitattributes

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
# Declare text files with unix file ending
2+
*.any text eol=lf
3+
*.cfg text eol=lf
24
*.conf text eol=lf
35
*.config text eol=lf
46
*.css text eol=lf
57
*.dtd text eol=lf
8+
*.env text eol=lf
69
*.esp text eol=lf
710
*.ecma text eol=lf
11+
*.farm text eol=lf
12+
*.gdsl text eol=lf
813
*.groovy text eol=lf
914
*.hbrs text eol=lf
1015
*.hbs text eol=lf
@@ -15,6 +20,7 @@
1520
*.js text eol=lf
1621
*.json text eol=lf
1722
*.jsp text eol=lf
23+
*.md text eol=lf
1824
*.mustache text eol=lf
1925
*.tld text eol=lf
2026
*.launch text eol=lf
@@ -24,15 +30,21 @@
2430
*.project text eol=lf
2531
*.properties text eol=lf
2632
*.props text eol=lf
33+
*.py text eol=lf
34+
*.rules text eol=lf
2735
*.sass text eol=lf
2836
*.scss text eol=lf
2937
*.sh text eol=lf
3038
*.shtm text eol=lf
3139
*.shtml text eol=lf
3240
*.sql text eol=lf
3341
*.svg text eol=lf
42+
*.tf text eol=lf
43+
*.ts text eol=lf
3444
*.txt text eol=lf
45+
*.vhost text eol=lf
3546
*.vm text eol=lf
47+
*.vue text eol=lf
3648
*.xml text eol=lf
3749
*.xsd text eol=lf
3850
*.xsl text eol=lf

eslint.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ export default defineConfigWithVueTs(
1919
pluginVue.configs['flat/essential'],
2020
vueTsConfigs.recommended,
2121

22+
{
23+
rules: {
24+
'semi': ['error', 'never']
25+
}
26+
},
27+
2228
{
2329
...pluginVitest.configs.recommended,
2430
files: [

0 commit comments

Comments
 (0)