Skip to content

Commit 51d39bb

Browse files
authored
Merge branch 'next' into locale/es/color
2 parents 71788df + 5832417 commit 51d39bb

14 files changed

+391
-666
lines changed

.github/workflows/check-mergable-by-label.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
- edited
1010
- labeled
1111
- unlabeled
12+
merge_group:
1213

1314
permissions: {}
1415

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches:
66
- next
77
pull_request:
8+
merge_group:
89

910
permissions:
1011
contents: read # to fetch code (actions/checkout)

.github/workflows/commentCodeGeneration.ts

Lines changed: 0 additions & 73 deletions
This file was deleted.

.github/workflows/pr.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: PR
22

33
on:
44
pull_request:
5+
merge_group:
56

67
permissions:
78
contents: read # to fetch code (actions/checkout)
@@ -10,8 +11,8 @@ jobs:
1011
check-code-generation:
1112
runs-on: ubuntu-latest
1213
timeout-minutes: 10
13-
name: 'Check Code Generation: node-22, ubuntu-latest'
1414

15+
name: 'Check Code Generation: node-22, ubuntu-latest'
1516
steps:
1617
- name: Checkout
1718
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/preflight-comment.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

.github/workflows/semantic-pull-request.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- opened
77
- edited
88
- synchronize
9+
merge_group:
910

1011
permissions: {}
1112

cypress/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"target": "ES5",
44
"lib": ["ES2015", "DOM"],
55
"types": ["cypress"],
6-
"esModuleInterop": true,
76
"noEmit": true,
87
"resolveJsonModule": true
98
},

