chore: upgrade to TS 5.5 (#2415)

sveltejs · Jun 24, 2024 · 1d5f3cd · 1d5f3cd
1 parent 7008652
commit 1d5f3cd
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 43 deletions.
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
         "lint": "prettier --check ."
     },
     "dependencies": {
-        "typescript": "^5.4.5"
+        "typescript": "^5.5.2"
     },
     "devDependencies": {
         "cross-env": "^7.0.2",

diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -57,8 +57,8 @@
         "svelte": "^3.57.0",
         "svelte-preprocess": "^5.1.3",
         "svelte2tsx": "workspace:~",
-        "typescript": "^5.3.2",
-        "typescript-auto-import-cache": "^0.3.2",
+        "typescript": "^5.5.2",
+        "typescript-auto-import-cache": "^0.3.3",
         "vscode-css-languageservice": "~6.2.10",
         "vscode-html-languageservice": "~5.1.1",
         "vscode-languageserver": "8.0.2",

diff --git a/packages/language-server/src/plugins/typescript/serviceCache.ts b/packages/language-server/src/plugins/typescript/serviceCache.ts
@@ -6,6 +6,7 @@ import {
 } from 'typescript-auto-import-cache/out/5_0/projectService';
 import { createProject as createProject50 } from 'typescript-auto-import-cache/out/5_0/project';
 import { createProject as createProject53 } from 'typescript-auto-import-cache/out/5_3/project';
+import { createProject as createProject55 } from 'typescript-auto-import-cache/out/5_5/project';
 import ts from 'typescript';
 import { ExportInfoMap } from 'typescript-auto-import-cache/out/5_0/exportInfoMap';
 import { ModuleSpecifierCache } from 'typescript-auto-import-cache/out/5_0/moduleSpecifierCache';
@@ -70,7 +71,7 @@ export function createProject(
         return undefined;
     }
 
-    const factory = minor < 3 ? createProject50 : createProject53;
+    const factory = minor < 3 ? createProject50 : minor < 5 ? createProject53 : createProject55;
     const project = factory(ts, host, createLanguageService, options);
 
     const proxyMethods: (keyof typeof project)[] = [

diff --git a/packages/language-server/test/plugins/typescript/features/CodeActionsProvider.test.ts b/packages/language-server/test/plugins/typescript/features/CodeActionsProvider.test.ts
@@ -1153,8 +1153,8 @@ describe('CodeActionsProvider', function () {
                     edits: [
                         {
                             newText:
-                                `\n${indent}import FixAllImported2 from \"./importing/FixAllImported2.svelte\";\n` +
-                                `${indent}import { FixAllImported3 } from \"./importing/c\";\n`,
+                                `\n${indent}import { FixAllImported3 } from \"./importing/c\";` +
+                                `\n${indent}import FixAllImported2 from \"./importing/FixAllImported2.svelte\";\n`,
                             range: {
                                 start: {
                                     character: 18,

diff --git a/...er/test/plugins/typescript/features/inlayHints/fixtures/component-handler/expectedv2.json b/...er/test/plugins/typescript/features/inlayHints/fixtures/component-handler/expectedv2.json
@@ -12,8 +12,8 @@
                 "value": "MouseEvent",
                 "location": {
                     "range": {
-                        "start": { "line": 15692, "character": 10 },
-                        "end": { "line": 15692, "character": 20 }
+                        "start": { "line": 15860, "character": 10 },
+                        "end": { "line": 15860, "character": 20 }
                     },
                     "uri": "<node_modules>/typescript/lib/lib.dom.d.ts"
                 }

diff --git a/...rver/test/plugins/typescript/features/inlayHints/fixtures/element-handler/expectedv2.json b/...rver/test/plugins/typescript/features/inlayHints/fixtures/element-handler/expectedv2.json
@@ -6,8 +6,8 @@
                 "value": "MouseEvent",
                 "location": {
                     "range": {
-                        "start": { "line": 15692, "character": 10 },
-                        "end": { "line": 15692, "character": 20 }
+                        "start": { "line": 15860, "character": 10 },
+                        "end": { "line": 15860, "character": 20 }
                     },
                     "uri": "<node_modules>/typescript/lib/lib.dom.d.ts"
                 }
@@ -21,8 +21,8 @@
                 "value": "EventTarget",
                 "location": {
                     "range": {
-                        "start": { "line": 8237, "character": 10 },
-                        "end": { "line": 8237, "character": 21 }
+                        "start": { "line": 8318, "character": 10 },
+                        "end": { "line": 8318, "character": 21 }
                     },
                     "uri": "<node_modules>/typescript/lib/lib.dom.d.ts"
                 }
@@ -32,8 +32,8 @@
                 "value": "HTMLButtonElement",
                 "location": {
                     "range": {
-                        "start": { "line": 9732, "character": 10 },
-                        "end": { "line": 9732, "character": 27 }
+                        "start": { "line": 9810, "character": 10 },
+                        "end": { "line": 9810, "character": 27 }
                     },
                     "uri": "<node_modules>/typescript/lib/lib.dom.d.ts"
                 }

diff --git a/packages/svelte-vscode/package.json b/packages/svelte-vscode/package.json
@@ -722,7 +722,7 @@
         "@types/vscode": "^1.67",
         "js-yaml": "^3.14.0",
         "tslib": "^2.4.0",
-        "typescript": "^5.4.5",
+        "typescript": "^5.5.2",
         "vscode-tmgrammar-test": "^0.0.11"
     },
     "dependencies": {

diff --git a/packages/svelte2tsx/package.json b/packages/svelte2tsx/package.json
@@ -40,7 +40,7 @@
         "svelte": "~3.57.0",
         "tiny-glob": "^0.2.6",
         "tslib": "^2.4.0",
-        "typescript": "^5.4.5"
+        "typescript": "^5.5.2"
     },
     "peerDependencies": {
         "svelte": "^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0",

diff --git a/packages/svelte2tsx/test/emitDts/samples/javascript-runes.v5/expected/TestRunes.svelte.d.ts b/packages/svelte2tsx/test/emitDts/samples/javascript-runes.v5/expected/TestRunes.svelte.d.ts
@@ -1,4 +1,3 @@
-/// <reference types="svelte" />
 interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
     new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
         $$bindings?: Bindings;

diff --git a/packages/svelte2tsx/test/emitDts/samples/javascript/expected/Test2.svelte.d.ts b/packages/svelte2tsx/test/emitDts/samples/javascript/expected/Test2.svelte.d.ts
@@ -2,7 +2,7 @@
 /** @typedef {typeof __propDef.events}  Test2Events */
 /** @typedef {typeof __propDef.slots}  Test2Slots */
 export default class Test2 extends SvelteComponentTyped<{
-    foo: boolean;
+    foo: import("./foo").Foo;
 }, {
     [evt: string]: CustomEvent<any>;
 }, {}> {
@@ -13,7 +13,7 @@ export type Test2Slots = typeof __propDef.slots;
 import { SvelteComponentTyped } from "svelte";
 declare const __propDef: {
     props: {
-        foo: import('./foo').Foo;
+        foo: import("./foo").Foo;
     };
     events: {
         [evt: string]: CustomEvent<any>;

diff --git a/...elte2tsx/test/emitDts/samples/typescript-runes-generics.v5/expected/TestRunes.svelte.d.ts b/...elte2tsx/test/emitDts/samples/typescript-runes-generics.v5/expected/TestRunes.svelte.d.ts
@@ -1,4 +1,3 @@
-/// <reference types="svelte" />
 declare class __sveltets_Render<T extends Record<string, any>, K extends keyof T> {
     props(): {
         foo: T;

diff --git a/packages/svelte2tsx/test/emitDts/samples/typescript-runes.v5/expected/TestRunes.svelte.d.ts b/packages/svelte2tsx/test/emitDts/samples/typescript-runes.v5/expected/TestRunes.svelte.d.ts
@@ -1,4 +1,3 @@
-/// <reference types="svelte" />
 interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
     new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
         $$bindings?: Bindings;

diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json
@@ -19,7 +19,7 @@
     "license": "MIT",
     "devDependencies": {
         "@types/node": "^16.0.0",
-        "typescript": "^5.4.5",
+        "typescript": "^5.5.2",
         "svelte": "^3.57.0"
     },
     "dependencies": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml