@storm-software/eslint 0.170.92 → 0.170.94

package/dist/preset.cjs

@@ -5707,7 +5707,7 @@ init_cjs_shims();
 
 // ../eslint-plugin-banner/package.json
 var package_default = {
-  version: "0.0.25"};
+  version: "0.0.26"};
 
 // ../eslint-plugin-banner/src/rules/banner.ts
 init_cjs_shims();
@@ -5867,7 +5867,9 @@ function excludeShebangs(comments) {
 function getLeadingComments(context, node2) {
   const firstBodyNode = Array.isArray(node2.body) && node2.body.length ? node2.body[0] : node2;
   const all = excludeShebangs(
-    context.getSourceCode().getAllComments(firstBodyNode)
+    (context.sourceCode || context.getSourceCode()).getAllComments(
+      firstBodyNode
+    )
   );
   if (!all.length) {
     return [];
@@ -5882,7 +5884,7 @@ function getLeadingComments(context, node2) {
     if (!prev || !current) {
       break;
     }
-    const txt = context.getSourceCode().getText().slice(prev.range[1], current.range[0]);
+    const txt = (context.sourceCode || context.getSourceCode()).getText().slice(prev.range[1], current.range[0]);
     if (!txt.match(/^(\r\n|\r|\n)$/)) {
       break;
     }
@@ -5903,7 +5905,7 @@ function genCommentsRange(context, comments, eol) {
   }
   const start = comments[0].range[0];
   let end = comments.slice(-1)[0]?.range[1] ?? start;
-  if (context.getSourceCode().text[end] === eol) {
+  if ((context.sourceCode || context.getSourceCode()).text[end] === eol) {
     end += eol.length;
   }
   return [start, end];
@@ -6063,7 +6065,11 @@ var banner_default = createRule({
     return {
       Program(node2) {
         const normalizedNewlines = newlines ?? 1;
-        if (!hasBanner(normalizedCommentStyle, context.sourceCode.getText(), eol)) {
+        if (!hasBanner(
+          normalizedCommentStyle,
+          (context.sourceCode || context.getSourceCode()).getText(),
+          eol
+        )) {
           context.report({
             loc: node2.loc,
             messageId: "missingBanner",
@@ -6164,7 +6170,7 @@ var banner_default = createRule({
                 if (!lastLeadingComment) {
                   return;
                 }
-                const postLineBanner = context.sourceCode.text.substr(
+                const postLineBanner = (context.sourceCode || context.getSourceCode()).text.substr(
                   lastLeadingComment.range[1],
                   normalizedNewlines * 2
                 );
@@ -6217,7 +6223,7 @@ var banner_default = createRule({
                     ) 
                   });
                 } else {
-                  const postBlockBanner = context.sourceCode.text.substr(
+                  const postBlockBanner = (context.sourceCode || context.getSourceCode()).text.substr(
                     firstLeadingComment2.range[1],
                     normalizedNewlines * 2
                   );
@@ -6484,6 +6490,13 @@ var relative = function(from, to) {
   }
   return [..._from.map(() => ".."), ..._to].join("/");
 };
+var dirname = function(p) {
+  const segments = normalizeWindowsPath2(p).replace(/\/$/, "").split("/").slice(0, -1);
+  if (segments.length === 1 && _DRIVE_LETTER_RE2.test(segments[0])) {
+    segments[0] += "/";
+  }
+  return segments.join("/") || (isAbsolute2(p) ? "/" : ".");
+};
 
 // src/utils/find-workspace-root.ts
 init_cjs_shims();
@@ -20089,6 +20102,7 @@ async function react(options = {}) {
     ignoresTypeAware = [`${GLOB_MARKDOWN}/**`, GLOB_ASTRO_TS],
     strict = false,
     overrides = {},
+    componentExts = [],
     tsconfigPath
   } = options;
   await ensurePackages([
@@ -20130,8 +20144,11 @@ async function react(options = {}) {
     (i) => localPkg.isPackageExists(i)
   );
   const isUsingReactRouter = ReactRouterPackages.some((i) => localPkg.isPackageExists(i));
+  const [pluginTs, parserTs] = await Promise.all([
+    interopDefault(import('@typescript-eslint/eslint-plugin')),
+    interopDefault(import('@typescript-eslint/parser'))
+  ]);
   return [
-    pluginReactHooks.configs.flat["recommended-latest"],
     {
       name: "storm/react/setup",
       plugins: {
@@ -20146,6 +20163,7 @@ async function react(options = {}) {
         "react-web-api": pluginReactWebApi
       }
     },
+    pluginReactHooks.configs.flat["recommended-latest"],
     {
       files,
       languageOptions: {
@@ -20159,7 +20177,7 @@ async function react(options = {}) {
       name: "storm/react/rules",
       rules: {
         ...renameRules2(
-          !!tsconfigPath ? strict ? pluginReact.configs["strict-type-checked"] : pluginReact.configs["recommended-type-checked"] : strict ? pluginReact.configs["strict"] : pluginReact.configs["recommended"]
+          strict ? pluginReact.configs["strict"] : pluginReact.configs["recommended"]
         ),
         "react-hooks/exhaustive-deps": strict ? "error" : "warn",
         "react-hooks/rules-of-hooks": "error",
@@ -20232,9 +20250,6 @@ async function react(options = {}) {
         "react/no-unstable-default-props": "warn",
         "react/no-unused-class-component-members": "warn",
         "react/no-unused-state": "warn",
-        // "react/prefer-destructuring-assignment": "warn",
-        // "react/prefer-shorthand-boolean": "warn",
-        // "react/prefer-shorthand-fragment": "warn",
         ...overrides
       }
     },
@@ -20242,8 +20257,25 @@ async function react(options = {}) {
       {
         files: filesTypeAware,
         ignores: ignoresTypeAware,
+        languageOptions: {
+          parser: parserTs,
+          parserOptions: {
+            extraFileExtensions: componentExts.map((ext2) => `.${ext2}`),
+            ecmaFeatures: { jsx: true },
+            ecmaVersion: 2022,
+            sourceType: "module",
+            projectService: {
+              allowDefaultProject: [GLOB_SRC_FILE],
+              defaultProject: tsconfigPath
+            },
+            tsconfigRootDir: !tsconfigPath ? findWorkspaceRoot2() : dirname(tsconfigPath)
+          }
+        },
         name: "storm/react/type-aware-rules",
         rules: {
+          ...renameRules2(
+            strict ? pluginReact.configs["strict-type-checked"] : pluginReact.configs["recommended-type-checked"]
+          ),
           "react/no-leaked-conditional-rendering": "warn",
           "react/no-implicit-key": "warn",
           "react/no-unused-props": strict ? "error" : "warn"

package/dist/preset.js

@@ -1,7 +1,7 @@
 import { isInEditorEnv, interopDefault, ensurePackages, renameRules, parserPlain, isPackageInScope } from './chunk-ZTS57MZL.js';
 import { getTsConfigPath } from './chunk-BI2UMAQU.js';
 import { findWorkspaceRoot } from './chunk-DC6IKVKL.js';
-import { joinPaths } from './chunk-6BPUJHCC.js';
+import { joinPaths, dirname as dirname$1 } from './chunk-6BPUJHCC.js';
 import { __commonJS, init_esm_shims, __toESM, __require, __filename as __filename$1 } from './chunk-67G5I72Q.js';
 import * as __import_util from 'util';
 import * as __import__microsoft_tsdocConfig from '@microsoft/tsdoc-config';
@@ -14,7 +14,7 @@ import { loadConfig } from 'c12';
 import defu from 'defu';
 import chalk from 'chalk';
 import fs3, { existsSync, readFileSync } from 'node:fs';
-import path16, { dirname as dirname$1, join } from 'node:path';
+import path16, { dirname as dirname$2, join } from 'node:path';
 import { readFile } from 'node:fs/promises';
 import { EOL } from 'node:os';
 import cspellConfig from '@cspell/eslint-plugin/recommended';
@@ -5566,7 +5566,7 @@ init_esm_shims();
 
 // ../eslint-plugin-banner/package.json
 var package_default = {
-  version: "0.0.25"};
+  version: "0.0.26"};
 
 // ../eslint-plugin-banner/src/rules/banner.ts
 init_esm_shims();
@@ -5726,7 +5726,9 @@ function excludeShebangs(comments) {
 function getLeadingComments(context, node2) {
   const firstBodyNode = Array.isArray(node2.body) && node2.body.length ? node2.body[0] : node2;
   const all = excludeShebangs(
-    context.getSourceCode().getAllComments(firstBodyNode)
+    (context.sourceCode || context.getSourceCode()).getAllComments(
+      firstBodyNode
+    )
   );
   if (!all.length) {
     return [];
@@ -5741,7 +5743,7 @@ function getLeadingComments(context, node2) {
     if (!prev || !current) {
       break;
     }
-    const txt = context.getSourceCode().getText().slice(prev.range[1], current.range[0]);
+    const txt = (context.sourceCode || context.getSourceCode()).getText().slice(prev.range[1], current.range[0]);
     if (!txt.match(/^(\r\n|\r|\n)$/)) {
       break;
     }
@@ -5762,7 +5764,7 @@ function genCommentsRange(context, comments, eol) {
   }
   const start = comments[0].range[0];
   let end = comments.slice(-1)[0]?.range[1] ?? start;
-  if (context.getSourceCode().text[end] === eol) {
+  if ((context.sourceCode || context.getSourceCode()).text[end] === eol) {
     end += eol.length;
   }
   return [start, end];
@@ -5922,7 +5924,11 @@ var banner_default = createRule({
     return {
       Program(node2) {
         const normalizedNewlines = newlines ?? 1;
-        if (!hasBanner(normalizedCommentStyle, context.sourceCode.getText(), eol)) {
+        if (!hasBanner(
+          normalizedCommentStyle,
+          (context.sourceCode || context.getSourceCode()).getText(),
+          eol
+        )) {
           context.report({
             loc: node2.loc,
             messageId: "missingBanner",
@@ -6023,7 +6029,7 @@ var banner_default = createRule({
                 if (!lastLeadingComment) {
                   return;
                 }
-                const postLineBanner = context.sourceCode.text.substr(
+                const postLineBanner = (context.sourceCode || context.getSourceCode()).text.substr(
                   lastLeadingComment.range[1],
                   normalizedNewlines * 2
                 );
@@ -6076,7 +6082,7 @@ var banner_default = createRule({
                     ) 
                   });
                 } else {
-                  const postBlockBanner = context.sourceCode.text.substr(
+                  const postBlockBanner = (context.sourceCode || context.getSourceCode()).text.substr(
                     firstLeadingComment2.range[1],
                     normalizedNewlines * 2
                   );
@@ -19690,6 +19696,7 @@ async function react(options = {}) {
     ignoresTypeAware = [`${GLOB_MARKDOWN}/**`, GLOB_ASTRO_TS],
     strict = false,
     overrides = {},
+    componentExts = [],
     tsconfigPath
   } = options;
   await ensurePackages([
@@ -19731,8 +19738,11 @@ async function react(options = {}) {
     (i) => isPackageExists(i)
   );
   const isUsingReactRouter = ReactRouterPackages.some((i) => isPackageExists(i));
+  const [pluginTs, parserTs] = await Promise.all([
+    interopDefault(import('@typescript-eslint/eslint-plugin')),
+    interopDefault(import('@typescript-eslint/parser'))
+  ]);
   return [
-    pluginReactHooks.configs.flat["recommended-latest"],
     {
       name: "storm/react/setup",
       plugins: {
@@ -19747,6 +19757,7 @@ async function react(options = {}) {
         "react-web-api": pluginReactWebApi
       }
     },
+    pluginReactHooks.configs.flat["recommended-latest"],
     {
       files,
       languageOptions: {
@@ -19760,7 +19771,7 @@ async function react(options = {}) {
       name: "storm/react/rules",
       rules: {
         ...renameRules2(
-          !!tsconfigPath ? strict ? pluginReact.configs["strict-type-checked"] : pluginReact.configs["recommended-type-checked"] : strict ? pluginReact.configs["strict"] : pluginReact.configs["recommended"]
+          strict ? pluginReact.configs["strict"] : pluginReact.configs["recommended"]
         ),
         "react-hooks/exhaustive-deps": strict ? "error" : "warn",
         "react-hooks/rules-of-hooks": "error",
@@ -19833,9 +19844,6 @@ async function react(options = {}) {
         "react/no-unstable-default-props": "warn",
         "react/no-unused-class-component-members": "warn",
         "react/no-unused-state": "warn",
-        // "react/prefer-destructuring-assignment": "warn",
-        // "react/prefer-shorthand-boolean": "warn",
-        // "react/prefer-shorthand-fragment": "warn",
         ...overrides
       }
     },
@@ -19843,8 +19851,25 @@ async function react(options = {}) {
       {
         files: filesTypeAware,
         ignores: ignoresTypeAware,
+        languageOptions: {
+          parser: parserTs,
+          parserOptions: {
+            extraFileExtensions: componentExts.map((ext2) => `.${ext2}`),
+            ecmaFeatures: { jsx: true },
+            ecmaVersion: 2022,
+            sourceType: "module",
+            projectService: {
+              allowDefaultProject: [GLOB_SRC_FILE],
+              defaultProject: tsconfigPath
+            },
+            tsconfigRootDir: !tsconfigPath ? findWorkspaceRoot() : dirname$1(tsconfigPath)
+          }
+        },
         name: "storm/react/type-aware-rules",
         rules: {
+          ...renameRules2(
+            strict ? pluginReact.configs["strict-type-checked"] : pluginReact.configs["recommended-type-checked"]
+          ),
           "react/no-leaked-conditional-rendering": "warn",
           "react/no-implicit-key": "warn",
           "react/no-unused-props": strict ? "error" : "warn"
@@ -20397,7 +20422,7 @@ async function typescript(options = {}) {
               allowDefaultProject: [GLOB_SRC_FILE],
               defaultProject: tsconfigPath
             },
-            tsconfigRootDir: !tsconfigPath ? findWorkspaceRoot() : dirname$1(tsconfigPath)
+            tsconfigRootDir: !tsconfigPath ? findWorkspaceRoot() : dirname$2(tsconfigPath)
           } : {},
           ...parserOptions
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/eslint",
-  "version": "0.170.92",
+  "version": "0.170.94",
   "private": false,
   "description": "A package containing the base ESLint configuration used by Storm Software across many projects.",
   "keywords": [
@@ -196,7 +196,7 @@
     "@next/eslint-plugin-next": "^15.5.19",
     "@nx/eslint": "22.7.5",
     "@prettier/plugin-xml": "^3.4.2",
-    "@storm-software/eslint-plugin-banner": "^0.0.25",
+    "@storm-software/eslint-plugin-banner": "^0.0.26",
     "@storm-software/eslint-plugin-pnpm": "^0.0.24",
     "@storm-software/eslint-plugin-tsdoc": "^0.0.24",
     "@stylistic/eslint-plugin-migrate": "^4.4.1",
@@ -271,5 +271,5 @@
     "zod": { "optional": true }
   },
   "publishConfig": { "access": "public" },
-  "gitHead": "9922d1f0f3307b6823f994db8545e164984c8be7"
+  "gitHead": "8e16cad354d1a5fecfbd25f87783ecdf4062e5c4"
 }