From 469cbca67fb04218fb5ff66e65a3ada481bc78d8 Mon Sep 17 00:00:00 2001
From: Aswin Ashok <aswwwin@google.com>
Date: Tue, 10 Feb 2026 00:06:16 +0530
Subject: [PATCH] fix(chore): Support linting for cjs (#18639)

Co-authored-by: Gal Zahavi <38544478+galz10@users.noreply.github.com>
---
 .github/scripts/sync-maintainer-labels.cjs    |  8 ++++--
 eslint.config.js                              | 28 +++++++++++++++++--
 .../skill-creator/scripts/init_skill.cjs      |  6 +++-
 .../skill-creator/scripts/package_skill.cjs   |  6 +++-
 .../skill-creator/scripts/validate_skill.cjs  |  6 +++-
 5 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/.github/scripts/sync-maintainer-labels.cjs b/.github/scripts/sync-maintainer-labels.cjs
index ab2358d369..41a75e99fa 100644
--- a/.github/scripts/sync-maintainer-labels.cjs
+++ b/.github/scripts/sync-maintainer-labels.cjs
@@ -1,5 +1,9 @@
-/* eslint-disable @typescript-eslint/no-require-imports */
-/* global process, console, require */
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 const { Octokit } = require('@octokit/rest');
 
 /**
diff --git a/eslint.config.js b/eslint.config.js
index 301dd7cf5d..f13773d11d 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -37,7 +37,6 @@ export default tseslint.config(
       'dist/**',
       'evals/**',
       'packages/test-utils/**',
-      'packages/core/src/skills/builtin/skill-creator/scripts/*.cjs',
     ],
   },
   eslint.configs.recommended,
@@ -243,7 +242,7 @@ export default tseslint.config(
     },
   },
   {
-    files: ['./**/*.{tsx,ts,js}'],
+    files: ['./**/*.{tsx,ts,js,cjs}'],
     plugins: {
       headers,
       import: importPlugin,
@@ -269,7 +268,6 @@ export default tseslint.config(
       'import/enforce-node-protocol-usage': ['error', 'always'],
     },
   },
-  // extra settings for scripts that we run directly with node
   {
     files: ['./scripts/**/*.js', 'esbuild.config.js'],
     languageOptions: {
@@ -290,6 +288,30 @@ export default tseslint.config(
       ],
     },
   },
+  {
+    files: ['**/*.cjs'],
+    languageOptions: {
+      sourceType: 'commonjs',
+      globals: {
+        ...globals.node,
+      },
+    },
+    rules: {
+      'no-restricted-syntax': 'off',
+      'no-console': 'off',
+      'no-empty': 'off',
+      'no-redeclare': 'off',
+      '@typescript-eslint/no-require-imports': 'off',
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_',
+        },
+      ],
+    },
+  },
   {
     files: ['packages/vscode-ide-companion/esbuild.js'],
     languageOptions: {
diff --git a/packages/core/src/skills/builtin/skill-creator/scripts/init_skill.cjs b/packages/core/src/skills/builtin/skill-creator/scripts/init_skill.cjs
index d23853f255..ea824e10ae 100644
--- a/packages/core/src/skills/builtin/skill-creator/scripts/init_skill.cjs
+++ b/packages/core/src/skills/builtin/skill-creator/scripts/init_skill.cjs
@@ -1,6 +1,10 @@
 #!/usr/bin/env node
 
-/* eslint-env node */
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /**
  * Skill Initializer - Creates a new skill from template
diff --git a/packages/core/src/skills/builtin/skill-creator/scripts/package_skill.cjs b/packages/core/src/skills/builtin/skill-creator/scripts/package_skill.cjs
index 875a6f95cc..b5e6577fd4 100644
--- a/packages/core/src/skills/builtin/skill-creator/scripts/package_skill.cjs
+++ b/packages/core/src/skills/builtin/skill-creator/scripts/package_skill.cjs
@@ -1,6 +1,10 @@
 #!/usr/bin/env node
 
-/* eslint-env node */
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /**
  * Skill Packager - Creates a distributable .skill file of a skill folder
diff --git a/packages/core/src/skills/builtin/skill-creator/scripts/validate_skill.cjs b/packages/core/src/skills/builtin/skill-creator/scripts/validate_skill.cjs
index d51fec96ba..82e2f3fcb8 100644
--- a/packages/core/src/skills/builtin/skill-creator/scripts/validate_skill.cjs
+++ b/packages/core/src/skills/builtin/skill-creator/scripts/validate_skill.cjs
@@ -1,4 +1,8 @@
-/* eslint-env node */
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /**
  * Quick validation logic for skills.