Fix external diagram test

2025-09-26 10:49:38 +02:00 · 2023-02-19 21:59:49 +05:30
parent 284ef24deb
commit 192aac388e
4 changed files with 10 additions and 92 deletions
--- a/.esbuild/server.ts
+++ b/.esbuild/server.ts
@@ -1,21 +1,23 @@
 import express from 'express';
 import cors from 'cors';
-import proxy from 'express-http-proxy';
 import { getBuildConfig } from './util.js';
 import { context } from 'esbuild';

 async function createServer() {
  const app = express();
-  const config = getBuildConfig({ minify: false, core: false, entryName: 'mermaid' });
-  const ctx = await context(config);
-  ctx.watch();
-  let { host, port } = await ctx.serve({ servedir: './dist' });
+  const mermaidCtx = await context(
+    getBuildConfig({ minify: false, core: false, entryName: 'mermaid' })
+  );
+  mermaidCtx.watch();
+  const externalCtx = await context(
+    getBuildConfig({ minify: false, core: false, entryName: 'mermaid-example-diagram' })
+  );
+  externalCtx.watch();
  app.use(cors());
  app.use(express.static('./packages/mermaid/dist'));
  app.use(express.static('./packages/mermaid-example-diagram/dist'));
  app.use(express.static('demos'));
  app.use(express.static('cypress/platform'));
-  app.use('/', proxy(`http://${host}:${port}`));

  app.listen(9000, () => {
    console.log(`Listening on http://localhost:9000`);
--- a/cypress/platform/external-diagrams-example-diagram.html
+++ b/cypress/platform/external-diagrams-example-diagram.html
@@ -11,8 +11,7 @@ example-diagram
    <!-- <script src="//cdn.jsdelivr.net/npm/mermaid@9.1.7/dist/mermaid.min.js"></script> -->
    <!-- <script type="module" src="./external-diagrams-mindmap.mjs" /> -->
    <script type="module">
-      import exampleDiagram from '../../packages/mermaid-example-diagram/src/detector';
-      // import example from '../../packages/mermaid-example-diagram/src/detector';
+      import exampleDiagram from './mermaid-example-diagram.esm.mjs';
      import mermaid from './mermaid.esm.mjs';

      await mermaid.registerExternalDiagrams([exampleDiagram]);
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
    "build:types": "tsc -p ./packages/mermaid/tsconfig.json --emitDeclarationOnly && tsc -p ./packages/mermaid-example-diagram/tsconfig.json --emitDeclarationOnly",
    "build:watch": "pnpm build:esbuild --watch",
    "build": "pnpm run -r clean && pnpm build:types && pnpm build:esbuild",
-    "dev": "concurrently \"pnpm build:esbuild --watch\" \"ts-node-esm --transpileOnly .esbuild/server.ts\"",
+    "dev": "ts-node-esm --transpileOnly .esbuild/server.ts",
    "release": "pnpm build",
    "lint": "eslint --cache --cache-strategy content --ignore-path .gitignore . && pnpm lint:jison && prettier --cache --check .",
    "lint:fix": "eslint --cache --cache-strategy content --fix --ignore-path .gitignore . && prettier --write . && ts-node-esm scripts/fixCSpell.ts",
@@ -61,14 +61,12 @@
    "@types/cors": "^2.8.13",
    "@types/eslint": "^8.4.10",
    "@types/express": "^4.17.17",
-    "@types/express-http-proxy": "^1.6.3",
    "@types/js-yaml": "^4.0.5",
    "@types/jsdom": "^21.0.0",
    "@types/lodash": "^4.14.188",
    "@types/mdast": "^3.0.10",
    "@types/node": "^18.11.9",
    "@types/prettier": "^2.7.1",
-    "@types/rollup-plugin-visualizer": "^4.2.1",
    "@typescript-eslint/eslint-plugin": "^5.48.2",
    "@typescript-eslint/parser": "^5.48.2",
    "@vitest/coverage-c8": "^0.28.4",
@@ -93,7 +91,6 @@
    "eslint-plugin-tsdoc": "^0.2.17",
    "eslint-plugin-unicorn": "^45.0.0",
    "express": "^4.18.2",
-    "express-http-proxy": "^1.6.3",
    "globby": "^13.1.2",
    "husky": "^8.0.2",
    "jest": "^29.3.1",
@@ -106,7 +103,6 @@
    "prettier": "^2.7.1",
    "prettier-plugin-jsdoc": "^0.4.2",
    "rimraf": "^4.0.0",
-    "rollup-plugin-visualizer": "^5.8.3",
    "start-server-and-test": "^1.15.4",
    "ts-node": "^10.9.1",
    "typescript": "^4.8.4",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -25,9 +25,6 @@ importers:
      '@types/express':
        specifier: ^4.17.17
        version: 4.17.17
-      '@types/express-http-proxy':
-        specifier: ^1.6.3
-        version: 1.6.3
      '@types/js-yaml':
        specifier: ^4.0.5
        version: 4.0.5
@@ -46,9 +43,6 @@ importers:
      '@types/prettier':
        specifier: ^2.7.1
        version: 2.7.1
-      '@types/rollup-plugin-visualizer':
-        specifier: ^4.2.1
-        version: 4.2.1
      '@typescript-eslint/eslint-plugin':
        specifier: ^5.48.2
        version: 5.48.2_azmbqzqvrlvblbdtiwxwvyvjjy
@@ -121,9 +115,6 @@ importers:
      express:
        specifier: ^4.18.2
        version: 4.18.2
-      express-http-proxy:
-        specifier: ^1.6.3
-        version: 1.6.3
      globby:
        specifier: ^13.1.2
        version: 13.1.2
@@ -160,9 +151,6 @@ importers:
      rimraf:
        specifier: ^4.0.0
        version: 4.1.2
-      rollup-plugin-visualizer:
-        specifier: ^5.8.3
-        version: 5.8.3
      start-server-and-test:
        specifier: ^1.15.4
        version: 1.15.4
@@ -2885,12 +2873,6 @@ packages:
    resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
    dev: true

-  /@types/express-http-proxy/1.6.3:
-    resolution: {integrity: sha512-dX3+Cb0HNPtqhC5JUWzzuODHRlgJRZx7KvwKVVwkOvm+8vOtpsh3qy8+qLv5X1hs4vdVHWKyXf86DwJot5H8pg==}
-    dependencies:
-      '@types/express': 4.17.17
-    dev: true
-
  /@types/express-serve-static-core/4.17.31:
    resolution: {integrity: sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==}
    dependencies:
@@ -3085,13 +3067,6 @@ packages:
    resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==}
    dev: true

-  /@types/rollup-plugin-visualizer/4.2.1:
-    resolution: {integrity: sha512-Fk4y0EgmsSbvbayYhtSI9+cGvgw1rcQ9RlbExkQt4ivXRdiEwFKuRpxNuJCr0JktXIvOPUuPR7GSmtyZu0dujQ==}
-    dependencies:
-      '@types/node': 18.11.9
-      rollup: 2.79.1
-    dev: true
-
  /@types/semver/7.3.12:
    resolution: {integrity: sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==}
    dev: true
@@ -5745,17 +5720,6 @@ packages:
      ms: 2.0.0
    dev: true

-  /debug/3.2.7:
-    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.3
-    dev: true
-
  /debug/3.2.7_supports-color@8.1.1:
    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
    peerDependencies:
@@ -6112,10 +6076,6 @@ packages:
    resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
    dev: true

-  /es6-promise/4.2.8:
-    resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==}
-    dev: true
-
  /esbuild/0.16.17:
    resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==}
    engines: {node: '>=12'}
