From 47090713efad33db1f94a278827ff3bf3ee39835 Mon Sep 17 00:00:00 2001 From: Waleed Latif Date: Mon, 19 May 2025 17:03:54 -0700 Subject: [PATCH] =?UTF-8?q?Revert=20"feat(package):=20add=20tsconfig=20pkg?= =?UTF-8?q?=20to=20share=20across=20packages=20in=20monorepo=20=E2=80=A6"?= =?UTF-8?q?=20(#381)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f5cbcfb514beb64503f0a65ba3e7402d916eb531. --- apps/docs/package.json | 2 +- apps/docs/tsconfig.json | 2 +- apps/sim/package.json | 4 +--- apps/sim/tsconfig.json | 23 +++++++++++++++++++++-- bun.lock | 10 +--------- package.json | 2 +- packages/simstudio/package.json | 3 +-- packages/simstudio/tsconfig.json | 14 +++++++++++--- packages/tsconfig/base.json | 21 --------------------- packages/tsconfig/library.json | 12 ------------ packages/tsconfig/nextjs.json | 20 -------------------- packages/tsconfig/package.json | 11 ----------- tsconfig.json | 3 --- 13 files changed, 38 insertions(+), 89 deletions(-) delete mode 100644 packages/tsconfig/base.json delete mode 100644 packages/tsconfig/library.json delete mode 100644 packages/tsconfig/nextjs.json delete mode 100644 packages/tsconfig/package.json delete mode 100644 tsconfig.json diff --git a/apps/docs/package.json b/apps/docs/package.json index 956d96315..92c91e1c3 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -4,7 +4,7 @@ "private": true, "license": "Apache-2.0", "scripts": { - "dev": "next dev --turbo --port 3001", + "dev": "next dev --port 3001", "build": "next build", "start": "next start", "postinstall": "fumadocs-mdx" diff --git a/apps/docs/tsconfig.json b/apps/docs/tsconfig.json index cf8cdab00..74d13e6ed 100644 --- a/apps/docs/tsconfig.json +++ b/apps/docs/tsconfig.json @@ -34,4 +34,4 @@ "content/docs/connections/index.mdx" ], "exclude": ["node_modules"] -} \ No newline at end of file +} diff --git a/apps/sim/package.json b/apps/sim/package.json index 8f3cf130c..4db0dc179 100644 --- a/apps/sim/package.json +++ b/apps/sim/package.json @@ -4,7 +4,6 @@ "private": true, "license": "Apache-2.0", "type": "module", - "packageManager": "bun@1.2.12", "engines": { "bun": ">=1.2.13", "node": ">=20.0.0" @@ -135,8 +134,7 @@ "tailwindcss": "^3.4.1", "typescript": "^5.7.3", "vite-tsconfig-paths": "^5.1.4", - "vitest": "^3.0.8", - "@simstudio/tsconfig": "workspace:*" + "vitest": "^3.0.8" }, "lint-staged": { "*.{js,jsx,ts,tsx,json,css,scss,md}": [ diff --git a/apps/sim/tsconfig.json b/apps/sim/tsconfig.json index d8e152cb6..58e1fd44c 100644 --- a/apps/sim/tsconfig.json +++ b/apps/sim/tsconfig.json @@ -1,6 +1,13 @@ { - "extends": "@simstudio/tsconfig/nextjs.json", "compilerOptions": { + "target": "es2020", + "module": "esnext", + "moduleResolution": "bundler", + "lib": ["es2020", "dom", "dom.iterable"], + "strict": true, + "esModuleInterop": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true, "baseUrl": ".", "paths": { "@/*": ["./*"], @@ -21,7 +28,19 @@ "@/db/*": ["./db/*"], "@/executor": ["./executor"], "@/executor/*": ["./executor/*"] - } + }, + "allowJs": true, + "noEmit": true, + "incremental": true, + "resolveJsonModule": true, + "isolatedModules": true, + "allowImportingTsExtensions": true, + "jsx": "preserve", + "plugins": [ + { + "name": "next" + } + ] }, "include": [ "**/*.ts", diff --git a/bun.lock b/bun.lock index 3eb2ef387..0bd17dabe 100644 --- a/bun.lock +++ b/bun.lock @@ -131,7 +131,6 @@ "zod": "^3.24.2", }, "devDependencies": { - "@simstudio/tsconfig": "workspace:*", "@tailwindcss/typography": "^0.5.16", "@testing-library/jest-dom": "^6.6.3", "@testing-library/react": "^16.2.0", @@ -162,7 +161,7 @@ }, "packages/simstudio": { "name": "simstudio", - "version": "0.1.17", + "version": "0.1.16", "bin": { "simstudio": "dist/index.js", }, @@ -174,16 +173,11 @@ "listr2": "^6.6.1", }, "devDependencies": { - "@simstudio/tsconfig": "workspace:*", "@types/inquirer": "^8.2.6", "@types/node": "^20.5.1", "typescript": "^5.1.6", }, }, - "packages/tsconfig": { - "name": "@simstudio/tsconfig", - "version": "0.0.0", - }, }, "trustedDependencies": [ "sharp", @@ -980,8 +974,6 @@ "@simplewebauthn/server": ["@simplewebauthn/server@13.1.1", "", { "dependencies": { "@hexagon/base64": "^1.1.27", "@levischuck/tiny-cbor": "^0.2.2", "@peculiar/asn1-android": "^2.3.10", "@peculiar/asn1-ecc": "^2.3.8", "@peculiar/asn1-rsa": "^2.3.8", "@peculiar/asn1-schema": "^2.3.8", "@peculiar/asn1-x509": "^2.3.8" } }, "sha512-1hsLpRHfSuMB9ee2aAdh0Htza/X3f4djhYISrggqGe3xopNjOcePiSDkDDoPzDYaaMCrbqGP1H2TYU7bgL9PmA=="], - "@simstudio/tsconfig": ["@simstudio/tsconfig@workspace:packages/tsconfig"], - "@smithy/abort-controller": ["@smithy/abort-controller@4.0.2", "", { "dependencies": { "@smithy/types": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-Sl/78VDtgqKxN2+1qduaVE140XF+Xg+TafkncspwM4jFP/LHr76ZHmIY/y3V1M0mMLNk+Je6IGbzxy23RSToMw=="], "@smithy/chunked-blob-reader": ["@smithy/chunked-blob-reader@5.0.0", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-+sKqDBQqb036hh4NPaUiEkYFkTUGYzRsn3EuFhyfQfMy6oGHEUJDurLP9Ufb5dasr/XiAmPNMr6wa9afjQB+Gw=="], diff --git a/package.json b/package.json index 9ded5f747..71f89fa51 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simstudio", - "packageManager": "bun@1.2.13", + "packageManager": "bun@1.2.12", "version": "0.0.0", "private": true, "license": "Apache-2.0", diff --git a/packages/simstudio/package.json b/packages/simstudio/package.json index 49484bb9a..ad7ad03bc 100644 --- a/packages/simstudio/package.json +++ b/packages/simstudio/package.json @@ -37,8 +37,7 @@ "devDependencies": { "@types/inquirer": "^8.2.6", "@types/node": "^20.5.1", - "typescript": "^5.1.6", - "@simstudio/tsconfig": "workspace:*" + "typescript": "^5.1.6" }, "engines": { "node": ">=16" diff --git a/packages/simstudio/tsconfig.json b/packages/simstudio/tsconfig.json index 652ca53da..2dbecd2a2 100644 --- a/packages/simstudio/tsconfig.json +++ b/packages/simstudio/tsconfig.json @@ -1,8 +1,16 @@ { - "extends": "@simstudio/tsconfig/library.json", "compilerOptions": { + "target": "es2020", + "module": "ESNext", + "moduleResolution": "node", "outDir": "./dist", - "rootDir": "./src" + "rootDir": "./src", + "strict": true, + "esModuleInterop": true, + "skipLibCheck": true, + "declaration": true, + "forceConsistentCasingInFileNames": true }, - "include": ["src/**/*"] + "include": ["src/**/*"], + "exclude": ["node_modules", "dist"] } \ No newline at end of file diff --git a/packages/tsconfig/base.json b/packages/tsconfig/base.json deleted file mode 100644 index 21e94c9b9..000000000 --- a/packages/tsconfig/base.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "display": "Default", - "compilerOptions": { - "target": "es2020", - "module": "esnext", - "moduleResolution": "bundler", - "lib": ["es2020", "dom", "dom.iterable"], - "strict": true, - "esModuleInterop": true, - "skipLibCheck": true, - "forceConsistentCasingInFileNames": true, - "allowJs": true, - "noEmit": true, - "incremental": true, - "resolveJsonModule": true, - "isolatedModules": true, - "jsx": "preserve" - }, - "exclude": ["node_modules", "dist", ".next"] -} diff --git a/packages/tsconfig/library.json b/packages/tsconfig/library.json deleted file mode 100644 index 30076eb81..000000000 --- a/packages/tsconfig/library.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "display": "Library", - "extends": "./base.json", - "compilerOptions": { - "module": "ESNext", - "moduleResolution": "node", - "declaration": true, - "noEmit": false - }, - "exclude": ["node_modules", "dist"] -} \ No newline at end of file diff --git a/packages/tsconfig/nextjs.json b/packages/tsconfig/nextjs.json deleted file mode 100644 index 3582f2691..000000000 --- a/packages/tsconfig/nextjs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "display": "Next.js", - "extends": "./base.json", - "compilerOptions": { - "allowImportingTsExtensions": true, - "noEmit": true, - "plugins": [ - { - "name": "next" - } - ] - }, - "include": [ - "next-env.d.ts", - "**/*.ts", - "**/*.tsx", - ".next/types/**/*.ts" - ] -} diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json deleted file mode 100644 index d12f24425..000000000 --- a/packages/tsconfig/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "@simstudio/tsconfig", - "version": "0.0.0", - "private": true, - "license": "Apache-2.0", - "files": [ - "base.json", - "nextjs.json", - "library.json" - ] -} diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index f9b916830..000000000 --- a/tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@simstudio/tsconfig/base.json" -}