From 6c7adf85c10d92cd3708a6dab44cb5b0f965fb84 Mon Sep 17 00:00:00 2001 From: Rikki Schulte Date: Sat, 13 Jan 2024 12:11:45 +0100 Subject: [PATCH] temporarily revert svelte parsing until we can fix bundling issues (#3503) --- .changeset/beige-parrots-sleep.md | 6 ++++++ .../graphql-language-service-server/package.json | 4 +--- .../src/__tests__/findGraphQLTags-test.ts | 3 ++- .../src/findGraphQLTags.ts | 6 ++++-- .../src/parsers/svelte.ts | 2 ++ packages/vscode-graphql/esbuild.js | 1 - yarn.lock | 13 ------------- 7 files changed, 15 insertions(+), 20 deletions(-) create mode 100644 .changeset/beige-parrots-sleep.md diff --git a/.changeset/beige-parrots-sleep.md b/.changeset/beige-parrots-sleep.md new file mode 100644 index 00000000000..16a6b2a3b3a --- /dev/null +++ b/.changeset/beige-parrots-sleep.md @@ -0,0 +1,6 @@ +--- +'graphql-language-service-server': patch +'vscode-graphql': patch +--- + +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 diff --git a/packages/graphql-language-service-server/package.json b/packages/graphql-language-service-server/package.json index 2b4b50ab222..716dc9a5e1c 100644 --- a/packages/graphql-language-service-server/package.json +++ b/packages/graphql-language-service-server/package.json @@ -55,10 +55,8 @@ "vscode-languageserver": "^8.0.1", "vscode-languageserver-types": "^3.17.2", "vscode-uri": "^3.0.2", - "svelte2tsx": "^0.6.27", "svelte": "^4.1.1", - "source-map-js": "1.0.2", - "typescript": "5.3.3" + "source-map-js": "1.0.2" }, "devDependencies": { "@types/glob": "^8.1.0", diff --git a/packages/graphql-language-service-server/src/__tests__/findGraphQLTags-test.ts b/packages/graphql-language-service-server/src/__tests__/findGraphQLTags-test.ts index d2f9c6d2837..ae59b022a17 100644 --- a/packages/graphql-language-service-server/src/__tests__/findGraphQLTags-test.ts +++ b/packages/graphql-language-service-server/src/__tests__/findGraphQLTags-test.ts @@ -355,7 +355,8 @@ query {id}`); `); expect(JSON.stringify(contents[0].range)).toEqual( - JSON.stringify(new Range(new Position(2, 29), new Position(12, 0))), + // TODO: change back to 29 when we get svelte parser working again + JSON.stringify(new Range(new Position(2, 27), new Position(12, 0))), ); }); diff --git a/packages/graphql-language-service-server/src/findGraphQLTags.ts b/packages/graphql-language-service-server/src/findGraphQLTags.ts index 28248f1a060..a6f83f5e20f 100644 --- a/packages/graphql-language-service-server/src/findGraphQLTags.ts +++ b/packages/graphql-language-service-server/src/findGraphQLTags.ts @@ -17,7 +17,7 @@ import { Position, Range } from 'graphql-language-service'; import { TAG_MAP } from './constants'; import { ecmaParser, tsParser } from './parsers/babel'; -import { svelteParser } from './parsers/svelte'; +// import { svelteParser } from './parsers/svelte'; import { vueParser } from './parsers/vue'; import type { Logger, NoopLogger } from './Logger'; import { RangeMapper } from './parsers/types'; @@ -40,7 +40,9 @@ const parserMap = { '.tsx': tsParser, '.cts': tsParser, '.mts': tsParser, - '.svelte': svelteParser, + // disabled for now, until we can figure out how to get svelte2tsx working in esbuild bundle + // '.svelte': svelteParser, + '.svelte': vueParser, '.vue': vueParser, }; diff --git a/packages/graphql-language-service-server/src/parsers/svelte.ts b/packages/graphql-language-service-server/src/parsers/svelte.ts index 2ecf6addabf..2f5282dbb76 100644 --- a/packages/graphql-language-service-server/src/parsers/svelte.ts +++ b/packages/graphql-language-service-server/src/parsers/svelte.ts @@ -1,4 +1,6 @@ import { babelParser } from './babel'; +// TODO: Remove this when we have a working svelte parsing implementation +// eslint-disable-next-line import/no-extraneous-dependencies import { svelte2tsx } from 'svelte2tsx'; import { SourceMapConsumer } from 'source-map-js'; import { Position, Range } from 'graphql-language-service'; diff --git a/packages/vscode-graphql/esbuild.js b/packages/vscode-graphql/esbuild.js index 62148b402b4..eb9f2bb39d8 100644 --- a/packages/vscode-graphql/esbuild.js +++ b/packages/vscode-graphql/esbuild.js @@ -49,7 +49,6 @@ build({ 'atpl', 'liquor', 'twig', - 'typescript', ], }) .then(({ errors, warnings }) => { diff --git a/yarn.lock b/yarn.lock index 206fe2bd146..8a581b7b6e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18401,14 +18401,6 @@ svelte2tsx@^0.6.16: dedent-js "^1.0.1" pascal-case "^3.1.1" -svelte2tsx@^0.6.27: - version "0.6.27" - resolved "https://registry.yarnpkg.com/svelte2tsx/-/svelte2tsx-0.6.27.tgz#5b2c21f38608be51cd32de177722f123e57919e5" - integrity sha512-E1uPW1o6VsbRz+nUk3fznZ2lSmCITAJoNu8AYefWSvIwE2pSB01i5sId4RMbWNzfcwCQl1DcgGShCPcldl4rvg== - dependencies: - dedent-js "^1.0.1" - pascal-case "^3.1.1" - svelte@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.1.1.tgz#468ed0377d3cae542b35df8a22a3ca188d93272a" @@ -18982,11 +18974,6 @@ typedoc@^0.19.2: shelljs "^0.8.4" typedoc-default-themes "^0.11.4" -typescript@5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" - integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== - typescript@^4.2.3: version "4.7.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"