diff --git a/.build/jisonTransformer.ts b/.build/jisonTransformer.ts index 314df8a33..b60350230 100644 --- a/.build/jisonTransformer.ts +++ b/.build/jisonTransformer.ts @@ -1,6 +1,7 @@ import jison from 'jison'; export const transformJison = (src: string): string => { + // @ts-ignore - Jison is not typed properly const parser = new jison.Generator(src, { moduleType: 'js', 'token-stack': true, diff --git a/.esbuild/build.ts b/.esbuild/build.ts index 3c87f9d62..471fb5c66 100644 --- a/.esbuild/build.ts +++ b/.esbuild/build.ts @@ -7,8 +7,8 @@ import { MermaidBuildOptions, defaultOptions, getBuildConfig } from './util.js'; const shouldVisualize = process.argv.includes('--visualize'); const buildPackage = async (entryName: keyof typeof packageOptions) => { - const commonOptions = { ...defaultOptions, entryName } as const; - const buildConfigs = [ + const commonOptions: MermaidBuildOptions = { ...defaultOptions, entryName } as const; + const buildConfigs: MermaidBuildOptions[] = [ // package.mjs { ...commonOptions }, // package.min.mjs diff --git a/.esbuild/util.ts b/.esbuild/util.ts index 5c21cbf45..7e0fd27ea 100644 --- a/.esbuild/util.ts +++ b/.esbuild/util.ts @@ -8,7 +8,7 @@ import { jisonPlugin } from './jisonPlugin.js'; const __dirname = fileURLToPath(new URL('.', import.meta.url)); -export interface MermaidBuildOptions { +export interface MermaidBuildOptions extends BuildOptions { minify: boolean; core: boolean; metafile: boolean; diff --git a/packages/mermaid/tsconfig.json b/packages/mermaid/tsconfig.json index 0111d1647..bb3a8106b 100644 --- a/packages/mermaid/tsconfig.json +++ b/packages/mermaid/tsconfig.json @@ -8,7 +8,6 @@ "paths": { "$root/*": ["src/*"] } - }, - "include": ["./src/**/*.ts", "./package.json"], + "include": ["./src/**/*.ts", "./package.json"] } diff --git a/vite.config.ts b/vite.config.ts index 935e4e44b..dc59a6aba 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -15,7 +15,6 @@ export default defineConfig({ plugins: [ jison(), jsonSchemaPlugin(), // handles .schema.yaml JSON Schema files - // @ts-expect-error According to the type definitions, rollup plugins are incompatible with vite typescript({ compilerOptions: { declaration: false } }), ], test: {