Skip to content

Commit e726059

Browse files
authored
Update deps and fix new lints (#57870)
1 parent dc113f8 commit e726059

File tree

10 files changed

+138
-141
lines changed

10 files changed

+138
-141
lines changed

package-lock.json

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

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,31 +41,31 @@
4141
"devDependencies": {
4242
"@esfx/canceltoken": "^1.0.0",
4343
"@octokit/rest": "^20.0.2",
44-
"@types/chai": "^4.3.12",
44+
"@types/chai": "^4.3.14",
4545
"@types/microsoft__typescript-etw": "^0.1.3",
4646
"@types/minimist": "^1.2.5",
4747
"@types/mocha": "^10.0.6",
4848
"@types/ms": "^0.7.34",
4949
"@types/node": "latest",
5050
"@types/source-map-support": "^0.5.10",
5151
"@types/which": "^3.0.3",
52-
"@typescript-eslint/eslint-plugin": "^7.1.1",
53-
"@typescript-eslint/parser": "^7.1.1",
54-
"@typescript-eslint/utils": "^7.1.1",
55-
"azure-devops-node-api": "^12.4.0",
52+
"@typescript-eslint/eslint-plugin": "^7.3.1",
53+
"@typescript-eslint/parser": "^7.3.1",
54+
"@typescript-eslint/utils": "^7.3.1",
55+
"azure-devops-node-api": "^12.5.0",
5656
"c8": "^9.1.0",
5757
"chai": "^4.4.1",
5858
"chalk": "^4.1.2",
5959
"chokidar": "^3.6.0",
6060
"diff": "^5.2.0",
6161
"dprint": "^0.45.0",
62-
"esbuild": "^0.20.1",
62+
"esbuild": "^0.20.2",
6363
"eslint": "^8.57.0",
6464
"eslint-formatter-autolinkable-stylish": "^1.3.0",
6565
"eslint-plugin-local": "^4.2.1",
6666
"eslint-plugin-no-null": "^1.0.2",
6767
"eslint-plugin-simple-import-sort": "^12.0.0",
68-
"fast-xml-parser": "^4.3.5",
68+
"fast-xml-parser": "^4.3.6",
6969
"glob": "^10.3.10",
7070
"hereby": "^1.8.9",
7171
"jsonc-parser": "^3.2.1",
@@ -77,7 +77,7 @@
7777
"playwright": "^1.42.1",
7878
"source-map-support": "^0.5.21",
7979
"tslib": "^2.6.2",
80-
"typescript": "^5.4.2",
80+
"typescript": "^5.4.3",
8181
"which": "^3.0.1"
8282
},
8383
"overrides": {

src/compiler/commandLineParser.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3514,7 +3514,6 @@ export function convertJsonOption(
35143514
convertJsonOption(opt.element, value, basePath, errors, propertyAssignment, valueExpression, sourceFile);
35153515
}
35163516
else if (!isString(opt.type)) {
3517-
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
35183517
return convertJsonOptionOfCustomType(opt as CommandLineOptionOfCustomType, value as string, errors, valueExpression, sourceFile);
35193518
}
35203519
const validatedValue = validateJsonOptionValue(opt, value, errors, valueExpression, sourceFile);

src/harness/client.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import {
3535
identity,
3636
ImplementationLocation,
3737
InlayHint,
38-
InlayHintKind,
3938
InteractiveRefactorArguments,
4039
isString,
4140
JSDocTagInfo,
@@ -777,7 +776,7 @@ export class SessionClient implements LanguageService {
777776
return ({
778777
...item,
779778
position: this.lineOffsetToPosition(file, position),
780-
kind: item.kind as InlayHintKind,
779+
kind: item.kind,
781780
displayParts: displayParts?.map(({ text, span }) => ({
782781
text,
783782
span: span && {

src/server/session.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {
1515
CompletionEntryData,
1616
CompletionEntryDetails,
1717
CompletionInfo,
18-
CompletionTriggerKind,
1918
computeLineAndCharacterOfPosition,
2019
computeLineStarts,
2120
concatenate,
@@ -2309,7 +2308,7 @@ export class Session<TMessage = string> implements EventSender {
23092308
{
23102309
...convertUserPreferences(this.getPreferences(file)),
23112310
triggerCharacter: args.triggerCharacter,
2312-
triggerKind: args.triggerKind as CompletionTriggerKind | undefined,
2311+
triggerKind: args.triggerKind,
23132312
includeExternalModuleExports: args.includeExternalModuleExports,
23142313
includeInsertTextCompletions: args.includeInsertTextCompletions,
23152314
},
@@ -2802,7 +2801,7 @@ export class Session<TMessage = string> implements EventSender {
28022801
const changes = project.getLanguageService().organizeImports(
28032802
{
28042803
fileName: file,
2805-
mode: args.mode as OrganizeImportsMode | undefined ?? (args.skipDestructiveCodeActions ? OrganizeImportsMode.SortAndCombine : undefined),
2804+
mode: args.mode ?? (args.skipDestructiveCodeActions ? OrganizeImportsMode.SortAndCombine : undefined),
28062805
type: "file",
28072806
},
28082807
this.getFormatOptions(file),

src/services/organizeImports.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ function detectNamedImportOrganizationBySort(originalGroups: readonly ImportDecl
750750
}
751751
}
752752
for (const key of typesToTest) {
753-
const typeOrder = key as OrganizeImportsTypeOrder;
753+
const typeOrder = key;
754754
if (currDiff[typeOrder] < bestDiff[typeOrder]) {
755755
bestDiff[typeOrder] = currDiff[typeOrder];
756756
bestComparer[typeOrder] = curComparer;
@@ -759,9 +759,9 @@ function detectNamedImportOrganizationBySort(originalGroups: readonly ImportDecl
759759
}
760760

761761
outer: for (const bestKey of typesToTest) {
762-
const bestTypeOrder = bestKey as OrganizeImportsTypeOrder;
762+
const bestTypeOrder = bestKey;
763763
for (const testKey of typesToTest) {
764-
const testTypeOrder = testKey as OrganizeImportsTypeOrder;
764+
const testTypeOrder = testKey;
765765
if (bestDiff[testTypeOrder] < bestDiff[bestTypeOrder]) continue outer;
766766
}
767767
return { namedImportComparer: bestComparer[bestTypeOrder], typeOrder: bestTypeOrder, isSorted: bestDiff[bestTypeOrder] === 0 };

src/testRunner/unittests/tsserver/externalProjects.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ describe("unittests:: tsserver:: externalProjects", () => {
467467
arguments: {
468468
knownProjects: knownProjects.map(p => p.info!),
469469
},
470-
}).response as ts.server.protocol.ProjectFilesWithDiagnostics[];
470+
});
471471

472472
externalProject.rootFiles.length = 1;
473473
openExternalProjectsForSession([externalProject], session);

src/testRunner/unittests/tsserver/navTo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ describe("unittests:: tsserver:: navigate-to for javascript project", () => {
3131
session.executeCommandSeq<ts.server.protocol.NavtoRequest>({
3232
command: ts.server.protocol.CommandTypes.Navto,
3333
arguments: { searchValue: "Document", file: file1.path, projectFileName: configFile.path },
34-
}).response as ts.server.protocol.NavtoItem[];
34+
});
3535

3636
session.executeCommandSeq<ts.server.protocol.NavtoRequest>({
3737
command: ts.server.protocol.CommandTypes.Navto,
3838
arguments: { searchValue: "foo", file: file1.path, projectFileName: configFile.path },
39-
}).response as ts.server.protocol.NavtoItem[];
39+
});
4040
baselineTsserverLogs("navTo", "should not include type symbols", session);
4141
});
4242

src/testRunner/unittests/tsserver/projectReferences.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,7 +1079,7 @@ export function bar() {}`,
10791079
session.executeCommandSeq<ts.server.protocol.ReferencesRequest>({
10801080
command: ts.server.protocol.CommandTypes.References,
10811081
arguments: protocolFileLocationFromSubstring(main, "foo", { index: 1 }),
1082-
}).response as ts.server.protocol.ReferencesResponseBody;
1082+
});
10831083

10841084
closeFilesForSession([main, dummyFilePath], session);
10851085

@@ -1090,7 +1090,7 @@ export function bar() {}`,
10901090
session.executeCommandSeq<ts.server.protocol.ReferencesRequest>({
10911091
command: ts.server.protocol.CommandTypes.References,
10921092
arguments: protocolFileLocationFromSubstring(fileResolvingToMainDts, "foo"),
1093-
}).response as ts.server.protocol.ReferencesResponseBody;
1093+
});
10941094
baselineTsserverLogs("projectReferences", input.scenario, session);
10951095
}
10961096

src/testRunner/unittests/tsserver/skipLibCheck.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ describe("unittests:: tsserver:: with skipLibCheck", () => {
197197
session.executeCommandSeq<ts.server.protocol.SemanticDiagnosticsSyncRequest>({
198198
command: ts.server.protocol.CommandTypes.SemanticDiagnosticsSync,
199199
arguments: { file: jsFile.path },
200-
}).response as ts.server.protocol.Diagnostic[];
200+
});
201201
baselineTsserverLogs("skipLibCheck", "reports semantic error in configured project with tscheck", session);
202202
});
203203

0 commit comments

Comments
 (0)