Merge master back into the develop branch#7398
Merged
sidharthv96 merged 42 commits intomermaid-js:developfrom Feb 16, 2026
Merged
Merge master back into the develop branch#7398sidharthv96 merged 42 commits intomermaid-js:developfrom
master back into the develop branch#7398sidharthv96 merged 42 commits intomermaid-js:developfrom
Conversation
…kinterval-app-crash 5496 : fixed UI crash from excessive tick generation with invalid dates/intervals
…master Version Packages
docs: Update to new pricing tiers
* master: fix: Upgrade npm to v11 to support trusted publishing Version Packages Merge pull request mermaid-js#7197 from mermaid-js/fix/5496-gantt-tickinterval-app-crash
Update pricing tier in Editor selection modal
…aid-ai setting canonicals to mermaid.ai/open-source
…als-to-mermaid-ai Merge pull request mermaid-js#7245 from mermaid-js/canonicals-to-mermaid-ai
…js#7320) * 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>
…yout fix: tiny tree downstream import issues
…master Version Packages
chore: Update banner with promo
* 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
🦋 Changeset detectedLatest commit: 2b12b93 The changes in this PR will be included in the next version bump. This PR includes changesets to release 2 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
✅ Deploy Preview for mermaid-js ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
@mermaid-js/examples
mermaid
@mermaid-js/layout-elk
@mermaid-js/layout-tidy-tree
@mermaid-js/mermaid-zenuml
@mermaid-js/parser
@mermaid-js/tiny
commit: |
|
The latest updates on your projects. Learn more about Argos notifications ↗︎
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📑 Summary
Merge the contents of the
masterbranch intodevelopto fix the merge conflicts from #7377 (I aimed that towardsmasterso we could make a patch/hotfix release).Closes #7336, closes #7345 (both fixed in
masteralready).📏 Design Decisions
N/A
📋 Tasks
Make sure you
MERMAID_RELEASE_VERSIONis used for all new features.pnpm changesetand following the prompts. Changesets that add features should beminorand those that fix bugs should bepatch. Please prefix changeset messages withfeat:,fix:, orchore:.