@storm-software/eslint 0.170.91 → 0.170.92

package/dist/preset.cjs

@@ -20796,7 +20796,7 @@ async function typescript(options = {}) {
               allowDefaultProject: [GLOB_SRC_FILE],
               defaultProject: tsconfigPath
             },
-            tsconfigRootDir: findWorkspaceRoot2()
+            tsconfigRootDir: !tsconfigPath ? findWorkspaceRoot2() : path16.dirname(tsconfigPath)
           } : {},
           ...parserOptions
         }
@@ -21289,13 +21289,6 @@ function preset(options, ...userConfigs) {
       );
     }
   }
-  const typescriptOptions = resolveSubOptions(options, "typescript");
-  if (typescriptOptions.tsconfigPath !== false) {
-    typescriptOptions.tsconfigPath = getTsConfigPath(
-      typescriptOptions.tsconfigPath,
-      options.type
-    );
-  }
   configs6.push(
     ignores(options.ignores),
     javascript({
@@ -21310,6 +21303,27 @@ function preset(options, ...userConfigs) {
     perfectionist(),
     secrets({ json: options.jsonc !== false })
   );
+  let typescriptOptions = {};
+  if (enableTypeScript) {
+    typescriptOptions = resolveSubOptions(options, "typescript");
+    if (typescriptOptions.tsconfigPath !== false) {
+      typescriptOptions.tsconfigPath = getTsConfigPath(
+        typescriptOptions.tsconfigPath,
+        options.type
+      );
+    }
+  }
+  if (enableTypeScript) {
+    configs6.push(
+      typescript({
+        ...typescriptOptions,
+        tsconfigPath: typescriptOptions.tsconfigPath === false ? void 0 : typescriptOptions.tsconfigPath,
+        componentExts,
+        overrides: getOverrides(options, "typescript"),
+        type: options.type
+      })
+    );
+  }
   if (enableBanner) {
     configs6.push(
       banner({
@@ -21347,17 +21361,6 @@ function preset(options, ...userConfigs) {
   if (enableJsx) {
     configs6.push(jsx());
   }
-  if (enableTypeScript) {
-    configs6.push(
-      typescript({
-        ...typescriptOptions,
-        tsconfigPath: typescriptOptions.tsconfigPath === false ? void 0 : typescriptOptions.tsconfigPath,
-        componentExts,
-        overrides: getOverrides(options, "typescript"),
-        type: options.type
-      })
-    );
-  }
   if (enableZod) {
     configs6.push(
       zod({

package/dist/preset.js

@@ -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, { join } from 'node:path';
+import path16, { dirname as dirname$1, join } from 'node:path';
 import { readFile } from 'node:fs/promises';
 import { EOL } from 'node:os';
 import cspellConfig from '@cspell/eslint-plugin/recommended';
@@ -20397,7 +20397,7 @@ async function typescript(options = {}) {
               allowDefaultProject: [GLOB_SRC_FILE],
               defaultProject: tsconfigPath
             },
-            tsconfigRootDir: findWorkspaceRoot()
+            tsconfigRootDir: !tsconfigPath ? findWorkspaceRoot() : dirname$1(tsconfigPath)
           } : {},
           ...parserOptions
         }
@@ -20853,13 +20853,6 @@ function preset(options, ...userConfigs) {
       );
     }
   }
-  const typescriptOptions = resolveSubOptions(options, "typescript");
-  if (typescriptOptions.tsconfigPath !== false) {
-    typescriptOptions.tsconfigPath = getTsConfigPath(
-      typescriptOptions.tsconfigPath,
-      options.type
-    );
-  }
   configs6.push(
     ignores(options.ignores),
     javascript({
@@ -20874,6 +20867,27 @@ function preset(options, ...userConfigs) {
     perfectionist(),
     secrets({ json: options.jsonc !== false })
   );
+  let typescriptOptions = {};
+  if (enableTypeScript) {
+    typescriptOptions = resolveSubOptions(options, "typescript");
+    if (typescriptOptions.tsconfigPath !== false) {
+      typescriptOptions.tsconfigPath = getTsConfigPath(
+        typescriptOptions.tsconfigPath,
+        options.type
+      );
+    }
+  }
+  if (enableTypeScript) {
+    configs6.push(
+      typescript({
+        ...typescriptOptions,
+        tsconfigPath: typescriptOptions.tsconfigPath === false ? void 0 : typescriptOptions.tsconfigPath,
+        componentExts,
+        overrides: getOverrides(options, "typescript"),
+        type: options.type
+      })
+    );
+  }
   if (enableBanner) {
     configs6.push(
       banner({
@@ -20911,17 +20925,6 @@ function preset(options, ...userConfigs) {
   if (enableJsx) {
     configs6.push(jsx());
   }
-  if (enableTypeScript) {
-    configs6.push(
-      typescript({
-        ...typescriptOptions,
-        tsconfigPath: typescriptOptions.tsconfigPath === false ? void 0 : typescriptOptions.tsconfigPath,
-        componentExts,
-        overrides: getOverrides(options, "typescript"),
-        type: options.type
-      })
-    );
-  }
   if (enableZod) {
     configs6.push(
       zod({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/eslint",
-  "version": "0.170.91",
+  "version": "0.170.92",
   "private": false,
   "description": "A package containing the base ESLint configuration used by Storm Software across many projects.",
   "keywords": [
@@ -271,5 +271,5 @@
     "zod": { "optional": true }
   },
   "publishConfig": { "access": "public" },
-  "gitHead": "68cf7b0a3e91562c05d5b4fb909326e65066c262"
+  "gitHead": "9922d1f0f3307b6823f994db8545e164984c8be7"
 }