From ca15dea96bfef29f7ebbd2511c2d57550bd86e1b Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 10 Nov 2022 21:58:16 -0800 Subject: Pick up latest dompurify and typings for vscode-markdown-languageservice (#166062) Pick up latest typings from vscode-markdown-languageservice --- extensions/markdown-language-features/package.json | 4 ++-- .../markdown-language-features/server/src/workspace.ts | 7 +++---- .../src/client/fileWatchingManager.ts | 5 ++--- extensions/markdown-language-features/yarn.lock | 16 ++++++++-------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json index f932320fe34..6777ec4cfcd 100644 --- a/extensions/markdown-language-features/package.json +++ b/extensions/markdown-language-features/package.json @@ -622,7 +622,7 @@ }, "dependencies": { "@vscode/extension-telemetry": "0.7.0-preview", - "dompurify": "^2.3.3", + "dompurify": "^2.4.1", "highlight.js": "^11.4.0", "markdown-it": "^12.3.2", "markdown-it-front-matter": "^0.2.1", @@ -640,7 +640,7 @@ "@types/vscode-webview": "^1.57.0", "lodash.throttle": "^4.1.1", "vscode-languageserver-types": "^3.17.2", - "vscode-markdown-languageservice": "^0.0.0-alpha.10" + "vscode-markdown-languageservice": "^0.2.0" }, "repository": { "type": "git", diff --git a/extensions/markdown-language-features/server/src/workspace.ts b/extensions/markdown-language-features/server/src/workspace.ts index cec5b950a5d..17a66cc7f60 100644 --- a/extensions/markdown-language-features/server/src/workspace.ts +++ b/extensions/markdown-language-features/server/src/workspace.ts @@ -6,7 +6,6 @@ import { Connection, Emitter, FileChangeType, NotebookDocuments, Position, Range, TextDocuments } from 'vscode-languageserver'; import { TextDocument } from 'vscode-languageserver-textdocument'; import * as md from 'vscode-markdown-languageservice'; -import { ContainingDocumentContext, FileWatcherOptions, IFileSystemWatcher } from 'vscode-markdown-languageservice/out/workspace'; import { URI } from 'vscode-uri'; import { LsConfiguration } from './config'; import * as protocol from './protocol'; @@ -99,7 +98,7 @@ export class VsCodeClientWorkspace implements md.IWorkspaceWithWatching { private _watcherPool = 0; private readonly _watchers = new Map; readonly onDidCreate: Emitter; readonly onDidDelete: Emitter; @@ -364,7 +363,7 @@ export class VsCodeClientWorkspace implements md.IWorkspaceWithWatching { return this.connection.sendRequest(protocol.fs_readDirectory, { uri: resource.toString() }); } - getContainingDocument(resource: URI): ContainingDocumentContext | undefined { + getContainingDocument(resource: URI): md.ContainingDocumentContext | undefined { if (resource.scheme === Schemes.notebookCell) { const nb = this.notebooks.findNotebookDocumentForCell(resource.toString()); if (nb) { @@ -377,7 +376,7 @@ export class VsCodeClientWorkspace implements md.IWorkspaceWithWatching { return undefined; } - watchFile(resource: URI, options: FileWatcherOptions): IFileSystemWatcher { + watchFile(resource: URI, options: md.FileWatcherOptions): md.IFileSystemWatcher { const id = this._watcherPool++; this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: watchFile', `(${id}) ${resource}`); diff --git a/extensions/markdown-language-features/src/client/fileWatchingManager.ts b/extensions/markdown-language-features/src/client/fileWatchingManager.ts index 3a4ba43d446..dabb8f1fc88 100644 --- a/extensions/markdown-language-features/src/client/fileWatchingManager.ts +++ b/extensions/markdown-language-features/src/client/fileWatchingManager.ts @@ -4,10 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { disposeAll } from 'vscode-markdown-languageservice/out/util/dispose'; -import { ResourceMap } from 'vscode-markdown-languageservice/out/util/resourceMap'; import { Utils } from 'vscode-uri'; -import { IDisposable } from '../util/dispose'; +import { disposeAll, IDisposable } from '../util/dispose'; +import { ResourceMap } from '../util/resourceMap'; import { Schemes } from '../util/schemes'; type DirWatcherEntry = { diff --git a/extensions/markdown-language-features/yarn.lock b/extensions/markdown-language-features/yarn.lock index fe1abceb4e7..82ac9793c20 100644 --- a/extensions/markdown-language-features/yarn.lock +++ b/extensions/markdown-language-features/yarn.lock @@ -386,10 +386,10 @@ diagnostic-channel@1.1.0: dependencies: semver "^5.3.0" -dompurify@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.3.tgz#c1af3eb88be47324432964d8abc75cf4b98d634c" - integrity sha512-dqnqRkPMAjOZE0FogZ+ceJNM2dZ3V/yNOuFB7+39qpO93hHhfRpHw3heYQC7DPK9FqbQTfBKUJhiSfz4MvXYwg== +dompurify@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.1.tgz#f9cb1a275fde9af6f2d0a2644ef648dd6847b631" + integrity sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA== emitter-listener@^1.0.1, emitter-listener@^1.1.1: version "1.1.2" @@ -634,10 +634,10 @@ vscode-languageserver-types@3.17.2, vscode-languageserver-types@^3.17.1, vscode- resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2" integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA== -vscode-markdown-languageservice@^0.0.0-alpha.10: - version "0.0.0-alpha.10" - resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.0.0-alpha.10.tgz#53b69c981eed7fd5efa155ab8c0f169995568681" - integrity sha512-rJ85nJ+d45yCz9lBhipavoWXz/vW5FknqqUpLqhe3/2xkrhxt8zcekhSoDepgkKFcTORAFV6g1SnnqxbVhX+uA== +vscode-markdown-languageservice@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.2.0.tgz#93e230a1ed826786792e820a6e993e50139a0119" + integrity sha512-3Jh7/eN6zEPqfkT6cjL+AwGoQ7euL8RtW3FYf24IfPksz4nAZJcRibRtpSdlCaOKpwEoy/f5Axh94cmWPIGBMw== dependencies: picomatch "^2.3.1" vscode-languageserver-textdocument "^1.0.5" -- cgit v1.2.3