diff --git a/package.json b/package.json index 6e1eae3..af951b7 100644 --- a/package.json +++ b/package.json @@ -24,12 +24,12 @@ "lodash": "4.17.21" }, "devDependencies": { - "@codemirror/basic-setup": "^0.19.0", - "@codemirror/buildhelper": "^0.1.0", - "@codemirror/lang-css": "^0.19.3", - "@codemirror/language": "^0.19.3", - "@codemirror/rangeset": "^0.19.1", - "@codemirror/view": "^0.19.7", + "@codemirror/basic-setup": "^0.20.0", + "@codemirror/buildhelper": "^1.0.0", + "@codemirror/lang-css": "^6.2.0", + "@codemirror/language": "^6.8.0", + "@codemirror/rangeset": "^0.19.9", + "@codemirror/view": "^6.15.0", "@types/lodash": "4.14.179", "@types/node": "^16.11.6", "@typescript-eslint/eslint-plugin": "5.13.0", diff --git a/src/creaseWidget.ts b/src/creaseWidget.ts index 8108e72..926db58 100644 --- a/src/creaseWidget.ts +++ b/src/creaseWidget.ts @@ -3,12 +3,11 @@ import { DecorationSet, EditorView, MatchDecorator, - PluginField, ViewPlugin, ViewUpdate, WidgetType, } from "@codemirror/view"; -import { App, editorLivePreviewField, Menu, setIcon } from "obsidian"; +import { App, Menu, editorLivePreviewField, setIcon } from "obsidian"; class CreaseWidget extends WidgetType { constructor( @@ -26,9 +25,9 @@ class CreaseWidget extends WidgetType { toDOM() { const creaseEl = createSpan("cm-creases-icon"); - setIcon(creaseEl, "shirt", 12); + setIcon(creaseEl, "shirt"); creaseEl.addEventListener("click", (evt) => { - const menu = new Menu(this.app); + const menu = new Menu(); menu .addItem((item) => item @@ -87,7 +86,9 @@ export function creasePlugin(app: App) { }, { decorations: (v) => v.decorations, - provide: PluginField.atomicRanges.from((val) => val.decorations), + provide: plugin => EditorView.atomicRanges.of(view => { + return view.plugin(plugin)?.decorations || Decoration.none + }) } ); } diff --git a/src/main.ts b/src/main.ts index 9c4c36b..a4cc68e 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,23 +1,17 @@ import sortBy from "lodash/sortBy"; -import remove from "lodash/remove"; import { Editor, EditorChange, EditorSelection, EventRef, FoldPosition, - HeadingCache, - MarkdownRenderer, MarkdownView, Menu, - OutlineView, Plugin, - stripHeading, TAbstractFile, TemplaterAppendedEvent, TemplaterNewNoteEvent, TFile, - WorkspaceLeaf, } from "obsidian"; import { foldable } from "@codemirror/language"; import { around } from "monkey-around"; @@ -28,20 +22,6 @@ import { CreasesSettings, CreasesSettingTab, DEFAULT_SETTINGS } from "./settings const headingLevels = [1, 2, 3, 4, 5, 6]; -function selectionInclude(selection: EditorSelection, fromLine: number, toLine: number) { - const { anchor, head } = selection; - - // selection anchor is between - if (anchor.line >= fromLine && anchor.line <= toLine) return true; - // selection head is between - if (head.line >= fromLine && head.line <= toLine) return true; - // selection envelopes (head < anchor) - if (head.line < fromLine && anchor.line > toLine) return true; - // selection envelopes (head > anchor) - if (anchor.line < fromLine && head.line > toLine) return true; - return false; -} - const BLOCK_ID_REGEX = /\^([a-zA-Z0-9-]+)$/; export default class CreasesPlugin extends Plugin { @@ -85,18 +65,6 @@ export default class CreasesPlugin extends Plugin { editorCallback: this.clearCreases.bind(this), }); - this.addCommand({ - id: "increase-fold-level-at-cursor", - name: "Fold more", - editorCallback: this.increaseFoldLevelAtCursor.bind(this), - }); - - this.addCommand({ - id: "decrease-fold-level-at-cursor", - name: "Fold less", - editorCallback: this.decreaseFoldLevelAtCursor.bind(this), - }); - this.addCommand({ id: "increase-fold-level", name: "Increase heading fold level", @@ -110,10 +78,9 @@ export default class CreasesPlugin extends Plugin { }); this.app.workspace.onLayoutReady(() => { - this.patchCoreOutlinePlugin(); + // this.patchCoreOutlinePlugin(); this.registerEvent(this.app.vault.on("create", this.onNewFile.bind(this))); this.patchCoreTemplatePlugin(); - this.patchFileSuggest(); }); headingLevels.forEach((level) => { @@ -159,29 +126,6 @@ export default class CreasesPlugin extends Plugin { ); } - private async increaseFoldLevelAtCursor(editor: Editor, view: MarkdownView) { - const foldInfo = await this.app.foldManager.load(view.file); - const folds = foldInfo?.folds ?? []; - - const selections = editor.listSelections(); - selections.forEach((selection) => { - const parentFolds = this.getAllParentFolds(editor, selection); - for (let i = parentFolds.length - 1; i >= 0; i--) { - const parentFold = parentFolds[i]; - if (!folds.find((fold) => fold.from === parentFold.from)) { - folds.push(parentFold); - break; - } - } - }); - - view.currentMode.applyFoldInfo({ - folds, - lines: view.editor.lineCount(), - }); - view.onMarkdownFold(); - } - private onFileOpen(_file: TFile): void { if (this.app.workspace.activeLeaf) { this.patchMarkdownView(); @@ -266,29 +210,6 @@ export default class CreasesPlugin extends Plugin { } } - async decreaseFoldLevelAtCursor(editor: Editor, view: MarkdownView) { - const foldInfo = await this.app.foldManager.load(view.file); - const folds = foldInfo?.folds ?? []; - - const selections = editor.listSelections(); - selections.forEach((selection) => { - const parentFolds = this.getAllParentFolds(editor, selection); - for (let i = 0; i < parentFolds.length; i++) { - const parentFold = parentFolds[i]; - if (folds.find((fold) => fold.from === parentFold.from)) { - remove(folds, (f) => f.from === parentFold.from); - break; - } - } - }); - - view.currentMode.applyFoldInfo({ - folds, - lines: view.editor.lineCount(), - }); - view.onMarkdownFold(); - } - async decreaseHeadingFoldLevel(_editor: Editor, view: MarkdownView) { const foldInfo = view.currentMode.getFoldInfo(); const existingFolds = foldInfo?.folds ?? []; @@ -358,30 +279,6 @@ export default class CreasesPlugin extends Plugin { this.register( around(leaf.view.constructor.prototype, { - onMarkdownFold(old: () => void) { - return async function () { - await old.call(this); - - if (plugin.settings.syncOutlineView === "none") { - return; - } - const existingFolds = (this as MarkdownView).currentMode.getFoldInfo(); - - const outlineViewLeaf = workspace.getLeavesOfType("outline")[0]; - if (outlineViewLeaf) { - const outlineView = outlineViewLeaf.view as OutlineView; - if (outlineView.file === this.file) { - const treeView = outlineView.treeView; - for (const item of treeView.allItems) { - const isFolded = !!existingFolds?.folds.find( - (fold) => fold.from === item.heading.position.start.line - ); - item.setCollapsed(isFolded); - } - } - } - }; - }, onLoadFile(old: (file: TFile) => void) { return async function (file: TFile) { await old.call(this, file); @@ -426,171 +323,6 @@ export default class CreasesPlugin extends Plugin { ); } - private getAnyLeaf(): WorkspaceLeaf { - let leaf: WorkspaceLeaf | null = this.app.workspace.activeLeaf; - if (leaf) return leaf; - - this.app.workspace.iterateAllLeaves(l => { - if (!leaf) { - leaf = l; - } - }); - return leaf!; - } - - private patchCoreOutlinePlugin() { - const leaf = this.getAnyLeaf(); - - const plugin = this as CreasesPlugin; - let outlineView: OutlineView | undefined = undefined; - try { - outlineView = this.app.viewRegistry.viewByType["outline"](leaf) as OutlineView; - } catch (e) { - // Outline plugin not enabled - return; - } - - - const treeView = outlineView.treeView; - const tempEl = createDiv(); - const tempTreeView = treeView.constructor(tempEl); - tempTreeView.renderOutline([ - { - heading: "test", - level: 1, - }, - ]); - - this.register( - around(tempTreeView.allItems[0].constructor.prototype, { - onCollapseClick(old: () => void) { - return function (e: MouseEvent) { - old.call(this, e); - - if (plugin.settings.syncOutlineView !== "bidirectional") { - return; - } - - const view = plugin.app.workspace.getActiveViewOfType(MarkdownView); - if (view) { - const existingFolds = view.currentMode.getFoldInfo()?.folds ?? []; - if (this.collapsed) { - const foldPositions = [ - ...existingFolds, - { - from: this.heading.position.start.line, - to: this.heading.position.start.line + 1, - }, - ]; - view.currentMode.applyFoldInfo({ - folds: foldPositions, - lines: view.editor.lineCount(), - }); - } else { - view.currentMode.applyFoldInfo({ - folds: existingFolds.filter( - (fold) => this.heading.position.start.line !== fold.from - ), - lines: view.editor.lineCount(), - }); - } - view.onMarkdownFold(); - } - }; - }, - render(old: () => void) { - return function () { - old.call(this); - const view = plugin.app.workspace.getActiveViewOfType(MarkdownView); - if (view) { - this.innerEl.empty(); - MarkdownRenderer.renderMarkdown( - this.heading.heading, - this.innerEl, - view.file.path, - this - ); - - const existingFolds = view.currentMode.getFoldInfo()?.folds ?? []; - if ( - existingFolds.find( - (fold) => fold.from === this.heading.position.start.line - ) - ) { - this.setCollapsed(true); - } - } - }; - }, - }) - ); - outlineView.close(); - } - - private patchFileSuggest() { - const suggests = this.app.workspace.editorSuggest.suggests; - const fileSuggest = suggests.find((s) => (s as any).mode !== undefined); - if (!fileSuggest) { - return; - } - - this.register( - around(fileSuggest.constructor.prototype, { - getGlobalBlockSuggestions(old: () => any[]) { - return async function (...args: any[]) { - const blocks = await old.call(this, ...args); - if (!blocks) { - return null; - } - return blocks.map((b: any) => { - if (b.node.type !== "heading") { - return b; - } - return { - ...b, - display: stripHeading( - b.node.data.hProperties.dataHeading.replace(CREASE_REGEX, "") - ), - }; - }); - }; - }, - getGlobalHeadingSuggestions(old: () => HeadingCache[]) { - return async function (...args: any[]) { - const headings = await old.call(this, ...args); - if (!headings) { - return null; - } - return headings.map((h: HeadingCache) => ({ - ...h, - heading: stripHeading(h.heading.replace(CREASE_REGEX, "")), - })); - }; - }, - - getHeadingSuggestions(old: () => HeadingCache[]) { - return async function (...args: any[]) { - const headings = await old.call(this, ...args); - if (!headings) { - return null; - } - return headings.map((h: HeadingCache) => ({ - ...h, - heading: stripHeading(h.heading.replace(CREASE_REGEX, "")), - })); - }; - }, - }) - ); - } - - private getAllParentFolds(editor: Editor, selection: EditorSelection): FoldPosition[] { - const allFoldsInFile = this.getAllFoldableLines(editor); - return allFoldsInFile.filter((fold) => - selectionInclude(selection, fold.from, fold.to) - ); - } - private getAllFoldableLines(editor: Editor): FoldPosition[] { if (this.app.vault.getConfig("legacyEditor")) { const foldOpts = editor.cm.state.foldGutter.options; diff --git a/src/obsidian.d.ts b/src/obsidian.d.ts index 9359683..11f71a7 100644 --- a/src/obsidian.d.ts +++ b/src/obsidian.d.ts @@ -5,26 +5,6 @@ declare module "obsidian" { foldManager: FoldManager; } - interface TreeItem { - setCollapsed(collapse: boolean): Promise; - collapsed: boolean; - children: TreeItem[]; - el: HTMLElement; - heading: HeadingCache; - } - - interface TreeView { - children: TreeItem[]; - allItems: TreeItem[]; - } - - export interface OutlineView extends View { - file: TFile; - treeView: TreeView; - update: () => void; - close: () => void; - } - export interface TemplaterNewNoteEvent { file: TFile; contents: string; diff --git a/src/settings.ts b/src/settings.ts index 45ff71b..e3b4f50 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -29,25 +29,6 @@ export class CreasesSettingTab extends PluginSettingTab { containerEl.empty(); - containerEl.createEl("h3", { - text: "Folding", - }); - - new Setting(containerEl) - .setName("Sync editor folds with outline view") - .addDropdown((cb) => { - cb.addOptions({ - "from-editor-to-outline": "From editor to outline", - bidirectional: "Bidirectionally", - none: "None", - }); - cb.setValue(this.plugin.settings.syncOutlineView); - cb.onChange(async (value) => { - this.plugin.settings.syncOutlineView = value as OutlineSyncType; - await this.plugin.saveSettings(); - }); - }); - containerEl.createEl("h3", { text: "Crease Behavior", }); diff --git a/yarn.lock b/yarn.lock index 5fdb51d..fdedebf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -44,238 +44,155 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@codemirror/autocomplete@^0.19.0": - version "0.19.13" - resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-0.19.13.tgz#33253750605ffa94a8880636df514fa49821485f" - integrity sha512-fI6lgTH2PlyTQqF2eWKDRBRUC+9MqvS2TfvE7aJ4Pu1oHM1w8JI16J9Qvwrd0iabJeF/QodU51Clok98c7fpCQ== - dependencies: - "@codemirror/language" "^0.19.0" - "@codemirror/state" "^0.19.4" - "@codemirror/text" "^0.19.2" - "@codemirror/tooltip" "^0.19.12" - "@codemirror/view" "^0.19.0" - "@lezer/common" "^0.15.0" - -"@codemirror/basic-setup@^0.19.0": - version "0.19.1" - resolved "https://registry.yarnpkg.com/@codemirror/basic-setup/-/basic-setup-0.19.1.tgz#17b27d02f15c628eb62a85d01e3e1b1958933eb4" - integrity sha512-gLjD7YgZU/we6BzS/ecCmD3viw83dsgv5ZUaSydYbYx9X4w4w9RqYnckcJ+0GDyHfNr5Jtfv2Z5ZtFQnBj0UDA== - dependencies: - "@codemirror/autocomplete" "^0.19.0" - "@codemirror/closebrackets" "^0.19.0" - "@codemirror/commands" "^0.19.0" - "@codemirror/comment" "^0.19.0" - "@codemirror/fold" "^0.19.0" - "@codemirror/gutter" "^0.19.0" - "@codemirror/highlight" "^0.19.0" - "@codemirror/history" "^0.19.0" - "@codemirror/language" "^0.19.0" - "@codemirror/lint" "^0.19.0" - "@codemirror/matchbrackets" "^0.19.0" - "@codemirror/rectangular-selection" "^0.19.0" - "@codemirror/search" "^0.19.0" - "@codemirror/state" "^0.19.0" - "@codemirror/view" "^0.19.31" - -"@codemirror/buildhelper@^0.1.0": - version "0.1.14" - resolved "https://registry.yarnpkg.com/@codemirror/buildhelper/-/buildhelper-0.1.14.tgz#1ec6207447ee0a0a4a69394da05bcc7d07c232ac" - integrity sha512-KyQPgrA4O+p20RhINKqxwU5EwQCR+Dwue/iJFdM8RNqHB/iwrGWlypCpBEVB6kS7EoXRDyZOVJUY30KSUP2cCg== - dependencies: - "@lezer/generator" "^0.15.0" - "@types/mocha" "^8.2.2" - acorn "^8.1.0" - acorn-walk "^8.0.2" - esmoduleserve "^0.2.0" - ist "^1.1.7" - mocha "^8.3.0" - rollup "^2.35.1" - rollup-plugin-dts "^3.0.0" - selenium-webdriver "^4.0.0-beta.3" - serve-static "^1.14.1" - typescript "^4.2.3" - -"@codemirror/closebrackets@^0.19.0": - version "0.19.1" - resolved "https://registry.yarnpkg.com/@codemirror/closebrackets/-/closebrackets-0.19.1.tgz#c93219d6800c27a880e569135b468cf4a05d903f" - integrity sha512-ZiLXT6u+VuBK5QnfBbt/Vmfd9Pg6449wn1DIOWFZHUOldg5eFn3VGGjYY2XWuHQz5WuK+7dXamV2KE885O1gyA== - dependencies: - "@codemirror/language" "^0.19.0" - "@codemirror/rangeset" "^0.19.0" - "@codemirror/state" "^0.19.2" - "@codemirror/text" "^0.19.0" - "@codemirror/view" "^0.19.44" - -"@codemirror/commands@^0.19.0": - version "0.19.8" - resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-0.19.8.tgz#1f99c1a8bf200d17c4d6997379099459f3678107" - integrity sha512-65LIMSGUGGpY3oH6mzV46YWRrgao6NmfJ+AuC7jNz3K5NPnH6GCV1H5I6SwOFyVbkiygGyd0EFwrWqywTBD1aw== - dependencies: - "@codemirror/language" "^0.19.0" - "@codemirror/matchbrackets" "^0.19.0" - "@codemirror/state" "^0.19.2" - "@codemirror/text" "^0.19.6" - "@codemirror/view" "^0.19.22" - "@lezer/common" "^0.15.0" - -"@codemirror/comment@^0.19.0": - version "0.19.1" - resolved "https://registry.yarnpkg.com/@codemirror/comment/-/comment-0.19.1.tgz#7def8345eeb9095ef1ef33676fbde1ab4fe33fad" - integrity sha512-uGKteBuVWAC6fW+Yt8u27DOnXMT/xV4Ekk2Z5mRsiADCZDqYvryrJd6PLL5+8t64BVyocwQwNfz1UswYS2CtFQ== - dependencies: - "@codemirror/state" "^0.19.9" - "@codemirror/text" "^0.19.0" - "@codemirror/view" "^0.19.0" - -"@codemirror/fold@^0.19.0": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@codemirror/fold/-/fold-0.19.3.tgz#de55d44a7313f2a8920aefb6ebf9eff34715d8d4" - integrity sha512-8hT+Eq2G68mL0yPRvSD2ewhnLQAX6sbUJmtGVKFcj8oAXtfpYCX8LIcfXsuI19Qs7gZkOSpqZvn+KKj8IhZoAw== - dependencies: - "@codemirror/gutter" "^0.19.0" - "@codemirror/language" "^0.19.0" - "@codemirror/rangeset" "^0.19.0" - "@codemirror/state" "^0.19.0" - "@codemirror/view" "^0.19.22" - -"@codemirror/gutter@^0.19.0", "@codemirror/gutter@^0.19.4": - version "0.19.9" - resolved "https://registry.yarnpkg.com/@codemirror/gutter/-/gutter-0.19.9.tgz#bbb69f4d49570d9c1b3f3df5d134980c516cd42b" - integrity sha512-PFrtmilahin1g6uL27aG5tM/rqR9DZzZYZsIrCXA5Uc2OFTFqx4owuhoU9hqfYxHp5ovfvBwQ+txFzqS4vog6Q== - dependencies: - "@codemirror/rangeset" "^0.19.0" - "@codemirror/state" "^0.19.0" - "@codemirror/view" "^0.19.23" - -"@codemirror/highlight@^0.19.0", "@codemirror/highlight@^0.19.6": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@codemirror/highlight/-/highlight-0.19.7.tgz#91a0c9994c759f5f153861e3aae74ff9e7c7c35b" - integrity sha512-3W32hBCY0pbbv/xidismw+RDMKuIag+fo4kZIbD7WoRj+Ttcaxjf+vP6RttRHXLaaqbWh031lTeON8kMlDhMYw== - dependencies: - "@codemirror/language" "^0.19.0" - "@codemirror/rangeset" "^0.19.0" - "@codemirror/state" "^0.19.3" - "@codemirror/view" "^0.19.0" - "@lezer/common" "^0.15.0" +"@codemirror/autocomplete@^0.20.0": + version "0.20.3" + resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-0.20.3.tgz#affe2d7e2b2e0be42ee1ac5fb74a1c84a6f1bfd7" + integrity sha512-lYB+NPGP+LEzAudkWhLfMxhTrxtLILGl938w+RcFrGdrIc54A+UgmCoz+McE3IYRFp4xyQcL4uFJwo+93YdgHw== + dependencies: + "@codemirror/language" "^0.20.0" + "@codemirror/state" "^0.20.0" + "@codemirror/view" "^0.20.0" + "@lezer/common" "^0.16.0" + +"@codemirror/autocomplete@^6.0.0": + version "6.8.1" + resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-6.8.1.tgz#3f3daa9f591186901db07f58d17256656242e841" + integrity sha512-HpphvDcTdOx+9R3eUw9hZK9JA77jlaBF0kOt2McbyfvY0rX9pnMoO8rkkZc0GzSbzhIY4m5xJ0uHHgjfqHNmXQ== + dependencies: + "@codemirror/language" "^6.0.0" + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.6.0" + "@lezer/common" "^1.0.0" + +"@codemirror/basic-setup@^0.20.0": + version "0.20.0" + resolved "https://registry.yarnpkg.com/@codemirror/basic-setup/-/basic-setup-0.20.0.tgz#ed331e0b2d29efc0a09317de9e10467b992b0c7b" + integrity sha512-W/ERKMLErWkrVLyP5I8Yh8PXl4r+WFNkdYVSzkXYPQv2RMPSkWpr2BgggiSJ8AHF/q3GuApncDD8I4BZz65fyg== + dependencies: + "@codemirror/autocomplete" "^0.20.0" + "@codemirror/commands" "^0.20.0" + "@codemirror/language" "^0.20.0" + "@codemirror/lint" "^0.20.0" + "@codemirror/search" "^0.20.0" + "@codemirror/state" "^0.20.0" + "@codemirror/view" "^0.20.0" + +"@codemirror/buildhelper@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@codemirror/buildhelper/-/buildhelper-1.0.0.tgz#23b1751f22c7df7c9393ef2af64d32806bb1e5a8" + integrity sha512-tjVnizCUsDJHWZFNjQWBl4DAZrfLGSUmFEvjMkfom4eK5zyByiCITfrNHZOYZgi4xMWk2qJHS6LBWCq0IBWtmQ== + dependencies: + "@lezer/generator" "^1.0.0" + "@marijn/buildtool" "^0.1.4" + "@marijn/testtool" "^0.1.1" + +"@codemirror/commands@^0.20.0": + version "0.20.0" + resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-0.20.0.tgz#51405d442e6b8687b63e8fa27effc28179917c88" + integrity sha512-v9L5NNVA+A9R6zaFvaTbxs30kc69F6BkOoiEbeFw4m4I0exmDEKBILN6mK+GksJtvTzGBxvhAPlVFTdQW8GB7Q== + dependencies: + "@codemirror/language" "^0.20.0" + "@codemirror/state" "^0.20.0" + "@codemirror/view" "^0.20.0" + "@lezer/common" "^0.16.0" + +"@codemirror/lang-css@^6.2.0": + version "6.2.0" + resolved "https://registry.yarnpkg.com/@codemirror/lang-css/-/lang-css-6.2.0.tgz#f84f9da392099432445c75e32fdac63ae572315f" + integrity sha512-oyIdJM29AyRPM3+PPq1I2oIk8NpUfEN3kAM05XWDDs6o3gSneIKaVJifT2P+fqONLou2uIgXynFyMUDQvo/szA== + dependencies: + "@codemirror/autocomplete" "^6.0.0" + "@codemirror/language" "^6.0.0" + "@codemirror/state" "^6.0.0" + "@lezer/common" "^1.0.2" + "@lezer/css" "^1.0.0" + +"@codemirror/language@^0.20.0": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-0.20.2.tgz#31c3712eac2251810986272dcd6a50510e0c1529" + integrity sha512-WB3Bnuusw0xhVvhBocieYKwJm04SOk5bPoOEYksVHKHcGHFOaYaw+eZVxR4gIqMMcGzOIUil0FsCmFk8yrhHpw== + dependencies: + "@codemirror/state" "^0.20.0" + "@codemirror/view" "^0.20.0" + "@lezer/common" "^0.16.0" + "@lezer/highlight" "^0.16.0" + "@lezer/lr" "^0.16.0" style-mod "^4.0.0" -"@codemirror/history@^0.19.0": - version "0.19.2" - resolved "https://registry.yarnpkg.com/@codemirror/history/-/history-0.19.2.tgz#25e3fda755f77ac1223a6ae6e9d7899f5919265e" - integrity sha512-unhP4t3N2smzmHoo/Yio6ueWi+il8gm9VKrvi6wlcdGH5fOfVDNkmjHQ495SiR+EdOG35+3iNebSPYww0vN7ow== +"@codemirror/language@^6.0.0", "@codemirror/language@^6.8.0": + version "6.8.0" + resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.8.0.tgz#f2d7eea6b338c25593d800f2293b062d9f9856db" + integrity sha512-r1paAyWOZkfY0RaYEZj3Kul+MiQTEbDvYqf8gPGaRvNneHXCmfSaAVFjwRUPlgxS8yflMxw2CTu6uCMp8R8A2g== dependencies: - "@codemirror/state" "^0.19.2" - "@codemirror/view" "^0.19.0" - -"@codemirror/lang-css@^0.19.3": - version "0.19.3" - resolved "https://registry.yarnpkg.com/@codemirror/lang-css/-/lang-css-0.19.3.tgz#7a17adf78c6fcdab4ad5ee4e360631c41e949e4a" - integrity sha512-tyCUJR42/UlfOPLb94/p7dN+IPsYSIzHbAHP2KQHANj0I+Orqp+IyIOS++M8TuCX4zkWh9dvi8s92yy/Tn8Ifg== - dependencies: - "@codemirror/autocomplete" "^0.19.0" - "@codemirror/highlight" "^0.19.6" - "@codemirror/language" "^0.19.0" - "@codemirror/state" "^0.19.0" - "@lezer/css" "^0.15.2" + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.0.0" + "@lezer/common" "^1.0.0" + "@lezer/highlight" "^1.0.0" + "@lezer/lr" "^1.0.0" + style-mod "^4.0.0" -"@codemirror/language@^0.19.0", "@codemirror/language@^0.19.3": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-0.19.7.tgz#9eef8e827692d93a701b18db9d46a42be34ecca6" - integrity sha512-pNNUtYWMIMG0lUSKyUXJr8U0rFiCKsKFXbA2Oj17PC+S1FY99hV0z1vcntW67ekAIZw9DMEUQnLsKBuIbAUX7Q== +"@codemirror/lint@^0.20.0": + version "0.20.3" + resolved "https://registry.yarnpkg.com/@codemirror/lint/-/lint-0.20.3.tgz#34c0fd45c5acd522637f68602e3a416162e03a15" + integrity sha512-06xUScbbspZ8mKoODQCEx6hz1bjaq9m8W8DxdycWARMiiX1wMtfCh/MoHpaL7ws/KUMwlsFFfp2qhm32oaCvVA== dependencies: - "@codemirror/state" "^0.19.0" - "@codemirror/text" "^0.19.0" - "@codemirror/view" "^0.19.0" - "@lezer/common" "^0.15.5" - "@lezer/lr" "^0.15.0" - -"@codemirror/lint@^0.19.0": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@codemirror/lint/-/lint-0.19.5.tgz#e5e4171df98ea66a7acb7c76084498e72a8c09c3" - integrity sha512-J6AnEj2WyQfejWmlm4TS5ItVDAe2R+1cO79138HEUJnAN0CX6pVG6zI9cUhoy6V6dsV0hTwFmu6TzGe6vNhkXA== - dependencies: - "@codemirror/gutter" "^0.19.4" - "@codemirror/panel" "^0.19.0" - "@codemirror/rangeset" "^0.19.1" - "@codemirror/state" "^0.19.4" - "@codemirror/tooltip" "^0.19.16" - "@codemirror/view" "^0.19.22" + "@codemirror/state" "^0.20.0" + "@codemirror/view" "^0.20.2" crelt "^1.0.5" -"@codemirror/matchbrackets@^0.19.0": - version "0.19.4" - resolved "https://registry.yarnpkg.com/@codemirror/matchbrackets/-/matchbrackets-0.19.4.tgz#50b5188eb2d53f32598dca906bf5fd66626a9ebc" - integrity sha512-VFkaOKPNudAA5sGP1zikRHCEKU0hjYmkKpr04pybUpQvfTvNJXlReCyP0rvH/1iEwAGPL990ZTT+QrLdu4MeEA== - dependencies: - "@codemirror/language" "^0.19.0" - "@codemirror/state" "^0.19.0" - "@codemirror/view" "^0.19.0" - "@lezer/common" "^0.15.0" - -"@codemirror/panel@^0.19.0": - version "0.19.1" - resolved "https://registry.yarnpkg.com/@codemirror/panel/-/panel-0.19.1.tgz#bf77d27b962cf16357139e50864d0eb69d634441" - integrity sha512-sYeOCMA3KRYxZYJYn5PNlt9yNsjy3zTNTrbYSfVgjgL9QomIVgOJWPO5hZ2sTN8lufO6lw0vTBsIPL9MSidmBg== - dependencies: - "@codemirror/state" "^0.19.0" - "@codemirror/view" "^0.19.0" - -"@codemirror/rangeset@^0.19.0", "@codemirror/rangeset@^0.19.1", "@codemirror/rangeset@^0.19.5": - version "0.19.8" - resolved "https://registry.yarnpkg.com/@codemirror/rangeset/-/rangeset-0.19.8.tgz#f9b572c287bcef08d150b4a539e0128db62b2091" - integrity sha512-1vusIkxSD0vK5KQ22JO/4Ejfww5268PgM/CpKNBSpTpWZEFlZbmOPyRiY4HXO2oEzOpypbA/walMiNInWnrT0Q== - dependencies: - "@codemirror/state" "^0.19.0" - -"@codemirror/rectangular-selection@^0.19.0": - version "0.19.1" - resolved "https://registry.yarnpkg.com/@codemirror/rectangular-selection/-/rectangular-selection-0.19.1.tgz#5a88ece4fb68ce5682539497db8a64fc015aae63" - integrity sha512-9ElnqOg3mpZIWe0prPRd1SZ48Q9QB3bR8Aocq8UtjboJSUG8ABhRrbuTZMW/rMqpBPSjVpCe9xkCCkEQMYQVmw== +"@codemirror/rangeset@^0.19.9": + version "0.19.9" + resolved "https://registry.yarnpkg.com/@codemirror/rangeset/-/rangeset-0.19.9.tgz#e80895de93c39dc7899f5be31d368c9d88aa4efc" + integrity sha512-V8YUuOvK+ew87Xem+71nKcqu1SXd5QROMRLMS/ljT5/3MCxtgrRie1Cvild0G/Z2f1fpWxzX78V0U4jjXBorBQ== dependencies: "@codemirror/state" "^0.19.0" - "@codemirror/text" "^0.19.4" - "@codemirror/view" "^0.19.0" -"@codemirror/search@^0.19.0": - version "0.19.8" - resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-0.19.8.tgz#20b5895ad6becd97e0b69b02369d69887ae15255" - integrity sha512-mMHx60bzbcbSI8Fu2WbxsGAZ2FCGkzslISsvyJXOxVoB7E+y1LDTBv0HUJ+srmfIsak6ceMxKgyI6RldRPMu5A== +"@codemirror/search@^0.20.0": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-0.20.1.tgz#9eba0514218a673e29501a889a4fcb7da7ce24ad" + integrity sha512-ROe6gRboQU5E4z6GAkNa2kxhXqsGNbeLEisbvzbOeB7nuDYXUZ70vGIgmqPu0tB+1M3F9yWk6W8k2vrFpJaD4Q== dependencies: - "@codemirror/panel" "^0.19.0" - "@codemirror/rangeset" "^0.19.0" - "@codemirror/state" "^0.19.3" - "@codemirror/text" "^0.19.0" - "@codemirror/view" "^0.19.34" + "@codemirror/state" "^0.20.0" + "@codemirror/view" "^0.20.0" crelt "^1.0.5" -"@codemirror/state@^0.19.0", "@codemirror/state@^0.19.2", "@codemirror/state@^0.19.3", "@codemirror/state@^0.19.4", "@codemirror/state@^0.19.6", "@codemirror/state@^0.19.9": +"@codemirror/state@^0.19.0": version "0.19.9" resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-0.19.9.tgz#b797f9fbc204d6dc7975485e231693c09001b0dd" integrity sha512-psOzDolKTZkx4CgUqhBQ8T8gBc0xN5z4gzed109aF6x7D7umpDRoimacI/O6d9UGuyl4eYuDCZmDFr2Rq7aGOw== dependencies: "@codemirror/text" "^0.19.0" -"@codemirror/text@^0.19.0", "@codemirror/text@^0.19.2", "@codemirror/text@^0.19.4", "@codemirror/text@^0.19.6": +"@codemirror/state@^0.20.0": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-0.20.1.tgz#de5c6dc0de3e216eaa3a9ee9391c926b766f6b46" + integrity sha512-ms0tlV5A02OK0pFvTtSUGMLkoarzh1F8mr6jy1cD7ucSC2X/VLHtQCxfhdSEGqTYlQF2hoZtmLv+amqhdgbwjQ== + +"@codemirror/state@^6.0.0", "@codemirror/state@^6.1.4": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.2.1.tgz#6dc8d8e5abb26b875e3164191872d69a5e85bd73" + integrity sha512-RupHSZ8+OjNT38zU9fKH2sv+Dnlr8Eb8sl4NOnnqz95mCFTZUaiRP8Xv5MeeaG0px2b8Bnfe7YGwCV3nsBhbuw== + +"@codemirror/text@^0.19.0": version "0.19.6" resolved "https://registry.yarnpkg.com/@codemirror/text/-/text-0.19.6.tgz#9adcbd8137f69b75518eacd30ddb16fd67bbac45" integrity sha512-T9jnREMIygx+TPC1bOuepz18maGq/92q2a+n4qTqObKwvNMg+8cMTslb8yxeEDEq7S3kpgGWxgO1UWbQRij0dA== -"@codemirror/tooltip@^0.19.12", "@codemirror/tooltip@^0.19.16": - version "0.19.16" - resolved "https://registry.yarnpkg.com/@codemirror/tooltip/-/tooltip-0.19.16.tgz#6ba2c43f9d8e3d943d9d7bbae22bf800f7726a22" - integrity sha512-zxKDHryUV5/RS45AQL+wOeN+i7/l81wK56OMnUPoTSzCWNITfxHn7BToDsjtrRKbzHqUxKYmBnn/4hPjpZ4WJQ== +"@codemirror/view@^0.20.0", "@codemirror/view@^0.20.2": + version "0.20.7" + resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-0.20.7.tgz#1d0acc740f71f92abef4b437c030d4e6c39ab6dc" + integrity sha512-pqEPCb9QFTOtHgAH5XU/oVy9UR/Anj6r+tG5CRmkNVcqSKEPmBU05WtN/jxJCFZBXf6HumzWC9ydE4qstO3TxQ== dependencies: - "@codemirror/state" "^0.19.0" - "@codemirror/view" "^0.19.0" + "@codemirror/state" "^0.20.0" + style-mod "^4.0.0" + w3c-keyname "^2.2.4" -"@codemirror/view@^0.19.0", "@codemirror/view@^0.19.22", "@codemirror/view@^0.19.23", "@codemirror/view@^0.19.31", "@codemirror/view@^0.19.34", "@codemirror/view@^0.19.44", "@codemirror/view@^0.19.7": - version "0.19.45" - resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-0.19.45.tgz#fa608ee1412808e2fa555e48658436dd9e309d5c" - integrity sha512-wR19UBYvJMeV9axa5Xo6ATbAP1jl30BPFZ5buu3cJjYXwlRhJDjzw2wUbxk1zsR1LtAe5jrRNeWEtGA+IPacxw== +"@codemirror/view@^6.0.0", "@codemirror/view@^6.15.0", "@codemirror/view@^6.6.0": + version "6.15.0" + resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.15.0.tgz#87b717b28a7beca560b22dcc0a09fb4d4e360c21" + integrity sha512-3hPeBoD4+pUpzezhKSoARQyFjUP8g4zoI5AIy72+jKqWkE6fp0KV3H/dyTxNfig4jyW7x7ypp060/etvv/4yuA== dependencies: - "@codemirror/rangeset" "^0.19.5" - "@codemirror/state" "^0.19.3" - "@codemirror/text" "^0.19.0" + "@codemirror/state" "^6.1.4" style-mod "^4.0.0" w3c-keyname "^2.2.4" @@ -374,32 +291,82 @@ resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340" integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q== -"@lezer/common@^0.15.0", "@lezer/common@^0.15.5": - version "0.15.11" - resolved "https://registry.yarnpkg.com/@lezer/common/-/common-0.15.11.tgz#965b5067036305f12e8a3efc344076850be1d3a8" - integrity sha512-vv0nSdIaVCRcJ8rPuDdsrNVfBOYe/4Szr/LhF929XyDmBndLDuWiCCHooGlGlJfzELyO608AyDhVsuX/ZG36NA== +"@lezer/common@^0.16.0": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lezer/common/-/common-0.16.1.tgz#3b98b42fdb11454b89e8a340da10bee1b0f94071" + integrity sha512-qPmG7YTZ6lATyTOAWf8vXE+iRrt1NJd4cm2nJHK+v7X9TsOF6+HtuU/ctaZy2RCrluxDb89hI6KWQ5LfQGQWuA== -"@lezer/css@^0.15.2": - version "0.15.2" - resolved "https://registry.yarnpkg.com/@lezer/css/-/css-0.15.2.tgz#e96995da67df90bb4b191aaa8a486349cca5d8e7" - integrity sha512-tnMOMZY0Zs6JQeVjqfmREYMV0GnmZR1NitndLWioZMD6mA7VQF/PPKPmJX1f+ZgVZQc5Am0df9mX3aiJnNJlKQ== +"@lezer/common@^1.0.0", "@lezer/common@^1.0.2": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@lezer/common/-/common-1.0.3.tgz#1808f70e2b0a7b1fdcbaf5c074723d2d4ed1e4c5" + integrity sha512-JH4wAXCgUOcCGNekQPLhVeUtIqjH0yPBs7vvUdSjyQama9618IOKFJwkv2kcqdhF0my8hQEgCTEJU0GIgnahvA== + +"@lezer/css@^1.0.0": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@lezer/css/-/css-1.1.3.tgz#605495b00fd8a122088becf196a93744cbe817fc" + integrity sha512-SjSM4pkQnQdJDVc80LYzEaMiNy9txsFbI7HsMgeVF28NdLaAdHNtQ+kB/QqDUzRBV/75NTXjJ/R5IdC8QQGxMg== + dependencies: + "@lezer/highlight" "^1.0.0" + "@lezer/lr" "^1.0.0" + +"@lezer/generator@^1.0.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@lezer/generator/-/generator-1.3.0.tgz#2de49ddb54f44a70093661458b9bcad2efc487cc" + integrity sha512-7HfulDoOMOkskb97fnwgpC6StwPVSob4ptc0iuOH72rapNQBbp6lVj05y7vc5IM0E9pjFjiLmNQeiBiSbLpCtA== + dependencies: + "@lezer/common" "^1.0.2" + "@lezer/lr" "^1.3.0" + +"@lezer/highlight@^0.16.0": + version "0.16.0" + resolved "https://registry.yarnpkg.com/@lezer/highlight/-/highlight-0.16.0.tgz#95f7b7ee3c32c8a0f6ce499c085e8b1f927ffbdc" + integrity sha512-iE5f4flHlJ1g1clOStvXNLbORJoiW4Kytso6ubfYzHnaNo/eo5SKhxs4wv/rtvwZQeZrK3we8S9SyA7OGOoRKQ== dependencies: - "@lezer/lr" "^0.15.0" + "@lezer/common" "^0.16.0" -"@lezer/generator@^0.15.0": - version "0.15.4" - resolved "https://registry.yarnpkg.com/@lezer/generator/-/generator-0.15.4.tgz#8a5546eefc65968bed28b4e377460f2f7297bbc5" - integrity sha512-9bBwU2TzKMBQ6OCEDevuMNWGOBKlkq5YIGEhjrz9pb3MLb+oYYR4dVFZ7ehwLcDoSecsSA7PdlAy0thJO5pt2w== +"@lezer/highlight@^1.0.0": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@lezer/highlight/-/highlight-1.1.6.tgz#87e56468c0f43c2a8b3dc7f0b7c2804b34901556" + integrity sha512-cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg== dependencies: - "@lezer/common" "^0.15.0" - "@lezer/lr" "^0.15.0" + "@lezer/common" "^1.0.0" -"@lezer/lr@^0.15.0": - version "0.15.8" - resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-0.15.8.tgz#1564a911e62b0a0f75ca63794a6aa8c5dc63db21" - integrity sha512-bM6oE6VQZ6hIFxDNKk8bKPa14hqFrV07J/vHGOeiAbJReIaQXmkVb6xQu4MR+JBTLa5arGRyAAjJe1qaQt3Uvg== +"@lezer/lr@^0.16.0": + version "0.16.3" + resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-0.16.3.tgz#1e4cc581d2725c498e6a731fc83c379114ba3a70" + integrity sha512-pau7um4eAw94BEuuShUIeQDTf3k4Wt6oIUOYxMmkZgDHdqtIcxWND4LRxi8nI9KuT4I1bXQv67BCapkxt7Ywqw== dependencies: - "@lezer/common" "^0.15.0" + "@lezer/common" "^0.16.0" + +"@lezer/lr@^1.0.0", "@lezer/lr@^1.3.0": + version "1.3.9" + resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-1.3.9.tgz#cb299816d1c58efcca23ebbeb70bb4204fdd001b" + integrity sha512-XPz6dzuTHlnsbA5M2DZgjflNQ+9Hi5Swhic0RULdp3oOs3rh6bqGZolosVqN/fQIT8uNiepzINJDnS39oweTHQ== + dependencies: + "@lezer/common" "^1.0.0" + +"@marijn/buildtool@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@marijn/buildtool/-/buildtool-0.1.4.tgz#be802989b02c1c3cabbc10994768760c6b29d737" + integrity sha512-XHH+ZTlxd34snfIPwonUM0V1S4p2RBfDvG1sIDWWQyU7MQzRwLCHrPEWIrck6f+6iryOtYp/9p2IKJFJNkYZTw== + dependencies: + "@types/mocha" "^9.1.1" + acorn "^8.1.0" + acorn-walk "^8.0.2" + rollup "^2.35.1" + rollup-plugin-dts "^3.0.0" + typescript "^4.6.2" + +"@marijn/testtool@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@marijn/testtool/-/testtool-0.1.1.tgz#b4c34154682764ad0b180bf23f995806903f2a26" + integrity sha512-mc8Tq46yGA5C4Nk0utPNy1iJmZGkezHkC9u0m8y46QMTwg/ImI76UCE3gnOa1NxV+yddrwV4JAK/9n//1JmtfA== + dependencies: + esmoduleserve "^0.2.0" + ist "^1.1.7" + mocha "^10.0.0" + selenium-webdriver "^4.0.0-beta.3" + serve-static "^1.14.1" "@nodelib/fs.scandir@2.1.4": version "2.1.4" @@ -469,10 +436,10 @@ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== -"@types/mocha@^8.2.2": - version "8.2.3" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.3.tgz#bbeb55fbc73f28ea6de601fbfa4613f58d785323" - integrity sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw== +"@types/mocha@^9.1.1": + version "9.1.1" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4" + integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw== "@types/node@>=12": version "17.0.24" @@ -581,11 +548,6 @@ "@typescript-eslint/types" "5.13.0" eslint-visitor-keys "^3.0.0" -"@ungap/promise-all-settled@1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" - integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== - JSONStream@^1.0.4: version "1.3.5" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" @@ -673,10 +635,10 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -anymatch@~3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== +anymatch@~3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -724,6 +686,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^3.0.1, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -792,25 +761,33 @@ chalk@^4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== -chokidar@3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== +chokidar@3.5.3: + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== dependencies: - anymatch "~3.1.1" + anymatch "~3.1.2" braces "~3.0.2" - glob-parent "~5.1.0" + glob-parent "~5.1.2" is-binary-path "~2.1.0" is-glob "~4.0.1" normalize-path "~3.0.0" - readdirp "~3.5.0" + readdirp "~3.6.0" optionalDependencies: - fsevents "~2.3.1" + fsevents "~2.3.2" cli-cursor@^2.1.0: version "2.1.0" @@ -1165,7 +1142,14 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@4.3.1, debug@^4.1.1: +debug@4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +debug@^4.1.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== @@ -1743,7 +1727,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@~2.3.1, fsevents@~2.3.2: +fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== @@ -1821,7 +1805,7 @@ glob-parent@^6.0.1: dependencies: is-glob "^4.0.3" -glob-parent@~5.1.0: +glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -1840,7 +1824,19 @@ glob@7.1.4: once "^1.3.0" path-is-absolute "^1.0.0" -glob@7.1.6, glob@^7.1.3: +glob@7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^7.1.3: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -1903,11 +1899,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -growl@1.10.5: - version "1.10.5" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" - integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== - handlebars@^4.7.7: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" @@ -2134,6 +2125,11 @@ is-text-path@^1.0.1: dependencies: text-extensions "^1.0.0" +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== + is-utf8@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" @@ -2164,14 +2160,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" - integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== - dependencies: - argparse "^2.0.1" - -js-yaml@^4.1.0: +js-yaml@4.1.0, js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== @@ -2310,12 +2299,13 @@ lodash@4.17.21, lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17. resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" - integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA== +log-symbols@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== dependencies: - chalk "^4.0.0" + chalk "^4.1.0" + is-unicode-supported "^0.1.0" longest@^2.0.1: version "2.0.1" @@ -2401,7 +2391,14 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -minimatch@3.0.4, minimatch@^3.0.4: +minimatch@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" + integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== + dependencies: + brace-expansion "^2.0.1" + +minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -2427,33 +2424,29 @@ minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== -mocha@^8.3.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz#677be88bf15980a3cae03a73e10a0fc3997f0cff" - integrity sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ== +mocha@^10.0.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8" + integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg== dependencies: - "@ungap/promise-all-settled" "1.1.2" ansi-colors "4.1.1" browser-stdout "1.3.1" - chokidar "3.5.1" - debug "4.3.1" + chokidar "3.5.3" + debug "4.3.4" diff "5.0.0" escape-string-regexp "4.0.0" find-up "5.0.0" - glob "7.1.6" - growl "1.10.5" + glob "7.2.0" he "1.2.0" - js-yaml "4.0.0" - log-symbols "4.0.0" - minimatch "3.0.4" + js-yaml "4.1.0" + log-symbols "4.1.0" + minimatch "5.0.1" ms "2.1.3" - nanoid "3.1.20" - serialize-javascript "5.0.1" + nanoid "3.3.3" + serialize-javascript "6.0.0" strip-json-comments "3.1.1" supports-color "8.1.1" - which "2.0.2" - wide-align "1.1.3" - workerpool "6.1.0" + workerpool "6.2.1" yargs "16.2.0" yargs-parser "20.2.4" yargs-unparser "2.0.0" @@ -2463,10 +2456,10 @@ modify-values@^1.0.0: resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== -moment@2.29.1: - version "2.29.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" - integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== +moment@2.29.4: + version "2.29.4" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" + integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== monkey-around@2.3.0: version "2.3.0" @@ -2493,10 +2486,10 @@ mute-stream@0.0.7: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= -nanoid@3.1.20: - version "3.1.20" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" - integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== +nanoid@3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" + integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== natural-compare@^1.4.0: version "1.4.0" @@ -2538,15 +2531,13 @@ null-check@^1.0.0: resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd" integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0= -obsidian@0.13.26: - version "0.13.26" - resolved "https://registry.yarnpkg.com/obsidian/-/obsidian-0.13.26.tgz#e7a191184b0857e4ddad8250cb918d35308ebd6a" - integrity sha512-7NLjrX8Yw5q3zROiOo52KUh4U0qEm3Oj5T62OhG/tbdHfq2/hqB2U93S/rquIseCbKUHnV4AVGIlYKGczvy8rg== +obsidian@latest: + version "1.2.8" + resolved "https://registry.yarnpkg.com/obsidian/-/obsidian-1.2.8.tgz#294e76d9021cbf341ffd5d49e2bcfa15432da7d7" + integrity sha512-HrC+feA8o0tXspj4lEAqxb1btwLwHD2oHXSwbbN+CdRHURqbCkuIDLld+nkuyJ1w1c9uvVDRVk8BoeOnWheOrQ== dependencies: - "@codemirror/state" "^0.19.6" - "@codemirror/view" "^0.19.31" "@types/codemirror" "0.0.108" - moment "2.29.1" + moment "2.29.4" on-finished@~2.3.0: version "2.3.0" @@ -2837,10 +2828,10 @@ readable-stream@~2.3.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" - integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== dependencies: picomatch "^2.2.1" @@ -3023,10 +3014,10 @@ send@0.17.2: range-parser "~1.2.1" statuses "~1.5.0" -serialize-javascript@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" - integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== +serialize-javascript@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== dependencies: randombytes "^2.1.0" @@ -3148,7 +3139,7 @@ standard-version@^9.3.2: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= -"string-width@^1.0.2 || 2", string-width@^2.1.0: +string-width@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -3404,16 +3395,16 @@ typescript@4.5.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.2.tgz#8ac1fba9f52256fdb06fb89e4122fa6a346c2998" integrity sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw== -typescript@^4.2.3: - version "4.5.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" - integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA== - typescript@^4.4.3: version "4.6.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c" integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw== +typescript@^4.6.2: + version "4.9.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" + integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== + uglify-js@^3.1.4: version "3.15.4" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.4.tgz#fa95c257e88f85614915b906204b9623d4fa340d" @@ -3459,13 +3450,6 @@ w3c-keyname@^2.2.4: resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.4.tgz#4ade6916f6290224cdbd1db8ac49eab03d0eef6b" integrity sha512-tOhfEwEzFLJzf6d1ZPkYfGj+FWhIpBux9ppoP3rlclw3Z0BZv3N7b7030Z1kYth+6rDuAsXUFr+d0VE6Ed1ikw== -which@2.0.2, which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - which@^1.2.14: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -3473,12 +3457,12 @@ which@^1.2.14: dependencies: isexe "^2.0.0" -wide-align@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: - string-width "^1.0.2 || 2" + isexe "^2.0.0" word-wrap@^1.0.3, word-wrap@^1.2.3: version "1.2.3" @@ -3490,10 +3474,10 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= -workerpool@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz#a8e038b4c94569596852de7a8ea4228eefdeb37b" - integrity sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg== +workerpool@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" + integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== wrap-ansi@^7.0.0: version "7.0.0"