Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .rebase/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ https://github.com/che-incubator/che-code/pull/791
- code/test/monaco/package.json
---

#### @sbouchet
https://github.com/che-incubator/che-code/pull/797

- code/extensions/mermaid-markdown-features/package.json
- code/extensions/markdown-language-features/package.json
---

#### @rnikitenko
https://github.com/che-incubator/che-code/commit/177a26a8ef76ea41a26eb6ac0ef9d6006b9af53e

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": {
"mermaid": "^11.17.1"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": {
"mermaid": "^11.17.1"
}
}
44 changes: 30 additions & 14 deletions code/extensions/markdown-language-features/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion code/extensions/markdown-language-features/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,7 @@
"highlight.js": "^11.8.0",
"katex": "^0.16.33",
"markdown-it": "^14.2.0",
"mermaid": "^11.15.0",
"mermaid": "^11.17.1",
"morphdom": "^2.7.7",
"picomatch": "^2.3.2",
"punycode": "^2.3.1",
Expand Down
68 changes: 42 additions & 26 deletions code/extensions/mermaid-markdown-features/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion code/extensions/mermaid-markdown-features/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
"@mermaid-js/layout-tidy-tree": "^0.2.0",
"@mermaid-js/mermaid-zenuml": "^0.2.0",
"dompurify": "^3.4.10",
"mermaid": "^11.15.0"
"mermaid": "^11.17.1"
},
"overrides": {
"lodash-es": "4.18.1",
Expand Down
2 changes: 2 additions & 0 deletions rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,8 @@ resolve_conflicts() {
apply_package_changes_by_path "$conflictingFile"
elif [[ "$conflictingFile" == "code/extensions/markdown-language-features/package.json" ]]; then
apply_package_changes_by_path "$conflictingFile"
elif [[ "$conflictingFile" == "code/extensions/mermaid-markdown-features/package.json" ]]; then
apply_package_changes_by_path "$conflictingFile"
elif [[ "$conflictingFile" == "code/src/vs/platform/workspaces/common/workspaceIdentifier.ts" ]]; then
apply_changes_multi_line "$conflictingFile"
else
Expand Down