diff --git a/packages/codemirror/src/eslint.spec.ts b/packages/codemirror/src/eslint.spec.ts index 3b3d08b5f..0d73e81e2 100644 --- a/packages/codemirror/src/eslint.spec.ts +++ b/packages/codemirror/src/eslint.spec.ts @@ -1,7 +1,18 @@ -import { lint } from "./eslint.js"; +import { lint as _lint } from "./eslint.js"; import { trimIndentation } from "@triliumnext/commons"; import { describe, expect, it } from "vitest"; +async function lint(code: string, mimeType: string) { + const linterData = await _lint(mimeType); + console.log("Got linter data", linterData); + if (!("linter" in linterData)) { + return []; + } + const { linter, config } = linterData; + const result = linter.verify(code, config); + return result; +} + describe("Linter", () => { it("reports some basic errors", async () => { const result = await lint(trimIndentation` diff --git a/packages/codemirror/tsconfig.json b/packages/codemirror/tsconfig.json index 7eeca5de7..fe54eef82 100644 --- a/packages/codemirror/tsconfig.json +++ b/packages/codemirror/tsconfig.json @@ -8,6 +8,9 @@ }, { "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" } ] } diff --git a/packages/codemirror/tsconfig.lib.json b/packages/codemirror/tsconfig.lib.json index a65f6b306..f46b85d22 100644 --- a/packages/codemirror/tsconfig.lib.json +++ b/packages/codemirror/tsconfig.lib.json @@ -21,5 +21,19 @@ { "path": "../commons/tsconfig.lib.json" } + ], + "exclude": [ + "vite.config.ts", + "vite.config.mts", + "vitest.config.ts", + "vitest.config.mts", + "src/**/*.test.ts", + "src/**/*.spec.ts", + "src/**/*.test.tsx", + "src/**/*.spec.tsx", + "src/**/*.test.js", + "src/**/*.spec.js", + "src/**/*.test.jsx", + "src/**/*.spec.jsx" ] } diff --git a/packages/codemirror/tsconfig.spec.json b/packages/codemirror/tsconfig.spec.json new file mode 100644 index 000000000..fbd68ed60 --- /dev/null +++ b/packages/codemirror/tsconfig.spec.json @@ -0,0 +1,28 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "outDir": "./out-tsc/vitest", + "types": [ + "vitest/globals", + "vitest/importMeta", + "vite/client", + "node", + "vitest" + ] + }, + "include": [ + "vite.config.ts", + "vite.config.mts", + "vitest.config.ts", + "vitest.config.mts", + "src/**/*.test.ts", + "src/**/*.spec.ts", + "src/**/*.test.tsx", + "src/**/*.spec.tsx", + "src/**/*.test.js", + "src/**/*.spec.js", + "src/**/*.test.jsx", + "src/**/*.spec.jsx", + "src/**/*.d.ts" + ] +} diff --git a/packages/codemirror/vite.config.ts b/packages/codemirror/vite.config.ts index d68abd1b9..c2ba7e860 100644 --- a/packages/codemirror/vite.config.ts +++ b/packages/codemirror/vite.config.ts @@ -1,4 +1,4 @@ -/// + import { defineConfig } from 'vite'; import dts from 'vite-plugin-dts'; import * as path from 'path'; @@ -6,7 +6,7 @@ import * as path from 'path'; export default defineConfig(() => ({ root: __dirname, cacheDir: '../../node_modules/.vite/packages/codemirror', - plugins: [dts({ entryRoot: 'src', tsconfigPath: path.join(__dirname, 'tsconfig.lib.json') })], + plugins: [dts({ entryRoot: 'src', tsconfigPath: path.join(__dirname, 'tsconfig.lib.json') }), ], // Uncomment this if you are using workers. // worker: { // plugins: [ nxViteTsPaths() ],