eslint-config-webpack 4.6.2 → 4.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/configs/javascript.js +8 -4
- package/configs/markdown.js +1 -1
- package/configs/node.js +20 -9
- package/configs/typescript.js +2 -2
- package/package.json +1 -1
package/configs/javascript.js
CHANGED
|
@@ -2,7 +2,8 @@ import javascriptConfig from "@eslint/js";
|
|
|
2
2
|
import importPlugin from "eslint-plugin-import";
|
|
3
3
|
import unicornPlugin from "eslint-plugin-unicorn";
|
|
4
4
|
import globals from "globals";
|
|
5
|
-
import { allExtensions } from "./utils/extensions.js";
|
|
5
|
+
import { allExtensions, javascriptExtensions } from "./utils/extensions.js";
|
|
6
|
+
import isTypescriptInstalled from "./utils/is-typescript-installed.js";
|
|
6
7
|
|
|
7
8
|
const possibleProblems = {
|
|
8
9
|
"array-callback-return": [
|
|
@@ -1182,20 +1183,23 @@ const importRules = {
|
|
|
1182
1183
|
* @returns {Record<string, string | number>} config
|
|
1183
1184
|
*/
|
|
1184
1185
|
function getConfig(esVersion) {
|
|
1186
|
+
const extensions = isTypescriptInstalled()
|
|
1187
|
+
? allExtensions
|
|
1188
|
+
: javascriptExtensions;
|
|
1185
1189
|
const config = {
|
|
1186
1190
|
...javascriptConfig.configs.recommended,
|
|
1187
1191
|
name: `javascript/es${esVersion}`,
|
|
1188
|
-
files: [`**/*.{${
|
|
1192
|
+
files: [`**/*.{${extensions.map((item) => item.slice(1)).join(",")}}`],
|
|
1189
1193
|
ignores: ["**/*.d.ts"],
|
|
1190
1194
|
settings: {
|
|
1191
|
-
"import/extensions":
|
|
1195
|
+
"import/extensions": extensions,
|
|
1192
1196
|
"import/ignore": [
|
|
1193
1197
|
"eslint-plugin-.*",
|
|
1194
1198
|
"\\.(coffee|scss|css|less|hbs|svg|md|jpg|jpeg|png|gif|webp|avif)$",
|
|
1195
1199
|
],
|
|
1196
1200
|
"import/resolver": {
|
|
1197
1201
|
node: {
|
|
1198
|
-
extensions: [...
|
|
1202
|
+
extensions: [...extensions],
|
|
1199
1203
|
},
|
|
1200
1204
|
},
|
|
1201
1205
|
},
|
package/configs/markdown.js
CHANGED
package/configs/node.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import importPlugin from "eslint-plugin-import";
|
|
2
2
|
import globals from "globals";
|
|
3
|
+
import isTypescriptInstalled from "./utils/is-typescript-installed.js";
|
|
3
4
|
|
|
4
5
|
const commonRules = {
|
|
5
6
|
// No need
|
|
@@ -263,6 +264,16 @@ async function getDirtyConfig() {
|
|
|
263
264
|
|
|
264
265
|
const dirtyConfig = await getDirtyConfig();
|
|
265
266
|
|
|
267
|
+
const jsExtensions = isTypescriptInstalled()
|
|
268
|
+
? ["**/*.{js,jsx,ts,tsx}"]
|
|
269
|
+
: ["**/*.{js,jsx}"];
|
|
270
|
+
const cjsExtensions = isTypescriptInstalled()
|
|
271
|
+
? ["**/*.{cjs,cts}"]
|
|
272
|
+
: ["**/*.{cjs}"];
|
|
273
|
+
const mjsExtensions = isTypescriptInstalled()
|
|
274
|
+
? ["**/*.{mjs,mts}"]
|
|
275
|
+
: ["**/*.{mjs}"];
|
|
276
|
+
|
|
266
277
|
export default {
|
|
267
278
|
"node/dirty": dirtyConfig,
|
|
268
279
|
"node/commonjs": commonjsConfig,
|
|
@@ -270,43 +281,43 @@ export default {
|
|
|
270
281
|
"node/recommended": moduleConfig,
|
|
271
282
|
"node/mixed-dirty": [
|
|
272
283
|
{
|
|
273
|
-
files:
|
|
284
|
+
files: jsExtensions,
|
|
274
285
|
...dirtyConfig,
|
|
275
286
|
},
|
|
276
287
|
{
|
|
277
|
-
files:
|
|
288
|
+
files: cjsExtensions,
|
|
278
289
|
...commonjsConfig,
|
|
279
290
|
},
|
|
280
291
|
{
|
|
281
|
-
files:
|
|
292
|
+
files: mjsExtensions,
|
|
282
293
|
...moduleConfig,
|
|
283
294
|
},
|
|
284
295
|
],
|
|
285
296
|
"node/mixed-module-and-commonjs": [
|
|
286
297
|
{
|
|
287
|
-
files:
|
|
298
|
+
files: jsExtensions,
|
|
288
299
|
...moduleConfig,
|
|
289
300
|
},
|
|
290
301
|
{
|
|
291
|
-
files:
|
|
302
|
+
files: cjsExtensions,
|
|
292
303
|
...commonjsConfig,
|
|
293
304
|
},
|
|
294
305
|
{
|
|
295
|
-
files:
|
|
306
|
+
files: mjsExtensions,
|
|
296
307
|
...moduleConfig,
|
|
297
308
|
},
|
|
298
309
|
],
|
|
299
310
|
"node/mixed-commonjs-and-module": [
|
|
300
311
|
{
|
|
301
|
-
files:
|
|
312
|
+
files: jsExtensions,
|
|
302
313
|
...commonjsConfig,
|
|
303
314
|
},
|
|
304
315
|
{
|
|
305
|
-
files:
|
|
316
|
+
files: cjsExtensions,
|
|
306
317
|
...commonjsConfig,
|
|
307
318
|
},
|
|
308
319
|
{
|
|
309
|
-
files:
|
|
320
|
+
files: mjsExtensions,
|
|
310
321
|
...moduleConfig,
|
|
311
322
|
},
|
|
312
323
|
],
|
package/configs/typescript.js
CHANGED
|
@@ -279,8 +279,6 @@ async function getTypescriptJSDocRecommendedConfig() {
|
|
|
279
279
|
};
|
|
280
280
|
}
|
|
281
281
|
|
|
282
|
-
const allExtensions = [...typescriptExtensions, ...javascriptExtensions];
|
|
283
|
-
|
|
284
282
|
/**
|
|
285
283
|
* @returns {Promise<Record<string, string>>} config
|
|
286
284
|
*/
|
|
@@ -311,6 +309,8 @@ async function getTypescriptRecommendedConfig() {
|
|
|
311
309
|
(item) => item.name === "typescript-eslint/stylistic",
|
|
312
310
|
);
|
|
313
311
|
|
|
312
|
+
const allExtensions = [...typescriptExtensions, ...javascriptExtensions];
|
|
313
|
+
|
|
314
314
|
return {
|
|
315
315
|
...baseConfig,
|
|
316
316
|
name: "typescript/recommended",
|