@genesislcap/eslint-stylelint-builder 14.436.0-FUI-2489.2 → 14.437.0

package/README.md

@@ -1,19 +1,7 @@
-# ESLint, Oxlint, Oxfmt & Stylelint builder
+# ESLint & Stylelint builder
 
-Builder used by **`genx lint`**. It runs **Oxlint**, **Oxfmt**, and **Stylelint** by default, and **ESLint** when requested.
+Builder wrapping [ESLint](https://eslint.org/) and [Stylelint](https://stylelint.io/). 
 
-## Default pipeline (`genx lint` / `npm run lint`)
-
-1. **Oxlint** — `oxlint .` (with `--fix` when fixing).
-2. **Oxfmt** — format check or write (`oxfmt --check .` or `oxfmt .` with `--fix`).
-3. **Stylelint** — `*.styles.ts` under the current working directory.
-
-## Opt-in linters
-
-- **ESLint only:** `genx lint -l eslint` (use `--profile` for `TIMING=1` rule timings).
-- **Other flags:** `-l oxfmt`, `-l oxlint`, `-l stylelint`, or combine as supported by the CLI.
-
-Configs: [`@genesislcap/oxfmt-config`](../oxfmt-config/), [`@genesislcap/oxlint-config`](../oxlint-config/), root **`eslint.config.mjs`** (flat config) for ESLint, and **`@genesislcap/stylelint-config`** for Stylelint.
 
 ## Installation
 
@@ -40,4 +28,4 @@ To enable this module in your application, follow the steps below.
 Note: this project provides front-end dependencies and uses licensed components listed in the next section; thus, licenses for those components are required during development. Contact [Genesis Global](https://genesis.global/contact-us/) for more details.
 
 ### Licensed components
-Genesis low-code platform
+Genesis low-code platform

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;yBAsFrC,KAAK,YAAY;AAAvC,wBAgDE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;yBAIrC,KAAK,YAAY;AAAvC,wBAuCE"}

package/dist/index.js

@@ -1,121 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const os_1 = tslib_1.__importDefault(require("os"));
 const build_kit_1 = require("@genesislcap/build-kit");
 const consola_1 = tslib_1.__importDefault(require("consola"));
-/** ESLint file glob; Oxlint scope is aligned via `OXLINT_CLI_IGNORE_PATTERNS` (extensions + `.genx`). */
-const ESLINT_TS_JS_GLOB = '"./**/*.{ts,js,tsx,jsx}"';
-/**
- * Oxlint only accepts directory/file PATHs, not ESLint-style brace globs. Lint `.` and ignore other
- * extensions Oxlint supports so scope matches `ESLINT_TS_JS_GLOB` (plain `.ts` / `.js` only).
- */
-/** CLI flags: Oxlint does not reliably apply `ignorePatterns` from extended configs for dot-directories like `.genx`. */
-const OXLINT_CLI_IGNORE_PATTERNS = [
-    '**/.genx/**',
-    '**/*.mjs',
-    '**/*.cjs',
-    '**/*.mts',
-    '**/*.cts',
-    '**/*.vue',
-    '**/*.svelte',
-    '**/*.astro',
-]
-    .map((pattern) => ` --ignore-pattern="${pattern}"`)
-    .join('');
-/**
- * TODO: https://github.com/apify/apify-oxlint-config/issues/7 - Migrate everything to oxlint after resolving this issue.
- */
-function runOxlintStep(cwd, oxlintFixArg) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        consola_1.default.info('Running Oxlint...');
-        const oxlint = yield (0, build_kit_1.resolveBin)('oxlint');
-        const oxlintCmd = `${oxlint} .${OXLINT_CLI_IGNORE_PATTERNS}${oxlintFixArg}`;
-        consola_1.default.info(`Executing: ${oxlintCmd}`);
-        (0, build_kit_1.run)(cwd, oxlintCmd);
-        consola_1.default.success('Oxlint completed');
-    });
-}
-function runEslintStep(cwd_1, fixArg_1, profile_1, concurrency_1) {
-    return tslib_1.__awaiter(this, arguments, void 0, function* (cwd, fixArg, profile, concurrency, disablePrettierNoise = false) {
-        consola_1.default.info('Running ESLint...');
-        if (profile) {
-            process.env.TIMING = '1';
-        }
-        const eslint = yield (0, build_kit_1.resolveBin)('eslint');
-        let concurrencyArg = '';
-        if (concurrency) {
-            concurrencyArg = ` --concurrency ${concurrency}`;
-        }
-        else if (!process.env.CI) {
-            const defaultConcurrency = Math.max(1, Math.floor(os_1.default.cpus().length / 2));
-            concurrencyArg = ` --concurrency ${defaultConcurrency}`;
-        }
-        const formattingNoiseArg = disablePrettierNoise
-            ? [
-                ' --rule "prettier/prettier: off"',
-                ' --rule "max-len: off"',
-                ' --rule "eol-last: off"',
-                ' --rule "jsx-quotes: off"',
-                ' --rule "spaced-comment: off"',
-            ].join('')
-            : '';
-        const command = `${eslint} ${ESLINT_TS_JS_GLOB} ${fixArg}${concurrencyArg}${formattingNoiseArg}`;
-        consola_1.default.info(`Executing: ${command}`);
-        (0, build_kit_1.run)(cwd, command);
-        consola_1.default.success('ESLint completed');
-    });
-}
-function runOxfmtStep(cwd, fix) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        consola_1.default.info('Running Oxfmt...');
-        const oxfmt = yield (0, build_kit_1.resolveBin)('oxfmt');
-        const oxfmtCmd = fix ? `${oxfmt} .` : `${oxfmt} --check .`;
-        consola_1.default.info(`Executing: ${oxfmtCmd}`);
-        (0, build_kit_1.run)(cwd, oxfmtCmd);
-        consola_1.default.success('Oxfmt completed');
-    });
-}
-function runStylelintStep(cwd, fixArg) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        consola_1.default.info('Running Stylelint...');
-        const stylelint = yield (0, build_kit_1.resolveBin)('stylelint');
-        (0, build_kit_1.run)(cwd, `${stylelint} "./**/*.styles.ts" ${fixArg} --allow-empty-input`);
-        consola_1.default.success('Stylelint completed');
-    });
-}
+const os_1 = tslib_1.__importDefault(require("os"));
 exports.default = (ctx) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     const { dirs: { cwd }, cli: { isLint, options: { profile, linter, fix, concurrency }, }, } = ctx;
     if (isLint) {
         const fixArg = fix ? ' --fix' : '';
-        const oxlintFixArg = fix ? ' --fix' : '';
-        // CI pipeline: Oxlint → ESLint → Oxfmt → Stylelint (code linters before format/style).
-        if (linter === 'ci') {
-            yield runOxlintStep(cwd, oxlintFixArg);
-            // CI keeps ESLint for non-formatting correctness checks (e.g. import/no-extraneous-dependencies).
-            yield runEslintStep(cwd, fixArg, profile, concurrency, true);
-            yield runOxfmtStep(cwd, fix);
-            yield runStylelintStep(cwd, fixArg);
-            return;
-        }
-        // Default and `-l all`: Oxlint → Oxfmt → Stylelint. ESLint is opt-in (`-l eslint`) only.
-        const runAll = !linter || linter === 'all';
-        const runOxfmt = runAll || linter === 'oxfmt';
-        const runOxlint = runAll || linter === 'oxlint';
-        const runEslint = linter === 'eslint';
-        const runStylelint = runAll || linter === 'stylelint';
-        if (runOxlint) {
-            yield runOxlintStep(cwd, oxlintFixArg);
-        }
-        if (runOxfmt) {
-            yield runOxfmtStep(cwd, fix);
-        }
-        if (runEslint) {
-            // ESLint-only mode: Prettier runs via ESLint (old-school standalone flow).
-            yield runEslintStep(cwd, fixArg, profile, concurrency, false);
-        }
-        if (runStylelint) {
-            yield runStylelintStep(cwd, fixArg);
+        if (!linter || linter === 'eslint' || linter === 'all') {
+            consola_1.default.info('Running ESLint...');
+            if (profile) {
+                process.env.TIMING = '1';
+            }
+            const eslint = yield (0, build_kit_1.resolveBin)('eslint');
+            let concurrencyArg = '';
+            if (concurrency) {
+                concurrencyArg = ` --concurrency ${concurrency}`;
+            }
+            else if (!process.env.CI) {
+                const defaultConcurrency = Math.max(1, Math.floor(os_1.default.cpus().length / 2));
+                concurrencyArg = ` --concurrency ${defaultConcurrency}`;
+            }
+            const command = `${eslint} "./**/*.{ts,tsx,js,jsx}" ${fixArg}${concurrencyArg}`;
+            consola_1.default.info(`Executing: ${command}`);
+            (0, build_kit_1.run)(cwd, command);
+            consola_1.default.success('ESLint completed');
+        }
+        if (!linter || linter === 'stylelint' || linter === 'all') {
+            consola_1.default.info('Running Stylelint...');
+            const stylelint = yield (0, build_kit_1.resolveBin)('stylelint');
+            (0, build_kit_1.run)(cwd, `${stylelint} "./**/*.styles.ts" ${fixArg} --allow-empty-input`);
+            consola_1.default.success('Stylelint completed');
         }
     }
     else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/eslint-stylelint-builder",
   "description": "ESLint/Stylelint builder",
-  "version": "14.436.0-FUI-2489.2",
+  "version": "14.437.0",
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,11 +16,9 @@
     "lint:fix": "genx lint --fix"
   },
   "dependencies": {
-    "@genesislcap/build-kit": "14.436.0-FUI-2489.2",
+    "@genesislcap/build-kit": "14.437.0",
     "consola": "^3.0.2",
     "eslint": "^9.34.0",
-    "oxfmt": "^0.44.0",
-    "oxlint": "^1.59.0",
     "stylelint": "^14.0.0"
   },
   "repository": {
@@ -31,5 +29,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "16309f873a08dfa541589cd172482677ff5dfd20"
+  "gitHead": "c30c777f0ab5e45f4e931a9cc1200ac85bcace35"
 }

