From 925ce6503e3672574ceaf02f2a03ad93abe587fd Mon Sep 17 00:00:00 2001 From: Dax Raad Date: Sat, 27 Sep 2025 04:10:56 -0400 Subject: sync --- packages/app/tsconfig.json | 1 - packages/opencode/tsconfig.json | 3 +-- packages/plugin/package.json | 10 ++-------- packages/plugin/script/publish.ts | 20 ++++++++++++++----- packages/plugin/tsconfig.json | 3 +-- packages/sdk/js/package.json | 23 +++++++--------------- packages/sdk/js/script/build.ts | 39 ++++++++++++++++++++++++++++++++++++++ packages/sdk/js/script/generate.ts | 37 ------------------------------------ packages/sdk/js/script/publish.ts | 18 +++++++++++++----- packages/sdk/js/tsconfig.json | 3 +-- tsconfig.json | 4 +--- 11 files changed, 80 insertions(+), 81 deletions(-) create mode 100755 packages/sdk/js/script/build.ts delete mode 100755 packages/sdk/js/script/generate.ts mode change 100644 => 100755 packages/sdk/js/script/publish.ts diff --git a/packages/app/tsconfig.json b/packages/app/tsconfig.json index 5efa8c85b..d86b8ca46 100644 --- a/packages/app/tsconfig.json +++ b/packages/app/tsconfig.json @@ -6,7 +6,6 @@ "jsxImportSource": "solid-js", "types": ["vite/client"], "lib": ["DOM", "DOM.Iterable"], - "customConditions": ["development"], "paths": { "@/*": ["./src/*"] } diff --git a/packages/opencode/tsconfig.json b/packages/opencode/tsconfig.json index a6d7592d3..8e4f68a03 100644 --- a/packages/opencode/tsconfig.json +++ b/packages/opencode/tsconfig.json @@ -2,7 +2,6 @@ "$schema": "https://json.schemastore.org/tsconfig", "extends": "@tsconfig/bun/tsconfig.json", "compilerOptions": { - "lib": ["ESNext", "DOM", "DOM.Iterable"], - "customConditions": ["development"] + "lib": ["ESNext", "DOM", "DOM.Iterable"] } } diff --git a/packages/plugin/package.json b/packages/plugin/package.json index 846990f5d..1fad1726a 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -8,14 +8,8 @@ "build": "tsc" }, "exports": { - ".": { - "development": "./src/index.ts", - "import": "./dist/index.js" - }, - "./tool": { - "development": "./src/tool.ts", - "import": "./dist/tool.js" - } + ".": "./src/index.ts", + "./tool": "./src/tool.ts" }, "files": [ "dist" diff --git a/packages/plugin/script/publish.ts b/packages/plugin/script/publish.ts index b984fd4f4..178c41f66 100644 --- a/packages/plugin/script/publish.ts +++ b/packages/plugin/script/publish.ts @@ -5,14 +5,24 @@ process.chdir(dir) import { $ } from "bun" -const snapshot = process.env["OPENCODE_SNAPSHOT"] === "true" - await $`bun tsc` +const pkg = await import("../package.json") +for (const [key, value] of Object.entries(pkg.exports)) { + const file = value.replace("./src/", "./").replace(".ts", "") + // @ts-expect-error + pkg.exports[key] = { + import: file + ".js", + types: file + ".d.ts", + } +} +await Bun.write("./dist/package.json", JSON.stringify(pkg, null, 2)) + +const snapshot = process.env["OPENCODE_SNAPSHOT"] === "true" + if (snapshot) { - await $`bun publish --tag snapshot --access public` - await $`git checkout package.json` + await $`bun publish --tag snapshot --access public`.cwd("./dist") } if (!snapshot) { - await $`bun publish --access public` + await $`bun publish --access public`.cwd("./dist") } diff --git a/packages/plugin/tsconfig.json b/packages/plugin/tsconfig.json index e86e08fdf..58072c81c 100644 --- a/packages/plugin/tsconfig.json +++ b/packages/plugin/tsconfig.json @@ -6,8 +6,7 @@ "module": "preserve", "declaration": true, "moduleResolution": "bundler", - "lib": ["es2022", "dom", "dom.iterable"], - "customConditions": ["development"] + "lib": ["es2022", "dom", "dom.iterable"] }, "include": ["src"] } diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json index 0eb1b9e6d..bf44cb013 100644 --- a/packages/sdk/js/package.json +++ b/packages/sdk/js/package.json @@ -5,24 +5,12 @@ "type": "module", "scripts": { "typecheck": "tsc --noEmit", - "build": "tsc" + "build": "./script/build.ts" }, "exports": { - ".": { - "development": "./src/index.ts", - "import": "./dist/index.js", - "types": "./dist/index.d.ts" - }, - "./client": { - "development": "./src/client.ts", - "import": "./dist/client.js", - "types": "./dist/client.d.ts" - }, - "./server": { - "development": "./src/server.ts", - "import": "./dist/server.js", - "types": "./dist/server.d.ts" - } + ".": "./src/index.ts", + "./client": "./src/client.ts", + "./server": "./src/server.ts" }, "files": [ "dist" @@ -34,5 +22,8 @@ }, "dependencies": { "@hey-api/openapi-ts": "0.81.0" + }, + "publishConfig": { + "directory": "dist" } } diff --git a/packages/sdk/js/script/build.ts b/packages/sdk/js/script/build.ts new file mode 100755 index 000000000..db7e56f90 --- /dev/null +++ b/packages/sdk/js/script/build.ts @@ -0,0 +1,39 @@ +#!/usr/bin/env bun + +const dir = new URL("..", import.meta.url).pathname +process.chdir(dir) + +import { $ } from "bun" +import path from "path" + +import { createClient } from "@hey-api/openapi-ts" + +await $`bun dev generate > ${dir}/openapi.json`.cwd(path.resolve(dir, "../../opencode")) + +await createClient({ + input: "./openapi.json", + output: { + path: "./src/gen", + tsConfigPath: path.join(dir, "tsconfig.json"), + }, + plugins: [ + { + name: "@hey-api/typescript", + exportFromIndex: false, + }, + { + name: "@hey-api/sdk", + instance: "OpencodeClient", + exportFromIndex: false, + auth: false, + }, + { + name: "@hey-api/client-fetch", + exportFromIndex: false, + baseUrl: "http://localhost:4096", + }, + ], +}) +await $`bun prettier --write src/gen` +await $`rm -rf dist` +await $`bun tsc` diff --git a/packages/sdk/js/script/generate.ts b/packages/sdk/js/script/generate.ts deleted file mode 100755 index b03104823..000000000 --- a/packages/sdk/js/script/generate.ts +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bun - -const dir = new URL("..", import.meta.url).pathname -process.chdir(dir) - -import { $ } from "bun" -import path from "path" - -import { createClient } from "@hey-api/openapi-ts" - -await $`bun dev generate > ${dir}/openapi.json`.cwd(path.resolve(dir, "../../opencode")) - -await createClient({ - input: "./openapi.json", - output: { - path: "./src/gen", - tsConfigPath: path.join(dir, "tsconfig.json"), - }, - plugins: [ - { - name: "@hey-api/typescript", - exportFromIndex: false, - }, - { - name: "@hey-api/sdk", - instance: "OpencodeClient", - exportFromIndex: false, - auth: false, - }, - { - name: "@hey-api/client-fetch", - exportFromIndex: false, - baseUrl: "http://localhost:4096", - }, - ], -}) -await $`bun prettier --write src/gen` diff --git a/packages/sdk/js/script/publish.ts b/packages/sdk/js/script/publish.ts old mode 100644 new mode 100755 index 389a9376c..74218c40c --- a/packages/sdk/js/script/publish.ts +++ b/packages/sdk/js/script/publish.ts @@ -5,15 +5,23 @@ process.chdir(dir) import { $ } from "bun" -await import("./generate") -await $`rm -rf dist` -await $`bun tsc` +await import("./build") +const pkg = await import("../package.json") +for (const [key, value] of Object.entries(pkg.exports)) { + const file = value.replace("./src/", "./").replace(".ts", "") + // @ts-expect-error + pkg.exports[key] = { + import: file + ".js", + types: file + ".d.ts", + } +} +await Bun.write("./dist/package.json", JSON.stringify(pkg, null, 2)) const snapshot = process.env["OPENCODE_SNAPSHOT"] === "true" if (snapshot) { - await $`bun publish --tag snapshot` + await $`bun publish --tag snapshot`.cwd("./dist") } if (!snapshot) { - await $`bun publish` + await $`bun publish`.cwd("./dist") } diff --git a/packages/sdk/js/tsconfig.json b/packages/sdk/js/tsconfig.json index 6c5318946..117381878 100644 --- a/packages/sdk/js/tsconfig.json +++ b/packages/sdk/js/tsconfig.json @@ -6,8 +6,7 @@ "module": "nodenext", "declaration": true, "moduleResolution": "nodenext", - "lib": ["es2022", "dom", "dom.iterable"], - "customConditions": ["development"] + "lib": ["es2022", "dom", "dom.iterable"] }, "include": ["src"] } diff --git a/tsconfig.json b/tsconfig.json index 7f7299620..65fa6c7f3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,5 @@ { "$schema": "https://json.schemastore.org/tsconfig", "extends": "@tsconfig/bun/tsconfig.json", - "compilerOptions": { - "customConditions": ["development"] - } + "compilerOptions": {} } -- cgit v1.2.3