From 867baf3292d8354c26d81ed9dbaef9b30f0bfdc7 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@accso.de>
Date: Tue, 24 Nov 2020 19:12:24 +0100
Subject: [PATCH 1/2] (chore) bump TS and svelte-preprocess

---
 packages/language-server/package.json |  2 +-
 packages/svelte2tsx/package.json      |  4 ++--
 yarn.lock                             | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/language-server/package.json b/packages/language-server/package.json
index 9ca35180d..c8a229d38 100644
--- a/packages/language-server/package.json
+++ b/packages/language-server/package.json
@@ -54,7 +54,7 @@
         "prettier-plugin-svelte": "~1.4.1",
         "source-map": "^0.7.3",
         "svelte": "3.28.0",
-        "svelte-preprocess": "~4.3.0",
+        "svelte-preprocess": "~4.6.1",
         "svelte2tsx": "*",
         "typescript": "*",
         "vscode-css-languageservice": "4.2.0",
diff --git a/packages/svelte2tsx/package.json b/packages/svelte2tsx/package.json
index 7e1fa1295..b8c024a33 100644
--- a/packages/svelte2tsx/package.json
+++ b/packages/svelte2tsx/package.json
@@ -35,11 +35,11 @@
         "svelte": "3.28.0",
         "tiny-glob": "^0.2.6",
         "tslib": "^1.10.0",
-        "typescript": "^4.0.2"
+        "typescript": "^4.1.2"
     },
     "peerDependencies": {
         "svelte": "^3.24",
-        "typescript": "^4.0.2"
+        "typescript": "^4.1.2"
     },
     "scripts": {
         "build": "rollup -c",
diff --git a/yarn.lock b/yarn.lock
index a2a10dfef..bd3711167 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2496,10 +2496,10 @@ svelte-preprocess@^4.0.0:
     detect-indent "^6.0.0"
     strip-indent "^3.0.0"
 
-svelte-preprocess@~4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/svelte-preprocess/-/svelte-preprocess-4.3.0.tgz#7db318e9da4ac3fe22ec9671095533806ad76219"
-  integrity sha512-7FGpPrnRWMqNuQ/FnP0T52yHw1qgFYXisTM3JnQCzXkSdPMNDU2Wts0O3x1ovM+mPzWiAQ0PWHFeFhP5+fnRJQ==
+svelte-preprocess@~4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/svelte-preprocess/-/svelte-preprocess-4.6.1.tgz#a7de4d91b32d5608b6637da960ee81e6089ae276"
+  integrity sha512-s7KdhR2pOsffyOzZIMEb315f6pfgeDnOWN47m6YKFeSEx3NMf/79Znc3vuG/Ai79SL/vsi86WDrjFPLGRfDesg==
   dependencies:
     "@types/pug" "^2.0.4"
     "@types/sass" "^1.16.0"
@@ -2596,10 +2596,10 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-typescript@*, typescript@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
-  integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
+typescript@*, typescript@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
+  integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==
 
 unist-util-stringify-position@^2.0.0:
   version "2.0.3"

From 5a558fde58314c88feb083cda0cb655b41f096a4 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@accso.de>
Date: Tue, 24 Nov 2020 19:22:41 +0100
Subject: [PATCH 2/2] fix tests

---
 .../plugins/typescript/features/CompletionProvider.test.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/language-server/test/plugins/typescript/features/CompletionProvider.test.ts b/packages/language-server/test/plugins/typescript/features/CompletionProvider.test.ts
index 0a159f0ae..9de38a410 100644
--- a/packages/language-server/test/plugins/typescript/features/CompletionProvider.test.ts
+++ b/packages/language-server/test/plugins/typescript/features/CompletionProvider.test.ts
@@ -68,7 +68,7 @@ describe('CompletionProviderImpl', () => {
             label: 'b',
             insertText: undefined,
             kind: CompletionItemKind.Method,
-            sortText: '0',
+            sortText: '1',
             commitCharacters: ['.', ',', '('],
             preselect: undefined
         });
@@ -249,7 +249,7 @@ describe('CompletionProviderImpl', () => {
                 line: 0
             },
             replacementSpan: undefined,
-            sortText: '0',
+            sortText: '1',
             source: undefined,
             uri: fileNameToAbsoluteUri(filename)
         } as CompletionEntryWithIdentifer);