From 2176935db4d9346d780b80d547d1faf9f1d85806 Mon Sep 17 00:00:00 2001 From: Danilo Tuler Date: Tue, 13 Jan 2026 16:37:56 -0500 Subject: [PATCH] feat(cli): fix package.json loading for version --- .changeset/petite-areas-relate.md | 5 +++++ apps/cli/package.json | 2 +- apps/cli/src/index.ts | 6 +----- bun.lock | 18 +++++++----------- package.json | 2 +- packages/devnet/package.json | 2 +- 6 files changed, 16 insertions(+), 19 deletions(-) create mode 100644 .changeset/petite-areas-relate.md diff --git a/.changeset/petite-areas-relate.md b/.changeset/petite-areas-relate.md new file mode 100644 index 00000000..fe734ffa --- /dev/null +++ b/.changeset/petite-areas-relate.md @@ -0,0 +1,5 @@ +--- +"@cartesi/cli": patch +--- + +fix package.json loading for version diff --git a/apps/cli/package.json b/apps/cli/package.json index 85048465..57ae3a75 100644 --- a/apps/cli/package.json +++ b/apps/cli/package.json @@ -43,7 +43,7 @@ "devDependencies": { "@cartesi/devnet": "2.0.0-alpha.9", "@cartesi/rollups": "2.1.1", - "@types/bun": "^1.3.5", + "@types/bun": "^1.3.6", "@types/bytes": "^3.1.5", "@types/fs-extra": "^11.0.4", "@types/inquirer": "^9.0.9", diff --git a/apps/cli/src/index.ts b/apps/cli/src/index.ts index 171ccfd2..1045a545 100755 --- a/apps/cli/src/index.ts +++ b/apps/cli/src/index.ts @@ -1,5 +1,5 @@ import { Command } from "@commander-js/extra-typings"; -import { createRequire } from "node:module"; +import pkg from "../package.json" with { type: "json" }; import { createAddressBookCommand } from "./commands/address-book.js"; import { createBuildCommand } from "./commands/build.js"; import { createCleanCommand } from "./commands/clean.js"; @@ -14,10 +14,6 @@ import { createSendCommand } from "./commands/send.js"; import { createShellCommand } from "./commands/shell.js"; import { createStatusCommand } from "./commands/status.js"; -// Use `createRequire` to import JSON in ESM -const require = createRequire(import.meta.url); -const pkg = require("../package.json"); - const splash = String.raw` . / \ / \ diff --git a/bun.lock b/bun.lock index 4457965a..b36290f5 100644 --- a/bun.lock +++ b/bun.lock @@ -7,13 +7,13 @@ "devDependencies": { "@biomejs/biome": "^2.3.11", "@changesets/cli": "^2.29.8", - "@types/bun": "^1.3.5", + "@types/bun": "^1.3.6", "turbo": "^2.7.4", }, }, "apps/cli": { "name": "@cartesi/cli", - "version": "2.0.0-alpha.24", + "version": "2.0.0-alpha.25", "bin": { "cartesi": "./dist/index.js", }, @@ -46,7 +46,7 @@ "devDependencies": { "@cartesi/devnet": "2.0.0-alpha.9", "@cartesi/rollups": "2.1.1", - "@types/bun": "^1.3.5", + "@types/bun": "^1.3.6", "@types/bytes": "^3.1.5", "@types/fs-extra": "^11.0.4", "@types/inquirer": "^9.0.9", @@ -70,7 +70,7 @@ "name": "@cartesi/devnet", "version": "2.0.0-alpha.9", "devDependencies": { - "@types/bun": "^1.3.5", + "@types/bun": "^1.3.6", "@types/fs-extra": "^11.0.4", "fs-extra": "^11.3.2", "listr2": "^9.0.5", @@ -106,7 +106,7 @@ }, "packages/sdk": { "name": "@cartesi/sdk", - "version": "0.12.0-alpha.30", + "version": "0.12.0-alpha.31", }, "packages/tsconfig": { "name": "tsconfig", @@ -400,7 +400,7 @@ "@tsconfig/node16": ["@tsconfig/node16@1.0.4", "", {}, "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA=="], - "@types/bun": ["@types/bun@1.3.5", "", { "dependencies": { "bun-types": "1.3.5" } }, "sha512-RnygCqNrd3srIPEWBd5LFeUYG7plCoH2Yw9WaZGyNmdTEei+gWaHqydbaIRkIkcbXwhBT94q78QljxN0Sk838w=="], + "@types/bun": ["@types/bun@1.3.6", "", { "dependencies": { "bun-types": "1.3.6" } }, "sha512-uWCv6FO/8LcpREhenN1d1b6fcspAB+cefwD7uti8C8VffIv0Um08TKMn98FynpTiU38+y2dUO55T11NgDt8VAA=="], "@types/bytes": ["@types/bytes@3.1.5", "", {}, "sha512-VgZkrJckypj85YxEsEavcMmmSOIzkUHqWmM4CCyia5dc54YwsXzJ5uT4fYxBQNEXx+oF1krlhgCbvfubXqZYsQ=="], @@ -504,7 +504,7 @@ "browserslist": ["browserslist@4.28.1", "", { "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", "electron-to-chromium": "^1.5.263", "node-releases": "^2.0.27", "update-browserslist-db": "^1.2.0" }, "bin": { "browserslist": "cli.js" } }, "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA=="], - "bun-types": ["bun-types@1.3.5", "", { "dependencies": { "@types/node": "*" } }, "sha512-inmAYe2PFLs0SUbFOWSVD24sg1jFlMPxOjOSSCYqUgn4Hsc3rDc7dFvfVYjFPNHtov6kgUeulV4SxbuIV/stPw=="], + "bun-types": ["bun-types@1.3.6", "", { "dependencies": { "@types/node": "*" } }, "sha512-OlFwHcnNV99r//9v5IIOgQ9Uk37gZqrNMCcqEaExdkVq3Avwqok1bJFmvGMCkCE0FqzdY8VMOZpfpR3lwI+CsQ=="], "bundle-require": ["bundle-require@5.1.0", "", { "dependencies": { "load-tsconfig": "^0.2.3" }, "peerDependencies": { "esbuild": ">=0.18" } }, "sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA=="], @@ -1350,8 +1350,6 @@ "ajv/fast-uri": ["fast-uri@3.1.0", "", {}, "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA=="], - "bun-types/@types/node": ["@types/node@24.5.1", "", { "dependencies": { "undici-types": "7.12.0" } }, "sha512-/SQdmUP2xa+1rdx7VwB9yPq8PaKej8TD5cQ+XfKDPWWC+VDJU4rvVVagXqKUzhKjtFoNA8rXDJAkCxQPAe00+Q=="], - "cli-truncate/string-width": ["string-width@8.1.0", "", { "dependencies": { "get-east-asian-width": "^1.3.0", "strip-ansi": "^7.1.0" } }, "sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg=="], "cross-spawn/semver": ["semver@5.7.2", "", { "bin": { "semver": "bin/semver" } }, "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="], @@ -1500,8 +1498,6 @@ "@wagmi/cli/viem/ox": ["ox@0.11.1", "", { "dependencies": { "@adraffy/ens-normalize": "^1.11.0", "@noble/ciphers": "^1.3.0", "@noble/curves": "1.9.1", "@noble/hashes": "^1.8.0", "@scure/bip32": "^1.7.0", "@scure/bip39": "^1.6.0", "abitype": "^1.2.3", "eventemitter3": "5.0.1" }, "peerDependencies": { "typescript": ">=5.4.0" }, "optionalPeers": ["typescript"] }, "sha512-1l1gOLAqg0S0xiN1dH5nkPna8PucrZgrIJOfS49MLNiMevxu07Iz4ZjuJS9N+xifvT+PsZyIptS7WHM8nC+0+A=="], - "bun-types/@types/node/undici-types": ["undici-types@7.12.0", "", {}, "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ=="], - "enquirer/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], "execa/cross-spawn/path-key": ["path-key@3.1.1", "", {}, "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="], diff --git a/package.json b/package.json index a5a0d52b..81efcbd3 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "devDependencies": { "@biomejs/biome": "^2.3.11", "@changesets/cli": "^2.29.8", - "@types/bun": "^1.3.5", + "@types/bun": "^1.3.6", "turbo": "^2.7.4" }, "packageManager": "bun@1.3.6", diff --git a/packages/devnet/package.json b/packages/devnet/package.json index 0d6e9e88..592ace54 100644 --- a/packages/devnet/package.json +++ b/packages/devnet/package.json @@ -15,7 +15,7 @@ "fmt:write": "forge fmt" }, "devDependencies": { - "@types/bun": "^1.3.5", + "@types/bun": "^1.3.6", "@types/fs-extra": "^11.0.4", "fs-extra": "^11.3.2", "listr2": "^9.0.5",