From ad36da6f675ede32ec7a9f7020baab43db8692c2 Mon Sep 17 00:00:00 2001 From: Gabriel Bianchi Date: Tue, 2 Apr 2024 19:04:57 -0300 Subject: [PATCH 1/4] Fix format check --- packages/locales/src/generate.ts | 7 ++----- packages/locales/src/generated/de.ts | 3 ++- packages/locales/src/generated/en.ts | 3 ++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/locales/src/generate.ts b/packages/locales/src/generate.ts index 1f3260ae..d95499ef 100644 --- a/packages/locales/src/generate.ts +++ b/packages/locales/src/generate.ts @@ -12,11 +12,8 @@ const sources = { type SourcesType = keyof typeof sources function generateTranslationFile(source: SourcesType) { - const types = `export default ${JSON.stringify( - sources[source], - null, - 2, - )} as const` + const types = `// prettier-ignore + export default ${JSON.stringify(sources[source], null, 2)} as const` const generatedPath = path.resolve("src/generated") diff --git a/packages/locales/src/generated/de.ts b/packages/locales/src/generated/de.ts index 9d983492..faa27feb 100644 --- a/packages/locales/src/generated/de.ts +++ b/packages/locales/src/generated/de.ts @@ -1,4 +1,5 @@ -export default { +// prettier-ignore + export default { "auth": { "signout": "Abmelden", "headline": "Anmelden mit", diff --git a/packages/locales/src/generated/en.ts b/packages/locales/src/generated/en.ts index 25882123..5217776d 100644 --- a/packages/locales/src/generated/en.ts +++ b/packages/locales/src/generated/en.ts @@ -1,4 +1,5 @@ -export default { +// prettier-ignore + export default { "auth": { "signout": "Sign out", "headline": "Sign in with", From d14c28a69140c1b0675250a8f6320efa559488bd Mon Sep 17 00:00:00 2001 From: Gabriel Bianchi Date: Tue, 2 Apr 2024 19:11:15 -0300 Subject: [PATCH 2/4] Run format, and fix generate.ts with \n --- apps/nextjs/tsconfig.json | 8 ++++---- packages/api/tsconfig.json | 4 ++-- packages/auth/tsconfig.json | 4 ++-- packages/db/tsconfig.json | 4 ++-- packages/locales/src/generate.ts | 3 +-- packages/locales/src/generated/de.ts | 2 +- packages/locales/src/generated/en.ts | 2 +- packages/ui/tsconfig.json | 6 +++--- packages/validators/tsconfig.json | 4 ++-- tooling/eslint/tsconfig.json | 4 ++-- tooling/prettier/tsconfig.json | 4 ++-- tooling/tailwind/tsconfig.json | 4 ++-- 12 files changed, 24 insertions(+), 25 deletions(-) diff --git a/apps/nextjs/tsconfig.json b/apps/nextjs/tsconfig.json index c4008be7..377b55b2 100644 --- a/apps/nextjs/tsconfig.json +++ b/apps/nextjs/tsconfig.json @@ -3,17 +3,17 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "@/*": ["./src/*"] + "@/*": ["./src/*"], }, "plugins": [{ "name": "next" }], - "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" + "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json", }, "include": [ ".", ".next/types/**/*.ts", "../../packages/locales/client.ts", "../../packages/locales/provider.tsx", - "../../packages/locales/server.ts" + "../../packages/locales/server.ts", ], - "exclude": ["node_modules"] + "exclude": ["node_modules"], } diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json index ba556ecc..e6fd377e 100644 --- a/packages/api/tsconfig.json +++ b/packages/api/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "@acme/tsconfig/base.json", "compilerOptions": { - "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" + "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json", }, "include": ["src"], - "exclude": ["node_modules"] + "exclude": ["node_modules"], } diff --git a/packages/auth/tsconfig.json b/packages/auth/tsconfig.json index 1f8dd2f0..f682cb3b 100644 --- a/packages/auth/tsconfig.json +++ b/packages/auth/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "@acme/tsconfig/base.json", "compilerOptions": { - "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" + "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json", }, "include": ["src", "env.mjs"], - "exclude": ["node_modules"] + "exclude": ["node_modules"], } diff --git a/packages/db/tsconfig.json b/packages/db/tsconfig.json index 5b3b7820..d5a440a7 100644 --- a/packages/db/tsconfig.json +++ b/packages/db/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "@acme/tsconfig/base.json", "compilerOptions": { - "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" + "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json", }, "include": ["src", "drizzle.config.ts"], - "exclude": ["node_modules"] + "exclude": ["node_modules"], } diff --git a/packages/locales/src/generate.ts b/packages/locales/src/generate.ts index d95499ef..de488775 100644 --- a/packages/locales/src/generate.ts +++ b/packages/locales/src/generate.ts @@ -12,8 +12,7 @@ const sources = { type SourcesType = keyof typeof sources function generateTranslationFile(source: SourcesType) { - const types = `// prettier-ignore - export default ${JSON.stringify(sources[source], null, 2)} as const` + const types = `// prettier-ignore\nexport default ${JSON.stringify(sources[source], null, 2)} as const` const generatedPath = path.resolve("src/generated") diff --git a/packages/locales/src/generated/de.ts b/packages/locales/src/generated/de.ts index faa27feb..9f3c19b6 100644 --- a/packages/locales/src/generated/de.ts +++ b/packages/locales/src/generated/de.ts @@ -1,5 +1,5 @@ // prettier-ignore - export default { +export default { "auth": { "signout": "Abmelden", "headline": "Anmelden mit", diff --git a/packages/locales/src/generated/en.ts b/packages/locales/src/generated/en.ts index 5217776d..c25bc6d4 100644 --- a/packages/locales/src/generated/en.ts +++ b/packages/locales/src/generated/en.ts @@ -1,5 +1,5 @@ // prettier-ignore - export default { +export default { "auth": { "signout": "Sign out", "headline": "Sign in with", diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json index 27b5382f..a5a2032b 100644 --- a/packages/ui/tsconfig.json +++ b/packages/ui/tsconfig.json @@ -4,9 +4,9 @@ "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json", "baseUrl": ".", "paths": { - "@/*": ["./src/*"] - } + "@/*": ["./src/*"], + }, }, "include": ["*.ts", "src"], - "exclude": ["node_modules"] + "exclude": ["node_modules"], } diff --git a/packages/validators/tsconfig.json b/packages/validators/tsconfig.json index 7a26a270..ab8c374a 100644 --- a/packages/validators/tsconfig.json +++ b/packages/validators/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "@acme/tsconfig/base.json", "compilerOptions": { - "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" + "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json", }, "include": ["*.ts", "src"], - "exclude": ["node_modules"] + "exclude": ["node_modules"], } diff --git a/tooling/eslint/tsconfig.json b/tooling/eslint/tsconfig.json index f9a3fa3e..4639e38d 100644 --- a/tooling/eslint/tsconfig.json +++ b/tooling/eslint/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "@acme/tsconfig/base.json", "compilerOptions": { - "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" + "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json", }, "include": ["."], - "exclude": ["node_modules"] + "exclude": ["node_modules"], } diff --git a/tooling/prettier/tsconfig.json b/tooling/prettier/tsconfig.json index f9a3fa3e..4639e38d 100644 --- a/tooling/prettier/tsconfig.json +++ b/tooling/prettier/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "@acme/tsconfig/base.json", "compilerOptions": { - "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" + "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json", }, "include": ["."], - "exclude": ["node_modules"] + "exclude": ["node_modules"], } diff --git a/tooling/tailwind/tsconfig.json b/tooling/tailwind/tsconfig.json index f9a3fa3e..4639e38d 100644 --- a/tooling/tailwind/tsconfig.json +++ b/tooling/tailwind/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "@acme/tsconfig/base.json", "compilerOptions": { - "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" + "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json", }, "include": ["."], - "exclude": ["node_modules"] + "exclude": ["node_modules"], } From 4f6bbd55422b959367930c521d267735eb35eedb Mon Sep 17 00:00:00 2001 From: Gabriel Bianchi Date: Tue, 2 Apr 2024 19:16:16 -0300 Subject: [PATCH 3/4] Re-added format script to locale package --- packages/locales/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/locales/package.json b/packages/locales/package.json index c6ebed1e..59942f81 100644 --- a/packages/locales/package.json +++ b/packages/locales/package.json @@ -14,6 +14,7 @@ }, "scripts": { "clean": "rm -rf .turbo node_modules", + "format": "prettier --check . --ignore-path ../../.gitignore", "lint": "eslint .", "lint:fix": "pnpm lint --fix", "type-check": "tsc --noEmit", From 7430c7f2239f7c5c59de1c73d568540f8b3c099c Mon Sep 17 00:00:00 2001 From: Gabriel Bianchi Date: Tue, 2 Apr 2024 19:30:17 -0300 Subject: [PATCH 4/4] Better solution --- packages/locales/package.json | 2 +- packages/locales/src/generate.ts | 2 +- packages/locales/src/generated/de.ts | 1 - packages/locales/src/generated/en.ts | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/locales/package.json b/packages/locales/package.json index 59942f81..7d430854 100644 --- a/packages/locales/package.json +++ b/packages/locales/package.json @@ -14,7 +14,7 @@ }, "scripts": { "clean": "rm -rf .turbo node_modules", - "format": "prettier --check . --ignore-path ../../.gitignore", + "format": "prettier --check . '!src/generated/**' --ignore-path ../../.gitignore", "lint": "eslint .", "lint:fix": "pnpm lint --fix", "type-check": "tsc --noEmit", diff --git a/packages/locales/src/generate.ts b/packages/locales/src/generate.ts index de488775..890d6f99 100644 --- a/packages/locales/src/generate.ts +++ b/packages/locales/src/generate.ts @@ -12,7 +12,7 @@ const sources = { type SourcesType = keyof typeof sources function generateTranslationFile(source: SourcesType) { - const types = `// prettier-ignore\nexport default ${JSON.stringify(sources[source], null, 2)} as const` + const types = `export default ${JSON.stringify(sources[source], null, 2)} as const` const generatedPath = path.resolve("src/generated") diff --git a/packages/locales/src/generated/de.ts b/packages/locales/src/generated/de.ts index 9f3c19b6..9d983492 100644 --- a/packages/locales/src/generated/de.ts +++ b/packages/locales/src/generated/de.ts @@ -1,4 +1,3 @@ -// prettier-ignore export default { "auth": { "signout": "Abmelden", diff --git a/packages/locales/src/generated/en.ts b/packages/locales/src/generated/en.ts index c25bc6d4..25882123 100644 --- a/packages/locales/src/generated/en.ts +++ b/packages/locales/src/generated/en.ts @@ -1,4 +1,3 @@ -// prettier-ignore export default { "auth": { "signout": "Sign out",