Skip to content

Commit 8361dc8

Browse files
authored
Merge branch 'main' into fix/tooltip-hidden-under-toolbar
2 parents f931513 + e197af6 commit 8361dc8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+824
-550
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,19 @@ jobs:
4141
run: npm run test
4242
- name: ESBuild compatability
4343
run: npm run test:esbuild
44+
45+
check_circular_deps:
46+
name: Check Circular Dependencies
47+
runs-on: ubuntu-latest
48+
steps:
49+
- name: Checkout
50+
uses: actions/checkout@v3
51+
- name: Setup Node
52+
uses: actions/setup-node@v3
53+
with:
54+
node-version: 18
55+
cache: npm
56+
- name: Install Packages
57+
run: npm ci
58+
- name: Check circular dependencies
59+
run: npm run check-circular-deps

.github/workflows/main-preview.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
- name: Setup Node
15-
uses: actions/setup-node@v3
15+
uses: actions/setup-node@v4
1616
with:
1717
node-version: 18
1818
cache: npm

.github/workflows/pr-preview-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
name: Build
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: gravity-ui/preview-build-action@v1
11+
- uses: gravity-ui/preview-build-action@v2
1212
with:
1313
node-version: 18

.github/workflows/pr-preview-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
github.event.workflow_run.conclusion == 'success'
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: gravity-ui/preview-deploy-action@v1
17+
- uses: gravity-ui/preview-deploy-action@v2
1818
with:
1919
project: md-editor
2020
github-token: ${{ secrets.GRAVITY_UI_BOT_GITHUB_TOKEN }}

CHANGELOG.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,44 @@
11
# Changelog
22

