@w5s/eslint-config 1.2.1 → 1.3.1

package/dist/jest.js

@@ -4,15 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const dev_1 = require("@w5s/dev");
 const jest_js_1 = __importDefault(require("./rules/jest.js"));
-const extensions = dev_1.EXTENSIONS_WITHOUT_DOT.join('|');
+const sourceGlob = dev_1.Project.extensionsToGlob(dev_1.Project.sourceExtensions());
 const config = {
     overrides: [
         {
             ...jest_js_1.default,
             files: [
-                `**/__mocks__/**/*.+(${extensions})`,
-                `**/__tests__/**/*.+(${extensions})`,
-                `**/?(*.)+(spec|test).+(${extensions})`,
+                `**/__mocks__/**/${sourceGlob}`,
+                `**/__tests__/**/${sourceGlob}`,
+                `**/?(*.)+(spec|test)${sourceGlob.slice(1)}`,
             ],
         },
     ],

package/dist/rules/es/import.js

@@ -37,18 +37,18 @@ const config = dev_1.ESLintConfig.concat(imports_1.default,
         'import/unambiguous': dev_1.ESLintConfig.fixme('off'), // Disable because proposal still in progress
     },
     settings: {
-        'import/extensions': dev_1.EXTENSIONS,
+        'import/extensions': dev_1.Project.sourceExtensions(),
         // Resolve type definition packages
         'import/external-module-folders': ['node_modules', 'node_modules/@types'],
-        'import/ignore': [...dev_1.IGNORE_LIST, dev_1.EXTENSIONS_RESOURCES_REGEX],
+        'import/ignore': [...dev_1.Project.ignored(), dev_1.Project.extensionsToMatcher(dev_1.Project.resourceExtensions()).source],
         // Apply special parsing for TypeScript files
         'import/parsers': {
-            '@typescript-eslint/parser': dev_1.EXTENSIONS.filter((ext) => !ext.includes('js')),
+            '@typescript-eslint/parser': dev_1.Project.sourceExtensions().filter((ext) => !ext.includes('js')),
         },
         // Append 'ts' extensions to Airbnb 'import/resolver' setting
         'import/resolver': {
             node: {
-                extensions: [...dev_1.EXTENSIONS, '.json'],
+                extensions: [...dev_1.Project.sourceExtensions(), '.json'],
             },
         },
     },

package/dist/rules/ignore.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const find_up_1 = __importDefault(require("find-up"));
 const parse_gitignore_1 = __importDefault(require("parse-gitignore"));
-const node_path_1 = require("node:path");
 const getGitignore = (prefix = '') => {
     const cwd = process.cwd();
     const gitIgnoreFile = find_up_1.default.sync((0, node_path_1.join)(prefix, '.gitignore'), { cwd });

package/dist/ts.js

@@ -10,7 +10,11 @@ const config = {
             ...dev_1.ESLintConfig.concat({
                 extends: [require.resolve('./rules/typescript.js')],
             }, prettier_js_1.default),
-            files: [`*.+(${dev_1.EXTENSIONS_WITHOUT_DOT.filter((_) => _.includes('ts')).join('|')})`],
+            files: [
+                dev_1.Project.extensionsToGlob(
+                // ts only extensions
+                dev_1.Project.sourceExtensions().filter((_) => _.includes('ts'))),
+            ],
         },
     ],
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/eslint-config",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "ESLint configuration presets",
   "keywords": [
     "eslint",
@@ -49,7 +49,7 @@
     "@rushstack/eslint-patch": "^1.1.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
-    "@w5s/dev": "^1.2.0",
+    "@w5s/dev": "^1.3.0",
     "@w5s/prettier-config": "^1.1.2",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.0.0",
@@ -67,9 +67,9 @@
   "devDependencies": {
     "@types/eslint": "8.44.1",
     "@types/parse-gitignore": "1.0.0",
-    "@types/react": "18.2.17",
-    "@typescript-eslint/parser": "6.2.0",
-    "eslint": "8.45.0",
+    "@types/react": "18.2.18",
+    "@typescript-eslint/parser": "6.2.1",
+    "eslint": "8.46.0",
     "eslint-config-prettier": "8.9.0",
     "eslint-find-rules": "4.1.0",
     "prettier": "3.0.0",
@@ -96,5 +96,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a078b8f62ac0ffe46e977bd68af1c2180b6900fc"
+  "gitHead": "024ef9515d39f1c6eb891d7e7427212b2b06c952"
 }

package/src/jest.ts

@@ -1,16 +1,16 @@
 import type eslint from 'eslint';
-import { EXTENSIONS_WITHOUT_DOT } from '@w5s/dev';
+import { Project } from '@w5s/dev';
 import jestConfig from './rules/jest.js';
 
-const extensions = EXTENSIONS_WITHOUT_DOT.join('|');
+const sourceGlob = Project.extensionsToGlob(Project.sourceExtensions());
 const config: eslint.Linter.Config = {
   overrides: [
     {
       ...jestConfig,
       files: [
-        `**/__mocks__/**/*.+(${extensions})`,
-        `**/__tests__/**/*.+(${extensions})`,
-        `**/?(*.)+(spec|test).+(${extensions})`,
+        `**/__mocks__/**/${sourceGlob}`,
+        `**/__tests__/**/${sourceGlob}`,
+        `**/?(*.)+(spec|test)${sourceGlob.slice(1)}`,
       ],
     },
   ],

package/src/rules/es/import.ts

@@ -1,4 +1,4 @@
-import { ESLintConfig, EXTENSIONS, EXTENSIONS_RESOURCES_REGEX, IGNORE_LIST } from '@w5s/dev';
+import { ESLintConfig, Project } from '@w5s/dev';
 import type eslint from 'eslint';
 // @ts-ignore airbnb is not typed
 import importConfig from 'eslint-config-airbnb-base/rules/imports';
@@ -37,20 +37,20 @@ const config: eslint.Linter.Config = ESLintConfig.concat(
       'import/unambiguous': ESLintConfig.fixme('off'), // Disable because proposal still in progress
     },
     settings: {
-      'import/extensions': EXTENSIONS,
+      'import/extensions': Project.sourceExtensions(),
 
       // Resolve type definition packages
       'import/external-module-folders': ['node_modules', 'node_modules/@types'],
-      'import/ignore': [...IGNORE_LIST, EXTENSIONS_RESOURCES_REGEX],
+      'import/ignore': [...Project.ignored(), Project.extensionsToMatcher(Project.resourceExtensions()).source],
 
       // Apply special parsing for TypeScript files
       'import/parsers': {
-        '@typescript-eslint/parser': EXTENSIONS.filter((ext) => !ext.includes('js')),
+        '@typescript-eslint/parser': Project.sourceExtensions().filter((ext) => !ext.includes('js')),
       },
       // Append 'ts' extensions to Airbnb 'import/resolver' setting
       'import/resolver': {
         node: {
-          extensions: [...EXTENSIONS, '.json'],
+          extensions: [...Project.sourceExtensions(), '.json'],
         },
       },
     },

package/src/rules/ignore.ts

@@ -1,8 +1,8 @@
-import type eslint from 'eslint';
 import { readFileSync } from 'node:fs';
+import { join as pathJoin } from 'node:path';
+import type eslint from 'eslint';
 import findUp from 'find-up';
 import parseGitignore from 'parse-gitignore';
-import { join as pathJoin } from 'node:path';
 
 const getGitignore = (prefix = '') => {
   const cwd = process.cwd();

package/src/ts.ts

@@ -1,5 +1,5 @@
 import type eslint from 'eslint';
-import { EXTENSIONS_WITHOUT_DOT, ESLintConfig } from '@w5s/dev';
+import { ESLintConfig, Project } from '@w5s/dev';
 import prettierConfig from './rules/prettier.js';
 
 const config: eslint.Linter.Config = {
@@ -11,7 +11,12 @@ const config: eslint.Linter.Config = {
         },
         prettierConfig
       ),
-      files: [`*.+(${EXTENSIONS_WITHOUT_DOT.filter((_) => _.includes('ts')).join('|')})`],
+      files: [
+        Project.extensionsToGlob(
+          // ts only extensions
+          Project.sourceExtensions().filter((_) => _.includes('ts'))
+        ),
+      ],
     },
   ],
 };