conflicted commits cherry picked manually

Author: Raj-StepSecurity

.prettierignore

@@ -0,0 +1,16 @@
+# Build outputs
+dist/
+lib/
+coverage/
+
+# Dependencies
+node_modules/
+
+# Misc
+.github/
+*.log
+.DS_Store
+__tests__/release.txt
+
+# Package files
+package-lock.json

.prettierrc.js

@@ -0,0 +1,11 @@
+/**
+ * @type {import('prettier').Config}
+ */
+module.exports = {
+  trailingComma: 'all',
+  tabWidth: 2,
+  semi: true,
+  singleQuote: true,
+  printWidth: 100,
+  bracketSpacing: true,
+};

src/main.ts

@@ -1,26 +1,16 @@
-import {
-  paths,
-  parseConfig,
-  isTag,
-  unmatchedPatterns,
-  uploadUrl,
-} from "./util";
-import { release, upload, GitHubReleaser } from "./github";
-import { getOctokit } from "@actions/github";
-import * as core from "@actions/core";
-import axios, { isAxiosError } from "axios";
+import { setFailed, setOutput, error, info } from '@actions/core';
+import { getOctokit } from '@actions/github';
+import { GitHubReleaser, release, upload } from './github';
+import { isTag, parseConfig, paths, unmatchedPatterns, uploadUrl } from './util';
+import axios, { isAxiosError } from 'axios';
 
-import { env } from "process";
+import { env } from 'process';
 
 async function run() {
   try {
     await validateSubscription();
     const config = parseConfig(env);
-    if (
-      !config.input_tag_name &&
-      !isTag(config.github_ref) &&
-      !config.input_draft
-    ) {
+    if (!config.input_tag_name && !isTag(config.github_ref) && !config.input_draft) {
       throw new Error(`⚠️ GitHub Releases requires a tag`);
     }
     if (config.input_files) {
@@ -46,9 +36,7 @@ async function run() {
       //new oktokit(
       throttle: {
         onRateLimit: (retryAfter, options) => {
-          console.warn(
-            `Request quota exhausted for request ${options.method} ${options.url}`,
-          );
+          console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
           if (options.request.retryCount === 0) {
             // only retries once
             console.log(`Retrying after ${retryAfter} seconds!`);
@@ -57,9 +45,7 @@ async function run() {
         },
         onAbuseLimit: (retryAfter, options) => {
           // does not retry, only logs a warning
-          console.warn(
-            `Abuse detected for request ${options.method} ${options.url}`,
-          );
+          console.warn(`Abuse detected for request ${options.method} ${options.url}`);
         },
       },
     });
@@ -69,46 +55,40 @@ async function run() {
       const files = paths(config.input_files);
       if (files.length == 0) {
         if (config.input_fail_on_unmatched_files) {
-          throw new Error(
-            `⚠️ ${config.input_files} does not include a valid file.`,
-          );
+          throw new Error(`⚠️ ${config.input_files} does not include a valid file.`);
         } else {
-          console.warn(
-            `🤔 ${config.input_files} does not include a valid file.`,
-          );
+          console.warn(`🤔 ${config.input_files} does not include a valid file.`);
         }
       }
       const currentAssets = rel.assets;
 
       const uploadFile = async (path) => {
-        const json = await upload(
-          config,
-          gh,
-          uploadUrl(rel.upload_url),
-          path,
-          currentAssets,
-        );
-        delete json.uploader;
+        const json = await upload(config, gh, uploadUrl(rel.upload_url), path, currentAssets);
+        if (json) {
+          delete json.uploader;
+        }
         return json;
       };
 
-      let assets;
+      let results: (any | null)[];
       if (!config.input_preserve_order) {
-        assets = await Promise.all(files.map(uploadFile));
+        results = await Promise.all(files.map(uploadFile));
       } else {
-        assets = [];
+        results = [];
         for (const path of files) {
-          assets.push(await uploadFile(path));
+          results.push(await uploadFile(path));
         }
       }
-      core.setOutput("assets", assets);
+
+      const assets = results.filter(Boolean);
+      setOutput('assets', assets);
     }
     console.log(`🎉 Release ready at ${rel.html_url}`);
-    core.setOutput("url", rel.html_url);
-    core.setOutput("id", rel.id.toString());
-    core.setOutput("upload_url", rel.upload_url);
+    setOutput('url', rel.html_url);
+    setOutput('id', rel.id.toString());
+    setOutput('upload_url', rel.upload_url);
   } catch (error) {
-    core.setFailed(error.message);
+    setFailed(error.message);
   }
 }
 
@@ -119,14 +99,12 @@ async function validateSubscription(): Promise<void> {
 
   try {
     await axios.get(API_URL, { timeout: 3000 });
-  } catch (error) {
-    if (isAxiosError(error) && error.response?.status === 403) {
-      core.error(
-        "Subscription is not valid. Reach out to [email protected]",
-      );
+  } catch (err) {
+    if (isAxiosError(err) && err.response?.status === 403) {
+      error('Subscription is not valid. Reach out to [email protected]');
       process.exit(1);
     } else {
-      core.info("Timeout or API not reachable. Continuing to next step.");
+      info('Timeout or API not reachable. Continuing to next step.');
     }
   }
 }