diff --git a/packages/language-service/tsconfig.json b/packages/language-service/tsconfig.json index 97fc79b..a99a88d 100644 --- a/packages/language-service/tsconfig.json +++ b/packages/language-service/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "tempblot-config/tsconfig.json", "include": ["src"], - "references": [{ "path": "../parser/tsconfig.json" }], + "references": [{ "path": "../parser/tsconfig.build.json" }], "compilerOptions": { "declaration": true, diff --git a/packages/parser/eslint.config.mjs b/packages/parser/eslint.config.mjs index b3931d8..7eb16fa 100644 --- a/packages/parser/eslint.config.mjs +++ b/packages/parser/eslint.config.mjs @@ -6,9 +6,7 @@ export default [ files: ['**/*.ts', '**/*.tsx', '**/*.mts', '**/*.cts'], languageOptions: { parserOptions: { - projectService: { - allowDefaultProject: ['tests/*.ts', 'vite.config.ts'], - }, + projectService: true, tsconfigRootDir: import.meta.dirname, }, }, diff --git a/packages/parser/package.json b/packages/parser/package.json index ed6e903..1e5e56c 100644 --- a/packages/parser/package.json +++ b/packages/parser/package.json @@ -14,10 +14,10 @@ "lib" ], "scripts": { - "build": "tsc --build", - "prepack": "tsc --build --clean && tsc --build", + "build": "tsc --build tsconfig.build.json", + "prepack": "tsc --build tsconfig.build.json --clean && tsc --build tsconfig.build.json", "test:lib": "vitest", - "test:types": "tsc --noEmit", + "test:types": "tsc --noEmit --project tsconfig.spec.json", "test:eslint": "eslint ." }, "devDependencies": { diff --git a/packages/parser/tsconfig.build.json b/packages/parser/tsconfig.build.json new file mode 100644 index 0000000..1223db8 --- /dev/null +++ b/packages/parser/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "tempblot-config/tsconfig.json", + "include": ["src"], + "compilerOptions": { + "declaration": true, + "outDir": "lib", + "rootDir": "src" + } +} diff --git a/packages/parser/tsconfig.json b/packages/parser/tsconfig.json index 1223db8..dcb77f1 100644 --- a/packages/parser/tsconfig.json +++ b/packages/parser/tsconfig.json @@ -1,9 +1,7 @@ { - "extends": "tempblot-config/tsconfig.json", - "include": ["src"], - "compilerOptions": { - "declaration": true, - "outDir": "lib", - "rootDir": "src" - } + "files": [], + "references": [ + { "path": "./tsconfig.build.json" }, + { "path": "./tsconfig.spec.json" } + ] } diff --git a/packages/parser/tsconfig.spec.json b/packages/parser/tsconfig.spec.json new file mode 100644 index 0000000..10c6412 --- /dev/null +++ b/packages/parser/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "tempblot-config/tsconfig.json", + "include": ["src", "tests", "vite.config.ts"], + "compilerOptions": { + "noEmit": true, + "resolveJsonModule": true + } +} diff --git a/packages/parser/vite.config.ts b/packages/parser/vite.config.ts index e3b748f..67c8c62 100644 --- a/packages/parser/vite.config.ts +++ b/packages/parser/vite.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'vitest/config' -import packageJson from './package.json' +import packageJson from './package.json' with { type: 'json' } export default defineConfig(({ mode }) => ({ test: { diff --git a/packages/prettier-plugin/eslint.config.mjs b/packages/prettier-plugin/eslint.config.mjs index b3931d8..7eb16fa 100644 --- a/packages/prettier-plugin/eslint.config.mjs +++ b/packages/prettier-plugin/eslint.config.mjs @@ -6,9 +6,7 @@ export default [ files: ['**/*.ts', '**/*.tsx', '**/*.mts', '**/*.cts'], languageOptions: { parserOptions: { - projectService: { - allowDefaultProject: ['tests/*.ts', 'vite.config.ts'], - }, + projectService: true, tsconfigRootDir: import.meta.dirname, }, }, diff --git a/packages/prettier-plugin/package.json b/packages/prettier-plugin/package.json index bb510e5..7709185 100644 --- a/packages/prettier-plugin/package.json +++ b/packages/prettier-plugin/package.json @@ -14,8 +14,8 @@ "lib" ], "scripts": { - "build": "tsc --build", - "prepack": "tsc --build --clean && tsc --build", + "build": "tsc --build tsconfig.build.json", + "prepack": "tsc --build tsconfig.build.json --clean && tsc --build tsconfig.build.json", "test:lib": "vitest", "test:eslint": "eslint ." }, diff --git a/packages/prettier-plugin/tsconfig.build.json b/packages/prettier-plugin/tsconfig.build.json new file mode 100644 index 0000000..0afa833 --- /dev/null +++ b/packages/prettier-plugin/tsconfig.build.json @@ -0,0 +1,10 @@ +{ + "extends": "tempblot-config/tsconfig.json", + "include": ["src"], + "references": [{ "path": "../parser/tsconfig.build.json" }], + "compilerOptions": { + "declaration": true, + "outDir": "lib", + "rootDir": "src" + } +} diff --git a/packages/prettier-plugin/tsconfig.json b/packages/prettier-plugin/tsconfig.json index 8d69d41..dcb77f1 100644 --- a/packages/prettier-plugin/tsconfig.json +++ b/packages/prettier-plugin/tsconfig.json @@ -1,10 +1,7 @@ { - "extends": "tempblot-config/tsconfig.json", - "include": ["src"], - "compilerOptions": { - "declaration": true, - "outDir": "lib", - "rootDir": "src" - }, - "references": [{ "path": "../parser" }] + "files": [], + "references": [ + { "path": "./tsconfig.build.json" }, + { "path": "./tsconfig.spec.json" } + ] } diff --git a/packages/prettier-plugin/tsconfig.spec.json b/packages/prettier-plugin/tsconfig.spec.json new file mode 100644 index 0000000..10c6412 --- /dev/null +++ b/packages/prettier-plugin/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "tempblot-config/tsconfig.json", + "include": ["src", "tests", "vite.config.ts"], + "compilerOptions": { + "noEmit": true, + "resolveJsonModule": true + } +} diff --git a/packages/prettier-plugin/vite.config.ts b/packages/prettier-plugin/vite.config.ts index e3b748f..67c8c62 100644 --- a/packages/prettier-plugin/vite.config.ts +++ b/packages/prettier-plugin/vite.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'vitest/config' -import packageJson from './package.json' +import packageJson from './package.json' with { type: 'json' } export default defineConfig(({ mode }) => ({ test: {