@bedrockio/eslint-plugin 1.1.11 → 1.2.0

package/dist/cjs/importRules.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = exports.default = {
+  'import/no-unresolved': 'warn',
+  'import/no-named-as-default-member': 'off',
+  'import/first': 'warn',
+  'import/order': ['warn', {
+    'newlines-between': 'always-and-inside-groups',
+    alphabetize: {
+      order: 'asc',
+      caseInsensitive: false
+    },
+    named: true,
+    warnOnUnassignedImports: true,
+    consolidateIslands: 'inside-groups',
+    groups: ['builtin', 'unknown', 'external', 'internal', ['parent', 'sibling'], 'index', 'object', 'type'],
+    pathGroups: [{
+      pattern: 'semantic',
+      group: 'external'
+    }, {
+      pattern: '+(stores|helpers|layouts|@stores|@helpers|@layouts){,/**}',
+      group: 'internal',
+      position: 'before'
+    }, {
+      pattern: '+(screens|modals|components|@screens|@modals|@components){,/**}',
+      group: 'internal'
+    }, {
+      pattern: '+(utils|@utils){,/**}',
+      group: 'internal',
+      position: 'after'
+    }, {
+      pattern: '+(assets|@assets){,**}',
+      group: 'sibling',
+      position: 'after'
+    }]
+  }]
+};

package/dist/cjs/index.js

@@ -39,6 +39,12 @@ Object.defineProperty(exports, "typescriptImports", {
     return _typescriptImports.default;
   }
 });
