From 541958e905eae41d84e2ff28feee28133e8782ea Mon Sep 17 00:00:00 2001 From: Nicolas Vuillamy Date: Sun, 25 Aug 2024 22:34:42 +0200 Subject: [PATCH] find-package-json --- lib/utils.js | 4 ++-- test/miscellaneous.test.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/utils.js b/lib/utils.js index c681a432..b2ff8cda 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -8,7 +8,7 @@ import * as os from "os"; import * as path from "path"; import { fileURLToPath } from "url"; const __dirname = path.dirname(fileURLToPath(import.meta.url)); -import * as findPackageJson from "find-package-json"; +import find from "find-package-json"; const validErrorCombinations = { error: ["error", "warning", "info"], @@ -421,7 +421,7 @@ function getNpmGroovyLintVersion() { let v = process.env.npm_package_version; if (!v) { try { - const finder = findPackageJson(__dirname); + const finder = find(__dirname); v = finder.next().value.version; } catch { v = "error"; diff --git a/test/miscellaneous.test.js b/test/miscellaneous.test.js index 707ad798..49160a29 100644 --- a/test/miscellaneous.test.js +++ b/test/miscellaneous.test.js @@ -5,7 +5,7 @@ import * as childProcess from "child_process"; import fs from 'fs-extra' import * as os from "os"; import * as path from "path"; -import * as findPackageJson from "find-package-json"; +import find from "find-package-json"; import * as util from 'util' import * as which from 'which' const exec = util.promisify(childProcess.exec); @@ -286,7 +286,7 @@ describe("Miscellaneous", function() { process.env.npm_package_version = ""; // NV: Do not use npm_package_version to have more code coverage :) const linter = await new NpmGroovyLint([process.execPath, "", "-v"], {}).run(); assert(linter.status === 0, `Linter status is 0 (${linter.status} returned)`); - const finder = findPackageJson(__dirname); + const finder = find(__dirname); const v = finder.next().value.version; assert(linter.outputString.includes(`npm-groovy-lint version ${v}`), `Provides version ${v}\nReturned outputString:\n${linter.outputString}`); assert(linter.outputString.includes(`CodeNarc version`), `Provides CodeNarc version\nReturned outputString:\n${linter.outputString}`);