Merge branch 'master' of github.com:mermaid-js/mermaid

packages/mermaid-mindmap/package.json

@@ -19,18 +19,7 @@
     "mermaid"
   ],
   "scripts": {
-    "clean": "rimraf dist",
-    "build:types": "tsc -p ./tsconfig.json --emitDeclarationOnly",
-    "build:watch": "yarn build:code --watch",
-    "build:esbuild": "concurrently \"yarn build:code\" \"yarn build:types\"",
-    "build": "yarn clean; yarn build:esbuild",
-    "dev": "node .esbuild/serve.cjs",
-    "release": "yarn build",
-    "lint": "eslint --cache --ignore-path .gitignore . && yarn lint:jison && prettier --check .",
-    "lint:fix": "eslint --fix --ignore-path .gitignore . && prettier --write .",
-    "lint:jison": "ts-node-esm src/jison/lint.mts",
-    "todo-prepare": "concurrently \"husky install ../../.husky\" \"yarn build\"",
-    "todo-pre-commit": "lint-staged"
+    "prepublishOnly": "pnpm -w run build"
   },
   "repository": {
     "type": "git",
@@ -54,6 +43,7 @@
     "cytoscape-cose-bilkent": "^4.1.0",
     "cytoscape-fcose": "^2.1.0",
     "d3": "^7.0.0",
+    "khroma": "^2.0.0",
     "non-layered-tidy-tree-layout": "^2.0.2"
   },
   "devDependencies": {

packages/mermaid/package.json

@@ -25,24 +25,11 @@
   ],
   "scripts": {
     "clean": "rimraf dist",
-    "build:code": "node .esbuild/esbuild.cjs",
-    "build:types": "tsc -p ./tsconfig.json --emitDeclarationOnly",
-    "build:watch": "yarn build:code --watch",
-    "build:esbuild": "concurrently \"yarn build:code\" \"yarn build:types\"",
-    "build": "yarn clean; yarn build:esbuild",
-    "dev": "node .esbuild/serve.cjs",
     "docs:build": "ts-node-esm src/docs.mts",
-    "docs:verify": "yarn docs:build --verify",
+    "docs:verify": "pnpm docs:build --verify",
     "todo-postbuild": "documentation build src/mermaidAPI.ts src/config.ts src/defaultConfig.ts --shallow -f md --markdown-toc false > src/docs/Setup.md && prettier --write src/docs/Setup.md",
-    "release": "yarn build",
-    "lint": "eslint --cache --ignore-path .gitignore . && yarn lint:jison && prettier --check .",
-    "lint:fix": "eslint --fix --ignore-path .gitignore . && prettier --write .",
-    "lint:jison": "ts-node-esm src/jison/lint.mts",
-    "cypress": "cypress run",
-    "cypress:open": "cypress open",
-    "e2e": "start-server-and-test dev http://localhost:9000/ cypress",
-    "todo-prepare": "concurrently \"husky install\" \"yarn build\"",
-    "pre-commit": "lint-staged"
+    "release": "pnpm build",
+    "prepublishOnly": "pnpm -w run build"
   },
   "repository": {
     "type": "git",
@@ -92,10 +79,7 @@
     "@typescript-eslint/parser": "^5.37.0",
     "concurrently": "^7.4.0",
     "coveralls": "^3.1.1",
-    "cypress": "^10.0.0",
-    "cypress-image-snapshot": "^4.0.1",
     "documentation": "13.2.0",
-    "esbuild": "^0.15.8",
     "eslint": "^8.23.1",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-cypress": "^2.12.1",
@@ -104,18 +88,10 @@
     "eslint-plugin-jsdoc": "^39.3.6",
     "eslint-plugin-json": "^3.1.0",
     "eslint-plugin-markdown": "^3.0.0",
-    "express": "^4.18.1",
-    "globby": "^13.1.2",
-    "husky": "^8.0.0",
     "identity-obj-proxy": "^3.0.0",
     "jison": "^0.4.18",
     "js-base64": "3.7.2",
     "jsdom": "^20.0.0",
-    "lint-staged": "^13.0.0",
-    "moment": "^2.23.0",
-    "path-browserify": "^1.0.1",
-    "prettier": "^2.7.1",
-    "prettier-plugin-jsdoc": "^0.4.2",
     "remark": "^14.0.2",
     "rimraf": "^3.0.2",
     "start-server-and-test": "^1.12.6",

packages/mermaid/src/jison/lint.mts

@@ -1,31 +0,0 @@
-/* eslint-disable no-console */
-import { readFile } from 'fs/promises';
-import { globby } from 'globby';
-import { ESLint } from 'eslint';
-// @ts-ignore no typings
-import jison from 'jison';
-
-const linter = new ESLint({
-  overrideConfig: { rules: { 'no-console': 'error' }, parser: '@typescript-eslint/parser' },
-  useEslintrc: false,
-});
-
-const lint = async (file: string): Promise<boolean> => {
-  const jisonCode = await readFile(file, 'utf8');
-  // @ts-ignore no typings
-  const jsCode = new jison.Generator(jisonCode, { moduleType: 'amd' }).generate();
-  const [result] = await linter.lintText(jsCode);
-  if (result.errorCount > 0) {
-    console.error(`Linting failed for ${file}`);
-    console.error(result.messages);
-  }
-  return result.errorCount === 0;
-};
-
-(async () => {
-  const jisonFiles = await globby(['./src/**/*.jison'], { dot: true });
-  const lintResults = await Promise.all(jisonFiles.map(lint));
-  if (lintResults.some((result) => result === false)) {
-    process.exit(1);
-  }
-})();