+Object.defineProperty(exports, "viteImports", {
+  enumerable: true,
+  get: function () {
+    return _viteImports.default;
+  }
+});
 Object.defineProperty(exports, "webpackImports", {
   enumerable: true,
   get: function () {
@@ -50,6 +56,7 @@ var _react = _interopRequireDefault(require("./react.js"));
 var _jest = _interopRequireDefault(require("./jest.js"));
 var _mdx = _interopRequireDefault(require("./mdx.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/node-imports.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var _default = exports.default = {
@@ -16,28 +18,7 @@ var _default = exports.default = {
     sourceType: 'module'
   },
   rules: {
-    'import/no-unresolved': 'warn',
-    'import/no-named-as-default-member': 'off',
-    'import/order': ['warn', {
-      'newlines-between': 'always-and-inside-groups',
-      pathGroups: [{
-        pattern: '+(stores|helpers|layouts|@stores|@helpers|@layouts){,/**}',
-        group: 'internal',
-        position: 'before'
-      }, {
-        pattern: '+(screens|modals|components|@screens|@modals|@components){,/**}',
-        group: 'internal'
-      }, {
-        pattern: '+(utils|@utils){,/**}',
-        group: 'internal',
-        position: 'after'
-      }, {
-        pattern: '+(assets|@assets){,**}',
-        group: 'sibling',
-        position: 'after'
-      }],
-      groups: ['builtin', 'unknown', 'external', 'internal', ['parent', 'sibling'], 'index', 'object', 'type']
-    }]
+    ..._importRules.default
   },
   settings: {
     'import/resolver': {

package/dist/cjs/typescript-imports.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const {
@@ -13,24 +15,12 @@ const {
 } = plugin.configs.recommended;
 var _default = exports.default = {
   ...rest,
-  files: ['**/*.{ts,tsx}'],
+  files: ['**/*.{ts,tsx,js,jsx}'],
   plugins: {
     import: plugin
   },
   rules: {
     'prefer-const': 'off',
-    'import/no-unresolved': 'warn',
-    'import/no-named-as-default-member': 'off',
-    'import/order': ['warn', {
-      'newlines-between': 'always-and-inside-groups',
-      pathGroups: [{
-        pattern: 'utils',
-        group: 'internal'
-      }, {
-        pattern: 'utils/**',
-        group: 'internal'
-      }],
-      groups: ['builtin', 'external', 'internal', ['parent', 'sibling'], 'index', 'object', 'type']
-    }]
+    ..._importRules.default
   }
 };

package/dist/cjs/vite-imports.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _path = _interopRequireDefault(require("path"));
+var plugin = _interopRequireWildcard(require("eslint-plugin-import"));
+var _importRules = _interopRequireDefault(require("./importRules.js"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+// const bar = path.join(process.cwd(), './vite.config.js');
+// console.info('huh', bar);
+const foo = await Promise.resolve().then(() => _interopRequireWildcard(require('/Users/andrew/Bedrock/core/services/web/vite.config.js')));
+var _default = exports.default = {
+  ...plugin.flatConfigs.recommended,
+  files: ['**/*.{js,jsx,ts,tsx}'],
+  ignores: ['node_modules/**/*', 'dist/**/*', '**/*.d.ts'],
+  languageOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module'
+  },
+  rules: {
+    ...plugin.flatConfigs.recommended.rules,
+    ..._importRules.default
+  },
+  settings: {
+    'import/resolver': {
+      vite: {
+        viteConfig: foo.default
+      },
+      node: {
+        moduleDirectory: ['node_modules', 'src']
+      }
+    }
+  }
+};

package/dist/cjs/webpack-imports.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var _default = exports.default = {
@@ -17,35 +19,12 @@ var _default = exports.default = {
   },
   rules: {
     ...plugin.flatConfigs.recommended.rules,
+    ..._importRules.default,
     'import/no-unresolved': ['warn', {
       // package.json "style" may be used here which
       // will resolve for webpack but not within the
       // eslint plugin
       ignore: ['\\.css$']
-    }],
-    'import/no-named-as-default-member': 'off',
-    'import/order': ['warn', {
-      'newlines-between': 'always-and-inside-groups',
-      pathGroups: [{
-        pattern: 'semantic',
-        group: 'external'
-      }, {
-        pattern: '+(stores|helpers|layouts|@stores|@helpers|@layouts){,/**}',
-        group: 'internal',
-        position: 'before'
-      }, {
-        pattern: '+(screens|modals|components|@screens|@modals|@components){,/**}',
-        group: 'internal'
-      }, {
-        pattern: '+(utils|@utils){,/**}',
-        group: 'internal',
-        position: 'after'
-      }, {
-        pattern: '+(assets|@assets){,**}',
-        group: 'sibling',
-        position: 'after'
-      }],
-      groups: ['builtin', 'unknown', 'external', 'internal', ['parent', 'sibling'], 'index', 'object', 'type']
     }]
   },
   settings: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/eslint-plugin",
-  "version": "1.1.11",
+  "version": "1.2.0",
   "description": "Common ESLint plugin for Bedrock projects.",
   "license": "MIT",
   "type": "module",
@@ -23,6 +23,8 @@
     "@eslint/js": "^9.33.0",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-import-resolver-exports": "^1.0.0-beta.5",
+    "eslint-import-resolver-vite": "^2.1.0",
+    "eslint-import-resolver-webpack": "^0.13.10",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jest": "^29.0.1",
     "eslint-plugin-mdx": "^3.6.2",
@@ -30,27 +32,14 @@
     "globals": "^16.3.0"
   },
   "peerDependencies": {
-    "eslint": ">=9",
-    "eslint-import-resolver-webpack": ">=0.13.10"
-  },
-  "peerDependenciesMeta": {
-    "eslint-import-resolver-webpack": {
-      "optional": true
-    },
-    "eslint-plugin-react": {
-      "optional": true
-    },
-    "eslint-plugin-mdx": {
-      "optional": true
-    }
+    "eslint": ">=9"
   },
   "devDependencies": {
     "@babel/cli": "^7.26.4",
     "@babel/core": "^7.26.7",
     "@babel/preset-env": "^7.26.7",
     "@bedrockio/prettier-config": "^1.1.1",
-    "eslint": "^9.33.0",
-    "eslint-import-resolver-webpack": "^0.13.10"
+    "eslint": "^9.33.0"
   },
   "prettier": "@bedrockio/prettier-config",
   "volta": {

package/src/importRules.js

@@ -0,0 +1,54 @@
+export default {
+  'import/no-unresolved': 'warn',
+  'import/no-named-as-default-member': 'off',
+  'import/first': 'warn',
+  'import/order': [
+    'warn',
+    {
+      'newlines-between': 'always-and-inside-groups',
+      alphabetize: {
+        order: 'asc',
+        caseInsensitive: false,
+      },
+      named: true,
+      warnOnUnassignedImports: true,
+      consolidateIslands: 'inside-groups',
+      groups: [
+        'builtin',
+        'unknown',
+        'external',
+        'internal',
+        ['parent', 'sibling'],
+        'index',
+        'object',
+        'type',
+      ],
+      pathGroups: [
+        {
+          pattern: 'semantic',
+          group: 'external',
+        },
+        {
+          pattern: '+(stores|helpers|layouts|@stores|@helpers|@layouts){,/**}',
+          group: 'internal',
+          position: 'before',
+        },
+        {
+          pattern:
+            '+(screens|modals|components|@screens|@modals|@components){,/**}',
+          group: 'internal',
+        },
+        {
+          pattern: '+(utils|@utils){,/**}',
+          group: 'internal',
+          position: 'after',
+        },
+        {
+          pattern: '+(assets|@assets){,**}',
+          group: 'sibling',
+          position: 'after',
+        },
+      ],
+    },
+  ],
+};

package/src/index.js

@@ -3,6 +3,7 @@ import { default as react } from './react.js';
 import { default as jest } from './jest.js';
 import { default as mdx } from './mdx.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';
 
@@ -12,6 +13,7 @@ export {
   react,
   recommended,
   nodeImports,
+  viteImports,
   webpackImports,
   typescriptImports,
 };

package/src/node-imports.js

@@ -1,4 +1,5 @@
 import * as plugin from 'eslint-plugin-import';
+import importRules from './importRules.js';
 
 export default {
   ...plugin.flatConfigs.recommended,
@@ -9,47 +10,7 @@ export default {
     sourceType: 'module',
   },
   rules: {
-    'import/no-unresolved': 'warn',
-    'import/no-named-as-default-member': 'off',
-    'import/order': [
-      'warn',
-      {
-        'newlines-between': 'always-and-inside-groups',
-        pathGroups: [
-          {
-            pattern:
-              '+(stores|helpers|layouts|@stores|@helpers|@layouts){,/**}',
-            group: 'internal',
-            position: 'before',
-          },
-          {
-            pattern:
-              '+(screens|modals|components|@screens|@modals|@components){,/**}',
-            group: 'internal',
-          },
-          {
-            pattern: '+(utils|@utils){,/**}',
-            group: 'internal',
-            position: 'after',
-          },
-          {
-            pattern: '+(assets|@assets){,**}',
-            group: 'sibling',
-            position: 'after',
-          },
-        ],
-        groups: [
-          'builtin',
-          'unknown',
-          'external',
-          'internal',
-          ['parent', 'sibling'],
-          'index',
-          'object',
-          'type',
-        ],
-      },
-    ],
+    ...importRules,
   },
   settings: {
     'import/resolver': {

package/src/typescript-imports.js

@@ -1,41 +1,16 @@
 import * as plugin from 'eslint-plugin-import';
+import importRules from './importRules.js';
 
 const { parserOptions, ...rest } = plugin.configs.recommended;
 
 export default {
   ...rest,
-  files: ['**/*.{ts,tsx}'],
+  files: ['**/*.{ts,tsx,js,jsx}'],
   plugins: {
     import: plugin,
   },
   rules: {
     'prefer-const': 'off',
-    'import/no-unresolved': 'warn',
-    'import/no-named-as-default-member': 'off',
-    'import/order': [
-      'warn',
-      {
-        'newlines-between': 'always-and-inside-groups',
-        pathGroups: [
-          {
-            pattern: 'utils',
-            group: 'internal',
-          },
-          {
-            pattern: 'utils/**',
-            group: 'internal',
-          },
-        ],
-        groups: [
-          'builtin',
-          'external',
-          'internal',
-          ['parent', 'sibling'],
-          'index',
-          'object',
-          'type',
-        ],
-      },
-    ],
+    ...importRules,
   },
 };

package/src/vite-imports.js

@@ -0,0 +1,33 @@
+import path from 'path';
+import * as plugin from 'eslint-plugin-import';
+import importRules from './importRules.js';
+
+// const bar = path.join(process.cwd(), './vite.config.js');
+// console.info('huh', bar);
+const foo = await import(
+  '/Users/andrew/Bedrock/core/services/web/vite.config.js'
+);
+
+export default {
+  ...plugin.flatConfigs.recommended,
+  files: ['**/*.{js,jsx,ts,tsx}'],
+  ignores: ['node_modules/**/*', 'dist/**/*', '**/*.d.ts'],
+  languageOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+  },
+  rules: {
+    ...plugin.flatConfigs.recommended.rules,
+    ...importRules,
+  },
+  settings: {
+    'import/resolver': {
+      vite: {
+        viteConfig: foo.default,
+      },
+      node: {
+        moduleDirectory: ['node_modules', 'src'],
+      },
+    },
+  },
+};

package/src/webpack-imports.js

@@ -1,4 +1,5 @@
 import * as plugin from 'eslint-plugin-import';
+import importRules from './importRules.js';
 
 export default {
   ...plugin.flatConfigs.recommended,
@@ -10,6 +11,7 @@ export default {
   },
   rules: {
     ...plugin.flatConfigs.recommended.rules,
+    ...importRules,
     'import/no-unresolved': [
       'warn',
       {
@@ -19,50 +21,6 @@ export default {
         ignore: ['\\.css$'],
       },
     ],
-    'import/no-named-as-default-member': 'off',
-    'import/order': [
-      'warn',
-      {
-        'newlines-between': 'always-and-inside-groups',
-        pathGroups: [
-          {
-            pattern: 'semantic',
-            group: 'external',
-          },
-          {
-            pattern:
-              '+(stores|helpers|layouts|@stores|@helpers|@layouts){,/**}',
-            group: 'internal',
-            position: 'before',
-          },
-          {
-            pattern:
-              '+(screens|modals|components|@screens|@modals|@components){,/**}',
-            group: 'internal',
-          },
-          {
-            pattern: '+(utils|@utils){,/**}',
-            group: 'internal',
-            position: 'after',
-          },
-          {
-            pattern: '+(assets|@assets){,**}',
-            group: 'sibling',
-            position: 'after',
-          },
-        ],
-        groups: [
-          'builtin',
-          'unknown',
-          'external',
-          'internal',
-          ['parent', 'sibling'],
-          'index',
-          'object',
-          'type',
-        ],
-      },
-    ],
   },
   settings: {
     'import/resolver': {