Skip to content

Commit d033fd1

Browse files
committed
update dependencies, remove unused
1 parent 1d0051a commit d033fd1

File tree

10 files changed

+1082
-1032
lines changed

10 files changed

+1082
-1032
lines changed

package-lock.json

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

package.json

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,35 +1479,32 @@
14791479
"@xmldom/xmldom": "^0.9.3",
14801480
"adm-zip": "^0.5.16",
14811481
"async": "^3.2.6",
1482-
"axios": "^1.7.7",
1482+
"axios": "^1.12.2",
14831483
"code-d-api": "^0.2.1",
1484-
"expand-tilde": "^2.0.2",
1485-
"jsdom": "^25.0.0",
1486-
"line-by-line": "^0.1.6",
1484+
"jsdom": "^27.0.0",
14871485
"mkdirp": "^3.0.1",
14881486
"ncp": "^2.0.0",
14891487
"rimraf": "^6.0.1",
14901488
"string-argv": "^0.3.2",
14911489
"vscode-languageclient": "^9.0.1",
14921490
"vscode-test-adapter-api": "^1.9.0",
1493-
"which": "^4.0.0"
1491+
"which": "^5.0.0"
14941492
},
14951493
"devDependencies": {
1496-
"@types/expand-tilde": "^2.0.2",
1497-
"@types/jsdom": "^21.1.7",
1498-
"@types/mocha": "^10.0.8",
1499-
"@types/node": "^22.5.5",
1494+
"@types/jsdom": "^27.0.0",
1495+
"@types/mocha": "^10.0.10",
1496+
"@types/node": "^24.8.1",
15001497
"@types/parse5": "^7.0.0",
1501-
"@types/vscode": "^1.93.0",
1498+
"@types/vscode": "^1.105.0",
15021499
"@types/which": "^3.0.4",
1503-
"@vscode/test-electron": "^2.4.1",
1504-
"glob": "^11.0.0",
1500+
"@vscode/test-electron": "^2.5.2",
1501+
"glob": "^11.0.3",
15051502
"js-yaml": "^4.1.0",
1506-
"mocha": "^10.7.3",
1503+
"mocha": "^11.7.4",
15071504
"source-map-support": "^0.5.21",
1508-
"typescript": "^5.6.2",
1505+
"typescript": "5.5",
15091506
"vscode-oniguruma": "^2.0.1",
15101507
"vscode-test": "^1.6.1",
1511-
"vscode-textmate": "^9.1.0"
1508+
"vscode-textmate": "^9.2.1"
15121509
}
15131510
}

src/debug.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode';
2-
import { ServeD, served } from './extension';
2+
import { ServeD } from './extension';
33
import { win32EscapeShellParam, unixEscapeShellParam } from './util';
44
import * as which from "which";
55
import * as path from "path";

src/dmode.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import vscode = require("vscode");
1+
import { DocumentFilter } from "vscode";
22

3-
export const D_MODE: vscode.DocumentFilter = { language: "d", scheme: "file" };
4-
export const DML_MODE: vscode.DocumentFilter = { language: "dml", scheme: "file" };
5-
export const DSCRIPT_MODE: vscode.DocumentFilter = { language: "dscript", scheme: "file" };
6-
export const SDL_MODE: vscode.DocumentFilter = { language: "sdl", scheme: "file" };
7-
export const DUB_MODE: vscode.DocumentFilter = { pattern: "**/dub.{sdl,json}", scheme: "file" };
8-
export const DSCANNER_INI_MODE: vscode.DocumentFilter = { pattern: "**/dscanner.ini", scheme: "file" };
9-
export const DIET_MODE: vscode.DocumentFilter = { language: "diet", scheme: "file" };
10-
export const PROFILEGC_MODE: vscode.DocumentFilter = { pattern: "**/profilegc.log", scheme: "file" };
3+
export const D_MODE: DocumentFilter = { language: "d", scheme: "file" };
4+
export const DML_MODE: DocumentFilter = { language: "dml", scheme: "file" };
5+
export const DSCRIPT_MODE: DocumentFilter = { language: "dscript", scheme: "file" };
6+
export const SDL_MODE: DocumentFilter = { language: "sdl", scheme: "file" };
7+
export const DUB_MODE: DocumentFilter = { pattern: "**/dub.{sdl,json}", scheme: "file" };
8+
export const DSCANNER_INI_MODE: DocumentFilter = { pattern: "**/dscanner.ini", scheme: "file" };
9+
export const DIET_MODE: DocumentFilter = { language: "diet", scheme: "file" };
10+
export const PROFILEGC_MODE: DocumentFilter = { pattern: "**/profilegc.log", scheme: "file" };

src/dub-view.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,4 @@ export class DubDependency extends vscode.TreeItem {
4747
}
4848

4949
info?: DubDependencyInfo;
50-
command?: vscode.Command;
5150
}

src/extension.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import { CoverageAnalyzer } from "./coverage";
1313
import { registerCommands, registerClientCommands } from "./commands";
1414
import { DubDependency, DubDependencyInfo } from "./dub-view";
1515

16-
import expandTilde = require("expand-tilde");
1716
import { CodedAPI, Snippet } from "code-d-api";
1817
import { builtinPlugins } from "./builtin_plugins";
1918
import { CodedAPIServedImpl } from "./api_impl";
2019
import { restoreCreateProjectPackageBackup } from "./project-creator";
2120
import { registerDebuggers, linkDebuggersWithServed } from "./debug";
2221
import { DubTasksProvider } from "./dub-tasks";
2322
import { checkCompilers, DetectedCompiler, makeCompilerInstallButtons, registerCompilerInstaller } from "./compilers";
23+
import { homedir } from "os";
2424

2525
class CustomErrorHandler implements ErrorHandler {
2626
private restarts: number[];
@@ -1095,3 +1095,15 @@ export function hideNextPotentialConfigUpdateWarning() {
10951095
lastConfigUpdateWasInternal = new Date().getTime();
10961096
}
10971097

1098+
function expandTilde(filepath: string): string {
1099+
var home = homedir();
1100+
1101+
if (filepath.charCodeAt(0) === 126 /* ~ */) {
1102+
if (filepath.charCodeAt(1) === 43 /* + */) {
1103+
return path.join(process.cwd(), filepath.slice(2));
1104+
}
1105+
return home ? path.join(home, filepath.slice(1)) : filepath;
1106+
}
1107+
1108+
return filepath;
1109+
};

src/installer.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import * as path from "path"
44
import * as fs from "fs"
55
import { reqJson, reqType } from "./util"
66
import { config, extensionContext, hideNextPotentialConfigUpdateWarning } from "./extension"
7-
import expandTilde = require("expand-tilde");
87
import { AxiosResponse } from "axios"
98
import { Readable } from "stream"
109

src/test/ci/syntaxes.test.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import * as assert from 'assert';
2-
import * as vscode from 'vscode';
32
import * as fs from 'fs';
43
import * as path from 'path';
54
import * as vsctm from 'vscode-textmate';
65
import * as oniguruma from 'vscode-oniguruma';
76
import { suite, test } from 'mocha';
8-
import { IRawGrammar } from 'vscode-textmate/release/rawGrammar';
97

108
/**
119
* Resolves a package relative path (relative to root folder / package.json folder) to the actual path
@@ -31,7 +29,7 @@ function readFile(pathStr: string): Promise<Buffer> {
3129

3230
const registry = new vsctm.Registry({
3331
onigLib: vscodeOnigurumaLib,
34-
loadGrammar: async (scopeName): Promise<IRawGrammar | undefined | null> => {
32+
loadGrammar: async (scopeName): Promise<vsctm.IRawGrammar | undefined | null> => {
3533
if (scopeName === 'source.diet') {
3634
const data = await readFile('syntaxes/diet.json');
3735
return vsctm.parseRawGrammar(data.toString(), 'syntaxes/diet.json');

0 commit comments

Comments
 (0)