From bb5137bdc2943daa9fde25313873f1979bc04a8e Mon Sep 17 00:00:00 2001
From: Andrew Dupont <github@andrewdupont.net>
Date: Mon, 12 Aug 2024 10:19:24 -0700
Subject: [PATCH] Fix CI (#29)

* Copy over the new config file format in package interaction specs

* Use Node 18 instead of Node 16
---
 .github/workflows/CI.yml                              | 4 ++--
 lib/main.js                                           | 2 +-
 spec/fixtures/ci/package-interaction/eslint.config.js | 7 +++++++
 spec/node-bin-spec.js                                 | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 spec/fixtures/ci/package-interaction/eslint.config.js

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index d2aec43..e89f840 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -28,7 +28,7 @@ jobs:
           volta install node@latest
           echo "NODE_LATEST=$(volta which node)" >> $GITHUB_ENV
           echo "NODE_LATEST_VERSION=$(node --version)" >> $GITHUB_ENV
-          volta install node@16
+          volta install node@18
           echo "NODE_DEFAULT=$(volta which node)" >> $GITHUB_ENV
           echo "NODE_DEFAULT_VERSION=$(node --version)" >> $GITHUB_ENV
       - name: Install multiple Node versions (Windows)
@@ -37,7 +37,7 @@ jobs:
           volta install node@latest
           echo "NODE_LATEST=$(volta which node)" >> $env:GITHUB_ENV
           echo "NODE_LATEST_VERSION=$(node --version)" >> $env:GITHUB_ENV
-          volta install node@16
+          volta install node@18
           echo "NODE_DEFAULT=$(volta which node)" >> $env:GITHUB_ENV
           echo "NODE_DEFAULT_VERSION=$(node --version)" >> $env:GITHUB_ENV
       - name: Setup dummy ESLint projects
diff --git a/lib/main.js b/lib/main.js
index 8d25bbb..f051694 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -469,7 +469,7 @@ export default {
       return null;
     }
 
-    if (err.type && err.type === 'config-not-found') {
+    if (err.type === 'config-not-found' || err.messageTemplate === 'config-file-missing') {
       if (Config.get('disabling.disableWhenNoEslintConfig')) {
         let { filePath, projectPath } = err;
         if (projectPath && projectPath.length && filePath.startsWith(projectPath)) {
diff --git a/spec/fixtures/ci/package-interaction/eslint.config.js b/spec/fixtures/ci/package-interaction/eslint.config.js
new file mode 100644
index 0000000..b10068a
--- /dev/null
+++ b/spec/fixtures/ci/package-interaction/eslint.config.js
@@ -0,0 +1,7 @@
+module.exports = [
+  {
+    rules: {
+      'no-unused-vars': "error"
+    }
+  }
+];
diff --git a/spec/node-bin-spec.js b/spec/node-bin-spec.js
index f8d43eb..d0f26df 100644
--- a/spec/node-bin-spec.js
+++ b/spec/node-bin-spec.js
@@ -29,6 +29,7 @@ async function writeProjectConfig (projectPath, config) {
 async function copyFilesIntoProject (projectPath) {
   let files = [
     Path.join(fixtureRoot, '.eslintrc'),
+    Path.join(fixtureRoot, 'eslint.config.js'),
     Path.join(fixtureRoot, 'index.js')
   ];
   for (let file of files) {