(chore) bump versions (#1000)

dummdidumm · web-flow · commit 9b9e0e6a9930 · 2021-05-11T22:58:47.000+02:00
- bump svelte
- bump prettier and prettier-plugin-svelte and format accordingly
diff --git a/docs/preprocessors/typescript.md b/docs/preprocessors/typescript.md
@@ -52,13 +52,14 @@ The first and possibly most often used way is to type the `createEventDispatcher
 <script lang="ts">
     import { createEventDispatcher } from 'svelte';
 
-    const dispatch = createEventDispatcher<{
-        /**
-         * you can also add docs
-         */
-        checked: boolean; // Will translate to `CustomEvent<boolean>`
-        hello: string;
-    }>();
+    const dispatch =
+        createEventDispatcher<{
+            /**
+             * you can also add docs
+             */
+            checked: boolean; // Will translate to `CustomEvent<boolean>`
+            hello: string;
+        }>();
 
     // ...
 </script>
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
         "eslint": "^7.7.0",
         "eslint-plugin-import": "^2.22.1",
         "eslint-plugin-svelte3": "^2.7.3",
-        "prettier": "2.2.1",
+        "prettier": "2.3.0",
         "cross-env": "^7.0.2"
     }
 }
diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -40,7 +40,7 @@
         "@types/lodash": "^4.14.116",
         "@types/mocha": "^7.0.2",
         "@types/node": "^13.9.0",
-        "@types/prettier": "^1.13.2",
+        "@types/prettier": "^2.2.3",
         "@types/sinon": "^7.5.2",
         "@types/source-map": "^0.5.7",
         "cross-env": "^7.0.2",
@@ -53,10 +53,10 @@
         "estree-walker": "^2.0.1",
         "glob": "^7.1.6",
         "lodash": "^4.17.21",
-        "prettier": "2.2.1",
-        "prettier-plugin-svelte": "~2.2.0",
+        "prettier": "2.3.0",
+        "prettier-plugin-svelte": "~2.3.0",
         "source-map": "^0.7.3",
-        "svelte": "~3.35.0",
+        "svelte": "~3.38.2",
         "svelte-preprocess": "~4.6.1",
         "svelte2tsx": "*",
         "typescript": "*",
diff --git a/packages/language-server/src/lib/semanticToken/semanticTokenLegend.ts b/packages/language-server/src/lib/semanticToken/semanticTokenLegend.ts
@@ -42,34 +42,38 @@ export const enum TokenModifier {
 export function getSemanticTokenLegends(): SemanticTokensLegend {
     const tokenModifiers: string[] = [];
 
-    ([
-        [TokenModifier.declaration, SemanticTokenModifiers.declaration],
-        [TokenModifier.static, SemanticTokenModifiers.static],
-        [TokenModifier.async, SemanticTokenModifiers.async],
-        [TokenModifier.readonly, SemanticTokenModifiers.readonly],
-        [TokenModifier.defaultLibrary, SemanticTokenModifiers.defaultLibrary],
-        [TokenModifier.local, 'local']
-    ] as const).forEach(([tsModifier, legend]) => (tokenModifiers[tsModifier] = legend));
+    (
+        [
+            [TokenModifier.declaration, SemanticTokenModifiers.declaration],
+            [TokenModifier.static, SemanticTokenModifiers.static],
+            [TokenModifier.async, SemanticTokenModifiers.async],
+            [TokenModifier.readonly, SemanticTokenModifiers.readonly],
+            [TokenModifier.defaultLibrary, SemanticTokenModifiers.defaultLibrary],
+            [TokenModifier.local, 'local']
+        ] as const
+    ).forEach(([tsModifier, legend]) => (tokenModifiers[tsModifier] = legend));
 
     const tokenTypes: string[] = [];
 
-    ([
-        [TokenType.class, SemanticTokenTypes.class],
-        [TokenType.enum, SemanticTokenTypes.enum],
-        [TokenType.interface, SemanticTokenTypes.interface],
-        [TokenType.namespace, SemanticTokenTypes.namespace],
-        [TokenType.typeParameter, SemanticTokenTypes.typeParameter],
-        [TokenType.type, SemanticTokenTypes.type],
-        [TokenType.parameter, SemanticTokenTypes.parameter],
-        [TokenType.variable, SemanticTokenTypes.variable],
-        [TokenType.enumMember, SemanticTokenTypes.enumMember],
-        [TokenType.property, SemanticTokenTypes.property],
-        [TokenType.function, SemanticTokenTypes.function],
+    (
+        [
+            [TokenType.class, SemanticTokenTypes.class],
+            [TokenType.enum, SemanticTokenTypes.enum],
+            [TokenType.interface, SemanticTokenTypes.interface],
+            [TokenType.namespace, SemanticTokenTypes.namespace],
+            [TokenType.typeParameter, SemanticTokenTypes.typeParameter],
+            [TokenType.type, SemanticTokenTypes.type],
+            [TokenType.parameter, SemanticTokenTypes.parameter],
+            [TokenType.variable, SemanticTokenTypes.variable],
+            [TokenType.enumMember, SemanticTokenTypes.enumMember],
+            [TokenType.property, SemanticTokenTypes.property],
+            [TokenType.function, SemanticTokenTypes.function],
 
-        // member is renamed to method in vscode codebase to match LSP default
-        [TokenType.member, SemanticTokenTypes.method],
-        [TokenType.event, SemanticTokenTypes.event]
-    ] as const).forEach(([tokenType, legend]) => (tokenTypes[tokenType] = legend));
+            // member is renamed to method in vscode codebase to match LSP default
+            [TokenType.member, SemanticTokenTypes.method],
+            [TokenType.event, SemanticTokenTypes.event]
+        ] as const
+    ).forEach(([tokenType, legend]) => (tokenTypes[tokenType] = legend));
 
     return {
         tokenModifiers,
diff --git a/packages/language-server/src/plugins/css/CSSPlugin.ts b/packages/language-server/src/plugins/css/CSSPlugin.ts
@@ -52,7 +52,8 @@ export class CSSPlugin
         DocumentColorsProvider,
         ColorPresentationsProvider,
         DocumentSymbolsProvider,
-        SelectionRangeProvider {
+        SelectionRangeProvider
+{
     private configManager: LSConfigManager;
     private cssDocuments = new WeakMap<Document, CSSDocument>();
     private triggerCharacters = ['.', ':', '-', '/'];
diff --git a/packages/language-server/src/plugins/html/HTMLPlugin.ts b/packages/language-server/src/plugins/html/HTMLPlugin.ts
@@ -34,7 +34,8 @@ import {
 import { isInsideMoustacheTag, toRange } from '../../lib/documents/utils';
 
 export class HTMLPlugin
-    implements HoverProvider, CompletionsProvider, RenameProvider, LinkedEditingRangesProvider {
+    implements HoverProvider, CompletionsProvider, RenameProvider, LinkedEditingRangesProvider
+{
     private configManager: LSConfigManager;
     private lang = getLanguageService({
         customDataProviders: [svelteHtmlDataProvider],
diff --git a/packages/language-server/src/plugins/svelte/SvelteDocument.ts b/packages/language-server/src/plugins/svelte/SvelteDocument.ts
@@ -69,7 +69,9 @@ export class SvelteDocument {
         if (!this.transpiledDoc) {
             this.transpiledDoc = await TranspiledSvelteDocument.create(
                 this.parent,
-                (await this.config)?.preprocess
+                (
+                    await this.config
+                )?.preprocess
             );
         }
         return this.transpiledDoc;
@@ -294,9 +296,8 @@ export class SvelteFragmentMapper implements PositionMapper {
 
     getOriginalPosition(generatedPosition: Position): Position {
         // Map the position to be relative to the transpiled fragment
-        const positionInTranspiledFragment = this.transpiledFragmentMapper.getGeneratedPosition(
-            generatedPosition
-        );
+        const positionInTranspiledFragment =
+            this.transpiledFragmentMapper.getGeneratedPosition(generatedPosition);
         // Map the position, using the sourcemap, to the original position in the source fragment
         const positionInOriginalFragment = this.sourceMapper.getOriginalPosition(
             positionInTranspiledFragment
@@ -309,9 +310,8 @@ export class SvelteFragmentMapper implements PositionMapper {
      * Reversing `getOriginalPosition`
      */
     getGeneratedPosition(originalPosition: Position): Position {
-        const positionInOriginalFragment = this.originalFragmentMapper.getGeneratedPosition(
-            originalPosition
-        );
+        const positionInOriginalFragment =
+            this.originalFragmentMapper.getGeneratedPosition(originalPosition);
         const positionInTranspiledFragment = this.sourceMapper.getGeneratedPosition(
             positionInOriginalFragment
         );
diff --git a/packages/language-server/src/plugins/svelte/SveltePlugin.ts b/packages/language-server/src/plugins/svelte/SveltePlugin.ts
@@ -38,7 +38,8 @@ export class SveltePlugin
         CompletionsProvider,
         HoverProvider,
         CodeActionsProvider,
-        SelectionRangeProvider {
+        SelectionRangeProvider
+{
     private docManager = new Map<Document, SvelteDocument>();
 
     constructor(private configManager: LSConfigManager) {}
diff --git a/packages/language-server/src/plugins/svelte/features/getCodeActions/getRefactorings.ts b/packages/language-server/src/plugins/svelte/features/getCodeActions/getRefactorings.ts
@@ -136,8 +136,9 @@ async function executeExtractComponentCommand(
 }
 
 // `import {...} from '..'` or `import ... from '..'`
-// eslint-disable-next-line max-len
-const scriptRelativeImportRegex = /import\s+{[^}]*}.*['"`](((\.\/)|(\.\.\/)).*?)['"`]|import\s+\w+\s+from\s+['"`](((\.\/)|(\.\.\/)).*?)['"`]/g;
+const scriptRelativeImportRegex =
+    // eslint-disable-next-line max-len
+    /import\s+{[^}]*}.*['"`](((\.\/)|(\.\.\/)).*?)['"`]|import\s+\w+\s+from\s+['"`](((\.\/)|(\.\.\/)).*?)['"`]/g;
 // `@import '..'`
 const styleRelativeImportRege = /@import\s+['"`](((\.\/)|(\.\.\/)).*?)['"`]/g;
 
diff --git a/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts b/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts
@@ -322,7 +322,8 @@ export class SvelteDocumentSnapshot implements DocumentSnapshot {
  */
 export class JSOrTSDocumentSnapshot
     extends IdentityMapper
-    implements DocumentSnapshot, SnapshotFragment {
+    implements DocumentSnapshot, SnapshotFragment
+{
     scriptKind = getScriptKindFromFileName(this.filePath);
     scriptInfo = null;
 
diff --git a/packages/language-server/src/plugins/typescript/LSAndTSDocResolver.ts b/packages/language-server/src/plugins/typescript/LSAndTSDocResolver.ts
@@ -63,9 +63,7 @@ export class LSAndTSDocResolver {
         return getLanguageServiceForPath(path, this.workspaceUris, this.lsDocumentContext);
     }
 
-    async getLSAndTSDoc(
-        document: Document
-    ): Promise<{
+    async getLSAndTSDoc(document: Document): Promise<{
         tsDoc: SvelteDocumentSnapshot;
         lang: ts.LanguageService;
         userPreferences: ts.UserPreferences;
diff --git a/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts b/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts
@@ -83,7 +83,8 @@ export class TypeScriptPlugin
         SemanticTokensProvider,
         OnWatchFileChanges,
         CompletionsProvider<CompletionEntryWithIdentifer>,
-        UpdateTsOrJsFile {
+        UpdateTsOrJsFile
+{
     private readonly configManager: LSConfigManager;
     private readonly lsAndTsDocResolver: LSAndTSDocResolver;
     private readonly completionProvider: CompletionsProviderImpl;
diff --git a/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts b/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts
@@ -295,10 +295,8 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionEn
         );
 
         if (detail) {
-            const {
-                detail: itemDetail,
-                documentation: itemDocumentation
-            } = this.getCompletionDocument(detail);
+            const { detail: itemDetail, documentation: itemDocumentation } =
+                this.getCompletionDocument(detail);
 
             completionItem.detail = itemDetail;
             completionItem.documentation = itemDocumentation;
@@ -465,7 +463,8 @@ const beginOfDocumentRange = Range.create(Position.create(0, 0), Position.create
 // `import {...} from '..'` or `import ... from '..'`
 // Note: Does not take into account if import is within a comment.
 // eslint-disable-next-line max-len
-const scriptImportRegex = /\bimport\s+{([^}]*?)}\s+?from\s+['"`].+?['"`]|\bimport\s+(\w+?)\s+from\s+['"`].+?['"`]/g;
+const scriptImportRegex =
+    /\bimport\s+{([^}]*?)}\s+?from\s+['"`].+?['"`]|\bimport\s+(\w+?)\s+from\s+['"`].+?['"`]/g;
 
 const completionBlacklist = new Set(['sveltekitPrefetch', 'sveltekitNoscroll']);
 
diff --git a/packages/language-server/src/plugins/typescript/features/RenameProvider.ts b/packages/language-server/src/plugins/typescript/features/RenameProvider.ts
@@ -70,15 +70,16 @@ export class RenameProviderImpl implements RenameProvider {
             }
         > = await this.mapAndFilterRenameLocations(renameLocations, docs);
         // eslint-disable-next-line max-len
-        const additionalRenameForPropRenameInsideComponentWithProp = await this.getAdditionLocationsForRenameOfPropInsideComponentWithProp(
-            document,
-            tsDoc,
-            fragment,
-            position,
-            convertedRenameLocations,
-            docs,
-            lang
-        );
+        const additionalRenameForPropRenameInsideComponentWithProp =
+            await this.getAdditionLocationsForRenameOfPropInsideComponentWithProp(
+                document,
+                tsDoc,
+                fragment,
+                position,
+                convertedRenameLocations,
+                docs,
+                lang
+            );
         const additionalRenamesForPropRenameOutsideComponentWithProp =
             // This is an either-or-situation, don't do both
             additionalRenameForPropRenameInsideComponentWithProp.length > 0
diff --git a/packages/language-server/src/plugins/typescript/module-loader.ts b/packages/language-server/src/plugins/typescript/module-loader.ts
@@ -97,8 +97,12 @@ export function createSvelteModuleLoader(
         // Delegate to the TS resolver first.
         // If that does not bring up anything, try the Svelte Module loader
         // which is able to deal with .svelte files.
-        const tsResolvedModule = ts.resolveModuleName(name, containingFile, compilerOptions, ts.sys)
-            .resolvedModule;
+        const tsResolvedModule = ts.resolveModuleName(
+            name,
+            containingFile,
+            compilerOptions,
+            ts.sys
+        ).resolvedModule;
         if (tsResolvedModule && !isVirtualSvelteFilePath(tsResolvedModule.resolvedFileName)) {
             return tsResolvedModule;
         }
diff --git a/packages/language-server/src/plugins/typescript/utils.ts b/packages/language-server/src/plugins/typescript/utils.ts
@@ -270,7 +270,8 @@ const commentsRegex = /^(\s*\/\/.*\s*)*/;
 // [ \t\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]
 // is just \s (a.k.a any whitespace character) without linebreak and vertical tab
 // eslint-disable-next-line max-len
-const tsCheckRegex = /\/\/[ \t\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]*(@ts-(no)?check)($|\s)/;
+const tsCheckRegex =
+    /\/\/[ \t\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]*(@ts-(no)?check)($|\s)/;
 
 /**
  * Returns `// @ts-check` or `// @ts-nocheck` if content starts with comments and has one of these
diff --git a/packages/language-server/src/server.ts b/packages/language-server/src/server.ts
@@ -37,11 +37,8 @@ import { isNotNullOrUndefined, urlToPath } from './utils';
 import { FallbackWatcher } from './lib/FallbackWatcher';
 
 namespace TagCloseRequest {
-    export const type: RequestType<
-        TextDocumentPositionParams,
-        string | null,
-        any
-    > = new RequestType('html/tag');
+    export const type: RequestType<TextDocumentPositionParams, string | null, any> =
+        new RequestType('html/tag');
 }
 
 export interface LSOptions {
@@ -128,8 +125,8 @@ export function startServer(options?: LSOptions) {
         );
 
         pluginHost.initialize({
-            filterIncompleteCompletions: !evt.initializationOptions
-                ?.dontFilterIncompleteCompletions,
+            filterIncompleteCompletions:
+                !evt.initializationOptions?.dontFilterIncompleteCompletions,
             definitionLinkSupport: !!evt.capabilities.textDocument?.definition?.linkSupport
         });
         pluginHost.register((sveltePlugin = new SveltePlugin(configManager)));
diff --git a/packages/language-server/test/plugins/css/CSSPlugin.test.ts b/packages/language-server/test/plugins/css/CSSPlugin.test.ts
@@ -89,8 +89,7 @@ describe('CSS Plugin', () => {
                 kind: CompletionItemKind.Keyword,
                 documentation: {
                     kind: 'markdown',
-                    value:
-                        'Defines character set of the document\\.\n\n[MDN Reference](https://developer.mozilla.org/docs/Web/CSS/@charset)'
+                    value: 'Defines character set of the document\\.\n\n[MDN Reference](https://developer.mozilla.org/docs/Web/CSS/@charset)'
                 },
                 textEdit: TextEdit.insert(Position.create(0, 7), '@charset'),
                 tags: []
diff --git a/packages/language-server/test/plugins/html/HTMLPlugin.test.ts b/packages/language-server/test/plugins/html/HTMLPlugin.test.ts
@@ -28,8 +28,7 @@ describe('HTML Plugin', () => {
         assert.deepStrictEqual(plugin.doHover(document, Position.create(0, 2)), <Hover>{
             contents: {
                 kind: 'markdown',
-                value:
-                    'The h1 element represents a section heading.\n\n[MDN Reference](https://developer.mozilla.org/docs/Web/HTML/Element/Heading_Elements)'
+                value: 'The h1 element represents a section heading.\n\n[MDN Reference](https://developer.mozilla.org/docs/Web/HTML/Element/Heading_Elements)'
             },
 
             range: Range.create(0, 1, 0, 3)
diff --git a/packages/language-server/test/plugins/svelte/features/getHoverInfo.test.ts b/packages/language-server/test/plugins/svelte/features/getHoverInfo.test.ts
@@ -84,11 +84,13 @@ describe('SveltePlugin#getHoverInfo', () => {
     });
 
     describe('should return hover for definite :', () => {
-        ([
-            ['if', 'else if'],
-            ['await', 'then'],
-            ['await', 'catch']
-        ] as const).forEach((tag) => {
+        (
+            [
+                ['if', 'else if'],
+                ['await', 'then'],
+                ['await', 'catch']
+            ] as const
+        ).forEach((tag) => {
             it(`(:${tag[1]})`, () => {
                 expectHoverInfoFor(`{:${tag[1]}}`, Position.create(0, 3)).toEqual(tag[0]);
                 expectHoverInfoFor(`{:${tag[1]} `, Position.create(0, 3)).toEqual(tag[0]);
diff --git a/packages/language-server/test/plugins/typescript/TypescriptPlugin.test.ts b/packages/language-server/test/plugins/typescript/TypescriptPlugin.test.ts
diff --git a/packages/language-server/test/plugins/typescript/features/getDirectiveCommentCompletions.test.ts b/packages/language-server/test/plugins/typescript/features/getDirectiveCommentCompletions.test.ts
diff --git a/packages/language-server/test/plugins/typescript/module-loader.test.ts b/packages/language-server/test/plugins/typescript/module-loader.test.ts
diff --git a/packages/svelte-vscode/src/extension.ts b/packages/svelte-vscode/src/extension.ts
diff --git a/packages/svelte2tsx/package.json b/packages/svelte2tsx/package.json
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts
diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`"eslint": "^7.7.0",`
`26`	`26`	`"eslint-plugin-import": "^2.22.1",`
`27`	`27`	`"eslint-plugin-svelte3": "^2.7.3",`
`28`		`- "prettier": "2.2.1",`
	`28`	`+ "prettier": "2.3.0",`
`29`	`29`	`"cross-env": "^7.0.2"`
`30`	`30`	`}`
`31`	`31`	`}`