@oclif/plugin-update 4.2.11 → 4.2.12

package/README.md

@@ -55,7 +55,7 @@ EXAMPLES
     $ oclif-example update --available
 ```
 
-_See code: [src/commands/update.ts](https://github.com/oclif/plugin-update/blob/v4.2.11/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/oclif/plugin-update/blob/v4.2.12/src/commands/update.ts)_
 <!-- commandsstop -->
 
 # Contributing

package/dist/tar.js

@@ -1,6 +1,6 @@
 import makeDebug from 'debug';
 import { existsSync } from 'node:fs';
-import { cp, rename, rm } from 'node:fs/promises';
+import { rename, rm } from 'node:fs/promises';
 import { join } from 'node:path';
 import { touch } from './util.js';
 const debug = makeDebug('oclif-update');
@@ -63,9 +63,7 @@ async function extract(stream, basename, output, sha) {
         });
         if (existsSync(output)) {
             try {
-                const tmp = getTmp();
-                await cp(output, tmp);
-                await rm(tmp, { force: true, recursive: true }).catch(debug);
+                await rm(output, { force: true, recursive: true }).catch(debug);
             }
             catch (error) {
                 debug(error);

package/dist/update.js

@@ -1,8 +1,7 @@
 import { Config, ux } from '@oclif/core';
 import chalk from 'chalk';
 import fileSize from 'filesize';
-import { HTTP } from 'http-call';
-import throttle from 'lodash.throttle';
+import { got } from 'got';
 import { existsSync } from 'node:fs';
 import { mkdir, readFile, readdir, rm, stat, symlink, utimes, writeFile } from 'node:fs/promises';
 import { basename, dirname, join } from 'node:path';
@@ -25,7 +24,7 @@ export class Updater {
         ux.action.status = 'fetching version index';
         const newIndexUrl = this.config.s3Url(s3VersionIndexKey(this.config));
         try {
-            const { body } = await HTTP.get(newIndexUrl);
+            const { body } = await got.get(newIndexUrl);
             return typeof body === 'string' ? JSON.parse(body) : body;
         }
         catch {
@@ -219,7 +218,6 @@ const ensureClientDir = async (clientRoot) => {
         }
     }
 };
-// eslint-disable-next-line unicorn/no-await-expression-member
 const mtime = async (f) => (await stat(f)).mtime;
 const notUpdatable = (config) => {
     if (!config.binPath) {
@@ -243,7 +241,7 @@ const composeS3SubDir = (config) => {
 const fetchManifest = async (s3Key, config) => {
     ux.action.status = 'fetching manifest';
     const url = config.s3Url(s3Key);
-    const { body } = await HTTP.get(url);
+    const { body } = await got.get(url);
     if (typeof body === 'string') {
         return JSON.parse(body);
     }
@@ -309,7 +307,7 @@ const downloadAndExtract = async (output, manifest, channel, config) => {
             platform: determinePlatform(config),
             version,
         }));
-    const { response: stream } = await HTTP.stream(gzUrl);
+    const stream = got.stream(gzUrl);
     stream.pause();
     const baseDir = manifest.baseDir ??
         config.s3Key('baseDir', {
@@ -321,14 +319,11 @@ const downloadAndExtract = async (output, manifest, channel, config) => {
         });
     const extraction = Extractor.extract(stream, baseDir, output, sha256gz);
     if (ux.action.type === 'spinner') {
-        const total = Number.parseInt(stream.headers['content-length'], 10);
-        let current = 0;
-        const updateStatus = throttle((newStatus) => {
-            ux.action.status = newStatus;
-        }, 250, { leading: true, trailing: false });
-        stream.on('data', (data) => {
-            current += data.length;
-            updateStatus(`${filesize(current)}/${filesize(total)}`);
+        stream.on('downloadProgress', (progress) => {
+            ux.action.status =
+                progress.percent === 1
+                    ? `${filesize(progress.transferred)}/${filesize(progress.total)} - Extracting`
+                    : `${filesize(progress.transferred)}/${filesize(progress.total)}`;
         });
     }
     stream.resume();
@@ -336,13 +331,12 @@ const downloadAndExtract = async (output, manifest, channel, config) => {
 };
 const determineChannel = async ({ config, version }) => {
     const channelPath = join(config.dataDir, 'channel');
-    // eslint-disable-next-line unicorn/no-await-expression-member
     const channel = existsSync(channelPath) ? (await readFile(channelPath, 'utf8')).trim() : 'stable';
     if (config.pjson.oclif.update?.disableNpmLookup ?? false) {
         return channel;
     }
     try {
-        const { body } = await HTTP.get(`${config.npmRegistry ?? 'https://registry.npmjs.org'}/${config.pjson.name}`);
+        const { body } = await got.get(`${config.npmRegistry ?? 'https://registry.npmjs.org'}/${config.pjson.name}`);
         const tags = body['dist-tags'];
         const tag = Object.keys(tags).find((v) => tags[v] === version) ?? channel;
         // convert from npm style tag defaults to OCLIF style

package/oclif.manifest.json

@@ -88,5 +88,5 @@
       ]
     }
   },
-  "version": "4.2.11"
+  "version": "4.2.12"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oclif/plugin-update",
-  "version": "4.2.11",
+  "version": "4.2.12",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/plugin-update/issues",
   "dependencies": {
@@ -9,8 +9,7 @@
     "chalk": "^5",
     "debug": "^4.3.1",
     "filesize": "^6.1.0",
-    "http-call": "^5.3.0",
-    "lodash.throttle": "^4.1.1",
+    "got": "^13",
     "semver": "^7.6.0",
     "tar-fs": "^2.1.1"
   },
@@ -22,7 +21,6 @@
     "@types/chai": "^4.3.11",
     "@types/debug": "^4.1.12",
     "@types/execa": "^0.9.0",
-    "@types/lodash.throttle": "^4.1.9",
     "@types/mocha": "^10",
     "@types/node": "^18",
     "@types/semver": "^7.5.8",
@@ -33,7 +31,6 @@
     "eslint-config-oclif": "^5.2.0",
     "eslint-config-oclif-typescript": "^3.1.7",
     "eslint-config-prettier": "^9.1.0",
-    "got": "^13.0.0",
     "husky": "^9",
     "lint-staged": "^15",
     "mocha": "^10.4.0",
@@ -51,8 +48,7 @@
   },
   "files": [
     "oclif.manifest.json",
-    "/dist",
-    "npm-shrinkwrap.json"
+    "/dist"
   ],
   "homepage": "https://github.com/oclif/plugin-update",
   "keywords": [
@@ -74,12 +70,12 @@
   "repository": "oclif/plugin-update",
   "scripts": {
     "build": "shx rm -rf lib && tsc",
-    "clean": "shx rm -f oclif.manifest.json npm-shrinkwrap.json",
+    "clean": "shx rm -f oclif.manifest.json",
     "compile": "tsc",
     "lint": "eslint . --ext .ts",
     "postpack": "yarn run clean",
     "posttest": "yarn lint",
-    "prepack": "yarn build && oclif manifest && oclif readme && npm shrinkwrap",
+    "prepack": "yarn build && oclif manifest && oclif readme",
     "prepare": "husky && yarn build",
     "pretest": "yarn build --noEmit && tsc -p test --noEmit",
     "test:integration:sf": "mocha --forbid-only \"test/integration/sf.integration.ts\" --timeout 900000",