From 9a7795d3ad8249cb78c1a90b01ff1b69c5404904 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 20 Sep 2024 13:13:03 +0200 Subject: [PATCH] fix(cli): #317 cli on node 22 Use require instead import assertion to support node 20 and 22. Closes: #314 --- .changeset/dry-tigers-poke.md | 5 +++++ packages/cli/package.json | 5 ++--- packages/cli/src/index.ts | 5 ++++- pnpm-lock.yaml | 4 +--- 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 .changeset/dry-tigers-poke.md diff --git a/.changeset/dry-tigers-poke.md b/.changeset/dry-tigers-poke.md new file mode 100644 index 00000000..1e66d239 --- /dev/null +++ b/.changeset/dry-tigers-poke.md @@ -0,0 +1,5 @@ +--- +"@content-collections/cli": patch +--- + +Fix cli on node 22 diff --git a/packages/cli/package.json b/packages/cli/package.json index fc076c68..b30ff73d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -3,13 +3,13 @@ "description": "Command line interface for content-collections", "version": "0.1.3", "type": "module", - "main": "dist/src/index.js", + "main": "dist/index.js", "files": [ "dist", "README.md" ], "bin": { - "content-collections": "dist/src/index.js" + "content-collections": "dist/index.js" }, "scripts": { "build": "tsc", @@ -22,7 +22,6 @@ "devDependencies": { "@content-collections/core": "workspace:*", "@types/node": "^20.14.9", - "tsup": "^8.2.4", "tsx": "^4.1.1", "typescript": "^5.5.4" }, diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index 1553f086..8389cb40 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -1,9 +1,12 @@ #!/usr/bin/env node import { Clerc, completionsPlugin, helpPlugin, versionPlugin } from "clerc"; -import packageJson from "../package.json" assert { type: "json" }; import build from "./commands/build.js"; import watch from "./commands/watch.js"; +import { createRequire } from "node:module"; +const require = createRequire(import.meta.url); +const packageJson = require("../package.json"); + const name = "content-collections"; if (!packageJson.bin[name]) { throw new Error(`Missing bin entry for ${name} in package.json`); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3e331d31..7089b383 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,9 +48,6 @@ importers: '@types/node': specifier: ^20.14.9 version: 20.14.9 - tsup: - specifier: ^8.2.4 - version: 8.2.4(tsx@4.9.3)(typescript@5.5.4)(yaml@2.4.5) tsx: specifier: ^4.1.1 version: 4.9.3 @@ -14214,6 +14211,7 @@ packages: /rimraf@3.0.2: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} + deprecated: Rimraf versions prior to v4 are no longer supported hasBin: true dependencies: glob: 7.2.3