From 5fa6a4ef3d06bb2b14854ffbdd06dcae190d4296 Mon Sep 17 00:00:00 2001 From: David Sanders Date: Tue, 8 Jul 2025 17:03:54 -0700 Subject: [PATCH 1/2] fix: move cli entrypoint to separate file --- package.json | 4 ++-- src/cli.ts | 11 +++++++++++ src/index.ts | 10 ---------- 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 src/cli.ts diff --git a/package.json b/package.json index b23820d..02f6797 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "type": "module", "exports": "./dist/index.js", "bin": { - "fiddle-core": "dist/index.js" + "fiddle-core": "dist/cli.js" }, "files": [ "dist", @@ -30,7 +30,7 @@ "lint:prettier:fix": "prettier --write package.json src/**/*.ts tests/**/*.ts", "make": "run-p build", "prepublishOnly": "npm run make", - "start": "node dist/index.js", + "start": "node dist/cli.js", "test": "vitest run", "test:ci": "vitest run --coverage" }, diff --git a/src/cli.ts b/src/cli.ts new file mode 100644 index 0000000..e6fc638 --- /dev/null +++ b/src/cli.ts @@ -0,0 +1,11 @@ +import * as fs from 'node:fs'; +import { fileURLToPath } from 'node:url'; + +import { runFromCommandLine } from './command-line.js'; + +if ( + (await fs.promises.realpath(process.argv[1])) === + fileURLToPath(import.meta.url) +) { + void runFromCommandLine(process.argv.slice(2)); +} diff --git a/src/index.ts b/src/index.ts index 372cadd..4e391ca 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,8 +1,5 @@ #!/usr/bin/env node -import * as fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; - import { DefaultPaths, Paths } from './paths.js'; import { ElectronBinary, @@ -67,10 +64,3 @@ export { compareVersions, runFromCommandLine, }; - -if ( - (await fs.promises.realpath(process.argv[1])) === - fileURLToPath(import.meta.url) -) { - void runFromCommandLine(process.argv.slice(2)); -} From 0c25d3f3f9fc124ecfa1b085b8d2ea8c0d133c24 Mon Sep 17 00:00:00 2001 From: David Sanders Date: Wed, 9 Jul 2025 08:02:40 -0700 Subject: [PATCH 2/2] chore: move shebang as well --- src/cli.ts | 2 ++ src/index.ts | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli.ts b/src/cli.ts index e6fc638..9b83215 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -1,3 +1,5 @@ +#!/usr/bin/env node + import * as fs from 'node:fs'; import { fileURLToPath } from 'node:url'; diff --git a/src/index.ts b/src/index.ts index 4e391ca..646c91e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,3 @@ -#!/usr/bin/env node - import { DefaultPaths, Paths } from './paths.js'; import { ElectronBinary,