From 980f88cae1018175d96e5ae4ef3f005fd7a7b431 Mon Sep 17 00:00:00 2001
From: Shpingalet007 <22795961+shpingalet007@users.noreply.github.com>
Date: Thu, 12 Jan 2023 14:38:09 +0100
Subject: [PATCH] Some fixes

* Node.js shebang added in binary script
* Add NCC as dev dependency
* Fix path to main script
---
 bin/conflictor.js |  4 +++-
 package-lock.json | 22 +++++++++++++++++++---
 package.json      |  5 +++--
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/bin/conflictor.js b/bin/conflictor.js
index b8c8818..c02f2bc 100644
--- a/bin/conflictor.js
+++ b/bin/conflictor.js
@@ -1,5 +1,7 @@
+#!/usr/bin/env node
+
 import args from '../src/libs/args.js';
-import Conflictor from '../src/index.js';
+import Conflictor from '../src/main.js';
 
 const result = await Conflictor.analyze(args);
 
diff --git a/package-lock.json b/package-lock.json
index 5e88e1e..8a33106 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "conflictor",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "conflictor",
-      "version": "0.3.0",
+      "version": "0.3.1",
       "license": "ISC",
       "dependencies": {
         "@actions/artifact": "^1.1.0",
@@ -18,7 +18,8 @@
         "conflictor": "bin/conflictor.js"
       },
       "devDependencies": {
-        "@types/yargs": "^17.0.12"
+        "@types/yargs": "^17.0.12",
+        "@vercel/ncc": "^0.36.0"
       }
     },
     "node_modules/@actions/artifact": {
@@ -64,6 +65,15 @@
       "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
       "dev": true
     },
+    "node_modules/@vercel/ncc": {
+      "version": "0.36.0",
+      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.36.0.tgz",
+      "integrity": "sha512-/ZTUJ/ZkRt694k7KJNimgmHjtQcRuVwsST2Z6XfYveQIuBbHR+EqkTc1jfgPkQmMyk/vtpxo3nVxe8CNuau86A==",
+      "dev": true,
+      "bin": {
+        "ncc": "dist/ncc/cli.js"
+      }
+    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -410,6 +420,12 @@
       "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
       "dev": true
     },
+    "@vercel/ncc": {
+      "version": "0.36.0",
+      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.36.0.tgz",
+      "integrity": "sha512-/ZTUJ/ZkRt694k7KJNimgmHjtQcRuVwsST2Z6XfYveQIuBbHR+EqkTc1jfgPkQmMyk/vtpxo3nVxe8CNuau86A==",
+      "dev": true
+    },
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
diff --git a/package.json b/package.json
index fcb30b5..bc422d7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "conflictor",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Utility that analyzes pull requests and conflicts between them",
   "main": "main.js",
   "bin": {
@@ -19,6 +19,7 @@
     "yargs": "^17.5.1"
   },
   "devDependencies": {
-    "@types/yargs": "^17.0.12"
+    "@types/yargs": "^17.0.12",
+    "@vercel/ncc": "^0.36.0"
   }
 }