diff --git a/.prettierignore b/.prettierignore index c357830ebe..17883dc0e5 100644 --- a/.prettierignore +++ b/.prettierignore @@ -9,4 +9,4 @@ **/node_modules **/temp **/docs/** -./tsconfig.json +tsconfig.json diff --git a/test/testHooks.js b/test/testHooks.js index 835dc61ea7..fc8c6ae4cd 100644 --- a/test/testHooks.js +++ b/test/testHooks.js @@ -2,7 +2,6 @@ import { existsSync, promises } from 'fs' import json5 from 'json5' import path from 'path' import { fileURLToPath } from 'url' -import { execSync } from 'child_process' const { readFile, writeFile, rm } = promises const filename = fileURLToPath(import.meta.url) @@ -40,8 +39,6 @@ export const createTestHooks = async (testSuiteName = '_community') => { tsConfig.compilerOptions.paths['@payload-config'] = ['./test/_community/config.ts'] await writeFile(tsConfigPath, JSON.stringify(tsConfig, null, 2) + '\n') - - execSync(`pnpm prettier --write ${tsConfigPath}`, { cwd: path.resolve(dirname, '../') }) }, } } diff --git a/tsconfig.json b/tsconfig.json index 7062457954..51ba1562d6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,7 +11,11 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "jsx": "preserve", - "lib": ["dom", "dom.iterable", "esnext"], + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], "noEmit": true, "outDir": "./dist", "resolveJsonModule": true, @@ -19,7 +23,11 @@ "skipLibCheck": true, "sourceMap": true, "strict": false, - "types": ["jest", "node", "@types/jest"], + "types": [ + "jest", + "node", + "@types/jest" + ], "incremental": true, "isolatedModules": true, "plugins": [ @@ -28,26 +36,65 @@ } ], "paths": { - "@payload-config": ["./test/_community/config.ts"], - "@payloadcms/live-preview": ["./packages/live-preview/src"], - "@payloadcms/live-preview-react": ["./packages/live-preview-react/src/index.ts"], - "@payloadcms/ui/assets": ["./packages/ui/src/assets/index.ts"], - "@payloadcms/ui/elements/*": ["./packages/ui/src/elements/*/index.tsx"], - "@payloadcms/ui/fields/*": ["./packages/ui/src/fields/*/index.tsx"], - "@payloadcms/ui/forms/*": ["./packages/ui/src/forms/*/index.tsx"], - "@payloadcms/ui/graphics/*": ["./packages/ui/src/graphics/*/index.tsx"], - "@payloadcms/ui/hooks/*": ["./packages/ui/src/hooks/*.ts"], - "@payloadcms/ui/icons/*": ["./packages/ui/src/icons/*/index.tsx"], - "@payloadcms/ui/providers/*": ["./packages/ui/src/providers/*/index.tsx"], - "@payloadcms/ui/templates/*": ["./packages/ui/src/templates/*/index.tsx"], - "@payloadcms/ui/utilities/*": ["./packages/ui/src/utilities/*.ts"], - "@payloadcms/ui/scss": ["./packages/ui/src/scss.scss"], - "@payloadcms/ui/scss/app.scss": ["./packages/ui/src/scss/app.scss"], - "@payloadcms/next/*": ["./packages/next/src/*"], - "@payloadcms/next": ["./packages/next/src/exports/*"] + "@payload-config": [ + "./test/_community/config.ts" + ], + "@payloadcms/live-preview": [ + "./packages/live-preview/src" + ], + "@payloadcms/live-preview-react": [ + "./packages/live-preview-react/src/index.ts" + ], + "@payloadcms/ui/assets": [ + "./packages/ui/src/assets/index.ts" + ], + "@payloadcms/ui/elements/*": [ + "./packages/ui/src/elements/*/index.tsx" + ], + "@payloadcms/ui/fields/*": [ + "./packages/ui/src/fields/*/index.tsx" + ], + "@payloadcms/ui/forms/*": [ + "./packages/ui/src/forms/*/index.tsx" + ], + "@payloadcms/ui/graphics/*": [ + "./packages/ui/src/graphics/*/index.tsx" + ], + "@payloadcms/ui/hooks/*": [ + "./packages/ui/src/hooks/*.ts" + ], + "@payloadcms/ui/icons/*": [ + "./packages/ui/src/icons/*/index.tsx" + ], + "@payloadcms/ui/providers/*": [ + "./packages/ui/src/providers/*/index.tsx" + ], + "@payloadcms/ui/templates/*": [ + "./packages/ui/src/templates/*/index.tsx" + ], + "@payloadcms/ui/utilities/*": [ + "./packages/ui/src/utilities/*.ts" + ], + "@payloadcms/ui/scss": [ + "./packages/ui/src/scss.scss" + ], + "@payloadcms/ui/scss/app.scss": [ + "./packages/ui/src/scss/app.scss" + ], + "@payloadcms/next/*": [ + "./packages/next/src/*" + ], + "@payloadcms/next": [ + "./packages/next/src/exports/*" + ] } }, - "exclude": ["dist", "build", "temp", "node_modules"], + "exclude": [ + "dist", + "build", + "temp", + "node_modules" + ], "composite": true, "references": [ { @@ -108,5 +155,9 @@ "path": "./packages/ui" } ], - "include": ["next-env.d.ts", ".next/types/**/*.ts", "scripts/**/*.ts"] + "include": [ + "next-env.d.ts", + ".next/types/**/*.ts", + "scripts/**/*.ts" + ] }