diff --git a/.eslintignore b/.eslintignore index 923e61fdc88..0df74ed121d 100644 --- a/.eslintignore +++ b/.eslintignore @@ -856,6 +856,7 @@ packages/lib/models/Tag.js packages/lib/models/dateTimeFormats.test.js packages/lib/models/settings/FileHandler.js packages/lib/models/settings/settingValidations.js +packages/lib/models/utils/getCollator.js packages/lib/models/utils/getConflictFolderId.js packages/lib/models/utils/isItemId.js packages/lib/models/utils/itemCanBeEncrypted.js diff --git a/.gitignore b/.gitignore index 94709bad68b..21bb9c71c89 100644 --- a/.gitignore +++ b/.gitignore @@ -836,6 +836,7 @@ packages/lib/models/Tag.js packages/lib/models/dateTimeFormats.test.js packages/lib/models/settings/FileHandler.js packages/lib/models/settings/settingValidations.js +packages/lib/models/utils/getCollator.js packages/lib/models/utils/getConflictFolderId.js packages/lib/models/utils/isItemId.js packages/lib/models/utils/itemCanBeEncrypted.js diff --git a/packages/editor/package.json b/packages/editor/package.json index d42db20496f..7d9e3f8c561 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -36,7 +36,7 @@ "@codemirror/lint": "6.5.0", "@codemirror/search": "6.5.6", "@codemirror/state": "6.4.1", - "@codemirror/view": "6.24.1", + "@codemirror/view": "6.26.0", "@lezer/common": "1.2.1", "@lezer/highlight": "1.2.0", "@lezer/markdown": "1.2.0", diff --git a/yarn.lock b/yarn.lock index 7781647591f..0e8268593ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4291,14 +4291,14 @@ __metadata: languageName: node linkType: hard -"@codemirror/view@npm:6.24.1, @codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.23.0": - version: 6.24.1 - resolution: "@codemirror/view@npm:6.24.1" +"@codemirror/view@npm:6.26.0, @codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.23.0": + version: 6.26.0 + resolution: "@codemirror/view@npm:6.26.0" dependencies: "@codemirror/state": ^6.4.0 style-mod: ^4.1.0 w3c-keyname: ^2.2.4 - checksum: 376a9dd6ba3d626373f06a241defa7b61dfa80dda021e8dac8aa05261873b5e8bdf2f7d378f844c8bea2b644659020729bbf43330a272a76143e9995d77a452c + checksum: 93c824334228d0ed81c0db8f58a627b69dad1300f4b64df6e19b487aa36cbd8bf624121092119fc09d49c290cd4e1c88680de62bd138a15f89570832f7addd80 languageName: node linkType: hard @@ -6784,7 +6784,7 @@ __metadata: "@codemirror/lint": 6.5.0 "@codemirror/search": 6.5.6 "@codemirror/state": 6.4.1 - "@codemirror/view": 6.24.1 + "@codemirror/view": 6.26.0 "@joplin/lib": ~3.0 "@lezer/common": 1.2.1 "@lezer/highlight": 1.2.0