docs/guide/usage.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ In order to have Faker working properly, you need to check if these `compilerOpt
102102
```json
103103
{
104104
"compilerOptions": {
105-
"esModuleInterop": true,
106105
"moduleResolution": "Bundler", // "Node10", "Node16" or "NodeNext"
107106
"strict": true // Optional, but recommended
108107
}

eslint.config.ts

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { includeIgnoreFile } from '@eslint/compat';
22
import eslint from '@eslint/js';
33
import stylistic from '@stylistic/eslint-plugin';
44
import eslintPluginVitest from '@vitest/eslint-plugin';
5+
import eslintPluginFileProgress from 'eslint-plugin-file-progress';
56
import eslintPluginJsdoc from 'eslint-plugin-jsdoc';
67
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
78
import eslintPluginUnicorn from 'eslint-plugin-unicorn';
@@ -17,6 +18,7 @@ const config: ReturnType<typeof tseslint.config> = tseslint.config(
1718
//#region global
1819
includeIgnoreFile(gitignorePath),
1920
{
21+
name: 'manual ignores',
2022
ignores: [
2123
// Skip some files that don't need linting right now
2224
'.github/workflows/commentCodeGeneration.ts',
@@ -28,6 +30,7 @@ const config: ReturnType<typeof tseslint.config> = tseslint.config(
2830
],
2931
},
3032
{
33+
name: 'linter options',
3134
linterOptions: {
3235
reportUnusedDisableDirectives: 'error',
3336
},
@@ -37,6 +40,7 @@ const config: ReturnType<typeof tseslint.config> = tseslint.config(
3740
//#region eslint (js)
3841
eslint.configs.recommended,
3942
{
43+
name: 'eslint overrides',
4044
rules: {
4145
eqeqeq: ['error', 'always', { null: 'ignore' }],
4246
'logical-assignment-operators': 'error',
@@ -51,9 +55,7 @@ const config: ReturnType<typeof tseslint.config> = tseslint.config(
5155
//#region typescript-eslint
5256
...tseslint.configs.strictTypeChecked,
5357
{
54-
plugins: {
55-
'@typescript-eslint': tseslint.plugin,
56-
},
58+
name: 'typescript-eslint overrides',
5759
languageOptions: {
5860
parserOptions: {
5961
project: true,
@@ -128,6 +130,7 @@ const config: ReturnType<typeof tseslint.config> = tseslint.config(
128130

129131
//#region stylistic
130132
{
133+
name: 'stylistic overrides',
131134
plugins: {
132135
'@stylistic': stylistic,
133136
},
@@ -143,6 +146,7 @@ const config: ReturnType<typeof tseslint.config> = tseslint.config(
143146
//#region unicorn
144147
eslintPluginUnicorn.configs['flat/recommended'],
145148
{
149+
name: 'unicorn overrides',
146150
rules: {
147151
'unicorn/import-style': 'off', // subjective & doesn't do anything for us
148152
'unicorn/no-array-callback-reference': 'off', // reduces readability
@@ -153,13 +157,13 @@ const config: ReturnType<typeof tseslint.config> = tseslint.config(
153157
'unicorn/number-literal-case': 'off', // incompatible with prettier
154158
'unicorn/numeric-separators-style': 'off', // "magic numbers" may carry specific meaning
155159
'unicorn/prefer-string-raw': 'off', // The additional prefix doesn't help readability
160+
'unicorn/prefer-string-slice': 'off', // string.substring is sometimes easier to use
156161
'unicorn/prefer-ternary': 'off', // ternaries aren't always better
157162

158163
// TODO @Shinigami92 2023-09-23: The following rules currently conflict with our code.
159164
// Each rule should be checked whether it should be enabled/configured and the problems fixed, or stay disabled permanently.
160165
'unicorn/consistent-function-scoping': 'off',
161166
'unicorn/prefer-export-from': 'off',
162-
'unicorn/prefer-string-slice': 'off',
163167
'unicorn/prevent-abbreviations': 'off',
164168
},
165169
},
@@ -168,6 +172,7 @@ const config: ReturnType<typeof tseslint.config> = tseslint.config(
168172
//#region jsdoc
169173
eslintPluginJsdoc.configs['flat/recommended-typescript-error'],
170174
{
175+
name: 'jsdoc overrides',
171176
rules: {
172177
'jsdoc/require-jsdoc': 'off', // Enabled only for src/**/*.ts
173178
'jsdoc/require-returns': 'off',
@@ -200,10 +205,15 @@ const config: ReturnType<typeof tseslint.config> = tseslint.config(
200205

201206
//#region prettier
202207
eslintPluginPrettierRecommended,
203-
//#endregion,
208+
//#endregion
209+
210+
//#region file-progress
211+
eslintPluginFileProgress.configs.recommended,
212+
//#endregion
204213

205214
//#region overrides
206215
{
216+
name: 'src/**/*.ts overrides',
207217
files: ['src/**/*.ts'],
208218
rules: {
209219
'no-undef': 'error', // Must override the config from typescript-eslint
@@ -215,12 +225,14 @@ const config: ReturnType<typeof tseslint.config> = tseslint.config(
215225
},
216226
},
217227
{
228+
name: 'src/locale/**/*.ts overrides',
218229
files: ['src/locale/**/*.ts'],
219230
rules: {
220231
'unicorn/filename-case': 'off', // our locale files have a custom naming scheme
221232
},
222233
},
223234
{
235+
name: 'src/{definitions,locales}/**/*.ts overrides',
224236
files: ['src/definitions/**/*.ts', 'src/locales/**/*.ts'],
225237
rules: {
226238
'unicorn/filename-case': [
@@ -233,6 +245,7 @@ const config: ReturnType<typeof tseslint.config> = tseslint.config(
233245
},
234246
},
235247
{
248+
name: 'test/**/*.ts overrides',
236249
files: ['test/**/*.spec.ts', 'test/**/*.spec.d.ts'],
237250
plugins: {
238251
vitest: eslintPluginVitest,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
"dist"
104104
],
105105
"devDependencies": {
106-
"@actions/github": "6.0.0",
107106
"@eslint/compat": "1.2.2",
108107
"@eslint/js": "9.14.0",
109108
"@stylistic/eslint-plugin": "2.10.1",
@@ -120,6 +119,7 @@
120119
"cypress": "13.15.1",
121120
"eslint": "9.14.0",
122121
"eslint-config-prettier": "9.1.0",
122+
"eslint-plugin-file-progress": "2.1.1",
123123
"eslint-plugin-jsdoc": "50.4.3",
124124
"eslint-plugin-prettier": "5.2.1",
125125
"eslint-plugin-unicorn": "56.0.0",

0 commit comments

Comments
 (0)