Skip to content

Commit 6c7adf8

Browse files
authored
temporarily revert svelte parsing until we can fix bundling issues (#3503)
1 parent f5ade68 commit 6c7adf8

File tree

7 files changed

+15
-20
lines changed

7 files changed

+15
-20
lines changed

.changeset/beige-parrots-sleep.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'graphql-language-service-server': patch
3+
'vscode-graphql': patch
4+
---
5+
6+
Temporarily revert svelte parsing until we can fix bundling issues with svelte2tsx. For now we return to using the vue parser to parse svelte files which will invariably cause some issues, such as being off by several characters

packages/graphql-language-service-server/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,8 @@
5555
"vscode-languageserver": "^8.0.1",
5656
"vscode-languageserver-types": "^3.17.2",
5757
"vscode-uri": "^3.0.2",
58-
"svelte2tsx": "^0.6.27",
5958
"svelte": "^4.1.1",
60-
"source-map-js": "1.0.2",
61-
"typescript": "5.3.3"
59+
"source-map-js": "1.0.2"
6260
},
6361
"devDependencies": {
6462
"@types/glob": "^8.1.0",

packages/graphql-language-service-server/src/__tests__/findGraphQLTags-test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,8 @@ query {id}`);
355355
`);
356356

357357
expect(JSON.stringify(contents[0].range)).toEqual(
358-
JSON.stringify(new Range(new Position(2, 29), new Position(12, 0))),
358+
// TODO: change back to 29 when we get svelte parser working again
359+
JSON.stringify(new Range(new Position(2, 27), new Position(12, 0))),
359360
);
360361
});
361362

packages/graphql-language-service-server/src/findGraphQLTags.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { Position, Range } from 'graphql-language-service';
1717

1818
import { TAG_MAP } from './constants';
1919
import { ecmaParser, tsParser } from './parsers/babel';
20-
import { svelteParser } from './parsers/svelte';
20+
// import { svelteParser } from './parsers/svelte';
2121
import { vueParser } from './parsers/vue';
2222
import type { Logger, NoopLogger } from './Logger';
2323
import { RangeMapper } from './parsers/types';
@@ -40,7 +40,9 @@ const parserMap = {
4040
'.tsx': tsParser,
4141
'.cts': tsParser,
4242
'.mts': tsParser,
43-
'.svelte': svelteParser,
43+
// disabled for now, until we can figure out how to get svelte2tsx working in esbuild bundle
44+
// '.svelte': svelteParser,
45+
'.svelte': vueParser,
4446
'.vue': vueParser,
4547
};
4648

packages/graphql-language-service-server/src/parsers/svelte.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import { babelParser } from './babel';
2+
// TODO: Remove this when we have a working svelte parsing implementation
3+
// eslint-disable-next-line import/no-extraneous-dependencies
24
import { svelte2tsx } from 'svelte2tsx';
35
import { SourceMapConsumer } from 'source-map-js';
46
import { Position, Range } from 'graphql-language-service';

packages/vscode-graphql/esbuild.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ build({
4949
'atpl',
5050
'liquor',
5151
'twig',
52-
'typescript',
5352
],
5453
})
5554
.then(({ errors, warnings }) => {

yarn.lock

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18401,14 +18401,6 @@ svelte2tsx@^0.6.16:
1840118401
dedent-js "^1.0.1"
1840218402
pascal-case "^3.1.1"
1840318403

18404-
svelte2tsx@^0.6.27:
18405-
version "0.6.27"
18406-
resolved "https://registry.yarnpkg.com/svelte2tsx/-/svelte2tsx-0.6.27.tgz#5b2c21f38608be51cd32de177722f123e57919e5"
18407-
integrity sha512-E1uPW1o6VsbRz+nUk3fznZ2lSmCITAJoNu8AYefWSvIwE2pSB01i5sId4RMbWNzfcwCQl1DcgGShCPcldl4rvg==
18408-
dependencies:
18409-
dedent-js "^1.0.1"
18410-
pascal-case "^3.1.1"
18411-
1841218404
svelte@^4.1.1:
1841318405
version "4.1.1"
1841418406
resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.1.1.tgz#468ed0377d3cae542b35df8a22a3ca188d93272a"
@@ -18982,11 +18974,6 @@ typedoc@^0.19.2:
1898218974
shelljs "^0.8.4"
1898318975
typedoc-default-themes "^0.11.4"
1898418976

18985-
18986-
version "5.3.3"
18987-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
18988-
integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
18989-
1899018977
typescript@^4.2.3:
1899118978
version "4.7.4"
1899218979
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"

0 commit comments

Comments
 (0)