3+
## [14.11.2](https://github.com/gravity-ui/markdown-editor/compare/v14.11.1...v14.11.2) (2025-02-07)
4+
5+
6+
### Bug Fixes
7+
8+
* **deps:** updated @diplodoc/cut-extension ([#593](https://github.com/gravity-ui/markdown-editor/issues/593)) ([30d0d8c](https://github.com/gravity-ui/markdown-editor/commit/30d0d8cb3732869d9142e15398315f78a4a8ea31))
9+
10+
## [14.11.1](https://github.com/gravity-ui/markdown-editor/compare/v14.11.0...v14.11.1) (2025-02-03)
11+
12+
13+
### Bug Fixes
14+
15+
* **BaseSchema:** fixed definition of an empty string during serialization ([#571](https://github.com/gravity-ui/markdown-editor/issues/571)) ([2926d71](https://github.com/gravity-ui/markdown-editor/commit/2926d71d88e89f6cb85512f39a9be944331644d9))
16+
* fixed critical circular dependencies ([#549](https://github.com/gravity-ui/markdown-editor/issues/549)) ([0540dc9](https://github.com/gravity-ui/markdown-editor/commit/0540dc95b23b8c866a4834e3ee6e6853d67e43e3))
17+
* **Link:** set high priority to link mark ([#568](https://github.com/gravity-ui/markdown-editor/issues/568)) ([6da4e70](https://github.com/gravity-ui/markdown-editor/commit/6da4e70e396eb9554ed55779bc364173171c6c26))
18+
* **markup:** show initial search state in search popup ([#570](https://github.com/gravity-ui/markdown-editor/issues/570)) ([0749cb3](https://github.com/gravity-ui/markdown-editor/commit/0749cb3edcc8ccc30f6f8ab7b75b515e28f582e6))
19+
* **Mermaid:** fixed serialization of mermaid block inside other blocks ([#577](https://github.com/gravity-ui/markdown-editor/issues/577)) ([5277645](https://github.com/gravity-ui/markdown-editor/commit/5277645c8914c996bf004ced55249f83f7737335))
20+
21+
## [14.11.0](https://github.com/gravity-ui/markdown-editor/compare/v14.10.5...v14.11.0) (2025-01-22)
22+
23+
24+
### Features
25+
26+
* **YfmTabs:** switch between tabs using tabs-extension runtime ([#550](https://github.com/gravity-ui/markdown-editor/issues/550)) ([3d223cc](https://github.com/gravity-ui/markdown-editor/commit/3d223cc9617d73c8e31e282a9f716b0f7ef663df))
27+
28+
## [14.10.5](https://github.com/gravity-ui/markdown-editor/compare/v14.10.4...v14.10.5) (2025-01-21)
29+
30+
31+
### Bug Fixes
32+
33+
* **modules/toolbars:** fixed strikethrough action in default toolbar preset ([#555](https://github.com/gravity-ui/markdown-editor/issues/555)) ([221b0ef](https://github.com/gravity-ui/markdown-editor/commit/221b0efc70be69ae8332ef71a083eb193b658e7b))
34+
35+
## [14.10.4](https://github.com/gravity-ui/markdown-editor/compare/v14.10.3...v14.10.4) (2025-01-20)
36+
37+
38+
### Bug Fixes
39+
40+
* **modules/toolbars:** fixed tabs actions in yfm toolbar preset [#551](https://github.com/gravity-ui/markdown-editor/issues/551) ([b2dd0f3](https://github.com/gravity-ui/markdown-editor/commit/b2dd0f369b4d48839c822a524d5cfc6a8bca2f35))
41+
342
## [14.10.3](https://github.com/gravity-ui/markdown-editor/compare/v14.10.2...v14.10.3) (2025-01-14)
443

544

demo/stories/ghost/ghostExtension/toolbar.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {Ghost} from '@gravity-ui/icons';
22

3-
import {ToolbarDataType} from '../../../../src';
4-
import {MToolbarSingleItemData} from '../../../../src/bundle/config/markup';
3+
import {type MToolbarSingleItemData, ToolbarDataType} from '../../../../src';
54

65
import {showGhostPopup} from './commands';
76

package-lock.json

Lines changed: 164 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@gravity-ui/markdown-editor",
3-
"version": "14.10.3",
3+
"version": "14.11.2",
44
"description": "Markdown wysiwyg and markup editor",
55
"license": "MIT",
66
"repository": {
@@ -25,6 +25,7 @@
2525
"lint:js": "eslint \"{src,demo}/**/*.{js,jsx,ts,tsx}\"",
2626
"lint:styles": "stylelint \"{src,demo}/**/*.{css,scss}\"",
2727
"lint:prettier": "prettier --check \"{src,demo}/**/*.{js,jsx,ts,tsx,css,scss}\"",
28+
"check-circular-deps": "node scripts/check-circular-deps.js 48",
2829
"test": "jest",
2930
"test:cov": "jest --coverage",
3031
"test:watch": "jest --watchAll",
@@ -201,7 +202,7 @@
201202
"tslib": "^2.3.1"
202203
},
203204
"devDependencies": {
204-
"@diplodoc/cut-extension": "^0.5.0",
205+
"@diplodoc/cut-extension": "^0.6.1",
205206
"@diplodoc/folding-headings-extension": "0.1.0",
206207
"@diplodoc/html-extension": "^2.5.0",
207208
"@diplodoc/latex-extension": "1.0.3",
@@ -235,6 +236,7 @@
235236
"@types/rimraf": "3.0.2",
236237
"@types/sanitize-html": "2.11.0",
237238
"bem-cn-lite": "4.1.0",
239+
"dpdm": "3.14.0",
238240
"esbuild-sass-plugin": "2.15.0",
239241
"eslint": "8.56.0",
240242
"eslint-plugin-lodash": "7.4.0",
@@ -286,7 +288,7 @@
286288
}
287289
},
288290
"peerDependencies": {
289-
"@diplodoc/cut-extension": "^0.3.1 || ^0.4.0 || ^0.5.0",
291+
"@diplodoc/cut-extension": "^0.3.1 || ^0.4.0 || ^0.5.0 || ^0.6.1 || ^0.7.1",
290292
"@diplodoc/folding-headings-extension": "^0.1.0",
291293
"@diplodoc/html-extension": "^2.3.2",
292294
"@diplodoc/latex-extension": "^1.0.3",

0 commit comments

Comments
 (0)