From 8b6c2b45a6ddd65b25e839043d992d67b2b55ef8 Mon Sep 17 00:00:00 2001 From: Alex Yang <himself65@outlook.com> Date: Mon, 17 Jun 2024 16:42:38 -0700 Subject: [PATCH] chore: fix version release (#937) --- package.json | 2 +- packages/llamaindex/jsr.json | 2 +- scripts/check-minor-version.js | 55 --------------------------------- scripts/check-minor-version.mjs | 30 ++++++++++++++++++ 4 files changed, 32 insertions(+), 57 deletions(-) delete mode 100644 scripts/check-minor-version.js create mode 100644 scripts/check-minor-version.mjs diff --git a/package.json b/package.json index ae6540dc5..4fc893c27 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "type-check": "tsc -b --diagnostics", "release": "pnpm run check-minor-version && pnpm run build:release && changeset publish", "release-snapshot": "pnpm run check-minor-version && pnpm run build:release && changeset publish --tag snapshot", - "check-minor-version": "node ./scripts/check-minor-version", + "check-minor-version": "node ./scripts/check-minor-version.mjs", "new-version": "changeset version && pnpm run check-minor-version && pnpm format:write && pnpm run build:release", "new-snapshot": "pnpm run build:release && changeset version --snapshot" }, diff --git a/packages/llamaindex/jsr.json b/packages/llamaindex/jsr.json index c665f7273..29866b9ba 100644 --- a/packages/llamaindex/jsr.json +++ b/packages/llamaindex/jsr.json @@ -1,5 +1,5 @@ { - "name": "@llamaindex/core", + "name": "@llamaindex/llamaindex", "version": "0.3.17", "exports": "./src/index.ts", "imports": { diff --git a/scripts/check-minor-version.js b/scripts/check-minor-version.js deleted file mode 100644 index e9af1eec7..000000000 --- a/scripts/check-minor-version.js +++ /dev/null @@ -1,55 +0,0 @@ -const fs = require("fs"); - -const packageJson = JSON.parse( - fs.readFileSync("./packages/core/package.json", "utf8"), -); - -const versions = packageJson.version.split("."); -const minorVersion = packageJson.version.split(".")[1]; -const expectedMinorVersion = packageJson.expectedMinorVersion; - -if (versions.length !== 3) { - console.error( - "Version must be in format x.y.z but is " + packageJson.version, - ); - process.exit(1); -} - -if (minorVersion !== expectedMinorVersion) { - console.error( - "Minor version must be " + - expectedMinorVersion + - " but is " + - minorVersion + - ". Please adjust that on the packages/core/package.json.", - ); - process.exit(1); -} - -const packages = ["env", "core"]; -const envPackageJson = JSON.parse( - fs.readFileSync("./packages/env/package.json", "utf8"), -); -for (const pkg of packages) { - const packageJson = JSON.parse( - fs.readFileSync(`./packages/${pkg}/package.json`, "utf8"), - ); - const jsrJson = JSON.parse( - fs.readFileSync(`./packages/${pkg}/jsr.json`, "utf8"), - ); - - jsrJson.version = packageJson.version; - if (pkg === "core") { - jsrJson.imports["@llamaindex/env"] = - `jsr:@llamaindex/env@${envPackageJson.version}`; - } - - fs.writeFileSync( - `./packages/${pkg}/jsr.json`, - JSON.stringify(jsrJson, null, 2) + "\n", - ); -} - -console.log("Current expected minor version is: " + expectedMinorVersion); -console.log("Minor version is: " + minorVersion); -console.log("Good to go!"); diff --git a/scripts/check-minor-version.mjs b/scripts/check-minor-version.mjs new file mode 100644 index 000000000..c1fedc837 --- /dev/null +++ b/scripts/check-minor-version.mjs @@ -0,0 +1,30 @@ +import { readFile, writeFile } from "node:fs/promises"; + +const packages = ["llamaindex", "env", "core"]; +const envPackageJson = JSON.parse( + await readFile("./packages/env/package.json", "utf8"), +); +for (const pkg of packages) { + const { packageJson, jsrJson } = await Promise.all([ + readFile(`./packages/${pkg}/package.json`, "utf8"), + readFile(`./packages/${pkg}/jsr.json`, "utf8"), + ]).then(([packageJson, jsrJson]) => { + return { + packageJson: JSON.parse(packageJson), + jsrJson: JSON.parse(jsrJson), + }; + }); + + jsrJson.version = packageJson.version; + if (pkg === "core") { + jsrJson.imports["@llamaindex/env"] = + `jsr:@llamaindex/env@${envPackageJson.version}`; + } + + await writeFile( + `./packages/${pkg}/jsr.json`, + JSON.stringify(jsrJson, null, 2) + "\n", + ); +} + +console.log("Good to go!"); -- GitLab