Skip to content

Commit 5411e0a

Browse files
authored
upgrade xmldom (#834)
1 parent 044cb95 commit 5411e0a

File tree

5 files changed

+22
-24
lines changed

5 files changed

+22
-24
lines changed

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@
368368
"@reduxjs/toolkit": "^1.5.0",
369369
"@vscode/codicons": "0.0.25",
370370
"@vscode/webview-ui-toolkit": "^0.8.2",
371+
"@xmldom/xmldom": "^0.7.5",
371372
"axios": "^0.21.4",
372373
"bootstrap": "^4.5.2",
373374
"compare-versions": "^3.6.0",
@@ -385,7 +386,6 @@
385386
"semver": "^5.7.1",
386387
"vscode-extension-telemetry-wrapper": "^0.9.0",
387388
"vscode-tas-client": "^0.1.22",
388-
"winreg-utf8": "^0.1.1",
389-
"xmldom": "^0.6.0"
389+
"winreg-utf8": "^0.1.1"
390390
}
391391
}

src/formatter-settings/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as fse from "fs-extra";
66
import * as path from "path";
77
import * as vscode from "vscode";
88
import { instrumentOperation, sendError, sendInfo, setUserError } from "vscode-extension-telemetry-wrapper";
9-
import { XMLSerializer } from "xmldom";
9+
import { XMLSerializer } from "@xmldom/xmldom";
1010
import { getNonce } from "../utils";
1111
import { Example, getSupportedVSCodeSettings, JavaConstants, SupportedSettings, VSCodeSettings } from "./FormatterConstants";
1212
import { FormatterConverter } from "./FormatterConverter";
@@ -87,7 +87,7 @@ export class JavaFormatterSettingsEditorProvider implements vscode.CustomTextEdi
8787
this.webviewPanel.onDidDispose(() => {
8888
this.webviewPanel = undefined;
8989
});
90-
this.webviewPanel.webview.html = this.getHtmlForWebview(path.join(this.context.extensionPath, "out", "assets", "formatter-settings", "index.js"));;
90+
this.webviewPanel.webview.html = this.getHtmlForWebview(path.join(this.context.extensionPath, "out", "assets", "formatter-settings", "index.js"));
9191
this.webviewPanel.webview.onDidReceiveMessage(async (e) => {
9292
switch (e.command) {
9393
case "onWillInitialize":

src/formatter-settings/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export enum ExampleKind {
4444
WRAPPING_EXAMPLE = "Wrapping",
4545
}
4646

47-
// two extra properties from xmldom package, see https://www.npmjs.com/package/xmldom
47+
// two extra properties from @xmldom/xmldom package, see https://www.npmjs.com/package/@xmldom/xmldom
4848
export interface DOMElement extends Element {
4949
lineNumber: number;
5050
columnNumber: number;

src/formatter-settings/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import * as fse from "fs-extra";
55
import * as path from "path";
66
import * as vscode from "vscode";
7-
import axios from 'axios';
7+
import axios from "axios";
88
import { sendInfo } from "vscode-extension-telemetry-wrapper";
99
import { DOMAttr, DOMElement, ProfileContent } from "./types";
10-
import { DOMParser, XMLSerializer } from "xmldom";
10+
import { DOMParser, XMLSerializer } from "@xmldom/xmldom";
1111
import { getDefaultValue, getSupportedProfileSettings, JavaConstants } from "./FormatterConstants";
1212
import { FormatterConverter } from "./FormatterConverter";
1313

0 commit comments

Comments
 (0)