From cf2c8943478298da99a869f26851864b54b9df61 Mon Sep 17 00:00:00 2001 From: Travis Fischer Date: Wed, 28 Jun 2023 23:28:36 -0700 Subject: [PATCH] fix: CI and turbo BS --- legacy/.eslintrc | 3 +-- legacy/ava.config.cjs | 9 +++++++++ legacy/docs/.prettierignore | 6 ++++++ legacy/docs/package.json | 5 ++++- legacy/package.json | 4 +--- legacy/packages/core/.prettierignore | 6 ++++++ legacy/packages/core/package.json | 17 ++++------------- legacy/packages/core/tsconfig.json | 13 +------------ legacy/tsconfig.json | 18 ++++++++++++++++++ legacy/turbo.json | 13 ++++++++----- 10 files changed, 58 insertions(+), 36 deletions(-) create mode 100644 legacy/ava.config.cjs create mode 100644 legacy/docs/.prettierignore create mode 100644 legacy/packages/core/.prettierignore create mode 100644 legacy/tsconfig.json diff --git a/legacy/.eslintrc b/legacy/.eslintrc index 45f384d6..9cff8174 100644 --- a/legacy/.eslintrc +++ b/legacy/.eslintrc @@ -13,8 +13,7 @@ }, "ecmaVersion": "latest", "sourceType": "module", - // TODO: move to ./packages/tsconfig/tsconfig.json - "project": "./packages/core/tsconfig.json" + "project": "tsconfig.json" }, "rules": { "@typescript-eslint/no-unused-vars": [ diff --git a/legacy/ava.config.cjs b/legacy/ava.config.cjs new file mode 100644 index 00000000..90e2d76b --- /dev/null +++ b/legacy/ava.config.cjs @@ -0,0 +1,9 @@ +module.exports = { + snapshotDir: 'test/.snapshots', + failFast: true, + extensions: { + ts: 'module' + }, + nodeArguments: ['--loader=tsx', '--no-warnings'], + timeout: '30s' +} diff --git a/legacy/docs/.prettierignore b/legacy/docs/.prettierignore new file mode 100644 index 00000000..0e57050d --- /dev/null +++ b/legacy/docs/.prettierignore @@ -0,0 +1,6 @@ +.snapshots/ +build/ +dist/ +node_modules/ +.next/ +.vercel/ \ No newline at end of file diff --git a/legacy/docs/package.json b/legacy/docs/package.json index 1da06e9b..9b737333 100644 --- a/legacy/docs/package.json +++ b/legacy/docs/package.json @@ -7,7 +7,10 @@ "scripts": { "dev": "next dev", "build-web": "next build", - "start": "next start" + "start": "next start", + "eslint-check": "eslint \"**/*.{ts,tsx}\"", + "prettier-check": "prettier --check \"**/*.{js,ts,tsx,md,mdx}\"", + "prettier-write": "prettier --write \"**/*.{js,ts,tsx,md,mdx}\"" }, "dependencies": { "next": "13.4.7", diff --git a/legacy/package.json b/legacy/package.json index ad1c388d..97219d47 100644 --- a/legacy/package.json +++ b/legacy/package.json @@ -1,4 +1,5 @@ { + "name": "agentic", "private": true, "description": "Everything you need to build reliable AI agents with TypeScript.", "author": "Travis Fischer ", @@ -19,9 +20,6 @@ "release": "turbo clean && turbo build && changeset publish", "test": "turbo test", "pre-commit": "lint-staged", - "eslint-check": "eslint \"**/*.{ts,tsx}\"", - "prettier-check": "prettier --check \"**/*.{js,ts,tsx,md,mdx}\"", - "prettier-write": "prettier --write \"**/*.{js,ts,tsx,md,mdx}\"", "version-packages": "changeset version" }, "devDependencies": { diff --git a/legacy/packages/core/.prettierignore b/legacy/packages/core/.prettierignore new file mode 100644 index 00000000..0e57050d --- /dev/null +++ b/legacy/packages/core/.prettierignore @@ -0,0 +1,6 @@ +.snapshots/ +build/ +dist/ +node_modules/ +.next/ +.vercel/ \ No newline at end of file diff --git a/legacy/packages/core/package.json b/legacy/packages/core/package.json index c7b4b216..599f5e6c 100644 --- a/legacy/packages/core/package.json +++ b/legacy/packages/core/package.json @@ -26,7 +26,10 @@ "build-lib": "tsup", "dev": "tsup --watch", "clean": "del build", - "test": "NODE_OPTIONS='--loader=tsx --no-warnings' ava" + "unit-test": "ava", + "eslint-check": "eslint \"**/*.{ts,tsx}\"", + "prettier-check": "prettier --check \"**/*.{js,ts,tsx,md,mdx}\"", + "prettier-write": "prettier --write \"**/*.{js,ts,tsx,md,mdx}\"" }, "dependencies": { "@agentic/midjourney-fetch": "^1.0.1", @@ -64,24 +67,12 @@ "devDependencies": { "@keyv/redis": "^2.6.1", "@types/debug": "^4.1.8", - "@types/node": "^20.3.2", "@types/sinon": "^10.0.15", "expect-type": "^0.16.0", "hash-obj": "^4.0.0", "ioredis": "^5.3.2", "keyv": "^4.5.2" }, - "ava": { - "snapshotDir": "test/.snapshots", - "failFast": true, - "extensions": { - "ts": "module" - }, - "nodeArguments": [ - "--loader=tsx", - "--no-warnings" - ] - }, "keywords": [ "ai", "openai", diff --git a/legacy/packages/core/tsconfig.json b/legacy/packages/core/tsconfig.json index 19db8a34..fe24d483 100644 --- a/legacy/packages/core/tsconfig.json +++ b/legacy/packages/core/tsconfig.json @@ -1,17 +1,6 @@ { + "extends": "../../tsconfig.json", "compilerOptions": { - "target": "es2020", - "lib": ["esnext", "es2022.error", "DOM"], - "allowJs": true, - "skipLibCheck": true, - "strict": true, - "noImplicitAny": false, - "forceConsistentCasingInFileNames": true, - "esModuleInterop": true, - "module": "esnext", - "moduleResolution": "node", - "resolveJsonModule": true, - "isolatedModules": true, "baseUrl": ".", "outDir": "build", "noEmit": true, diff --git a/legacy/tsconfig.json b/legacy/tsconfig.json new file mode 100644 index 00000000..e79506bf --- /dev/null +++ b/legacy/tsconfig.json @@ -0,0 +1,18 @@ +{ + "compilerOptions": { + "composite": false, + "target": "es2020", + "lib": ["esnext", "es2022.error", "DOM"], + "allowJs": true, + "skipLibCheck": true, + "strict": true, + "noImplicitAny": false, + "forceConsistentCasingInFileNames": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true + } +} diff --git a/legacy/turbo.json b/legacy/turbo.json index d7fca993..81d77394 100644 --- a/legacy/turbo.json +++ b/legacy/turbo.json @@ -13,15 +13,19 @@ }, "test": { "dependsOn": [ - "^build", + "^test", "prettier-check", "eslint-check", "build", "unit-test" ] }, - "prettier-check": {}, - "eslint-check": {}, + "prettier-check": { + "dependsOn": ["^build", "build"] + }, + "eslint-check": { + "dependsOn": ["^build", "build"] + }, "unit-test": { "dotEnv": [".env"], "outputs": ["test/.snapshots"] @@ -30,8 +34,7 @@ "dependsOn": ["^build", "build"] }, "clean": { - "dependsOn": ["^clean"], - "outputs": ["build/**"] + "cache": false }, "dev": { "cache": false,