Merge pull request #70 from advanced-security/revert-62-esm-cli-work

Revert "Modifications to support conversion from ESM in to CJS for the executables"
advanced-security · Mar 5, 2024 · 78e33de · 78e33de
2 parents 73da251 + 68f64b7
commit 78e33de
Show file tree

Hide file tree

Showing 10 changed files with 2,061 additions and 412 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 lib
-output
 
 node_modules
 target

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/package.json b/dist/package.json
diff --git a/dist/sourcemap-register.cjs → dist/sourcemap-register.js b/dist/sourcemap-register.cjs → dist/sourcemap-register.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,13 +2,11 @@
   "name": "maven-dependency-submission-action",
   "version": "4.0.1",
   "description": "Submit Maven dependencies to GitHub dependency submission API",
-  "type": "module",
   "main": "index.js",
   "scripts": {
     "base-build": "npm ci && tsc",
     "build": "npm run base-build && npm exec -- @vercel/ncc build --source-map lib/src/index.js",
-    "build:cli": "npm run base-build && npm exec -- rollup -c rollup.config.js",
-    "build-exe": "npm run build:cli && pkg output/cli.js --compress Gzip --out-path cli --targets node18-linux-x64,node18-macos-x64,node18-win-x64",
+    "build-exe": "npm run build && pkg package.json --compress Gzip",
     "test": "vitest --run"
   },
   "repository": {
@@ -30,19 +28,27 @@
     "packageurl-js": "^1.2.0"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.1",
     "@vercel/ncc": "^0.38.1",
     "chai": "^4.3.6",
     "pkg": "^5.8.0",
-    "rollup": "^4.10.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3",
     "vitest": "^1.2.1"
   },
   "bin": {
     "cli": "lib/src/executable/cli.js"
+  },
+  "pkg": {
+    "targets": [
+      "node18-linux-x64",
+      "node18-win-x64",
+      "node18-macos-x64"
+    ],
+    "assets": [
+      "package.json"
+    ],
+    "publicPackages": "*",
+    "outputPath": "cli"
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
diff --git a/src/executable/cli.ts b/src/executable/cli.ts
@@ -1,6 +1,6 @@
 import pkg from '../../package.json';
-import { program } from 'commander';
 
+const { program } = require('commander');
 program.name(pkg.name);
 program.version(pkg.version);
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -2,10 +2,6 @@
   "compilerOptions": {
     "target": "es6",
     "module": "ES2020",
-    "lib": [
-      "ES2020",
-    ],
-    "allowSyntheticDefaultImports": true,
     "outDir": "./lib",
     "sourceRoot": "./src",
     "strict": true,