Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
jaronheard committed Aug 23, 2024
1 parent 1a3d647 commit 6f71a3f
Show file tree
Hide file tree
Showing 24 changed files with 32 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ apps/expo/.gitignore
/apps/expo/credentials/android/

# typescript
*.tsbuildinfo
dist/
.cache

# turbo
.turbo
5 changes: 2 additions & 3 deletions apps/expo/metro.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ function withMonorepoPaths(config) {
}

/**
* Move the Metro cache to the `node_modules/.cache/metro` folder.
* This repository configured Turborepo to use this cache location as well.
* Move the Metro cache to the `.cache/metro` folder.
* If you have any environment variables, you can configure Turborepo to invalidate it when needed.
*
* @see https://turbo.build/repo/docs/reference/configuration#env
Expand All @@ -56,7 +55,7 @@ function withMonorepoPaths(config) {
*/
function withTurborepoManagedCache(config) {
config.cacheStores = [
new FileStore({ root: path.join(__dirname, "node_modules/.cache/metro") }),
new FileStore({ root: path.join(__dirname, ".cache/metro") }),
];
return config;
}
2 changes: 1 addition & 1 deletion apps/expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "expo-router/entry",
"scripts": {
"android": "expo run:android",
"clean": "git clean -xdf .expo .turbo node_modules dist",
"clean": "git clean -xdf .cache .expo .turbo ios android node_modules dist",
"debug.eas": "open 'rndebugger://set-debugger-loc?host=localhost&port=8081'",
"debug": "open 'rndebugger://set-debugger-loc?host=localhost&port=19000'",
"dev:android": "expo start --android",
Expand Down
1 change: 0 additions & 1 deletion apps/expo/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"~/*": ["./src/*"]
},
"jsx": "react-native",
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json",
"types": ["nativewind/types"],
"checkJs": false
},
Expand Down
2 changes: 1 addition & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "module",
"scripts": {
"build": "pnpm with-env next build",
"clean": "git clean -xdf .next .turbo node_modules",
"clean": "git clean -xdf .cache .next .turbo node_modules",
"dev": "pnpm with-env next dev --turbo",
"dev:production": "pnpm with-env:production next dev --turbo",
"dev:tunnel": "concurrently \"pnpm run tunnel\" \"pnpm with-env next dev --turbo\"",
Expand Down
2 changes: 1 addition & 1 deletion apps/web/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"~/*": ["./*"]
},
"plugins": [{ "name": "next" }],
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json",

