Fix import extensions

This commit is contained in:
Remco Haszing
2023-03-11 15:27:16 +01:00
parent fd013286f6
commit fc80ba66d2
34 changed files with 40 additions and 35 deletions

View File

@@ -107,7 +107,7 @@ export const getBuildConfig = ({ minify, core, watch, entryName }: BuildOptions)
}, },
plugins: [ plugins: [
jisonPlugin(), jisonPlugin(),
// @ts-expect-error // @ts-expect-error According to the type definitions, rollup plugins are incompatible with vite
typescript({ compilerOptions: { declaration: false } }), typescript({ compilerOptions: { declaration: false } }),
...visualizerOptions(packageName, core), ...visualizerOptions(packageName, core),
], ],

View File

@@ -1,4 +1,4 @@
import { parser } from './parser/exampleDiagram.js'; import { parser } from './parser/exampleDiagram.jison';
import * as db from './exampleDiagramDb.js'; import * as db from './exampleDiagramDb.js';
import { injectUtils } from './mermaidUtils.js'; import { injectUtils } from './mermaidUtils.js';
// Todo fix utils functions for tests // Todo fix utils functions for tests

View File

@@ -1,4 +1,4 @@
import { parser } from './parser/classDiagram.js'; import { parser } from './parser/classDiagram.jison';
import classDb from './classDb.js'; import classDb from './classDb.js';
describe('class diagram, ', function () { describe('class diagram, ', function () {

View File

@@ -1,5 +1,5 @@
// @ts-expect-error Jison doesn't export types // @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 classDb from './classDb.js';
import { vi, describe, it, expect } from 'vitest'; import { vi, describe, it, expect } from 'vitest';
const spyOn = vi.spyOn; const spyOn = vi.spyOn;

View File

@@ -1,6 +1,6 @@
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
import erDb from '../erDb.js'; import erDb from '../erDb.js';
import erDiagram from './erDiagram.js'; // jison file import erDiagram from './erDiagram.jison'; // jison file
setConfig({ setConfig({
securityLevel: 'strict', securityLevel: 'strict',

View File

@@ -1,5 +1,5 @@
import flowDb from './flowDb.js'; import flowDb from './flowDb.js';
import { parser } from './parser/flow.js'; import { parser } from './parser/flow.jison';
import flowRenderer from './flowRenderer.js'; import flowRenderer from './flowRenderer.js';
import { addDiagrams } from '../../diagram-api/diagram-orchestration.js'; import { addDiagrams } from '../../diagram-api/diagram-orchestration.js';

View File

@@ -1,5 +1,5 @@
import flowDb from '../flowDb.js'; import flowDb from '../flowDb.js';
import flow from './flow.js'; import flow from './flow.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,5 +1,5 @@
import flowDb from '../flowDb.js'; import flowDb from '../flowDb.js';
import flow from './flow.js'; import flow from './flow.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,5 +1,5 @@
import flowDb from '../flowDb.js'; import flowDb from '../flowDb.js';
import flow from './flow.js'; import flow from './flow.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,5 +1,5 @@
import flowDb from '../flowDb.js'; import flowDb from '../flowDb.js';
import flow from './flow.js'; import flow from './flow.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,5 +1,5 @@
import flowDb from '../flowDb.js'; import flowDb from '../flowDb.js';
import flow from './flow.js'; import flow from './flow.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,5 +1,5 @@
import flowDb from '../flowDb.js'; import flowDb from '../flowDb.js';
import flow from './flow.js'; import flow from './flow.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
import { vi } from 'vitest'; import { vi } from 'vitest';
const spyOn = vi.spyOn; const spyOn = vi.spyOn;

View File

@@ -1,5 +1,5 @@
import flowDb from '../flowDb.js'; import flowDb from '../flowDb.js';
import flow from './flow.js'; import flow from './flow.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,5 +1,5 @@
import flowDb from '../flowDb.js'; import flowDb from '../flowDb.js';
import flow from './flow.js'; import flow from './flow.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,5 +1,5 @@
import flowDb from '../flowDb.js'; import flowDb from '../flowDb.js';
import flow from './flow.js'; import flow from './flow.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,5 +1,5 @@
import flowDb from '../flowDb.js'; import flowDb from '../flowDb.js';
import flow from './flow.js'; import flow from './flow.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,5 +1,5 @@
import flowDb from '../flowDb.js'; import flowDb from '../flowDb.js';
import flow from './flow.js'; import flow from './flow.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,5 +1,5 @@
import flowDb from '../flowDb.js'; import flowDb from '../flowDb.js';
import flow from './flow.js'; import flow from './flow.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,5 +1,5 @@
import flowDb from '../flowDb.js'; import flowDb from '../flowDb.js';
import flow from './flow.js'; import flow from './flow.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,4 +1,4 @@
import { parser } from './gantt.js'; import { parser } from './gantt.jison';
import ganttDb from '../ganttDb.js'; import ganttDb from '../ganttDb.js';
import { convert } from '../../../tests/util.js'; import { convert } from '../../../tests/util.js';
import { vi } from 'vitest'; import { vi } from 'vitest';

View File

@@ -1,7 +1,7 @@
/* eslint-env jasmine */ /* eslint-env jasmine */
// Todo reintroduce without cryptoRandomString // Todo reintroduce without cryptoRandomString
import gitGraphAst from './gitGraphAst.js'; import gitGraphAst from './gitGraphAst.js';
import { parser } from './parser/gitGraph.js'; import { parser } from './parser/gitGraph.jison';
//import randomString from 'crypto-random-string'; //import randomString from 'crypto-random-string';
//import cryptoRandomString from 'crypto-random-string'; //import cryptoRandomString from 'crypto-random-string';

View File

@@ -1,4 +1,4 @@
import { parser } from './parser/info.js'; import { parser } from './parser/info.jison';
import infoDb from './infoDb.js'; import infoDb from './infoDb.js';
describe('when parsing an info graph it', function () { describe('when parsing an info graph it', function () {
let ex; let ex;

View File

@@ -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'; import * as mindmapDB from './mindmapDb.js';
// Todo fix utils functions for tests // Todo fix utils functions for tests
import { setLogLevel } from '../../diagram-api/diagramAPI.js'; import { setLogLevel } from '../../diagram-api/diagramAPI.js';

View File

@@ -1,5 +1,5 @@
import pieDb from '../pieDb.js'; import pieDb from '../pieDb.js';
import pie from './pie.js'; import pie from './pie.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,6 +1,6 @@
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
import requirementDb from '../requirementDb.js'; import requirementDb from '../requirementDb.js';
import reqDiagram from './requirementDiagram.js'; import reqDiagram from './requirementDiagram.jison';
setConfig({ setConfig({
securityLevel: 'strict', securityLevel: 'strict',

View File

@@ -1,5 +1,5 @@
import stateDb from '../stateDb.js'; import stateDb from '../stateDb.js';
import stateDiagram from './stateDiagram.js'; import stateDiagram from './stateDiagram.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,5 +1,5 @@
import stateDb from '../stateDb.js'; import stateDb from '../stateDb.js';
import stateDiagram from './stateDiagram.js'; import stateDiagram from './stateDiagram.jison';
import { setConfig } from '../../../config.js'; import { setConfig } from '../../../config.js';
setConfig({ setConfig({

View File

@@ -1,4 +1,4 @@
import { parser } from './parser/stateDiagram.js'; import { parser } from './parser/stateDiagram.jison';
import stateDb from './stateDb.js'; import stateDb from './stateDb.js';
import stateDiagram from './parser/stateDiagram.jison'; import stateDiagram from './parser/stateDiagram.jison';

View File

@@ -1,4 +1,4 @@
import { parser } from './parser/stateDiagram.js'; import { parser } from './parser/stateDiagram.jison';
import stateDb from './stateDb.js'; import stateDb from './stateDb.js';
describe('state diagram, ', function () { describe('state diagram, ', function () {

View File

@@ -1,6 +1,6 @@
import { expectTypeOf } from 'vitest'; import { expectTypeOf } from 'vitest';
import { parser } from './parser/stateDiagram.js'; import { parser } from './parser/stateDiagram.jison';
import stateDb from './stateDb.js'; import stateDb from './stateDb.js';
import stateRendererV2 from './stateRenderer-v2.js'; import stateRendererV2 from './stateRenderer-v2.js';

View File

@@ -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 * as timelineDB from './timelineDb.js';
// import { injectUtils } from './mermaidUtils.js'; // import { injectUtils } from './mermaidUtils.js';
import * as _commonDb from '../../commonDb.js'; import * as _commonDb from '../../commonDb.js';

View File

@@ -1,4 +1,4 @@
import { parser } from './journey.js'; import { parser } from './journey.jison';
import journeyDb from '../journeyDb.js'; import journeyDb from '../journeyDb.js';
const parserFnConstructor = (str) => { const parserFnConstructor = (str) => {

View File

@@ -1,6 +1,6 @@
import mermaid from './mermaid.js'; import mermaid from './mermaid.js';
import { mermaidAPI } from './mermaidAPI.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 { addDiagrams } from './diagram-api/diagram-orchestration.js';
import { beforeAll, describe, it, expect, vi } from 'vitest'; import { beforeAll, describe, it, expect, vi } from 'vitest';

View File

@@ -1,11 +1,16 @@
import jison from './.vite/jisonPlugin.js'; import jison from './.vite/jisonPlugin.js';
import typescript from '@rollup/plugin-typescript';
import { defineConfig } from 'vitest/config'; import { defineConfig } from 'vitest/config';
export default defineConfig({ export default defineConfig({
resolve: { 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: { test: {
environment: 'jsdom', environment: 'jsdom',
globals: true, globals: true,