@bedrockio/eslint-plugin 1.4.0 → 1.4.2

package/dist/cjs/importRules.js

@@ -29,7 +29,7 @@ var _default = exports.default = {
       pattern: '+(screens|modals|components|@screens|@modals|@components){,/**}',
       group: 'internal'
     }, {
-      pattern: '+(utils|@utils){,/**}',
+      pattern: '+(hooks|@hooks|utils|@utils){,/**}',
       group: 'internal',
       position: 'after'
     }, {

package/dist/cjs/index.js

@@ -33,10 +33,10 @@ Object.defineProperty(exports, "recommended", {
     return _recommended.default;
   }
 });
-Object.defineProperty(exports, "typescriptImports", {
+Object.defineProperty(exports, "typescript", {
   enumerable: true,
   get: function () {
-    return _typescriptImports.default;
+    return _typescript.default;
   }
 });
 Object.defineProperty(exports, "viteImports", {
@@ -55,8 +55,8 @@ var _recommended = _interopRequireDefault(require("./recommended.js"));
 var _react = _interopRequireDefault(require("./react.js"));
 var _jest = _interopRequireDefault(require("./jest.js"));
 var _mdx = _interopRequireDefault(require("./mdx.js"));
+var _typescript = _interopRequireDefault(require("./typescript.js"));
 var _nodeImports = _interopRequireDefault(require("./node-imports.js"));
 var _viteImports = _interopRequireDefault(require("./vite-imports.js"));
 var _webpackImports = _interopRequireDefault(require("./webpack-imports.js"));
-var _typescriptImports = _interopRequireDefault(require("./typescript-imports.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }

package/dist/cjs/recommended.js

@@ -9,7 +9,7 @@ var _globals = _interopRequireDefault(require("globals"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var _default = exports.default = {
   files: ['**/*.{js,jsx,ts,tsx}'],
-  ignores: ['node_modules/**/*', 'dist/**/*', 'docs/**/*', '**/*.d.ts'],
+  ignores: ['node_modules/**/*', 'dist/**/*', '**/*.d.ts'],
   languageOptions: {
     ecmaVersion: 'latest',
     sourceType: 'module',

package/dist/cjs/typescript.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _typescriptEslint = require("typescript-eslint");
+var _default = exports.default = {
+  files: ['**/*.{ts,tsx}'],
+  ignores: ['node_modules/**/*', 'dist/**/*', '**/*.d.ts'],
+  languageOptions: {
+    parser: _typescriptEslint.parser,
+    parserOptions: {
+      ecmaFeatures: {
+        jsx: true
+      }
+    }
+  }
+};

package/dist/cjs/vite-imports.js

@@ -7,19 +7,20 @@ exports.default = void 0;
 var _path = _interopRequireDefault(require("path"));
 var plugin = _interopRequireWildcard(require("eslint-plugin-import"));
 var _importRules = _interopRequireDefault(require("./importRules.js"));
+var _fs = require("fs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-let viteConfig;
-try {
+async function loadConfig() {
   const file = _path.default.join(process.cwd(), 'vite.config.js');
-  const {
-    default: config
-  } = await (specifier => new Promise(r => r(`${specifier}`)).then(s => _interopRequireWildcard(require(s))))(file);
-  viteConfig = config;
-} catch {
-  // Config file does not exist or
-  // top-level await not supported.
+  if (!(0, _fs.existsSync)(file)) {
+    // This file will be imported from index.js so
+    // bail if no vite.config.js file exists.
+    return;
+  }
+  const module = await (specifier => new Promise(r => r(`${specifier}`)).then(s => _interopRequireWildcard(require(s))))(file);
+  return module.default;
 }
+const viteConfig = await loadConfig();
 var _default = exports.default = {
   ...plugin.flatConfigs.recommended,
   files: ['**/*.{js,jsx,ts,tsx}'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/eslint-plugin",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Common ESLint plugin for Bedrock projects.",
   "license": "MIT",
   "type": "module",
@@ -35,16 +35,21 @@
     "@babel/core": "^7.29.0",
     "@babel/preset-env": "^7.29.0",
     "@bedrockio/prettier-config": "^1.1.1",
-    "eslint": "^10.0.0",
-    "typescript": "^5.9.3"
+    "eslint": "^9.39.2",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.55.0"
   },
   "peerDependencies": {
     "eslint": ">=9",
-    "eslint-import-resolver-webpack": "^0.13.10"
+    "eslint-import-resolver-webpack": "^0.13.10",
+    "typescript-eslint": "^8.55.0"
   },
   "peerDependenciesMeta": {
     "eslint-import-resolver-webpack": {
       "optional": true
+    },
+    "typescript-eslint": {
+      "optional": true
     }
   },
   "prettier": "@bedrockio/prettier-config",

package/src/importRules.js

@@ -39,7 +39,7 @@ export default {
           group: 'internal',
         },
         {
-          pattern: '+(utils|@utils){,/**}',
+          pattern: '+(hooks|@hooks|utils|@utils){,/**}',
           group: 'internal',
           position: 'after',
         },

package/src/index.js

@@ -2,18 +2,18 @@ import { default as recommended } from './recommended.js';
 import { default as react } from './react.js';
 import { default as jest } from './jest.js';
 import { default as mdx } from './mdx.js';
+import { default as typescript } from './typescript.js';
 import { default as nodeImports } from './node-imports.js';
 import { default as viteImports } from './vite-imports.js';
 import { default as webpackImports } from './webpack-imports.js';
-import { default as typescriptImports } from './typescript-imports.js';
 
 export {
   mdx,
   jest,
   react,
+  typescript,
   recommended,
   nodeImports,
   viteImports,
   webpackImports,
-  typescriptImports,
 };

package/src/recommended.js

@@ -3,7 +3,7 @@ import globals from 'globals';
 
 export default {
   files: ['**/*.{js,jsx,ts,tsx}'],
-  ignores: ['node_modules/**/*', 'dist/**/*', 'docs/**/*', '**/*.d.ts'],
+  ignores: ['node_modules/**/*', 'dist/**/*', '**/*.d.ts'],
   languageOptions: {
     ecmaVersion: 'latest',
     sourceType: 'module',

package/src/typescript.js

@@ -0,0 +1,14 @@
+import { parser } from 'typescript-eslint';
+
+export default {
+  files: ['**/*.{ts,tsx}'],
+  ignores: ['node_modules/**/*', 'dist/**/*', '**/*.d.ts'],
+  languageOptions: {
+    parser,
+    parserOptions: {
+      ecmaFeatures: {
+        jsx: true,
+      },
+    },
+  },
+};

package/src/vite-imports.js

@@ -1,18 +1,24 @@
 import path from 'path';
 import * as plugin from 'eslint-plugin-import';
 import importRules from './importRules.js';
+import { existsSync } from 'fs';
 
-let viteConfig;
-
-try {
+async function loadConfig() {
   const file = path.join(process.cwd(), 'vite.config.js');
-  const { default: config } = await import(file);
-  viteConfig = config;
-} catch {
-  // Config file does not exist or
-  // top-level await not supported.
+
+  if (!existsSync(file)) {
+    // This file will be imported from index.js so
+    // bail if no vite.config.js file exists.
+    return;
+  }
+
+  const module = await import(file);
+
+  return module.default;
 }
 
+const viteConfig = await loadConfig();
+
 export default {
   ...plugin.flatConfigs.recommended,
   files: ['**/*.{js,jsx,ts,tsx}'],

package/dist/cjs/typescript-imports.js

@@ -1,25 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var plugin = _interopRequireWildcard(require("eslint-plugin-import"));
-var _importRules = _interopRequireDefault(require("./importRules.js"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-const {
-  parserOptions,
-  ...rest
-} = plugin.configs.recommended;
-var _default = exports.default = {
-  ...rest,
-  files: ['**/*.{ts,tsx,js,jsx}'],
-  plugins: {
-    import: plugin
-  },
-  rules: {
-    'prefer-const': 'off',
-    ..._importRules.default
-  }
-};

package/src/typescript-imports.js

@@ -1,16 +0,0 @@
-import * as plugin from 'eslint-plugin-import';
-import importRules from './importRules.js';
-
-const { parserOptions, ...rest } = plugin.configs.recommended;
-
-export default {
-  ...rest,
-  files: ['**/*.{ts,tsx,js,jsx}'],
-  plugins: {
-    import: plugin,
-  },
-  rules: {
-    'prefer-const': 'off',
-    ...importRules,
-  },
-};