fix: upgrade utils

salesforce · Sep 28, 2021 · b4159a7 · b4159a7
1 parent bf665f3
commit b4159a7
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/packages/@best/types/src/config.ts b/packages/@best/types/src/config.ts
@@ -228,7 +228,7 @@ export interface EnvironmentConfig {
             brand: string;
             family: string;
             model: string;
-            speed: string;
+            speed: number;
             cores: number;
         },
         os: { platform: string, distro: string, release: string, kernel: string, arch: string };

diff --git a/packages/@best/utils/package.json b/packages/@best/utils/package.json
@@ -13,11 +13,8 @@
   "dependencies": {
     "chalk": "~2.4.2",
     "https-proxy-agent": "^5.0.0",
-    "is-ci": "~2.0.0",
-    "systeminformation": "~4.27.11"
-  },
-  "devDependencies": {
-    "@types/systeminformation": "^3.23.1"
+    "is-ci": "~3.0.0",
+    "systeminformation": "~5.9.4"
   },
   "files": [
     "build/**/*.js"

diff --git a/packages/@best/utils/src/__tests__/system-info.spec.ts b/packages/@best/utils/src/__tests__/system-info.spec.ts
@@ -20,7 +20,7 @@ test('getSystemInfo', async () => {
                 brand: expect.any(String),
                 family: expect.any(String),
                 model: expect.any(String),
-                speed: expect.any(String),
+                speed: expect.any(Number),
                 cores: expect.any(Number),
             },
             os: {

diff --git a/packages/@best/utils/src/system-info.ts b/packages/@best/utils/src/system-info.ts
@@ -11,7 +11,7 @@ export async function getSystemInfo() {
     const system = await si.system();
     const cpu = await si.cpu();
     const { platform, distro, release, kernel, arch } = await si.osInfo();
-    const { avgload } = await si.currentLoad();
+    const { avgLoad } = await si.currentLoad();
 
     return {
         system: {
@@ -27,6 +27,6 @@ export async function getSystemInfo() {
             cores: cpu.cores,
         },
         os: { platform, distro, release, kernel, arch },
-        load: { cpuLoad: avgload },
+        load: { cpuLoad: avgLoad },
     };
 }
diff --git a/yarn.lock b/yarn.lock
@@ -3458,13 +3458,6 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
-"@types/systeminformation@^3.23.1":
-  version "3.54.1"
-  resolved "https://registry.yarnpkg.com/@types/systeminformation/-/systeminformation-3.54.1.tgz#bbc1b9e4ae2e60d45f75906029c6fb5436e1c5cb"
-  integrity sha512-vvisj2mdWygyc0jk/5XtSVq9gtxCmF3nrGwv8wVway8pwNRhtPji/MU9dc1L0F6rl0F/NFIHa4ScRU7wmNaHmg==
-  dependencies:
-    systeminformation "*"
-
 "@types/tar@^4.0.0":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/tar/-/tar-4.0.3.tgz#e2cce0b8ff4f285293243f5971bd7199176ac489"
@@ -5644,6 +5637,11 @@ ci-info@^2.0.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
+ci-info@^3.1.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6"
+  integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -10069,13 +10067,20 @@ is-ci@^1.0.10:
   dependencies:
     ci-info "^1.5.0"
 
-is-ci@^2.0.0, is-ci@~2.0.0:
+is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
   integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
   dependencies:
     ci-info "^2.0.0"
 
+is-ci@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz#c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994"
+  integrity sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==
+  dependencies:
+    ci-info "^3.1.1"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -16971,10 +16976,10 @@ synchronous-promise@^2.0.6:
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.9.tgz#b83db98e9e7ae826bf9c8261fd8ac859126c780a"
   integrity sha512-LO95GIW16x69LuND1nuuwM4pjgFGupg7pZ/4lU86AmchPKrhk0o2tpMU2unXRrqo81iAFe1YJ0nAGEVwsrZAgg==
 
-systeminformation@*, systeminformation@~4.27.11:
-  version "4.27.11"
-  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-4.27.11.tgz#6dbe96e48091444f80dab6c05ee1901286826b60"
-  integrity sha512-U7bigXbOnsB8k1vNHS0Y13RCsRz5/UohiUmND+3mMUL6vfzrpbe/h4ZqewowB+B+tJNnmGFDj08Z8xGfYo45dQ==
+systeminformation@~5.9.4:
+  version "5.9.4"
+  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.9.4.tgz#1f0e29e0aa376dec8f69cc517eeefc5cdcda411a"
+  integrity sha512-FOsiTn0CyJZoj9kIhla11ndsMzbbwwuriul81wpqIBt9IpbxHZ6P/oZCphIFgJrwqjTnme0Qp1HDzIkUD9Xr/g==
 
 table@^5.2.3:
   version "5.4.0"