Merge branch '3061_making_a_monorepo' into sidv/3061_monorepo

* 3061_making_a_monorepo:
  Fixed paths for dev server
  Use of pnpm for the monorepo
  Use of pnpm for the monorepo

.esbuild/serve.cjs

@@ -14,8 +14,8 @@ const getEntryPointsAndExtensions = (format) => {
   return {
     entryPoints: {
       mermaid: './src/mermaid',
-      e2e: 'cypress/platform/viewer.js',
+      e2e: '../../cypress/platform/viewer.js',
-      'bundle-test': 'cypress/platform/bundle-test.js',
+      'bundle-test': '../../cypress/platform/bundle-test.js',
     },
     outExtension: { '.js': format === 'iife' ? '.js' : '.esm.mjs' },
   };

README.md

@@ -1,5 +1,22 @@
 # mermaid [![Build Status](https://travis-ci.org/mermaid-js/mermaid.svg?branch=master)](https://travis-ci.org/mermaid-js/mermaid) [![NPM](https://img.shields.io/npm/v/mermaid)](https://www.npmjs.com/package/mermaid) [![Coverage Status](https://coveralls.io/repos/github/mermaid-js/mermaid/badge.svg?branch=master)](https://coveralls.io/github/mermaid-js/mermaid?branch=master) [![Join our Slack!](https://img.shields.io/static/v1?message=join%20chat&color=9cf&logo=slack&label=slack)](https://join.slack.com/t/mermaid-talk/shared_invite/enQtNzc4NDIyNzk4OTAyLWVhYjQxOTI2OTg4YmE1ZmJkY2Y4MTU3ODliYmIwOTY3NDJlYjA0YjIyZTdkMDMyZTUwOGI0NjEzYmEwODcwOTE)
 
+# Whoa, whats going on here?
+
+We are transforming the Mermaid repository to a so called mono-repo. This is a part of the effort to decouple the diagrams from the core of mermaid. This will:
+
+- Make it possible to select which diagrams to include on your site
+- Open up for lazy loading
+- Make it possible to add diagrams from outside of the Mermaid repository
+- Separate the release flow between different diagrams and the Mermaid core
+
+As such be aware of sime changes..
+
+# We use pnpm now
+
+# The source code has moved
+
+It is now localted in the src forunder for respoective package located as subfoders in packages.
+
 English | [简体中文](./README.zh-CN.md)
 
 <img src="./img/header.png" alt="" />

cypress/platform/bundle-test.js

@@ -1,4 +1,4 @@
-import mermaid from '../../dist/mermaid.core';
+import mermaid from '../../packages/mermaid/dist/mermaid.core';
 
 let code = `flowchart LR
 Power_Supply --> Transmitter_A

cypress/platform/viewer.js

@@ -1,5 +1,5 @@
 import { Base64 } from 'js-base64';
-import mermaid2 from '../../src/mermaid';
+import mermaid2 from '../../packages/mermaid/src/mermaid';
 
 /**
  * ##contentLoaded Callback function that is called when page is loaded. This functions fetches

package.json

@@ -1,9 +1,6 @@
 {
   "name": "mermaid-monorepo",
   "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
   "version": "9.2.0-rc1",
   "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
   "main": "dist/mermaid.core.mjs",

packages/mermaid-mindmap/.esbuild/serve.cjs

@@ -14,8 +14,8 @@ const getEntryPointsAndExtensions = (format) => {
   return {
     entryPoints: {
       mermaid: './src/mermaid',
-      e2e: 'cypress/platform/viewer.js',
+      e2e: './cypress/platform/viewer.js',
-      'bundle-test': 'cypress/platform/bundle-test.js',
+      'bundle-test': './cypress/platform/bundle-test.js',
     },
     outExtension: { '.js': format === 'iife' ? '.js' : '.esm.mjs' },
   };

packages/mermaid-mindmap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mermaid-js/mermaid-mindmap",
-  "version": "9.2.0-rc1",
+  "version": "9.2.0-rc2",
   "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
   "main": "dist/mermaid-mindmap.core.mjs",
   "module": "dist/mermaid-mindmap.core.mjs",
@@ -59,7 +59,10 @@
     "mermaid": "*",
     "non-layered-tidy-tree-layout": "^2.0.2"
   },
-  "devDependencies": {},
+  "devDependencies": {
+    "concurrently": "^7.4.0",
+    "rimraf": "^3.0.2"
+  },
   "resolutions": {
     "d3": "^7.0.0"
   },

packages/mermaid/.esbuild/serve.cjs

@@ -14,8 +14,8 @@ const getEntryPointsAndExtensions = (format) => {
   return {
     entryPoints: {
       mermaid: './src/mermaid',
-      e2e: 'cypress/platform/viewer.js',
+      e2e: '../../cypress/platform/viewer.js',
-      'bundle-test': 'cypress/platform/bundle-test.js',
+      'bundle-test': '../../cypress/platform/bundle-test.js',
     },
     outExtension: { '.js': format === 'iife' ? '.js' : '.esm.mjs' },
   };

packages/mermaid/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mermaid",
-  "version": "9.2.0-rc1",
+  "version": "9.2.0-rc2",
   "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
   "main": "dist/mermaid.core.mjs",
   "module": "dist/mermaid.core.mjs",
@@ -33,7 +33,7 @@
     "dev": "node .esbuild/serve.cjs",
     "docs:build": "ts-node-esm src/docs.mts",
     "docs:verify": "yarn docs:build --verify",
-    "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",
+    "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 .",
@@ -45,7 +45,8 @@
     "test": "yarn lint && vitest run",
     "test:watch": "vitest --coverage --watch",
     "prepublishOnly": "yarn build && yarn test",
-    "prepare": "concurrently \"husky install\" \"yarn build\"",
+    "todo-prepare": "concurrently \"husky install\" \"yarn build\"",
+    "prepare": "concurrently \"yarn build\"",
     "pre-commit": "lint-staged"
   },
   "repository": {

pnpm-workspace.yaml

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