package/src/index.ts

@@ -1,90 +1,7 @@
-import os from 'os';
 import { run, resolveBin } from '@genesislcap/build-kit';
 import type { BuildContext } from '@genesislcap/build-kit';
 import consola from 'consola';
-
-/** ESLint file glob; Oxlint scope is aligned via `OXLINT_CLI_IGNORE_PATTERNS` (extensions + `.genx`). */
-const ESLINT_TS_JS_GLOB = '"./**/*.{ts,js,tsx,jsx}"';
-
-/**
- * Oxlint only accepts directory/file PATHs, not ESLint-style brace globs. Lint `.` and ignore other
- * extensions Oxlint supports so scope matches `ESLINT_TS_JS_GLOB` (plain `.ts` / `.js` only).
- */
-/** CLI flags: Oxlint does not reliably apply `ignorePatterns` from extended configs for dot-directories like `.genx`. */
-const OXLINT_CLI_IGNORE_PATTERNS = [
-  '**/.genx/**',
-  '**/*.mjs',
-  '**/*.cjs',
-  '**/*.mts',
-  '**/*.cts',
-  '**/*.vue',
-  '**/*.svelte',
-  '**/*.astro',
-]
-  .map((pattern) => ` --ignore-pattern="${pattern}"`)
-  .join('');
-
-/**
- * TODO: https://github.com/apify/apify-oxlint-config/issues/7 - Migrate everything to oxlint after resolving this issue.
- */
-async function runOxlintStep(cwd: string, oxlintFixArg: string): Promise<void> {
-  consola.info('Running Oxlint...');
-  const oxlint = await resolveBin('oxlint');
-  const oxlintCmd = `${oxlint} .${OXLINT_CLI_IGNORE_PATTERNS}${oxlintFixArg}`;
-  consola.info(`Executing: ${oxlintCmd}`);
-  run(cwd, oxlintCmd);
-  consola.success('Oxlint completed');
-}
-
-async function runEslintStep(
-  cwd: string,
-  fixArg: string,
-  profile: boolean | undefined,
-  concurrency: string | number | undefined,
-  disablePrettierNoise = false,
-): Promise<void> {
-  consola.info('Running ESLint...');
-  if (profile) {
-    process.env.TIMING = '1';
-  }
-  const eslint = await resolveBin('eslint');
-  let concurrencyArg = '';
-  if (concurrency) {
-    concurrencyArg = ` --concurrency ${concurrency}`;
-  } else if (!process.env.CI) {
-    const defaultConcurrency = Math.max(1, Math.floor(os.cpus().length / 2));
-    concurrencyArg = ` --concurrency ${defaultConcurrency}`;
-  }
-  const formattingNoiseArg = disablePrettierNoise
-    ? [
-        ' --rule "prettier/prettier: off"',
-        ' --rule "max-len: off"',
-        ' --rule "eol-last: off"',
-        ' --rule "jsx-quotes: off"',
-        ' --rule "spaced-comment: off"',
-      ].join('')
-    : '';
-  const command = `${eslint} ${ESLINT_TS_JS_GLOB} ${fixArg}${concurrencyArg}${formattingNoiseArg}`;
-  consola.info(`Executing: ${command}`);
-  run(cwd, command);
-  consola.success('ESLint completed');
-}
-
-async function runOxfmtStep(cwd: string, fix: boolean | undefined): Promise<void> {
-  consola.info('Running Oxfmt...');
-  const oxfmt = await resolveBin('oxfmt');
-  const oxfmtCmd = fix ? `${oxfmt} .` : `${oxfmt} --check .`;
-  consola.info(`Executing: ${oxfmtCmd}`);
-  run(cwd, oxfmtCmd);
-  consola.success('Oxfmt completed');
-}
-
-async function runStylelintStep(cwd: string, fixArg: string): Promise<void> {
-  consola.info('Running Stylelint...');
-  const stylelint = await resolveBin('stylelint');
-  run(cwd, `${stylelint} "./**/*.styles.ts" ${fixArg} --allow-empty-input`);
-  consola.success('Stylelint completed');
-}
+import os from 'os';
 
 export default async (ctx: BuildContext) => {
   const {
@@ -96,40 +13,31 @@ export default async (ctx: BuildContext) => {
   } = ctx;
   if (isLint) {
     const fixArg = fix ? ' --fix' : '';
-    const oxlintFixArg = fix ? ' --fix' : '';
-
-    // CI pipeline: Oxlint → ESLint → Oxfmt → Stylelint (code linters before format/style).
-    if (linter === 'ci') {
-      await runOxlintStep(cwd, oxlintFixArg);
-      // CI keeps ESLint for non-formatting correctness checks (e.g. import/no-extraneous-dependencies).
-      await runEslintStep(cwd, fixArg, profile, concurrency, true);
-      await runOxfmtStep(cwd, fix);
-      await runStylelintStep(cwd, fixArg);
-      return;
-    }
-
-    // Default and `-l all`: Oxlint → Oxfmt → Stylelint. ESLint is opt-in (`-l eslint`) only.
-    const runAll = !linter || linter === 'all';
-    const runOxfmt = runAll || linter === 'oxfmt';
-    const runOxlint = runAll || linter === 'oxlint';
-    const runEslint = linter === 'eslint';
-    const runStylelint = runAll || linter === 'stylelint';
-
-    if (runOxlint) {
-      await runOxlintStep(cwd, oxlintFixArg);
-    }
-
-    if (runOxfmt) {
-      await runOxfmtStep(cwd, fix);
-    }
 
-    if (runEslint) {
-      // ESLint-only mode: Prettier runs via ESLint (old-school standalone flow).
-      await runEslintStep(cwd, fixArg, profile, concurrency, false);
+    if (!linter || linter === 'eslint' || linter === 'all') {
+      consola.info('Running ESLint...');
+      if (profile) {
+        process.env.TIMING = '1';
+      }
+      const eslint = await resolveBin('eslint');
+      let concurrencyArg = '';
+      if (concurrency) {
+        concurrencyArg = ` --concurrency ${concurrency}`;
+      } else if (!process.env.CI) {
+        const defaultConcurrency = Math.max(1, Math.floor(os.cpus().length / 2));
+        concurrencyArg = ` --concurrency ${defaultConcurrency}`;
+      }
+      const command = `${eslint} "./**/*.{ts,tsx,js,jsx}" ${fixArg}${concurrencyArg}`;
+      consola.info(`Executing: ${command}`);
+      run(cwd, command);
+      consola.success('ESLint completed');
     }
 
-    if (runStylelint) {
-      await runStylelintStep(cwd, fixArg);
+    if (!linter || linter === 'stylelint' || linter === 'all') {
+      consola.info('Running Stylelint...');
+      const stylelint = await resolveBin('stylelint');
+      run(cwd, `${stylelint} "./**/*.styles.ts" ${fixArg} --allow-empty-input`);
+      consola.success('Stylelint completed');
     }
   } else {
     throw new Error(`Unrecognized command: ${JSON.stringify(ctx.cli.options)}`);

package/tsconfig.json

@@ -2,10 +2,17 @@
   "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "declarationDir": "./dist",
-    "lib": ["ES2015", "ES2016", "ES2017", "ES2019"],
+    "lib": [
+      "ES2015",
+      "ES2016",
+      "ES2017",
+      "ES2019",
+    ],
     "module": "commonjs",
     "outDir": "./dist",
-    "rootDir": "./src"
+    "rootDir": "./src",
   },
-  "include": ["src/**/*"]
+  "include": [
+    "src/**/*"
+  ]
 }