diff --git a/.vite/build.ts b/.vite/build.ts
index b3f1f64a4..183158288 100644
--- a/.vite/build.ts
+++ b/.vite/build.ts
@@ -107,7 +107,7 @@ export const getBuildConfig = ({ minify, core, watch, entryName }: BuildOptions)
     },
     plugins: [
       jisonPlugin(),
-      // @ts-expect-error
+      // @ts-expect-error According to the type definitions, rollup plugins are incompatible with vite
       typescript({ compilerOptions: { declaration: false } }),
       ...visualizerOptions(packageName, core),
     ],
diff --git a/packages/mermaid-example-diagram/src/exampleDiagram.spec.js b/packages/mermaid-example-diagram/src/exampleDiagram.spec.js
index 6ea655404..9cfe33a1b 100644
--- a/packages/mermaid-example-diagram/src/exampleDiagram.spec.js
+++ b/packages/mermaid-example-diagram/src/exampleDiagram.spec.js
@@ -1,4 +1,4 @@
-import { parser } from './parser/exampleDiagram.js';
+import { parser } from './parser/exampleDiagram.jison';
 import * as db from './exampleDiagramDb.js';
 import { injectUtils } from './mermaidUtils.js';
 // Todo fix utils functions for tests
diff --git a/packages/mermaid/src/diagrams/class/classDiagram-styles.spec.js b/packages/mermaid/src/diagrams/class/classDiagram-styles.spec.js
index 3b3da12ed..a693fbbea 100644
--- a/packages/mermaid/src/diagrams/class/classDiagram-styles.spec.js
+++ b/packages/mermaid/src/diagrams/class/classDiagram-styles.spec.js
@@ -1,4 +1,4 @@
-import { parser } from './parser/classDiagram.js';
+import { parser } from './parser/classDiagram.jison';
 import classDb from './classDb.js';
 
 describe('class diagram, ', function () {
diff --git a/packages/mermaid/src/diagrams/class/classDiagram.spec.ts b/packages/mermaid/src/diagrams/class/classDiagram.spec.ts
index 30faf7cd6..6dbf9c081 100644
--- a/packages/mermaid/src/diagrams/class/classDiagram.spec.ts
+++ b/packages/mermaid/src/diagrams/class/classDiagram.spec.ts
@@ -1,5 +1,5 @@
 // @ts-expect-error Jison doesn't export types
-import { parser } from './parser/classDiagram.js';
+import { parser } from './parser/classDiagram.jison';
 import classDb from './classDb.js';
 import { vi, describe, it, expect } from 'vitest';
 const spyOn = vi.spyOn;
diff --git a/packages/mermaid/src/diagrams/er/parser/erDiagram.spec.js b/packages/mermaid/src/diagrams/er/parser/erDiagram.spec.js
index 53273b885..904521d50 100644
--- a/packages/mermaid/src/diagrams/er/parser/erDiagram.spec.js
+++ b/packages/mermaid/src/diagrams/er/parser/erDiagram.spec.js
@@ -1,6 +1,6 @@
 import { setConfig } from '../../../config.js';
 import erDb from '../erDb.js';
-import erDiagram from './erDiagram.js'; // jison file
+import erDiagram from './erDiagram.jison'; // jison file
 
 setConfig({
   securityLevel: 'strict',
diff --git a/packages/mermaid/src/diagrams/flowchart/flowRenderer.addEdges.spec.js b/packages/mermaid/src/diagrams/flowchart/flowRenderer.addEdges.spec.js
index cbe661950..4b7fe272d 100644
--- a/packages/mermaid/src/diagrams/flowchart/flowRenderer.addEdges.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/flowRenderer.addEdges.spec.js
@@ -1,5 +1,5 @@
 import flowDb from './flowDb.js';
-import { parser } from './parser/flow.js';
+import { parser } from './parser/flow.jison';
 import flowRenderer from './flowRenderer.js';
 import { addDiagrams } from '../../diagram-api/diagram-orchestration.js';
 
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow-arrows.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/flow-arrows.spec.js
index 9754f8909..699aa333d 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow-arrows.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow-arrows.spec.js
@@ -1,5 +1,5 @@
 import flowDb from '../flowDb.js';
-import flow from './flow.js';
+import flow from './flow.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow-comments.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/flow-comments.spec.js
index 05ed738cc..912839a59 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow-comments.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow-comments.spec.js
@@ -1,5 +1,5 @@
 import flowDb from '../flowDb.js';
-import flow from './flow.js';
+import flow from './flow.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow-direction.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/flow-direction.spec.js
index 0fbc013ff..ce6b0b0c4 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow-direction.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow-direction.spec.js
@@ -1,5 +1,5 @@
 import flowDb from '../flowDb.js';
-import flow from './flow.js';
+import flow from './flow.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow-edges.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/flow-edges.spec.js
index 5af5f144a..dcac21ee7 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow-edges.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow-edges.spec.js
@@ -1,5 +1,5 @@
 import flowDb from '../flowDb.js';
-import flow from './flow.js';
+import flow from './flow.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow-huge.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/flow-huge.spec.js
index 49a733182..48fc2be16 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow-huge.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow-huge.spec.js
@@ -1,5 +1,5 @@
 import flowDb from '../flowDb.js';
-import flow from './flow.js';
+import flow from './flow.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow-interactions.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/flow-interactions.spec.js
index 7fd2e6b19..cb3f48cca 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow-interactions.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow-interactions.spec.js
@@ -1,5 +1,5 @@
 import flowDb from '../flowDb.js';
-import flow from './flow.js';
+import flow from './flow.jison';
 import { setConfig } from '../../../config.js';
 import { vi } from 'vitest';
 const spyOn = vi.spyOn;
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow-lines.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/flow-lines.spec.js
index 13aecc7c6..ec157e646 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow-lines.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow-lines.spec.js
@@ -1,5 +1,5 @@
 import flowDb from '../flowDb.js';
-import flow from './flow.js';
+import flow from './flow.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow-singlenode.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/flow-singlenode.spec.js
index 04b1ff01c..b959f019e 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow-singlenode.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow-singlenode.spec.js
@@ -1,5 +1,5 @@
 import flowDb from '../flowDb.js';
-import flow from './flow.js';
+import flow from './flow.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow-style.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/flow-style.spec.js
index e4f49b526..512a0b833 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow-style.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow-style.spec.js
@@ -1,5 +1,5 @@
 import flowDb from '../flowDb.js';
-import flow from './flow.js';
+import flow from './flow.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow-text.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/flow-text.spec.js
index 76a119fc1..db43e75bf 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow-text.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow-text.spec.js
@@ -1,5 +1,5 @@
 import flowDb from '../flowDb.js';
-import flow from './flow.js';
+import flow from './flow.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow-vertice-chaining.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/flow-vertice-chaining.spec.js
index 7c6441d7b..3f1078030 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow-vertice-chaining.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow-vertice-chaining.spec.js
@@ -1,5 +1,5 @@
 import flowDb from '../flowDb.js';
-import flow from './flow.js';
+import flow from './flow.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/flow.spec.js
index 526c9edfe..ef369504f 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/flow.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/flow.spec.js
@@ -1,5 +1,5 @@
 import flowDb from '../flowDb.js';
-import flow from './flow.js';
+import flow from './flow.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/flowchart/parser/subgraph.spec.js b/packages/mermaid/src/diagrams/flowchart/parser/subgraph.spec.js
index 3dc0785ca..12b2e4a39 100644
--- a/packages/mermaid/src/diagrams/flowchart/parser/subgraph.spec.js
+++ b/packages/mermaid/src/diagrams/flowchart/parser/subgraph.spec.js
@@ -1,5 +1,5 @@
 import flowDb from '../flowDb.js';
-import flow from './flow.js';
+import flow from './flow.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/gantt/parser/gantt.spec.js b/packages/mermaid/src/diagrams/gantt/parser/gantt.spec.js
index cb05bdbaf..020bab0ed 100644
--- a/packages/mermaid/src/diagrams/gantt/parser/gantt.spec.js
+++ b/packages/mermaid/src/diagrams/gantt/parser/gantt.spec.js
@@ -1,4 +1,4 @@
-import { parser } from './gantt.js';
+import { parser } from './gantt.jison';
 import ganttDb from '../ganttDb.js';
 import { convert } from '../../../tests/util.js';
 import { vi } from 'vitest';
diff --git a/packages/mermaid/src/diagrams/git/gitGraphParserV2.spec.js b/packages/mermaid/src/diagrams/git/gitGraphParserV2.spec.js
index 3ff8487af..764fbb214 100644
--- a/packages/mermaid/src/diagrams/git/gitGraphParserV2.spec.js
+++ b/packages/mermaid/src/diagrams/git/gitGraphParserV2.spec.js
@@ -1,7 +1,7 @@
 /* eslint-env jasmine */
 // Todo reintroduce without cryptoRandomString
 import gitGraphAst from './gitGraphAst.js';
-import { parser } from './parser/gitGraph.js';
+import { parser } from './parser/gitGraph.jison';
 //import randomString from 'crypto-random-string';
 //import cryptoRandomString from 'crypto-random-string';
 
diff --git a/packages/mermaid/src/diagrams/info/info.spec.js b/packages/mermaid/src/diagrams/info/info.spec.js
index 352392bea..6f1a59d1c 100644
--- a/packages/mermaid/src/diagrams/info/info.spec.js
+++ b/packages/mermaid/src/diagrams/info/info.spec.js
@@ -1,4 +1,4 @@
-import { parser } from './parser/info.js';
+import { parser } from './parser/info.jison';
 import infoDb from './infoDb.js';
 describe('when parsing an info graph it', function () {
   let ex;
diff --git a/packages/mermaid/src/diagrams/mindmap/mindmap.spec.js b/packages/mermaid/src/diagrams/mindmap/mindmap.spec.js
index e4777250f..845205f9b 100644
--- a/packages/mermaid/src/diagrams/mindmap/mindmap.spec.js
+++ b/packages/mermaid/src/diagrams/mindmap/mindmap.spec.js
@@ -1,4 +1,4 @@
-import { parser as mindmap } from './parser/mindmap.js';
+import { parser as mindmap } from './parser/mindmap.jison';
 import * as mindmapDB from './mindmapDb.js';
 // Todo fix utils functions for tests
 import { setLogLevel } from '../../diagram-api/diagramAPI.js';
diff --git a/packages/mermaid/src/diagrams/pie/parser/pie.spec.js b/packages/mermaid/src/diagrams/pie/parser/pie.spec.js
index a365268dd..5e5c0b4f5 100644
--- a/packages/mermaid/src/diagrams/pie/parser/pie.spec.js
+++ b/packages/mermaid/src/diagrams/pie/parser/pie.spec.js
@@ -1,5 +1,5 @@
 import pieDb from '../pieDb.js';
-import pie from './pie.js';
+import pie from './pie.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/requirement/parser/requirementDiagram.spec.js b/packages/mermaid/src/diagrams/requirement/parser/requirementDiagram.spec.js
index 823b476ac..1b4c5da31 100644
--- a/packages/mermaid/src/diagrams/requirement/parser/requirementDiagram.spec.js
+++ b/packages/mermaid/src/diagrams/requirement/parser/requirementDiagram.spec.js
@@ -1,6 +1,6 @@
 import { setConfig } from '../../../config.js';
 import requirementDb from '../requirementDb.js';
-import reqDiagram from './requirementDiagram.js';
+import reqDiagram from './requirementDiagram.jison';
 
 setConfig({
   securityLevel: 'strict',
diff --git a/packages/mermaid/src/diagrams/state/parser/state-parser.spec.js b/packages/mermaid/src/diagrams/state/parser/state-parser.spec.js
index 0d334da8e..e56931ade 100644
--- a/packages/mermaid/src/diagrams/state/parser/state-parser.spec.js
+++ b/packages/mermaid/src/diagrams/state/parser/state-parser.spec.js
@@ -1,5 +1,5 @@
 import stateDb from '../stateDb.js';
-import stateDiagram from './stateDiagram.js';
+import stateDiagram from './stateDiagram.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/state/parser/state-style.spec.js b/packages/mermaid/src/diagrams/state/parser/state-style.spec.js
index fec5f9900..9ce41df50 100644
--- a/packages/mermaid/src/diagrams/state/parser/state-style.spec.js
+++ b/packages/mermaid/src/diagrams/state/parser/state-style.spec.js
@@ -1,5 +1,5 @@
 import stateDb from '../stateDb.js';
-import stateDiagram from './stateDiagram.js';
+import stateDiagram from './stateDiagram.jison';
 import { setConfig } from '../../../config.js';
 
 setConfig({
diff --git a/packages/mermaid/src/diagrams/state/stateDiagram-v2.spec.js b/packages/mermaid/src/diagrams/state/stateDiagram-v2.spec.js
index fdc36ce3e..e64ecfdf8 100644
--- a/packages/mermaid/src/diagrams/state/stateDiagram-v2.spec.js
+++ b/packages/mermaid/src/diagrams/state/stateDiagram-v2.spec.js
@@ -1,4 +1,4 @@
-import { parser } from './parser/stateDiagram.js';
+import { parser } from './parser/stateDiagram.jison';
 import stateDb from './stateDb.js';
 import stateDiagram from './parser/stateDiagram.jison';
 
diff --git a/packages/mermaid/src/diagrams/state/stateDiagram.spec.js b/packages/mermaid/src/diagrams/state/stateDiagram.spec.js
index b8c44ae2e..e6e470140 100644
--- a/packages/mermaid/src/diagrams/state/stateDiagram.spec.js
+++ b/packages/mermaid/src/diagrams/state/stateDiagram.spec.js
@@ -1,4 +1,4 @@
-import { parser } from './parser/stateDiagram.js';
+import { parser } from './parser/stateDiagram.jison';
 import stateDb from './stateDb.js';
 
 describe('state diagram, ', function () {
diff --git a/packages/mermaid/src/diagrams/state/stateRenderer-v2.spec.js b/packages/mermaid/src/diagrams/state/stateRenderer-v2.spec.js
index 2333fc48f..a190fe05b 100644
--- a/packages/mermaid/src/diagrams/state/stateRenderer-v2.spec.js
+++ b/packages/mermaid/src/diagrams/state/stateRenderer-v2.spec.js
@@ -1,6 +1,6 @@
 import { expectTypeOf } from 'vitest';
 
-import { parser } from './parser/stateDiagram.js';
+import { parser } from './parser/stateDiagram.jison';
 import stateDb from './stateDb.js';
 import stateRendererV2 from './stateRenderer-v2.js';
 
diff --git a/packages/mermaid/src/diagrams/timeline/timeline.spec.js b/packages/mermaid/src/diagrams/timeline/timeline.spec.js
index 609bb7a47..1f6a96024 100644
--- a/packages/mermaid/src/diagrams/timeline/timeline.spec.js
+++ b/packages/mermaid/src/diagrams/timeline/timeline.spec.js
@@ -1,4 +1,4 @@
-import { parser as timeline } from './parser/timeline.js';
+import { parser as timeline } from './parser/timeline.jison';
 import * as timelineDB from './timelineDb.js';
 // import { injectUtils } from './mermaidUtils.js';
 import * as _commonDb from '../../commonDb.js';
diff --git a/packages/mermaid/src/diagrams/user-journey/parser/journey.spec.js b/packages/mermaid/src/diagrams/user-journey/parser/journey.spec.js
index 9a66572b2..8ed342bb5 100644
--- a/packages/mermaid/src/diagrams/user-journey/parser/journey.spec.js
+++ b/packages/mermaid/src/diagrams/user-journey/parser/journey.spec.js
@@ -1,4 +1,4 @@
-import { parser } from './journey.js';
+import { parser } from './journey.jison';
 import journeyDb from '../journeyDb.js';
 
 const parserFnConstructor = (str) => {
diff --git a/packages/mermaid/src/mermaid.spec.ts b/packages/mermaid/src/mermaid.spec.ts
index 8bd380e62..b6acd17cb 100644
--- a/packages/mermaid/src/mermaid.spec.ts
+++ b/packages/mermaid/src/mermaid.spec.ts
@@ -1,6 +1,6 @@
 import mermaid from './mermaid.js';
 import { mermaidAPI } from './mermaidAPI.js';
-import './diagram-api/diagram-orchestration';
+import './diagram-api/diagram-orchestration.js';
 import { addDiagrams } from './diagram-api/diagram-orchestration.js';
 import { beforeAll, describe, it, expect, vi } from 'vitest';
 
diff --git a/vite.config.ts b/vite.config.ts
index ec6cf3fd3..dfd0431bb 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,11 +1,16 @@
 import jison from './.vite/jisonPlugin.js';
+import typescript from '@rollup/plugin-typescript';
 import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   resolve: {
-    extensions: [],
+    extensions: ['.js'],
   },
-  plugins: [jison()],
+  plugins: [
+    jison(),
+    // @ts-expect-error According to the type definitions, rollup plugins are incompatible with vite
+    typescript({ compilerOptions: { declaration: false } }),
+  ],
   test: {
     environment: 'jsdom',
     globals: true,