@sentry/cli 2.0.1 → 2.0.4

package/checksums.txt

@@ -1,9 +1,9 @@
-sentry-cli-Darwin-arm64=6bf38158c0b3d198802a22ec2d2021d619e5fe1a125f2d21395c6b0b54f5808d
-sentry-cli-Darwin-universal=4ded776b94d1c1e26fbb9e8811fdf003e7f51116bd4720e627a3bc2b9a814e74
-sentry-cli-Darwin-x86_64=a3add22156f70fba60c4f2eb47880362c704bd1fbc6f455f7f9f941a3e269754
-sentry-cli-Linux-aarch64=d05bf0aba980795fb046c62a693bd6c152421de1f85c1c851f94e206cabbe62f
-sentry-cli-Linux-armv7=3e64b3b61dca0cae6c6845dfbfe7ec19a208cc04480ec1dca5a343d2a5a8f3f5
-sentry-cli-Linux-i686=2ac8358c52f5a8936bade1729fb85e3b8be604d60bd195f88609cb44e6fb8f06
-sentry-cli-Linux-x86_64=4f378d823e03a40560cb0438b3eb3ee54ea828aff6087a9ef63dfeb31fb064ab
-sentry-cli-Windows-i686.exe=83965514cc737d6d96cd04d39d0ba91a26fa7881e3bcd325ac89a60d615f4de1
-sentry-cli-Windows-x86_64.exe=00df30fa383c90e27a14f8ddb151f8b29a7edb78507e8832350260bd0e131209
+sentry-cli-Darwin-arm64=6ad23605f6e345375a80aeebc5db7dc9e42226abf63e39dd91730b8b831511a8
+sentry-cli-Darwin-universal=283370a6bf7356a422f39ab805094edefe15f087d512c4579b60e584cf4a3e20
+sentry-cli-Darwin-x86_64=f1f3ea7f5d1ed481080e8eb150b3adbf4ab02890f9ec1227e1703f7ec8e25c84
+sentry-cli-Linux-aarch64=e796a2d535cc59c6d72e5e19aa7604e964328b5a7e09a62f695e0d9acde9b07e
+sentry-cli-Linux-armv7=19ea3f1a843b37df82b310ab82e330f6f26e4ff8b20b4c98c2a47c894c2164ff
+sentry-cli-Linux-i686=abb2f9daeb78ba01ae3f2c36e4d64fb54fd3e937683c25f980872331c2a0e1b3
+sentry-cli-Linux-x86_64=46b6d913e3bfeccaf3170493942120a1b7b11b07c04e932b8fa643187c621fdf
+sentry-cli-Windows-i686.exe=7df3c7e672dae7338245a07685a05847dfa8d18daea51bbbab78feb95a7c0199
+sentry-cli-Windows-x86_64.exe=ecbc89c357bf67cfa9a2f937a10253c46f1183e8480a86c688885a0e3017003b

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.1",
+  "version": "2.0.4",
   "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,21 +230,19 @@ async function downloadBinary() {
       redirect: 'follow',
     });
   } catch (error) {
-    if (error instanceof fetch.FetchError) {
-      throw new Error(
-        `Unable to download sentry-cli binary from ${downloadUrl}.\nError code: ${error.code}`
-      );
-    } else {
-      throw error;
+    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');