From 035bacd041e28603a7cf66d72ecbd7777fae8998 Mon Sep 17 00:00:00 2001 From: Rowan Cockett Date: Tue, 23 Dec 2025 21:24:18 -0700 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Version=20no=20longer=20prin?= =?UTF-8?q?ts=200.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/clean-hoops-reply.md | 5 +++++ packages/oxa-core/.gitignore | 1 + packages/oxa-core/package.json | 3 ++- packages/oxa-core/src/cli.ts | 20 ++------------------ 4 files changed, 10 insertions(+), 19 deletions(-) create mode 100644 .changeset/clean-hoops-reply.md create mode 100644 packages/oxa-core/.gitignore diff --git a/.changeset/clean-hoops-reply.md b/.changeset/clean-hoops-reply.md new file mode 100644 index 0000000..734dad2 --- /dev/null +++ b/.changeset/clean-hoops-reply.md @@ -0,0 +1,5 @@ +--- +"@oxa/core": patch +--- + +Export version statically rather than dynamically diff --git a/packages/oxa-core/.gitignore b/packages/oxa-core/.gitignore new file mode 100644 index 0000000..7271f1a --- /dev/null +++ b/packages/oxa-core/.gitignore @@ -0,0 +1 @@ +src/version.ts diff --git a/packages/oxa-core/package.json b/packages/oxa-core/package.json index 9267c4e..5d625ad 100644 --- a/packages/oxa-core/package.json +++ b/packages/oxa-core/package.json @@ -16,7 +16,8 @@ "dist" ], "scripts": { - "build": "tsc && cp ../../schema/schema.json dist/ && pnpm run build:bundle", + "copy:version": "echo \"const version = '\"$npm_package_version\"';\nexport default version;\" > src/version.ts", + "build": "tsc && cp ../../schema/schema.json dist/ && pnpm run copy:version && pnpm run build:bundle", "build:bundle": "esbuild src/cli.ts --bundle --platform=node --target=node22 --format=cjs --outfile=dist/cli.bundle.cjs --banner:js='#!/usr/bin/env node' --log-override:empty-import-meta=silent", "test": "vitest run", "typecheck": "tsc --noEmit", diff --git a/packages/oxa-core/src/cli.ts b/packages/oxa-core/src/cli.ts index b79a7e6..be93889 100644 --- a/packages/oxa-core/src/cli.ts +++ b/packages/oxa-core/src/cli.ts @@ -5,9 +5,7 @@ */ import { program } from "commander"; -import { readFileSync } from "fs"; -import { fileURLToPath } from "url"; -import { dirname, join } from "path"; +import version from "./version.js"; import { validateFile, validateJson, @@ -82,24 +80,10 @@ async function readStdin(): Promise { return Buffer.concat(chunks).toString("utf-8"); } -/** - * Get package version from package.json. - */ -function getVersion(): string { - try { - const __dirname = dirname(fileURLToPath(import.meta.url)); - const pkgPath = join(__dirname, "..", "package.json"); - const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")); - return pkg.version; - } catch { - return "0.0.0"; - } -} - program .name("oxa") .description("CLI for validating OXA documents") - .version(getVersion()); + .version(version); program .command("validate") From 7a9b3a71eca5434237a8cb729af78ba5bc86baf6 Mon Sep 17 00:00:00 2001 From: Rowan Cockett Date: Tue, 23 Dec 2025 21:28:30 -0700 Subject: [PATCH 2/3] before tsc --- packages/oxa-core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/oxa-core/package.json b/packages/oxa-core/package.json index 5d625ad..89ca201 100644 --- a/packages/oxa-core/package.json +++ b/packages/oxa-core/package.json @@ -17,7 +17,7 @@ ], "scripts": { "copy:version": "echo \"const version = '\"$npm_package_version\"';\nexport default version;\" > src/version.ts", - "build": "tsc && cp ../../schema/schema.json dist/ && pnpm run copy:version && pnpm run build:bundle", + "build": "pnpm run copy:version && tsc && cp ../../schema/schema.json dist/ && pnpm run build:bundle", "build:bundle": "esbuild src/cli.ts --bundle --platform=node --target=node22 --format=cjs --outfile=dist/cli.bundle.cjs --banner:js='#!/usr/bin/env node' --log-override:empty-import-meta=silent", "test": "vitest run", "typecheck": "tsc --noEmit", From f907cc9083c9e29db5b0428eafd8e51715ca10bf Mon Sep 17 00:00:00 2001 From: Rowan Cockett Date: Tue, 23 Dec 2025 21:30:02 -0700 Subject: [PATCH 3/3] keep oxa/core and oxa together --- .changeset/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/config.json b/.changeset/config.json index ab0968f..02c1fb0 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -2,7 +2,7 @@ "$schema": "https://unpkg.com/@changesets/config@3.1.2/schema.json", "changelog": ["@changesets/changelog-github", { "repo": "oxa-dev/oxa" }], "commit": false, - "fixed": [], + "fixed": [["@oxa/core", "oxa"]], "linked": [], "access": "public", "baseBranch": "main",