@sentry/cli 1.74.4 → 1.74.6

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 "You know what they say. Fool me once, strike one, but fool me twice... strike three." — Michael Scott
 
+## 1.74.6
+
+### Various fixes & improvements
+
+- feat: Replace usage of eval to obfuscate binary path from bundlers (#1375)
+
+## 1.74.5
+
+### Various fixes & improvements
+
+- deps: Add resolution to bump `ansi-regex` to version `^3.0.1` (#1281)
+- ref: Increase `TempFile` robustness on Windows (#1256)
+
 ## 1.74.4
 
 ### Various fixes & improvements

package/checksums.txt

@@ -1,9 +1,9 @@
-sentry-cli-Darwin-arm64=119413778b03d10c38b0d132d27c011aa2ef33e90a563ab0f300fd334d65d23e
-sentry-cli-Darwin-universal=2a68d4d8bde9c8288bdbf36972af0750c5283ef72c9d1ec3145611a3c63d8263
-sentry-cli-Darwin-x86_64=21e2d1291b8a912b36c998aa0947bc06c8de124ba3bac9aa8979db1dcd87d133
-sentry-cli-Linux-aarch64=3fdf9ff93fc5daca3f78dcb48c3da2f45051c368ee85bdf29358222489a6bcd4
-sentry-cli-Linux-armv7=d6ff4881f688c130f937a8f8633bfb31dfbefe927adb10c22d8cb34342fd73af
-sentry-cli-Linux-i686=389c56a06a936a12f42a09827ffdda738fd8a761b87452664207515dde44d774
-sentry-cli-Linux-x86_64=7d0310369055eff794e0e22d43461b95e9d72b20a3d84c5d18b3270d105dadd0
-sentry-cli-Windows-i686.exe=1fbc59485119c4c419b8272eed9ba5bfdc73d41521d80636aef69ce52d33f338
-sentry-cli-Windows-x86_64.exe=880346096dcd033d613112a325ce3361c99923c09d87cb60d582be9648eba690
+sentry-cli-Darwin-arm64=0b0f0bfc1c7a5115c869b054291787a942a82e9c9a7bbca43f425e4f1f6d8e28
+sentry-cli-Darwin-universal=fd667d9f5f89f2e5f2b7bb0287a009cadddb3d200bffa09c1fa8b0887c207fc3
+sentry-cli-Darwin-x86_64=ec23e87d4c7eb7ed9cb42082f9a65d046fb62eb3c4005f360db721344cf63dcd
+sentry-cli-Linux-aarch64=fc6c4c0fbe2d2aad4fa8a65f363665e16ced56a3372e09d6c51ff080c2472a76
+sentry-cli-Linux-armv7=84d9b76284c6c9ef1950dadfa0c2aa0e8f77be083536117082c9da81457eb9e3
+sentry-cli-Linux-i686=d75b8c876ee86718c918c47b72c86c21db14598ce2d953e73d7f94e02e54043b
+sentry-cli-Linux-x86_64=ee4bd836f4fcc51bb3d7a05003d42e04f874e6ae1578877112acdb97181efd71
+sentry-cli-Windows-i686.exe=0a84ea06a83d40aa0f85e54e72d6596b65f672f5eb51e57cd3cb25ebeca28837
+sentry-cli-Windows-x86_64.exe=284e25b1bf8f5c14262baca5e315613c3856e71eff4f85c3f99483cf1c37582f

package/js/helper.js

@@ -1,21 +1,29 @@
 'use strict';
 
+const path = require('path');
 const childProcess = require('child_process');
 
 /**
- * Absolute path to the sentry-cli binary (platform dependent).
- * @type {string}
+ * This convoluted function resolves the path to the `sentry-cli` binary in a
+ * way that can't be analysed by @vercel/nft.
+ *
+ * Without this, the binary can be detected as an asset and included by bundlers
+ * that use @vercel/nft.
+ * @returns {string} The path to the sentry-cli binary
  */
-let binaryPath = eval(
-  "require('path').resolve(__dirname, require('os').platform() === 'win32' ? '..\\sentry-cli.exe' : '../sentry-cli')"
-);
+function getBinaryPath() {
+  const parts = [];
+  parts.push(__dirname);
+  parts.push('..');
+  parts.push(`sentry-cli${process.platform === 'win32' ? '.exe' : ''}`);
+  return path.resolve(...parts);
+}
 
 /**
- * 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
+ * Absolute path to the sentry-cli binary (platform dependent).
+ * @type {string}
  */
+let binaryPath = getBinaryPath();
 
 /**
  * Overrides the default binary path with a mock value, useful for testing.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cli",
-  "version": "1.74.4",
+  "version": "1.74.6",
   "description": "A command line utility to work with Sentry. https://docs.sentry.io/hosted/learn/cli/",
   "homepage": "https://docs.sentry.io/hosted/learn/cli/",
   "license": "BSD-3-Clause",
@@ -28,11 +28,12 @@
     "fix": "npm-run-all fix:eslint fix:prettier",
     "fix:eslint": "eslint --fix bin/* scripts/**/*.js js/**/*.js",
     "fix:prettier": "prettier --write bin/* scripts/**/*.js js/**/*.js",
-    "test": "npm-run-all test:jest test:eslint test:prettier",
+    "test": "npm-run-all test:jest test:eslint test:prettier test:vercel-nft",
     "test:jest": "jest",
     "test:watch": "jest --watch --notify",
     "test:eslint": "eslint bin/* scripts/**/*.js js/**/*.js",
-    "test:prettier": "prettier --check  bin/* scripts/**/*.js js/**/*.js"
+    "test:prettier": "prettier --check  bin/* scripts/**/*.js js/**/*.js",
+    "test:vercel-nft": "node scripts/test-vercel-nft.js"
   },
   "dependencies": {
     "https-proxy-agent": "^5.0.0",
@@ -44,6 +45,7 @@
     "which": "^2.0.2"
   },
   "devDependencies": {
+    "@vercel/nft": "^0.22.1",
     "eslint": "^6.8.0",
     "eslint-config-airbnb-base": "^14.1.0",
     "eslint-config-prettier": "^6.10.1",
@@ -52,6 +54,9 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^1.19.1"
   },
+  "resolutions": {
+    "npmlog/**/ansi-regex": "^3.0.1"
+  },
   "jest": {
     "collectCoverage": true,
     "testEnvironment": "node",

package/scripts/test-vercel-nft.js

@@ -0,0 +1,27 @@
+const major = process.versions.node.split('.')[0];
+
+// @vercel/nft doe not support Node.js v8
+if (major < 10) {
+  process.exit(0);
+}
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+const { nodeFileTrace } = require('@vercel/nft');
+
+const entryPoint = require.resolve('..');
+
+// Trace the module entrypoint
+nodeFileTrace([entryPoint]).then(result => {
+  // eslint-disable-next-line no-console
+  console.log('@vercel/nft traced dependencies:', Array.from(result.fileList));
+
+  // If either binary is picked up, fail the test
+  if (result.fileList.has('sentry-cli') || result.fileList.has('sentry-cli.exe')) {
+    // eslint-disable-next-line no-console
+    console.error('ERROR: The sentry-cli binary should not be found by @vercel/nft');
+    process.exit(-1);
+  } else {
+    // eslint-disable-next-line no-console
+    console.log('The sentry-cli binary was not traced by @vercel/nft');
+  }
+});