@salesforce-ux/slds-linter 0.3.1-internal-beta.1 → 0.3.1-internal-beta.3

package/README.md

@@ -28,7 +28,7 @@ Install these items if they aren't installed already.
 - [VS Code](https://code.visualstudio.com/)
 - [SARIF Viewer](https://marketplace.visualstudio.com/items?itemName=MS-SarifVSCode.sarif-viewer) VS Code extension. This extension enables you to view SLDS Linter violation reports.
 - [Node.js](https://nodejs.org/)
-  - The minimum supported version is **v18.4.0**
+  - The minimum supported version is **v18.18.0** 
   - We recommend using the latest [Active LTS](https://nodejs.org/en/about/previous-releases) version of Node.js.  
 
 ## Install SLDS Linter

package/build/commands/lint.js

@@ -27,12 +27,7 @@ function registerLintCommand(program) {
             Example: npx @salesforce-ux/slds-linter lint ${options.directory}`
         ));
       }
-      const lintResults = await lint({
-        directory: normalizedOptions.directory,
-        fix: normalizedOptions.fix,
-        configStylelint: normalizedOptions.configStylelint,
-        configEslint: normalizedOptions.configEslint
-      });
+      const lintResults = await lint(normalizedOptions);
       printLintResults(lintResults, normalizedOptions.editor);
       const errorCount = lintResults.reduce((sum, r) => sum + r.errors.length, 0);
       const warningCount = lintResults.reduce((sum, r) => sum + r.warnings.length, 0);

package/build/commands/report.js

@@ -4,7 +4,7 @@ import path from "path";
 import ora from "ora";
 import chalk from "chalk";
 import fs from "fs";
-import { normalizeCliOptions, normalizeDirectoryPath } from "../utils/config-utils.js";
+import { normalizeAndValidatePath, normalizeCliOptions, normalizeDirectoryPath } from "../utils/config-utils.js";
 import { Logger } from "../utils/logger.js";
 import { DEFAULT_ESLINT_CONFIG_PATH, DEFAULT_STYLELINT_CONFIG_PATH } from "../services/config.resolver.js";
 import { report, lint } from "../executor/index.js";
@@ -14,7 +14,8 @@ function registerReportCommand(program) {
     try {
       const normalizedOptions = normalizeCliOptions(options, {
         configStylelint: DEFAULT_STYLELINT_CONFIG_PATH,
-        configEslint: DEFAULT_ESLINT_CONFIG_PATH
+        configEslint: DEFAULT_ESLINT_CONFIG_PATH,
+        output: normalizeAndValidatePath(options.output)
       });
       if (directory) {
         normalizedOptions.directory = normalizeDirectoryPath(directory);
@@ -26,11 +27,7 @@ function registerReportCommand(program) {
       }
       spinner.start();
       const reportFormat = normalizedOptions.format?.toLowerCase() || "sarif";
-      const lintResults = await lint({
-        directory: normalizedOptions.directory,
-        configStylelint: normalizedOptions.configStylelint,
-        configEslint: normalizedOptions.configEslint
-      });
+      const lintResults = await lint(normalizedOptions);
       const reportStream = await report({
         format: reportFormat
       }, lintResults);

package/build/executor/index.js

@@ -4,13 +4,16 @@ import { FileScanner } from "../services/file-scanner.js";
 import { LintRunner } from "../services/lint-runner.js";
 import { StyleFilePatterns, ComponentFilePatterns } from "../services/file-patterns.js";
 import { ReportGenerator, CsvReportGenerator } from "../services/report-generator.js";
-import { LINTER_CLI_VERSION } from "../services/config.resolver.js";
+import { DEFAULT_ESLINT_CONFIG_PATH, DEFAULT_STYLELINT_CONFIG_PATH, LINTER_CLI_VERSION } from "../services/config.resolver.js";
 import { normalizeCliOptions } from "../utils/config-utils.js";
 import { Logger } from "../utils/logger.js";
 async function lint(config) {
   try {
     Logger.debug("Starting linting with Node API");
-    const normalizedConfig = normalizeCliOptions(config, {}, true);
+    const normalizedConfig = normalizeCliOptions(config, {
+      configEslint: DEFAULT_ESLINT_CONFIG_PATH,
+      configStylelint: DEFAULT_STYLELINT_CONFIG_PATH
+    });
     const styleFiles = await FileScanner.scanFiles(normalizedConfig.directory, {
       patterns: StyleFilePatterns,
       batchSize: 100
@@ -19,17 +22,14 @@ async function lint(config) {
       patterns: ComponentFilePatterns,
       batchSize: 100
     });
-    const lintOptions = {
-      fix: normalizedConfig.fix,
-      configPath: normalizedConfig.configStylelint
-    };
+    const { fix, configStylelint, configEslint } = normalizedConfig;
     const styleResults = await LintRunner.runLinting(styleFiles, "style", {
-      ...lintOptions,
-      configPath: normalizedConfig.configStylelint
+      fix,
+      configPath: configStylelint
     });
     const componentResults = await LintRunner.runLinting(componentFiles, "component", {
-      ...lintOptions,
-      configPath: normalizedConfig.configEslint
+      fix,
+      configPath: configEslint
     });
     const combinedResults = [...styleResults, ...componentResults];
     return standardizeLintMessages(combinedResults);
@@ -42,13 +42,12 @@ async function lint(config) {
 async function report(config, results) {
   try {
     Logger.debug("Starting report generation with Node API");
-    const normalizedConfig = normalizeCliOptions(config, {}, true);
-    const format = normalizedConfig.format || "sarif";
-    const lintResults = results || await lint({
-      directory: normalizedConfig.directory,
-      configStylelint: normalizedConfig.configStylelint,
-      configEslint: normalizedConfig.configEslint
+    const normalizedConfig = normalizeCliOptions(config, {
+      configStylelint: DEFAULT_STYLELINT_CONFIG_PATH,
+      configEslint: DEFAULT_ESLINT_CONFIG_PATH
     });
+    const format = normalizedConfig.format || "sarif";
+    const lintResults = results || await lint(normalizedConfig);
     switch (format) {
       case "sarif":
         return ReportGenerator.generateSarifReportStream(lintResults, {

package/build/index.js

@@ -19,7 +19,7 @@ process.on("uncaughtException", (error) => {
 var program = new Command();
 program.name("npx @salesforce-ux/slds-linter@latest").showHelpAfterError();
 function registerVersion() {
-  program.description("SLDS Linter CLI tool for linting styles and components").version("0.3.1-internal-beta.1");
+  program.description("SLDS Linter CLI tool for linting styles and components").version("0.3.1-internal-beta.3");
 }
 registerLintCommand(program);
 registerReportCommand(program);

package/build/services/config.resolver.js

@@ -1,11 +1,11 @@
 // src/services/config.resolver.ts
 import { ruleMetadata } from "@salesforce-ux/stylelint-plugin-slds";
 import { resolvePath } from "../utils/nodeVersionUtil.js";
-var DEFAULT_ESLINT_CONFIG_PATH = resolvePath("@salesforce-ux/eslint-plugin-slds/.eslintrc.yml", import.meta);
-var DEFAULT_STYLELINT_CONFIG_PATH = resolvePath("@salesforce-ux/stylelint-plugin-slds/.stylelintrc.yml", import.meta);
+var DEFAULT_ESLINT_CONFIG_PATH = resolvePath("@salesforce-ux/eslint-plugin-slds/config", import.meta);
+var DEFAULT_STYLELINT_CONFIG_PATH = resolvePath("@salesforce-ux/stylelint-plugin-slds/.stylelintrc.mjs", import.meta);
 var STYLELINT_VERSION = "16.14.1";
-var ESLINT_VERSION = "8.57.1";
-var LINTER_CLI_VERSION = "0.3.1-internal-beta.1";
+var ESLINT_VERSION = "9.30.1";
+var LINTER_CLI_VERSION = "0.3.1-internal-beta.3";
 var getRuleDescription = (ruleId) => {
   const ruleIdWithoutNameSpace = `${ruleId}`.replace(/\@salesforce-ux\//, "");
   return ruleMetadata(ruleIdWithoutNameSpace)?.ruleDesc || "--";

package/build/services/lint-runner.d.ts

@@ -1,15 +1,9 @@
-import { LintResult } from '../types';
-export interface LintOptions {
-    fix?: boolean;
-    configPath?: string;
-    maxWorkers?: number;
-    timeoutMs?: number;
-}
+import { LintResult, LintRunnerOptions } from '../types';
 export declare class LintRunner {
     /**
      * Run linting on batches of files
      */
-    static runLinting(fileBatches: string[][], workerType: 'style' | 'component', options?: LintOptions): Promise<LintResult[]>;
+    static runLinting(fileBatches: string[][], workerType: 'style' | 'component', options?: LintRunnerOptions): Promise<LintResult[]>;
     /**
      * Process and normalize worker results
      */

package/build/types/index.d.ts

@@ -27,6 +27,12 @@ export interface LintConfig extends BaseConfig {
 export interface ReportConfig extends BaseConfig {
     format?: 'sarif' | 'csv';
 }
+export interface LintRunnerOptions {
+    fix?: boolean;
+    configPath?: string;
+    maxWorkers?: number;
+    timeoutMs?: number;
+}
 export interface LintResultEntry {
     line: number;
     column: number;

package/build/utils/config-utils.d.ts

@@ -26,8 +26,7 @@ export declare function normalizeDirectoryPath(directory?: string): string;
  *
  * @param options Options to normalize
  * @param defaultOptions Default options to apply
- * @param isNodeApi Whether this is being called from the Node API
  * @returns Normalized options with appropriate defaults
  */
-export declare function normalizeCliOptions<T extends CliOptions | LintConfig | ReportConfig>(options: T, defaultOptions?: Partial<T>, isNodeApi?: boolean): T;
+export declare function normalizeCliOptions<T extends CliOptions | LintConfig | ReportConfig>(options: T, defaultOptions?: Partial<T>): T;
 export declare const normalizeConfig: typeof normalizeCliOptions;

package/build/utils/config-utils.js

@@ -1,6 +1,5 @@
 // src/utils/config-utils.ts
 import path from "path";
-import { DEFAULT_ESLINT_CONFIG_PATH, DEFAULT_STYLELINT_CONFIG_PATH } from "../services/config.resolver.js";
 import { isDynamicPattern } from "globby";
 import { accessSync } from "fs";
 import { Logger } from "./logger.js";
@@ -33,31 +32,21 @@ function normalizeDirectoryPath(directory) {
   Logger.debug(`Normalizing directory path: ${directory}`);
   return path.resolve(directory);
 }
-function normalizeCliOptions(options, defaultOptions = {}, isNodeApi = false) {
+function normalizeCliOptions(options, defaultOptions = {}) {
   const baseDefaults = {
     files: [],
-    configStylelint: isNodeApi ? DEFAULT_STYLELINT_CONFIG_PATH : "",
-    configEslint: isNodeApi ? DEFAULT_ESLINT_CONFIG_PATH : ""
+    configStylelint: "",
+    configEslint: "",
+    fix: false,
+    editor: detectCurrentEditor(),
+    format: "sarif"
   };
-  if (!isNodeApi) {
-    Object.assign(baseDefaults, {
-      fix: false,
-      editor: detectCurrentEditor(),
-      format: "sarif"
-    });
-  }
   const normalizedOptions = {
     ...baseDefaults,
     ...defaultOptions,
     ...options,
     directory: normalizeDirectoryPath(options.directory)
   };
-  if (!isNodeApi) {
-    normalizedOptions.output = options.output ? normalizeAndValidatePath(options.output) : process.cwd();
-  }
-  if ("format" in options && !options.format && isNodeApi) {
-    normalizedOptions.format = "sarif";
-  }
   return normalizedOptions;
 }
 var normalizeConfig = normalizeCliOptions;

package/build/utils/nodeVersionUtil.d.ts

@@ -1,10 +1,10 @@
-export declare const REQUIRED_NODE_VERSION = ">=18.4.0";
+export declare const REQUIRED_NODE_VERSION = ">=18.18.0";
 /**
  * Checks if the current Node.js version meets the required version.
  * @param {string} requiredVersion - The required Node.js version.
  * @returns {boolean} - Returns true if the current version is valid.
  */
-export declare function checkNodeVersion(requiredVersion: any): boolean;
+export declare function checkNodeVersion(requiredVersion: any): any;
 /**
  * Validates the Node.js version and exits if it does not meet the requirement.
  */

package/build/utils/nodeVersionUtil.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from "url";
 import { dirname } from "path";
 import { resolve } from "import-meta-resolve";
 import { Logger } from "./logger.js";
-var REQUIRED_NODE_VERSION = ">=18.4.0";
+var REQUIRED_NODE_VERSION = ">=18.18.0";
 function checkNodeVersion(requiredVersion) {
   return semver.satisfies(process.version, requiredVersion);
 }

package/build/workers/eslint.worker.js

@@ -6,9 +6,8 @@ var ESLintWorker = class extends BaseWorker {
   constructor() {
     super();
     this.eslint = new ESLint({
-      useEslintrc: false,
-      fix: this.task.config.fix,
-      overrideConfigFile: this.task.config.configPath
+      overrideConfigFile: this.task.config.configPath,
+      fix: this.task.config.fix
     });
   }
   async processFile(filePath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce-ux/slds-linter",
-  "version": "0.3.1-internal-beta.1",
+  "version": "0.3.1-internal-beta.3",
   "description": "SLDS Linter CLI tool for linting styles and components",
   "keywords": [
     "lightning design system linter",
@@ -29,13 +29,13 @@
   ],
   "bin": "build/index.js",
   "dependencies": {
-    "@salesforce-ux/eslint-plugin-slds": "0.3.1-internal-beta.1",
-    "@salesforce-ux/stylelint-plugin-slds": "0.3.1-internal-beta.1",
-    "@typescript-eslint/eslint-plugin": "^5.0.0",
-    "@typescript-eslint/parser": "^5.0.0",
+    "@salesforce-ux/eslint-plugin-slds": "0.3.1-internal-beta.3",
+    "@salesforce-ux/stylelint-plugin-slds": "0.3.1-internal-beta.3",
+    "@typescript-eslint/eslint-plugin": "^8.36.0",
+    "@typescript-eslint/parser": "^8.36.0",
     "chalk": "^4.1.2",
     "commander": "^13.1.0",
-    "eslint": "8.57.1",
+    "eslint": "^9.0.0",
     "export-to-csv": "^1.4.0",
     "globby": "^14.1.0",
     "import-meta-resolve": "^4.1.0",
@@ -45,6 +45,9 @@
     "semver": "^7.7.1",
     "stylelint": "16.14.1"
   },
+  "engines": {
+    "node": ">=18.18.0"
+  },
   "license": "ISC",
   "repository": {
     "type": "git",