Skip to content

Comments

[pull] develop from mermaid-js:develop#114

Merged
pull[bot] merged 43 commits intocode:developfrom
mermaid-js:develop
Feb 16, 2026
Merged

[pull] develop from mermaid-js:develop#114
pull[bot] merged 43 commits intocode:developfrom
mermaid-js:develop

Conversation

@pull
Copy link

@pull pull bot commented Feb 16, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

sidharthv96 and others added 30 commits November 21, 2025 12:31
…app-crash

5496 : fixed UI crash from excessive tick generation with invalid dates/intervals
* master:
  fix: Upgrade npm to v11 to support trusted publishing
  Version Packages
  Merge pull request #7197 from mermaid-js/fix/5496-gantt-tickinterval-app-crash
Update pricing tier in Editor selection modal
setting canonicals to mermaid.ai/open-source
…maid-ai

Merge pull request #7245 from mermaid-js/canonicals-to-mermaid-ai
* feat(docs): customize header based on DOCS_HOSTNAME env var

* feat(docs): customize header based on DOCS_HOSTNAME env var
This allows esbuild to inline it during build, which fixes import issues caused by ESM vs CJS.

Co-authored-by: Alois Klink <alois@aloisklink.com>
fix: tiny tree downstream import issues
sidharthv96 and others added 13 commits February 3, 2026 19:57
* master:
  chore: Update import
  test: fix getHeaderLogoLink
  test: fix getHeaderLogoLink
chore: Update mermaidchart.com to mermaid.ai
This is now required by TypeScript v5.8 and Node.js 22, and was
officially added to ECMAScript 2025 🥳
This is required to upgrade to Langium v4.
I've also unpinned the dependency and instead added a caret to the
specifier, so that any future security updates mean we won't need to
make a new release of the `@mermaid-js/parser` package.

I'm not sure why, but something between Langium v3.4.0 and v3.5.0
breaks indentation in treemaps, so we need to move the rule before
the `hidden terminal WS` rule.
Updates the `@mermaid-js/parser` to Langium v4.

There were a couple of breaking changes we had to fix to do this
upgrade:

- Rename all the grammers from Abc to AbcGrammar, as rules
  within grammars cannot have the same name as the grammar.
- Update the tests, since the generated type names from `ast.ts` have
  been moved from `<typeName>` to `<typeName>.$type`.
- Turn the EOL fragment into a rule, as in Langium v4, it's no longer
  allowed and throws an error.

As this is a **BREAKING CHANGE** for users, I've made a new major
release in the changeset (and it means we can finally get a v1.0.0 of
`@mermaid-js/parser`).
This pulls part of the following changes from `develop`:

- 99f17be (fix: update @argos-ci/cypress to version 6.1.3, 2025-10-07)
- 15e2824 (fix(deps): update all patch dependencies, 2025-11-06)
- 847b3aa (fix(deps): update all patch dependencies, 2025-11-10)
- 3c75242 (chore(deps): update all patch dependencies, 2025-11-19)

But, this is needed to get Argos working properly for PRs to `master`.
…grade-to-langium-v4-develop

Conflicts:
	package.json
	pnpm-lock.yaml
…grade-to-langium-v4-develop

Fixes conflicts due to the `import packageJson from './package.json'`
statements getting removed.

Conflicts:
	packages/mermaid/src/diagrams/info/infoDb.ts
	packages/mermaid/src/mermaidAPI.ts
…angium-v4-develop

Fixes a semantic merge conflict in
`packages/parser/tests/architecture.test.ts` due to the Langium v4
changing the `Architecture` value to `Architecture.$type`.

Conflicts:
	package.json
	pnpm-lock.yaml
…develop

Merge `master` back into the `develop` branch
@pull pull bot locked and limited conversation to collaborators Feb 16, 2026
@pull pull bot added the ⤵️ pull label Feb 16, 2026
@pull pull bot merged commit 4d5ede8 into code:develop Feb 16, 2026
9 of 10 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants