Skip to content

Commit e85b508

Browse files
committed
Consolidate lint rules
1 parent 681c774 commit e85b508

File tree

5 files changed

+51
-34
lines changed

5 files changed

+51
-34
lines changed

.config/rollup.base.config.mjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ const {
4545
LATEST,
4646
ROLLUP_ENTRY_SUFFIX,
4747
ROLLUP_EXTERNAL_SUFFIX,
48-
SLASH_NODE_MODULES_SLASH,
4948
SHADOW_NPM_BIN,
5049
SHADOW_NPM_INJECT,
5150
SHADOW_NPM_PATHS,
51+
SLASH_NODE_MODULES_SLASH,
5252
VENDOR,
5353
VITEST
5454
} = constants
@@ -135,10 +135,10 @@ function isAncestorsExternal(id, depStats) {
135135
return false
136136
}
137137
const {
138-
version,
139138
dependencies = {},
140139
optionalDependencies = {},
141-
peerDependencies = {}
140+
peerDependencies = {},
141+
version
142142
} = readPackageJsonSync(id.slice(0, nameEnd))
143143
const range =
144144
dependencies[name] ??
@@ -234,10 +234,10 @@ export default function baseConfig(extendConfig = {}) {
234234
const parentNameStart = parentNmIndex + SLASH_NODE_MODULES_SLASH.length
235235
const parentNameEnd = getPackageNameEnd(parentId, parentNameStart)
236236
const {
237-
version,
238237
dependencies = {},
239238
optionalDependencies = {},
240-
peerDependencies = {}
239+
peerDependencies = {},
240+
version
241241
} = readPackageJsonSync(parentId.slice(0, parentNameEnd))
242242
const range =
243243
dependencies[name] ??

.config/rollup.dist.config.mjs

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,24 +122,28 @@ async function globDtsAndMapFiles(namePattern, srcPath) {
122122
}
123123

124124
async function moveDtsAndMapFiles(namePattern, srcPath, destPath) {
125-
for (const filepath of await globDtsAndMapFiles(namePattern, srcPath)) {
126-
await fs.rename(filepath, path.join(destPath, path.basename(filepath)))
127-
}
125+
await Promise.all(
126+
(await globDtsAndMapFiles(namePattern, srcPath)).map(p =>
127+
fs.rename(p, path.join(destPath, path.basename(p)))
128+
)
129+
)
128130
}
129131

130132
async function removeDtsAndMapFiles(namePattern, srcPath) {
131-
for (const filepath of await globDtsAndMapFiles(namePattern, srcPath)) {
132-
await fs.rm(filepath)
133-
}
133+
await Promise.all(
134+
(await globDtsAndMapFiles(namePattern, srcPath)).map(p => fs.rm(p))
135+
)
134136
}
135137

136138
async function removeJsFiles(namePattern, srcPath) {
137-
for (const filepath of await tinyGlob([`**/${namePattern}.js`], {
138-
absolute: true,
139-
cwd: srcPath
140-
})) {
141-
await fs.rm(filepath)
142-
}
139+
await Promise.all(
140+
(
141+
await tinyGlob([`**/${namePattern}.js`], {
142+
absolute: true,
143+
cwd: srcPath
144+
})
145+
).map(p => fs.rm(p))
146+
)
143147
}
144148

145149
function resetBin(bin) {
@@ -358,7 +362,9 @@ export default () => {
358362
(basename === `${CONSTANTS}.js` ||
359363
basename === `${INSTRUMENT_WITH_SENTRY}.js`)
360364
) {
365+
// eslint-disable-next-line no-await-in-loop
361366
await fs.mkdir(rootDistPath, { recursive: true })
367+
// eslint-disable-next-line no-await-in-loop
362368
await fs.writeFile(
363369
path.join(rootDistPath, basename),
364370
data.code,

.config/rollup.test.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { isRelative } from '@socketsecurity/registry/lib/path'
66
import baseConfig, { INLINED_PACKAGES } from './rollup.base.config.mjs'
77
import constants from '../scripts/constants.js'
88
import {
9-
isBuiltin,
109
getPackageName,
10+
isBuiltin,
1111
normalizeId
1212
} from '../scripts/utils/packages.js'
1313

bin/cli.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ if (
4646
if (signalName) {
4747
process.kill(process.pid, signalName)
4848
} else if (code !== null) {
49+
// eslint-disable-next-line n/no-process-exit
4950
process.exit(code)
5051
}
5152
})

eslint.config.js

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -136,21 +136,12 @@ module.exports = [
136136
ignores: biomeConfig.files.ignore.map(convertIgnorePatternToMinimatch)
137137
},
138138
{
139-
files: ['**/*.{c,}js'],
140-
...importFlatConfigsForScript.recommended
141-
},
142-
{
143-
files: ['**/*.mjs'],
144-
...importFlatConfigsForModule.recommended
145-
},
146-
{
147-
files: ['src/**/*.ts', 'test/**/*.ts'],
148-
...importFlatConfigsForModule.typescript
149-
},
150-
{
151-
files: ['src/**/*.ts', 'test/**/*.ts'],
139+
files: ['**/*.ts'],
140+
...importFlatConfigsForModule.typescript,
152141
languageOptions: {
142+
...importFlatConfigsForModule.typescript.languageOptions,
153143
globals: {
144+
...importFlatConfigsForModule.typescript.languageOptions?.globals,
154145
BufferConstructor: 'readonly',
155146
BufferEncoding: 'readonly',
156147
NodeJS: 'readonly',
@@ -160,7 +151,10 @@ module.exports = [
160151
},
161152
parser: tsParser,
162153
parserOptions: {
154+
...importFlatConfigsForModule.typescript.languageOptions?.parserOptions,
163155
projectService: {
156+
...importFlatConfigsForModule.typescript.languageOptions
157+
?.parserOptions?.projectService,
164158
allowDefaultProject: [
165159
'test/*.ts',
166160
// src/utils/*
@@ -176,13 +170,16 @@ module.exports = [
176170
}
177171
},
178172
linterOptions: {
173+
...importFlatConfigsForModule.typescript.linterOptions,
179174
reportUnusedDisableDirectives: 'off'
180175
},
181176
plugins: {
177+
...importFlatConfigsForModule.typescript.plugins,
182178
...sharedPlugins,
183179
'@typescript-eslint': tsEslint.plugin
184180
},
185181
rules: {
182+
...importFlatConfigsForModule.typescript.rules,
186183
...sharedRules,
187184
'@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
188185
'@typescript-eslint/consistent-type-assertions': [
@@ -212,10 +209,21 @@ module.exports = [
212209
}
213210
},
214211
{
215-
files: ['scripts/**/*.{c,}js', 'test/**/*.{c,}js'],
212+
files: ['**/*.{c,}js'],
213+
...js.configs.recommended,
214+
...importFlatConfigsForScript.recommended,
216215
...nodePlugin.configs['flat/recommended-script'],
216+
plugins: {
217+
...js.configs.recommended.plugins,
218+
...importFlatConfigsForScript.recommended.plugins,
219+
...nodePlugin.configs['flat/recommended-script'].plugins,
220+
...sharedPlugins
221+
},
217222
rules: {
223+
...js.configs.recommended.rules,
224+
...importFlatConfigsForScript.recommended.rules,
218225
...nodePlugin.configs['flat/recommended-script'].rules,
226+
...sharedRules,
219227
'n/exports-style': ['error', 'module.exports'],
220228
'n/no-missing-require': ['off'],
221229
// The n/no-unpublished-bin rule does does not support non-trivial glob
@@ -240,12 +248,14 @@ module.exports = [
240248
}
241249
},
242250
{
243-
files: ['scripts/**/*.{c,}js', 'test/**/*.{c,}js'],
251+
files: ['**/*.mjs'],
252+
...importFlatConfigsForModule.recommended,
244253
plugins: {
254+
...importFlatConfigsForModule.recommended.plugins,
245255
...sharedPlugins
246256
},
247257
rules: {
248-
...js.configs.recommended.rules,
258+
...importFlatConfigsForModule.recommended.rules,
249259
...sharedRules
250260
}
251261
}

0 commit comments

Comments
 (0)