From 0efb8f40c43fd8673d4d419c51300d53c31bdeae Mon Sep 17 00:00:00 2001 From: Travis Fischer Date: Sat, 3 Aug 2024 22:14:21 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- legacy/examples/ai-sdk/package.json | 3 + legacy/examples/ai-sdk/tsconfig.json | 5 +- legacy/package.json | 1 + legacy/packages/ai-sdk/package.json | 3 +- legacy/packages/ai-sdk/tsconfig.json | 5 +- legacy/packages/core/package.json | 3 + legacy/packages/core/tsconfig.json | 5 +- legacy/packages/tsconfig/package.json | 17 ++++ .../tsconfig/tsconfig.base.json} | 1 + legacy/packages/weather/package.json | 3 +- legacy/packages/weather/tsconfig.json | 5 +- legacy/pnpm-lock.yaml | 98 +++++++++++++++++-- legacy/pnpm-workspace.yaml | 3 +- 13 files changed, 132 insertions(+), 20 deletions(-) create mode 100644 legacy/packages/tsconfig/package.json rename legacy/{tsconfig.json => packages/tsconfig/tsconfig.base.json} (92%) diff --git a/legacy/examples/ai-sdk/package.json b/legacy/examples/ai-sdk/package.json index 499ae25d..2fb79247 100644 --- a/legacy/examples/ai-sdk/package.json +++ b/legacy/examples/ai-sdk/package.json @@ -28,5 +28,8 @@ "dotenv": "^16.4.5", "openai": "^4.49.0", "zod": "^3.23.8" + }, + "devDependencies": { + "@agentic/tsconfig": "workspace:*" } } diff --git a/legacy/examples/ai-sdk/tsconfig.json b/legacy/examples/ai-sdk/tsconfig.json index fbf06c4d..b99a3fc1 100644 --- a/legacy/examples/ai-sdk/tsconfig.json +++ b/legacy/examples/ai-sdk/tsconfig.json @@ -1,4 +1,5 @@ { - "extends": "../../tsconfig.json", - "include": ["bin"] + "extends": "@agentic/tsconfig/base.json", + "include": ["bin"], + "exclude": ["node_modules", "dist"] } diff --git a/legacy/package.json b/legacy/package.json index ae408844..d686236c 100644 --- a/legacy/package.json +++ b/legacy/package.json @@ -49,6 +49,7 @@ "prettier": "^3.3.3", "tsup": "^8.2.3", "tsx": "^4.16.2", + "turbo": "^2.0.11", "typescript": "^5.5.4", "vitest": "2.0.4", "zod": "^3.23.3" diff --git a/legacy/packages/ai-sdk/package.json b/legacy/packages/ai-sdk/package.json index cf5e2e0b..8ce9e896 100644 --- a/legacy/packages/ai-sdk/package.json +++ b/legacy/packages/ai-sdk/package.json @@ -37,7 +37,8 @@ "ai": "^3.1.30" }, "devDependencies": { - "@agentic/core": "workspace:*" + "@agentic/core": "workspace:*", + "@agentic/tsconfig": "workspace:*" }, "publishConfig": { "access": "public" diff --git a/legacy/packages/ai-sdk/tsconfig.json b/legacy/packages/ai-sdk/tsconfig.json index 596e2cf7..6c8d720c 100644 --- a/legacy/packages/ai-sdk/tsconfig.json +++ b/legacy/packages/ai-sdk/tsconfig.json @@ -1,4 +1,5 @@ { - "extends": "../../tsconfig.json", - "include": ["src"] + "extends": "@agentic/tsconfig/base.json", + "include": ["src"], + "exclude": ["node_modules", "dist"] } diff --git a/legacy/packages/core/package.json b/legacy/packages/core/package.json index 8b88553a..d267bdf8 100644 --- a/legacy/packages/core/package.json +++ b/legacy/packages/core/package.json @@ -51,6 +51,9 @@ "peerDependencies": { "zod": "^3.23.3" }, + "devDependencies": { + "@agentic/tsconfig": "workspace:*" + }, "publishConfig": { "access": "public" } diff --git a/legacy/packages/core/tsconfig.json b/legacy/packages/core/tsconfig.json index 596e2cf7..6c8d720c 100644 --- a/legacy/packages/core/tsconfig.json +++ b/legacy/packages/core/tsconfig.json @@ -1,4 +1,5 @@ { - "extends": "../../tsconfig.json", - "include": ["src"] + "extends": "@agentic/tsconfig/base.json", + "include": ["src"], + "exclude": ["node_modules", "dist"] } diff --git a/legacy/packages/tsconfig/package.json b/legacy/packages/tsconfig/package.json new file mode 100644 index 00000000..60311ad2 --- /dev/null +++ b/legacy/packages/tsconfig/package.json @@ -0,0 +1,17 @@ +{ + "name": "@agentic/tsconfig", + "private": true, + "exports": { + ".": { + "import": "./tsconfig.base.json", + "default": "./tsconfig.base.json" + }, + "./base.json": { + "import": "./tsconfig.base.json", + "default": "./tsconfig.base.json" + } + }, + "files": [ + "tsconfig.base.json" + ] +} diff --git a/legacy/tsconfig.json b/legacy/packages/tsconfig/tsconfig.base.json similarity index 92% rename from legacy/tsconfig.json rename to legacy/packages/tsconfig/tsconfig.base.json index 8d623777..b9b7e41f 100644 --- a/legacy/tsconfig.json +++ b/legacy/packages/tsconfig/tsconfig.base.json @@ -1,4 +1,5 @@ { + "$schema": "https://json.schemastore.org/tsconfig", "compilerOptions": { "lib": ["esnext", "dom.iterable"], "module": "esnext", diff --git a/legacy/packages/weather/package.json b/legacy/packages/weather/package.json index 3704ab3e..a9b113fe 100644 --- a/legacy/packages/weather/package.json +++ b/legacy/packages/weather/package.json @@ -39,7 +39,8 @@ "zod": "^3.23.3" }, "devDependencies": { - "@agentic/core": "workspace:*" + "@agentic/core": "workspace:*", + "@agentic/tsconfig": "workspace:*" }, "publishConfig": { "access": "public" diff --git a/legacy/packages/weather/tsconfig.json b/legacy/packages/weather/tsconfig.json index 596e2cf7..6c8d720c 100644 --- a/legacy/packages/weather/tsconfig.json +++ b/legacy/packages/weather/tsconfig.json @@ -1,4 +1,5 @@ { - "extends": "../../tsconfig.json", - "include": ["src"] + "extends": "@agentic/tsconfig/base.json", + "include": ["src"], + "exclude": ["node_modules", "dist"] } diff --git a/legacy/pnpm-lock.yaml b/legacy/pnpm-lock.yaml index b210c6c6..0c8ca315 100644 --- a/legacy/pnpm-lock.yaml +++ b/legacy/pnpm-lock.yaml @@ -47,6 +47,9 @@ importers: tsx: specifier: ^4.16.2 version: 4.16.2 + turbo: + specifier: ^2.0.11 + version: 2.0.11 typescript: specifier: ^5.5.4 version: 5.5.4 @@ -86,6 +89,10 @@ importers: zod: specifier: ^3.23.8 version: 3.23.8 + devDependencies: + '@agentic/tsconfig': + specifier: workspace:* + version: link:../../packages/tsconfig packages/ai-sdk: dependencies: @@ -96,6 +103,9 @@ importers: '@agentic/core': specifier: workspace:* version: link:../core + '@agentic/tsconfig': + specifier: workspace:* + version: link:../tsconfig packages/core: dependencies: @@ -144,6 +154,12 @@ importers: zod-validation-error: specifier: ^3.3.0 version: 3.3.0(zod@3.23.8) + devDependencies: + '@agentic/tsconfig': + specifier: workspace:* + version: link:../tsconfig + + packages/tsconfig: {} packages/weather: dependencies: @@ -157,6 +173,9 @@ importers: '@agentic/core': specifier: workspace:* version: link:../core + '@agentic/tsconfig': + specifier: workspace:* + version: link:../tsconfig packages: @@ -3702,6 +3721,40 @@ packages: engines: {node: '>=18.0.0'} hasBin: true + turbo-darwin-64@2.0.11: + resolution: {integrity: sha512-YlHEEhcm+jI1BSZoLugGHUWDfRXaNaQIv7tGQBfadYjo9kixBnqoTOU6s1ubOrQMID+lizZZQs79GXwqM6vohg==} + cpu: [x64] + os: [darwin] + + turbo-darwin-arm64@2.0.11: + resolution: {integrity: sha512-K/YW+hWzRQ/wGmtffxllH4M1tgy8OlwgXODrIiAGzkSpZl9+pIsem/F86UULlhsIeavBYK/LS5+dzV3DPMjJ9w==} + cpu: [arm64] + os: [darwin] + + turbo-linux-64@2.0.11: + resolution: {integrity: sha512-mv8CwGP06UPweMh1Vlp6PI6OWnkuibxfIJ4Vlof7xqjohAaZU5FLqeOeHkjQflH/6YrCVuS9wrK0TFOu+meTtA==} + cpu: [x64] + os: [linux] + + turbo-linux-arm64@2.0.11: + resolution: {integrity: sha512-wLE5tl4oriTmHbuayc0ki0csaCplmVLj+uCWtecM/mfBuZgNS9ICNM9c4sB+Cfl5tlBBFeepqRNgvRvn8WeVZg==} + cpu: [arm64] + os: [linux] + + turbo-windows-64@2.0.11: + resolution: {integrity: sha512-tja3zvVCSWu3HizOoeQv0qDJ+GeWGWRFOOM6a8i3BYnXLgGKAaDZFcjwzgC50tWiAw4aowIVR4OouwIyRhLBaQ==} + cpu: [x64] + os: [win32] + + turbo-windows-arm64@2.0.11: + resolution: {integrity: sha512-sYjXP6k94Bqh99R+y3M1Ks6LRIEZybMz+7enA8GKl6JJ2ZFaXxTnS6q+/2+ii1+rRwxohj5OBb4gxODcF8Jd4w==} + cpu: [arm64] + os: [win32] + + turbo@2.0.11: + resolution: {integrity: sha512-imDlFFAvitbCm1JtDFJ6eG882qwxHUmVT2noPb3p2jq5o5DuXOchMbkVS9kUeC3/4WpY5N0GBZ3RvqNyjHZw1Q==} + hasBin: true + type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} @@ -4340,8 +4393,8 @@ snapshots: '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/utils': 7.17.0(eslint@8.57.0)(typescript@5.5.4) eslint-config-prettier: 9.1.0(eslint@8.57.0) - eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0) eslint-plugin-jest: 28.6.0(@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4) eslint-plugin-jest-dom: 5.4.0(eslint@8.57.0) eslint-plugin-jsx-a11y: 6.9.0(eslint@8.57.0) @@ -5576,13 +5629,13 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0): + eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0): dependencies: debug: 4.3.6 enhanced-resolve: 5.17.1 eslint: 8.57.0 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0) fast-glob: 3.3.2 get-tsconfig: 4.7.6 is-core-module: 2.15.0 @@ -5593,18 +5646,18 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.8.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0): + eslint-module-utils@2.8.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0): dependencies: debug: 3.2.7 optionalDependencies: '@typescript-eslint/parser': 7.17.0(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0) + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0) transitivePeerDependencies: - supports-color - eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0): + eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0): dependencies: array-includes: 3.1.8 array.prototype.findlastindex: 1.2.5 @@ -5614,7 +5667,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0) hasown: 2.0.2 is-core-module: 2.15.0 is-glob: 4.0.3 @@ -7837,6 +7890,33 @@ snapshots: optionalDependencies: fsevents: 2.3.3 + turbo-darwin-64@2.0.11: + optional: true + + turbo-darwin-arm64@2.0.11: + optional: true + + turbo-linux-64@2.0.11: + optional: true + + turbo-linux-arm64@2.0.11: + optional: true + + turbo-windows-64@2.0.11: + optional: true + + turbo-windows-arm64@2.0.11: + optional: true + + turbo@2.0.11: + optionalDependencies: + turbo-darwin-64: 2.0.11 + turbo-darwin-arm64: 2.0.11 + turbo-linux-64: 2.0.11 + turbo-linux-arm64: 2.0.11 + turbo-windows-64: 2.0.11 + turbo-windows-arm64: 2.0.11 + type-check@0.4.0: dependencies: prelude-ls: 1.2.1 diff --git a/legacy/pnpm-workspace.yaml b/legacy/pnpm-workspace.yaml index 3c30676c..2ecd7534 100644 --- a/legacy/pnpm-workspace.yaml +++ b/legacy/pnpm-workspace.yaml @@ -1,7 +1,8 @@ packages: + - 'packages/tsconfig' - 'packages/core' - 'packages/weather' - 'packages/ai-sdk' - 'examples/ai-sdk' -# - 'examples' +# - 'examples/*' # - 'packages/*'