@sentry/cli 2.0.3 → 2.2.0

package/README.md

@@ -1,6 +1,11 @@
 <p align="center">
-    <img src="https://sentry-brand.storage.googleapis.com/sentry-logo-black.png" width="280">
-    <br />
+  <a href="https://sentry.io/?utm_source=github&utm_medium=logo" target="_blank">
+    <picture>
+      <source srcset="https://sentry-brand.storage.googleapis.com/sentry-logo-white.png" media="(prefers-color-scheme: dark)" />
+      <source srcset="https://sentry-brand.storage.googleapis.com/sentry-logo-black.png" media="(prefers-color-scheme: light), (prefers-color-scheme: no-preference)" />
+      <img src="https://sentry-brand.storage.googleapis.com/sentry-logo-black.png" alt="Sentry" width="280">
+    </picture>
+  </a>
 </p>
 
 # Official Sentry Command Line Interface
@@ -20,10 +25,21 @@ fastlane tools.
 
 ## Installation
 
-The recommended way to install is with everybody's favorite curl to bash:
+If you are on OS X or Linux, you can use the automated downloader which will fetch the latest release version for you and install it:
 
     curl -sL https://sentry.io/get-cli/ | bash
 
+We do however, encourage you to pin the specific version of the CLI, so your builds are always reproducible.
+To do that, you can use the exact same method, with an additional version specifier:
+
+    curl -sL https://sentry.io/get-cli/ | SENTRY_CLI_VERSION=2.0.4 bash
+
+This will automatically download the correct version of `sentry-cli` for your operating system and install it. If necessary, it will prompt for your admin password for `sudo`. For a different installation location or for systems without `sudo` (like Windows), you can `export INSTALL_DIR=/custom/installation/path` before running this command.
+
+To verify it’s installed correctly you can bring up the help:
+
+    sentry-cli --help
+
 ### Node
 
 Additionally you can also install this binary via npm:

package/checksums.txt

@@ -1,9 +1,9 @@
-sentry-cli-Darwin-arm64=c3e015c0071e5d5c0e15eafd79818d05e7c73a6a1b48411387d6c310c967d1dc
-sentry-cli-Darwin-universal=89a6c663d8642625281ce0313d07f7e14762cb94d05e3b3159b28ad1dfbf7be5
-sentry-cli-Darwin-x86_64=500491c3d043b89b582ec1440742afd820d65318fedb9a553db1fc3cf68810c2
-sentry-cli-Linux-aarch64=ae1d495faa0f92a681e9425a61a6364e28105181911428f9db6dedd94a81ed8f
-sentry-cli-Linux-armv7=88242c3bd2cd47bab201c5209aad3baa0c8cf4b73cef28e4da27f6e1a8ff08e5
-sentry-cli-Linux-i686=ce876ee505911815f34a01d94ffddcd4575c5f3cf7d893081374ef237847d9f4
-sentry-cli-Linux-x86_64=fdcc34085404086eff7dd0d96bc68603da4bce1c094f8898fccfd08b4e599453
-sentry-cli-Windows-i686.exe=0eedd609ee68bb4fef61e4cd0f50816fbd1bc955cda2ed978e9f33e4b8ace14a
-sentry-cli-Windows-x86_64.exe=12952d184511366aa3feae1ddc95af3730f54013a5c399ed2f75e8b2363171fa
+sentry-cli-Darwin-arm64=6dc88344710a59bba72b6ee951074d725055e7151430df71446f6763d2993261
+sentry-cli-Darwin-universal=96f380d262725e88fc2ae83a1449eadc1fb6ffcaad61feee68de468d599cd96f
+sentry-cli-Darwin-x86_64=950d02537781523a2ac211f37759d8ead004fa64b57661c28bacd12b178499a9
+sentry-cli-Linux-aarch64=889aeaa277cada5287ed87821db4145d1f38dc367e85a1405282a68bb736a1a7
+sentry-cli-Linux-armv7=b4ceec0c1dad0e686a47cab92f82533c880b59840aebd9b0173ad16ae33237aa
+sentry-cli-Linux-i686=6ee5ce20cc2bce0408e5b2e2cb4b1d7ade453b7d8f532ec7a26660e3ef7b86fc
+sentry-cli-Linux-x86_64=03144d349c30aaf1d89b661eb6e8b7d09144938e38d0c9191eb2a571535c95f4
+sentry-cli-Windows-i686.exe=160eee4560a314e82eb772c7103cca2e1b86a0e0ea5f952c932336f4eb0b5276
+sentry-cli-Windows-x86_64.exe=b6531c7ba4f7214a0cd63bbf9831da95c4477848c3b932cb8ff7c73a9256a993

