fix(sentry): bug

Airkro · Oct 20, 2023 · 8819d3e · 8819d3e
1 parent e4d1649
commit 8819d3e
Show file tree

Hide file tree

Showing 6 changed files with 123 additions and 41 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/sentry/README.md b/packages/sentry/README.md
@@ -32,6 +32,6 @@ bring-it sentry
   "url": "...",
   "org": "...",
   "project": "...",
-  "authToken": "..."
+  "token": "..."
 }
 ```
diff --git a/packages/sentry/lib/utils.mjs b/packages/sentry/lib/utils.mjs
@@ -1,7 +1,8 @@
-import { execFile, execFileSync } from 'node:child_process';
+import { execFileSync } from 'node:child_process';
 import { rm } from 'node:fs/promises';
 
 import { ignore, Logger, readJSON } from '@bring-it/utils';
+import spawn from '@npmcli/promise-spawn';
 import { globby } from 'globby';
 
 const logger = new Logger('sentry');
@@ -19,14 +20,33 @@ function readConfig(configName) {
 function scan({ include }) {
   return globby(include, {
     ignore,
-    gitignore: true,
     onlyFiles: true,
     dot: true,
   })
     .then((list) => list.filter((item) => /\.map$/.test(item)))
     .then((list) => list.sort());
 }
 
+function createCli({ url, org, project, token }) {
+  return function cli(...args) {
+    return spawn('sentry-cli', ['releases', ...args], {
+      stdio: 'inherit',
+      env: {
+        ...process.env,
+        SENTRY_AUTH_TOKEN: token,
+        SENTRY_URL: url,
+        SENTRY_ORG: org,
+        SENTRY_PROJECT: project,
+        SENTRY_LOG_LEVEL: 'info',
+      },
+    }).then((io) => {
+      if (io.stderr) {
+        throw new Error('Command failed');
+      }
+    });
+  };
+}
+
 export async function action({ mode }) {
   try {
     const { [mode]: current, ...all } = await readConfig(
@@ -37,55 +57,74 @@ export async function action({ mode }) {
       url,
       org,
       project,
-      authToken,
+      token,
       include = 'dist/**',
     } = {
       ...all,
       ...current,
     };
 
-    const version = commitHash();
-
-    // eslint-disable-next-line no-inner-declarations
-    function cli(...args) {
-      return execFile(
-        'sentry-cli',
-        ['releases', ...args, '--url', url, '--org', org, '--project', project],
-        {
-          env: {
-            SENTRY_AUTH_TOKEN: authToken,
-            SENTRY_LOG_LEVEL: 'debug',
-          },
-        },
-      );
+    logger.task('scanning...');
+
+    const list = await scan({ include });
+
+    logger.info('found', list.length, 'files');
+
+    for (const item of list) {
+      logger.file(item);
     }
 
-    await cli('finalize', version);
+    if (list.length > 0) {
+      const version = commitHash();
 
-    logger.info('uploading...');
+      logger.info('git commit hash', version);
 
-    await cli(
-      'files',
-      version,
-      'upload-sourcemaps',
-      include,
-      '--no-sourcemap-reference',
-    );
+      const cli = createCli({ url, org, project, token });
 
-    await cli('deploys', version, 'new', '-e', mode);
+      logger.task('create release...');
 
-    const list = await scan({ include });
+      await cli('new', version);
 
-    for (const item of list) {
-      rm(item, { force: true })
-        .then(() => {
-          logger.okay('[delete]', item);
-        })
-        .catch((error) => {
-          logger.fail('[delete]', item, error.message);
-        });
+      logger.okay('release created');
+
+      logger.task('uploading...');
+
+      await cli(
+        'files',
+        version,
+        'upload-sourcemaps',
+        include,
+        '--no-sourcemap-reference',
+        '--no-rewrite',
+      );
+
+      logger.okay('uploaded');
+
+      logger.task('deploys', mode);
+
+      await cli('deploys', version, 'new', '-e', mode);
+
+      logger.task('finalize...');
+
+      await cli('finalize', version);
+
+      logger.okay('finalized');
+
+      logger.task('delete files...');
+
+      for (const item of list) {
+        await rm(item, { force: true })
+          .then(() => {
+            logger.okay('[delete]', item);
+          })
+          .catch((error) => {
+            logger.fail('[delete]', item, error.message);
+          });
+      }
+
+      logger.okay('done');
     }
   } catch (error) {
-    logger.fail(error);
+    logger.fail(error.message);
   }
 }
diff --git a/packages/sentry/package.json b/packages/sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/sentry",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Update sentry artifacts",
   "license": "MIT",
   "author": {
@@ -42,6 +42,7 @@
   },
   "devDependencies": {
     "@bring-it/utils": "*",
+    "@npmcli/promise-spawn": "^7.0.0",
     "cheetor": "^0.13.0",
     "globby": "^13.2.2"
   },

diff --git a/packages/utils/index.mjs b/packages/utils/index.mjs
@@ -29,6 +29,10 @@ export class Logger {
     this.log('[task]', ...message);
   }
 
+  file(...message) {
+    this.log('[file]', ...message);
+  }
+
   info(...message) {
     this.log('[info]', ...message);
   }

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -3,8 +3,9 @@
   "name": "@bring-it/utils",
   "version": "0.0.0",
   "main": "index.mjs",
+  "type": "module",
   "dependencies": {
     "chalk": "^5.2.0",
     "globby": "^13.1.3"
   }
-}
+}