Skip to content

fix(language-server): remove circular dependency on svelte/vue integrations #16532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ematipico merged 2 commits into from
May 1, 2026
Merged

fix(language-server): remove circular dependency on svelte/vue integrations #16532

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee6e351
fix(language-server): avoid circular dependency
ocavue Apr 30, 2026
d81c76b
Simplify types
ocavue Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions packages/language-tools/language-server/src/importPackage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import { dirname, resolve } from 'node:path';

// Those three imports needs to always be `type` imports, as we always want to import them dynamically

// TODO: Consider maybe somehow moving those integrations to a separate package to avoid circular dependencies?
// @ts-ignore - Due to a circular dependency, we can't have those as dependencies
import type * as svelte from '@astrojs/svelte/dist/editor.cjs';
// @ts-ignore - Due to a circular dependency, we can't have those as dependencies
import type * as vue from '@astrojs/vue/dist/editor.cjs';

// The following import needs to always be `type` imports, as we always want to import it dynamically
import type * as prettier from 'prettier';

type PackageVersion = {
Expand Down Expand Up @@ -74,11 +67,14 @@ function importEditorIntegration<T>(packageName: string, fromPath: string): T |
return undefined;
}

export function importSvelteIntegration(fromPath: string): typeof svelte | undefined {
type SvelteIntegration = { toTSX(code: string, className: string): string };
type VueIntegration = { toTSX(code: string, className: string): string };

export function importSvelteIntegration(fromPath: string): SvelteIntegration | undefined {
return importEditorIntegration('@astrojs/svelte', fromPath);
}

export function importVueIntegration(fromPath: string): typeof vue | undefined {
export function importVueIntegration(fromPath: string): VueIntegration | undefined {
return importEditorIntegration('@astrojs/vue', fromPath);
}

Expand Down
Loading