@@ -6638,17 +6598,6 @@ packages:
      jest-util: 29.3.1
    dev: true

-  /express-http-proxy/1.6.3:
-    resolution: {integrity: sha512-/l77JHcOUrDUX8V67E287VEUQT0lbm71gdGVoodnlWBziarYKgMcpqT7xvh/HM8Jv52phw8Bd8tY+a7QjOr7Yg==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      debug: 3.2.7
-      es6-promise: 4.2.8
-      raw-body: 2.5.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
  /express/4.18.2:
    resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==}
    engines: {node: '>= 0.10.0'}
@@ -10492,29 +10441,6 @@ packages:
    resolution: {integrity: sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g==}
    dev: false

-  /rollup-plugin-visualizer/5.8.3:
-    resolution: {integrity: sha512-QGJk4Bqe4AOat5AjipOh8esZH1nck5X2KFpf4VytUdSUuuuSwvIQZjMGgjcxe/zXexltqaXp5Vx1V3LmnQH15Q==}
-    engines: {node: '>=14'}
-    hasBin: true
-    peerDependencies:
-      rollup: 2.x || 3.x
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-    dependencies:
-      open: 8.4.0
-      source-map: 0.7.4
-      yargs: 17.5.1
-    dev: true
-
-  /rollup/2.79.1:
-    resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==}
-    engines: {node: '>=10.0.0'}
-    hasBin: true
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
-
  /rollup/3.15.0:
    resolution: {integrity: sha512-F9hrCAhnp5/zx/7HYmftvsNBkMfLfk/dXUh73hPSM2E3CRgap65orDNJbLetoiUFwSAk6iHPLvBrZ5iHYvzqsg==}
    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
@@ -10888,11 +10814,6 @@ packages:
    engines: {node: '>=0.10.0'}
    dev: true

-  /source-map/0.7.4:
-    resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==}
-    engines: {node: '>= 8'}
-    dev: true
-
  /sourcemap-codec/1.4.8:
    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
    deprecated: Please use @jridgewell/sourcemap-codec instead