Skip to content

Commit

Permalink
Some fixes
Browse files Browse the repository at this point in the history
* Node.js shebang added in binary script
* Add NCC as dev dependency
* Fix path to main script
  • Loading branch information
shpingalet007 committed Jan 12, 2023
1 parent a6cbf58 commit 980f88c
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 6 deletions.
4 changes: 3 additions & 1 deletion bin/conflictor.js
Original file line number Diff line number Diff line change
@@ -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);

Expand Down
22 changes: 19 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -19,6 +19,7 @@
"yargs": "^17.5.1"
},
"devDependencies": {
"@types/yargs": "^17.0.12"
"@types/yargs": "^17.0.12",
"@vercel/ncc": "^0.36.0"
}
}

0 comments on commit 980f88c

Please sign in to comment.