"module": "esnext",
"strictNullChecks": true // Next.js really wants this event though it's in the base tsconfig
},
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"packageManager": "pnpm@9.0.6",
"scripts": {
"build": "turbo build",
"clean": "git clean -xdf node_modules",
"clean": "git clean -xdf .cache node_modules",
"clean:ws": "turbo clean",
"db:push": "pnpm -F db push",
"db:studio": "pnpm -F db studio",
"dev": "turbo dev --parallel",
"format": "turbo format --continue -- --cache --cache-location node_modules/.cache/.prettiercache",
"format:fix": "turbo format --continue -- --write --cache --cache-location node_modules/.cache/.prettiercache",
"lint": "turbo lint --continue -- --cache --cache-location node_modules/.cache/.eslintcache",
"lint:fix": "turbo lint --continue -- --fix --cache --cache-location node_modules/.cache/.eslintcache",
"lint:quiet": "turbo lint --continue -- --quiet --cache --cache-location node_modules/.cache/.eslintcache",
"format": "turbo format --continue -- --cache --cache-location .cache/.prettiercache",
"format:fix": "turbo format --continue -- --write --cache --cache-location .cache/.prettiercache",
"lint": "turbo lint --continue -- --cache --cache-location .cache/.eslintcache",
"lint:fix": "turbo lint --continue -- --fix --cache --cache-location .cache/.eslintcache",
"lint:quiet": "turbo lint --continue -- --quiet --cache --cache-location .cache/.eslintcache",
"lint:ws": "pnpm dlx sherif@latest",
"ngrok": "ngrok tunnel --label edge=edghts_2knemEPLdFRuLQ6wzcBEqwVGz88 http://localhost:3000",
"typecheck": "turbo typecheck",
Expand Down
2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"scripts": {
"build": "tsc",
"dev": "tsc --watch",
"clean": "rm -rf .turbo node_modules dist",
"clean": "git clean -xdf .cache .turbo dist node_modules",
"format": "prettier --check . --ignore-path ../../.gitignore",
"lint": "eslint",
"typecheck": "tsc --noEmit --emitDeclarationOnly false"
Expand Down
3 changes: 1 addition & 2 deletions packages/api/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": "@soonlist/tsconfig/internal-package.json",
"compilerOptions": {
"outDir": "dist",
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
"outDir": "dist"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
2 changes: 1 addition & 1 deletion packages/cal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"scripts": {
"build": "tsc",
"dev": "tsc --watch",
"clean": "rm -rf .turbo node_modules dist",
"clean": "git clean -xdf .cache .turbo dist node_modules",
"format": "prettier --check . --ignore-path ../../.gitignore",
"lint": "eslint",
"typecheck": "tsc --noEmit --emitDeclarationOnly false"
Expand Down
3 changes: 1 addition & 2 deletions packages/cal/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": "@soonlist/tsconfig/internal-package.json",
"compilerOptions": {
"outDir": "dist",
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
"outDir": "dist"
},
"include": ["*.ts", "src"],
"exclude": ["node_modules"]
Expand Down
2 changes: 1 addition & 1 deletion packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"scripts": {
"build": "tsc",
"dev": "tsc --watch",
"clean": "rm -rf .turbo node_modules dist",
"clean": "git clean -xdf .cache .turbo dist node_modules",
"format": "prettier --check . --ignore-path ../../.gitignore",
"lint": "eslint",
"push": "pnpm with-env drizzle-kit push --config src/config.ts",
Expand Down
3 changes: 1 addition & 2 deletions packages/db/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": "@soonlist/tsconfig/internal-package.json",
"compilerOptions": {
"outDir": "dist",
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
"outDir": "dist"
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"license": "MIT",
"scripts": {
"add": "pnpm dlx shadcn-ui add",
"clean": "rm -rf .turbo node_modules dist",
"clean": "git clean -xdf .cache .turbo dist node_modules",
"format": "prettier --check . --ignore-path ../../.gitignore",
"lint": "eslint",
"typecheck": "tsc --noEmit --emitDeclarationOnly false",
Expand Down
3 changes: 1 addition & 2 deletions packages/ui/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "@soonlist/tsconfig/internal-package.json",
"compilerOptions": {
"lib": ["dom", "dom.iterable", "ES2022"],
"jsx": "preserve",
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
"jsx": "preserve"
},
"include": ["*.ts", "src"],
"exclude": ["node_modules"]
Expand Down
2 changes: 1 addition & 1 deletion packages/validators/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"scripts": {
"build": "tsc",
"dev": "tsc --watch",
"clean": "rm -rf .turbo node_modules dist",
"clean": "git clean -xdf .cache .turbo dist node_modules",
"format": "prettier --check . --ignore-path ../../.gitignore",
"lint": "eslint",
"typecheck": "tsc --noEmit --emitDeclarationOnly false"
Expand Down
3 changes: 1 addition & 2 deletions packages/validators/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": "@soonlist/tsconfig/internal-package.json",
"compilerOptions": {
"outDir": "dist",
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
"outDir": "dist"
},
"include": ["*.ts", "src"],
"exclude": ["node_modules"]
Expand Down
2 changes: 1 addition & 1 deletion tooling/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"./react": "./react.js"
},
"scripts": {
"clean": "rm -rf .turbo node_modules",
"clean": "git clean -xdf .cache .turbo node_modules",
"format": "prettier --check . --ignore-path ../../.gitignore",
"typecheck": "tsc --noEmit"
},
Expand Down
4 changes: 1 addition & 3 deletions tooling/eslint/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"extends": "@soonlist/tsconfig/base.json",
"compilerOptions": {
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
},
"compilerOptions": {},
"include": ["."],
"exclude": ["node_modules"]
}
2 changes: 1 addition & 1 deletion tooling/prettier/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
".": "./index.js"
},
"scripts": {
"clean": "rm -rf .turbo node_modules",
"clean": "git clean -xdf .cache .turbo node_modules",
"format": "prettier --check . --ignore-path ../../.gitignore",
"typecheck": "tsc --noEmit"
},
Expand Down
4 changes: 1 addition & 3 deletions tooling/prettier/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"extends": "@soonlist/tsconfig/base.json",
"compilerOptions": {
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
},
"compilerOptions": {},
"include": ["."],
"exclude": ["node_modules"]
}
2 changes: 1 addition & 1 deletion tooling/tailwind/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"license": "MIT",
"scripts": {
"clean": "rm -rf .turbo node_modules",
"clean": "git clean -xdf .cache .turbo node_modules",
"format": "prettier --check . --ignore-path ../../.gitignore",
"lint": "eslint",
"typecheck": "tsc --noEmit"
Expand Down
4 changes: 1 addition & 3 deletions tooling/tailwind/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"extends": "@soonlist/tsconfig/base.json",
"compilerOptions": {
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
},
"compilerOptions": {},
"include": ["."],
"exclude": ["node_modules"]
}
8 changes: 4 additions & 4 deletions turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@
".output/**",
".vercel/output/**",
"dist/**",
"node_modules/.cache/tsbuildinfo.json"
".cache/tsbuildinfo.json"
]
},
"dev": {
"persistent": true,
"cache": false
},
"format": {
"outputs": ["node_modules/.cache/.prettiercache"],
"outputs": [".cache/.prettiercache"],
"outputLogs": "new-only"
},
"lint": {
"dependsOn": ["^topo", "^build"],
"outputs": ["node_modules/.cache/.eslintcache"]
"outputs": [".cache/.eslintcache"]
},
"typecheck": {
"dependsOn": ["^topo", "^build"],
"outputs": ["node_modules/.cache/tsbuildinfo.json"]
"outputs": [".cache/tsbuildinfo.json"]
},
"clean": {
"cache": false
Expand Down

0 comments on commit 6f71a3f

Please sign in to comment.