From 8c513d932ba2dabe8cfb1e2a2003f0e9aabfbcde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=AF=E5=88=83?= Date: Wed, 10 Mar 2021 13:08:06 +0800 Subject: [PATCH] chore: rm pkg os-name --- lib/shared/runtime-info.js | 4 ++-- package.json | 1 - tests/lib/shared/runtime-info.js | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/shared/runtime-info.js b/lib/shared/runtime-info.js index cf3e552f3a0..aa5eff756a8 100644 --- a/lib/shared/runtime-info.js +++ b/lib/shared/runtime-info.js @@ -11,7 +11,7 @@ const path = require("path"); const spawn = require("cross-spawn"); -const osName = require("os-name"); +const os = require("os"); const log = require("../shared/logging"); const packageJson = require("../../package.json"); @@ -142,7 +142,7 @@ function environment() { `npm version: ${getBinVersion("npm")}`, `Local ESLint version: ${getNpmPackageVersion("eslint", { global: false })}`, `Global ESLint version: ${getNpmPackageVersion("eslint", { global: true })}`, - `Operating System: ${osName()}` + `Operating System: ${os.platform()} ${os.release()}` ].join("\n"); } diff --git a/package.json b/package.json index 2549fc12756..8950b8f6f37 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,6 @@ "minimatch": "^3.0.4", "natural-compare": "^1.4.0", "optionator": "^0.9.1", - "os-name": "^4.0.0", "progress": "^2.0.0", "regexpp": "^3.1.0", "semver": "^7.2.1", diff --git a/tests/lib/shared/runtime-info.js b/tests/lib/shared/runtime-info.js index 5a526ee185d..437b43e43f4 100644 --- a/tests/lib/shared/runtime-info.js +++ b/tests/lib/shared/runtime-info.js @@ -112,7 +112,7 @@ describe("RuntimeInfo", () => { npm version: v6.11.3 Local ESLint version: v6.3.0 (Currently used) Global ESLint version: v5.16.0 - Operating System: macOS Big Sur + Operating System: darwin 20.3.0 ` ); }); @@ -130,7 +130,7 @@ describe("RuntimeInfo", () => { npm version: v6.11.3 Local ESLint version: v6.3.0 Global ESLint version: v5.16.0 (Currently used) - Operating System: macOS Big Sur + Operating System: darwin 20.3.0 ` ); }); @@ -155,7 +155,7 @@ describe("RuntimeInfo", () => { npm version: v6.11.3 Local ESLint version: Not found Global ESLint version: v5.16.0 (Currently used) - Operating System: macOS Big Sur + Operating System: darwin 20.3.0 ` ); }); @@ -173,7 +173,7 @@ describe("RuntimeInfo", () => { npm version: v6.11.3 Local ESLint version: v6.3.0 (Currently used) Global ESLint version: Not found - Operating System: macOS Big Sur + Operating System: darwin 20.3.0 ` ); });