diff --git a/.node-version b/.node-version index ee09fac7..f203ab89 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -v20.11.1 +20.13.1 diff --git a/.vscode/settings.json b/.vscode/settings.json index 5d2cb867..b02e495c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -19,6 +19,7 @@ "pako", "panzoom", "pzoom", + "roughjs", "Serde", "serdes", "tailwindcss", diff --git a/README.md b/README.md index a9656501..74685558 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Mermaid Live Editor](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/detailed/2ckppp/master&style=flat&logo=cypress)](https://dashboard.cypress.io/projects/2ckppp/runs) [![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)[![Netlify Status](https://api.netlify.com/api/v1/badges/27fa023d-7c73-4a3f-9791-b3b657a47100/deploy-status)](https://app.netlify.com/sites/mermaidjs/deploys) +[![Mermaid Live Editor](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/detailed/2ckppp/master&style=flat&logo=cypress)](https://dashboard.cypress.io/projects/2ckppp/runs) [![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) [![Netlify Status](https://api.netlify.com/api/v1/badges/27fa023d-7c73-4a3f-9791-b3b657a47100/deploy-status)](https://app.netlify.com/sites/mermaidjs/deploys) # Contributors are welcome! diff --git a/cypress/e2e/diagramUpdate.spec.ts b/cypress/e2e/diagramUpdate.spec.ts index b8326bc3..377b365f 100644 --- a/cypress/e2e/diagramUpdate.spec.ts +++ b/cypress/e2e/diagramUpdate.spec.ts @@ -69,7 +69,7 @@ A & B & C & D & E --> F & G & K & Z & i`); }); it('supports commenting code out/in', () => { - cy.get('#editor').contains('Car').click(); + cy.get('#editor').contains('Car').click({ force: true }); cy.get('#editor').get('textarea').type(`${cmd}/`, { force: true }); cy.get('#view').contains('Car').should('not.exist'); diff --git a/package.json b/package.json index 256db712..e2721e0e 100644 --- a/package.json +++ b/package.json @@ -25,38 +25,38 @@ "@cypress/snapshot": "2.1.7", "@fortawesome/fontawesome-free": "^6.5.1", "@sveltejs/adapter-static": "3.0.1", - "@sveltejs/kit": "2.5.0", + "@sveltejs/kit": "2.5.9", "@sveltejs/vite-plugin-svelte": "^3.0.1", - "@testing-library/svelte": "4.1.0", + "@testing-library/svelte": "4.2.3", "@types/lodash-es": "^4.17.12", "@types/pako": "2.0.3", "@types/uuid": "9.0.8", - "@typescript-eslint/eslint-plugin": "6.20.0", - "@typescript-eslint/parser": "6.20.0", + "@typescript-eslint/eslint-plugin": "6.21.0", + "@typescript-eslint/parser": "6.21.0", "@vitest/ui": "^1.1.3", "autoprefixer": "^10.4.14", "c8": "7.14.0", "chai": "^4.3.7", "cssnano": "^6.0.0", "cypress": "12.17.4", - "cypress-localstorage-commands": "2.2.5", - "eslint": "8.56.0", + "cypress-localstorage-commands": "2.2.6", + "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", - "eslint-plugin-cypress": "2.15.1", + "eslint-plugin-cypress": "2.15.2", "eslint-plugin-es": "^4.1.0", "eslint-plugin-no-only-tests": "^3.1.0", "eslint-plugin-postcss-modules": "^2.0.0", "eslint-plugin-svelte": "^2.35.1", "eslint-plugin-tailwindcss": "^3.13.1", "eslint-plugin-unicorn": "^50.0.1", - "eslint-plugin-vitest": "^0.3.20", + "eslint-plugin-vitest": "^0.5.0", "esserializer": "^1.3.11", "husky": "^8.0.3", "jsdom": "^21.1.2", "lint-staged": "^15.2.0", "node-html-parser": "^6.1.5", "postcss": "^8.4.33", - "postcss-load-config": "5.0.2", + "postcss-load-config": "5.1.0", "prettier": "^3.1.0", "prettier-plugin-svelte": "^3.1.2", "prettier-plugin-tailwindcss": "^0.5.11", @@ -70,16 +70,18 @@ "vitest-dom": "^0.1.1" }, "dependencies": { + "@mermaid-js/mermaid-zenuml": "^0.2.0", "daisyui": "2.52.0", "dayjs": "^1.11.7", - "js-base64": "3.7.6", + "js-base64": "3.7.7", "lodash-es": "^4.17.21", - "mermaid": "10.8.0", - "monaco-editor": "0.45.0", + "mermaid": "10.9.1", + "monaco-editor": "0.48.0", "pako": "2.1.0", "plausible-tracker": "^0.3.8", "random-word-slugs": "0.1.7", "svg-pan-zoom": "3.6.1", + "svg2roughjs": "^3.2.0", "uuid": "9.0.1" }, "lint-staged": { @@ -89,8 +91,8 @@ ] }, "volta": { - "node": "18.19.0", - "yarn": "1.22.21" + "node": "18.20.2", + "yarn": "1.22.22" }, "engines": { "node": ">=16.7" diff --git a/src/app.postcss b/src/app.postcss index 1e8e278c..528b5111 100644 --- a/src/app.postcss +++ b/src/app.postcss @@ -10,3 +10,8 @@ .action-btn { @apply btn btn-primary; } +#graph-div sub, +#graph-div sup { + position: initial; + vertical-align: revert; +} diff --git a/src/lib/components/Preset.svelte b/src/lib/components/Preset.svelte index fb313dae..37bee294 100644 --- a/src/lib/components/Preset.svelte +++ b/src/lib/components/Preset.svelte @@ -141,6 +141,30 @@ C --> db D --> C style m fill:#d6d,stroke:#333,stroke-width:4px + `, + ZenUML: `zenuml + title Order Service + @Actor Client #FFEBE6 + @Boundary OrderController #0747A6 + @EC2 <> OrderService #E3FCEF + group BusinessService { + @Lambda PurchaseService + @AzureFunction InvoiceService + } + + @Starter(Client) + // \`POST /orders\` + OrderController.post(payload) { + OrderService.create(payload) { + order = new Order(payload) + if(order != null) { + par { + PurchaseService.createPO(order) + InvoiceService.createInvoice(order) + } + } + } + } ` }; @@ -154,7 +178,7 @@ }; // Adding in this array will add an icon to the preset menu - const newDiagrams: SampleTypes[] = ['QuadrantChart', 'XYChart', 'Block']; + const newDiagrams: SampleTypes[] = ['QuadrantChart', 'XYChart', 'Block', 'ZenUML']; const diagramOrder: SampleTypes[] = [ 'Flow', 'Sequence', @@ -168,7 +192,8 @@ 'Mindmap', 'QuadrantChart', 'XYChart', - 'Block' + 'Block', + 'ZenUML' ]; diff --git a/src/lib/components/View.svelte b/src/lib/components/View.svelte index db9efa1f..f7c70688 100644 --- a/src/lib/components/View.svelte +++ b/src/lib/components/View.svelte @@ -1,17 +1,19 @@