Merge pull request #3783 from mermaid-js/sidv/cleanupPackage.json

chore: Housekeeping

.npmrc

@@ -1,2 +1,3 @@
 auto-install-peers=true
 strict-peer-dependencies=false
+use-inline-specifiers-lockfile-format=true

.vite/build.ts

@@ -2,9 +2,8 @@ import { build, InlineConfig } from 'vite';
 import { resolve } from 'path';
 import { fileURLToPath } from 'url';
 import jisonPlugin from './jisonPlugin.js';
-import pkg from '../package.json' assert { type: 'json' };
+import { readFileSync } from 'fs';
 
-const { dependencies } = pkg;
 const watch = process.argv.includes('--watch');
 const mermaidOnly = process.argv.includes('--mermaid');
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
@@ -59,6 +58,9 @@ export const getBuildConfig = ({ minify, core, watch, entryName }: BuildOptions)
   ];
 
   if (core) {
+    const { dependencies } = JSON.parse(
+      readFileSync(resolve(__dirname, `../packages/${packageName}/package.json`), 'utf-8')
+    );
     // Core build is used to generate file without bundled dependencies.
     // This is used by downstream projects to bundle dependencies themselves.
     external.push(...Object.keys(dependencies));

.vite/tsconfig.json

@@ -1,6 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "module": "ES2022"
-  }
-}

package.json

@@ -4,7 +4,7 @@
   "version": "9.2.2",
   "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
   "type": "module",
-  "packageManager": "pnpm@7.13.2",
+  "packageManager": "pnpm@7.15.0",
   "keywords": [
     "diagram",
     "markdown",
@@ -15,8 +15,8 @@
     "git graph"
   ],
   "scripts": {
-    "build:mermaid": "ts-node-esm --transpileOnly --project=.vite/tsconfig.json .vite/build.ts --mermaid",
+    "build:mermaid": "ts-node-esm --transpileOnly .vite/build.ts --mermaid",
-    "build:vite": "ts-node-esm --transpileOnly --project=.vite/tsconfig.json .vite/build.ts",
+    "build:vite": "ts-node-esm --transpileOnly .vite/build.ts",
     "build:types": "tsc -p ./packages/mermaid/tsconfig.json --emitDeclarationOnly && tsc -p ./packages/mermaid-mindmap/tsconfig.json --emitDeclarationOnly",
     "build:watch": "pnpm build:vite --watch",
     "build": "pnpm run -r clean && concurrently \"pnpm build:vite\" \"pnpm build:types\"",
@@ -25,13 +25,13 @@
     "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": "pnpm build",
-    "lint": "eslint --cache --ignore-path .gitignore . && pnpm lint:jison && prettier --check .",
+    "lint": "eslint --cache --ignore-path .gitignore . && pnpm run lint:jison && prettier --check .",
+    "lint:fix": "eslint --fix --ignore-path .gitignore . && prettier --write .",
+    "lint:jison": "ts-node-esm ./scripts/jison/lint.mts",
     "vdocs:dev": "vitepress dev vdocs",
     "vdocs:build": "vitepress build vdocs",
     "vdocs:serve": "vitepress serve vdocs",
     "postbuild": "echo 'building docs from code here soon'",
-    "lint:fix": "eslint --fix --ignore-path .gitignore . && prettier --write .",
-    "lint:jison": "ts-node-esm --transpileOnly packages/mermaid/src/jison/lint.mts",
     "cypress": "cypress run",
     "cypress:open": "cypress open",
     "e2e": "start-server-and-test dev http://localhost:9000/ cypress",
@@ -41,6 +41,7 @@
     "test:coverage": "vitest --coverage",
     "prepublishOnly": "pnpm build && pnpm test",
     "prepare": "concurrently \"husky install\" \"pnpm build\"",
+    "postinstall": "./scripts/fixPnpmLock.sh",
     "pre-commit": "lint-staged"
   },
   "repository": {
@@ -59,24 +60,6 @@
       "page"
     ]
   },
-  "dependencies": {
-    "@braintree/sanitize-url": "^6.0.0",
-    "@types/node": "^18.8.1",
-    "@types/uuid": "^8.3.4",
-    "d3": "^7.0.0",
-    "dagre": "^0.8.5",
-    "dagre-d3": "^0.6.4",
-    "dompurify": "2.4.0",
-    "fast-clone": "^1.5.13",
-    "graphlib": "^2.1.8",
-    "khroma": "^2.0.0",
-    "lodash": "^4.17.21",
-    "moment-mini": "^2.24.0",
-    "non-layered-tidy-tree-layout": "^2.0.2",
-    "rollup": "^2.79.1",
-    "stylis": "^4.1.2",
-    "uuid": "^9.0.0"
-  },
   "devDependencies": {
     "@applitools/eyes-cypress": "^3.27.1",
     "@commitlint/cli": "^17.1.2",
@@ -88,8 +71,10 @@
     "@types/jsdom": "^20.0.0",
     "@types/lodash": "^4.14.186",
     "@types/mdast": "^3.0.10",
+    "@types/node": "^18.11.9",
     "@types/prettier": "^2.7.1",
     "@types/stylis": "^4.0.2",
+    "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^5.39.0",
     "@typescript-eslint/parser": "^5.39.0",
     "@vitest/coverage-c8": "^0.23.4",
@@ -117,8 +102,7 @@
     "jsdom": "^20.0.1",
     "lint-staged": "^13.0.3",
     "markdown-it": "^13.0.1",
-    "path-browserify": "^1.0.1",
+    "pnpm": "^7.15.0",
-    "pnpm": "^7.13.2",
     "prettier": "^2.7.1",
     "prettier-plugin-jsdoc": "^0.4.2",
     "remark": "^14.0.2",

packages/mermaid-mindmap/package.json

@@ -19,18 +19,7 @@
     "mermaid"
   ],
   "scripts": {
-    "clean": "rimraf dist",
+    "prepublishOnly": "pnpm -w run build"
-    "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"
   },
   "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",
+    "release": "pnpm build",
-    "lint": "eslint --cache --ignore-path .gitignore . && yarn lint:jison && prettier --check .",
+    "prepublishOnly": "pnpm -w run build"
-    "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"
   },
   "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",

pnpm-workspace.yaml

@@ -1,4 +1,4 @@
 packages:
   # all packages in direct subdirs of packages/
   - 'packages/*'
-  # - 'tests/*'
+  - 'tests/*'

scripts/fixPnpmLock.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+sed "/mermaid: ''/d" pnpm-lock.yaml > temp.yaml; 
+mv temp.yaml pnpm-lock.yaml

scripts/jison/lint.mts

@@ -11,6 +11,7 @@ const linter = new ESLint({
 });
 
 const lint = async (file: string): Promise<boolean> => {
+  console.log(`Linting ${file}`);
   const jisonCode = await readFile(file, 'utf8');
   // @ts-ignore no typings
   const jsCode = new jison.Generator(jisonCode, { moduleType: 'amd' }).generate();
@@ -23,7 +24,9 @@ const lint = async (file: string): Promise<boolean> => {
 };
 
 (async () => {
-  const jisonFiles = await globby(['./src/**/*.jison'], { dot: true });
+  const jisonFiles = await globby(['./packages/**/*.jison', '!./**/node_modules/**'], {
+    dot: true,
+  });
   const lintResults = await Promise.all(jisonFiles.map(lint));
   if (lintResults.some((result) => result === false)) {
     process.exit(1);