package/js/helper.js

@@ -1,19 +1,22 @@
 'use strict';
 
 const childProcess = require('child_process');
-const os = require('os');
-const path = require('path');
 
 /**
  * Absolute path to the sentry-cli binary (platform dependent).
  * @type {string}
  */
-// istanbul ignore next
-let binaryPath = path.resolve(
-  __dirname,
-
-  os.platform() === 'win32' ? '..\\sentry-cli.exe' : '../sentry-cli'
+let binaryPath = eval(
+  "require('path').resolve(__dirname, require('os').platform() === 'win32' ? '..\\sentry-cli.exe' : '../sentry-cli')"
 );
+
+/**
+ * NOTE: `eval` usage is a workaround for @vercel/nft detecting the binary itself as the hard dependency
+ *       and effectively always including it in the bundle, which is not what we want.
+ * ref: https://github.com/getsentry/sentry-javascript/issues/3865
+ * ref: https://github.com/vercel/nft/issues/203
+ */
+
 /**
  * Overrides the default binary path with a mock value, useful for testing.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cli",
-  "version": "2.0.3",
+  "version": "2.2.0",
   "description": "A command line utility to work with Sentry. https://docs.sentry.io/hosted/learn/cli/",
   "repository": "git://github.com/getsentry/sentry-cli.git",
   "homepage": "https://docs.sentry.io/hosted/learn/cli/",
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "https-proxy-agent": "^5.0.0",
-    "node-fetch": "^3.2.3",
+    "node-fetch": "^2.6.7",
     "npmlog": "^6.0.1",
     "progress": "^2.0.3",
     "proxy-from-env": "^1.1.0",

package/scripts/install.js

@@ -11,7 +11,7 @@ const zlib = require('zlib');
 const stream = require('stream');
 const process = require('process');
 
-const fetch = (...args) => import('node-fetch').then(({ default: fetch }) => fetch(...args));
+const fetch = require('node-fetch');
 const HttpsProxyAgent = require('https-proxy-agent');
 const ProgressBar = require('progress');
 const Proxy = require('proxy-from-env');
@@ -230,17 +230,19 @@ async function downloadBinary() {
       redirect: 'follow',
     });
   } catch (error) {
-    throw new Error(
-      `Unable to download sentry-cli binary from ${downloadUrl}.\nError message: ${error.message}\nError code: ${error.code}`
-    );
+    let errorMsg = `Unable to download sentry-cli binary from ${downloadUrl}.\nError message: ${error.message}`;
+    if (error.code) {
+      errorMsg += `\nError code: ${error.code}`;
+    }
+    throw new Error(errorMsg);
   }
 
   if (!response.ok) {
-    throw new Error(
-      `Unable to download sentry-cli binary from ${downloadUrl}.\nServer returned ${
-        response.status
-      }${response.statusText ? `: ${response.statusText}` : ''}.`
-    );
+    let errorMsg = `Unable to download sentry-cli binary from ${downloadUrl}.\nServer returned: ${response.status}`;
+    if (response.statusText) {
+      errorMsg += ` - ${response.statusText}`;
+    }
+    throw new Error(errorMsg);
   }
 
   const contentEncoding = response.headers.get('content-encoding');