Merge branch 'develop' into feat/3601-cspell-configuration

.eslintrc.json

@@ -22,7 +22,7 @@
     "plugin:@cspell/recommended",
     "prettier"
   ],
-  "plugins": ["@typescript-eslint", "html", "jest", "jsdoc", "json", "@cspell"],
+  "plugins": ["@typescript-eslint", "no-only-tests", "html", "jest", "jsdoc", "json", "@cspell"],
   "rules": {
     "no-console": "error",
     "no-prototype-builtins": "off",
@@ -49,7 +49,6 @@
       }
     ],
     "json/*": ["error", "allowComments"],
-    "no-empty": ["error", { "allowEmptyCatch": true }],
     "@cspell/spellchecker": [
       "warn",
       {
@@ -58,6 +57,13 @@
         "checkStringTemplates": false
       }
     ]
+    "no-empty": [
+      "error",
+      {
+        "allowEmptyCatch": true
+      }
+    ],
+    "no-only-tests/no-only-tests": "error"
   },
   "overrides": [
     {

.vite/server.ts

@@ -1,7 +1,15 @@
-import express from 'express';
+import express, { NextFunction, Request, Response } from 'express';
 import { createServer as createViteServer } from 'vite';
 // import { getBuildConfig } from './build';
 
+const cors = (req: Request, res: Response, next: NextFunction) => {
+  res.header('Access-Control-Allow-Origin', '*');
+  res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE');
+  res.header('Access-Control-Allow-Headers', 'Content-Type');
+
+  next();
+};
+
 async function createServer() {
   const app = express();
 
@@ -12,6 +20,7 @@ async function createServer() {
     appType: 'custom', // don't include Vite's default HTML handling middlewares
   });
 
+  app.use(cors);
   app.use(express.static('./packages/mermaid/dist'));
   app.use(express.static('./packages/mermaid-example-diagram/dist'));
   app.use(express.static('./packages/mermaid-mindmap/dist'));

cypress/integration/rendering/erDiagram.spec.js

@@ -167,7 +167,7 @@ describe('Entity Relationship Diagram', () => {
     cy.get('svg');
   });
 
-  it.only('should render entities with generic and array attributes', () => {
+  it('should render entities with generic and array attributes', () => {
     renderGraph(
       `
     erDiagram

docs/index.html

@@ -15,6 +15,14 @@
       name="viewport"
       content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
     />
+    <meta property="og:title" content="Mermaid" />
+    <meta property="og:url" content="https://mermaid-js.github.io/mermaid/" />
+    <meta property="og:image" content="https://mermaid-js.github.io/mermaid/img/header.png" />
+    <meta
+      property="og:description"
+      content="Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs."
+    />
+    <meta property="og:type" content="website" />
     <!-- <link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/vue.css"> -->
     <link rel="stylesheet" href="theme.css" />
     <link

package.json

@@ -119,6 +119,7 @@
     "eslint-plugin-jsdoc": "39.3.6",
     "eslint-plugin-json": "3.1.0",
     "eslint-plugin-markdown": "3.0.0",
+    "eslint-plugin-no-only-tests": "^3.0.0",
     "express": "4.18.2",
     "globby": "13.1.2",
     "husky": "8.0.1",

packages/mermaid/src/docs/index.html

@@ -15,6 +15,14 @@
       name="viewport"
       content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
     />
+    <meta property="og:title" content="Mermaid" />
+    <meta property="og:url" content="https://mermaid-js.github.io/mermaid/" />
+    <meta property="og:image" content="https://mermaid-js.github.io/mermaid/img/header.png" />
+    <meta
+      property="og:description"
+      content="Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs."
+    />
+    <meta property="og:type" content="website" />
     <!-- <link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/vue.css"> -->
     <link rel="stylesheet" href="theme.css" />
     <link

pnpm-lock.yaml

@@ -45,6 +45,7 @@ importers:
       eslint-plugin-jsdoc: 39.3.6
       eslint-plugin-json: 3.1.0
       eslint-plugin-markdown: 3.0.0
+      eslint-plugin-no-only-tests: ^3.0.0
       express: 4.18.2
       fast-clone: 1.5.13
       globby: 13.1.2
@@ -127,6 +128,7 @@ importers:
       eslint-plugin-jsdoc: 39.3.6_eslint@8.25.0
       eslint-plugin-json: 3.1.0
       eslint-plugin-markdown: 3.0.0_eslint@8.25.0
+      eslint-plugin-no-only-tests: 3.0.0
       express: 4.18.2
       globby: 13.1.2
       husky: 8.0.1
@@ -6073,6 +6075,11 @@ packages:
       - supports-color
     dev: true
 
+  /eslint-plugin-no-only-tests/3.0.0:
+    resolution: {integrity: sha512-I0PeXMs1vu21ap45hey4HQCJRqpcoIvGcNTPJe+UhUm8TwjQ6//mCrDqF8q0WS6LgmRDwQ4ovQej0AQsAHb5yg==}
+    engines: {node: '>=5.0.0'}
+    dev: true
+
   /eslint-scope/5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
     engines: {node: '>=8.0.0'}