@astrojs/language-server 2.1.2 → 2.1.4

package/dist/core/index.js

@@ -44,6 +44,15 @@ function getLanguageModule(astroInstall, ts) {
         resolveHost(host) {
             return {
                 ...host,
+                resolveModuleName(moduleName, impliedNodeFormat) {
+                    if (impliedNodeFormat === ts.ModuleKind.ESNext &&
+                        (moduleName.endsWith('.astro') ||
+                            moduleName.endsWith('.vue') ||
+                            moduleName.endsWith('.svelte'))) {
+                        return `${moduleName}.js`;
+                    }
+                    return host.resolveModuleName?.(moduleName, impliedNodeFormat) ?? moduleName;
+                },
                 getScriptFileNames() {
                     const fileNames = host.getScriptFileNames();
                     return [

package/dist/importPackage.d.ts

@@ -2,7 +2,10 @@ import type * as svelte from '@astrojs/svelte/dist/editor.cjs';
 import type * as vue from '@astrojs/vue/dist/editor.cjs';
 import type * as prettier from 'prettier';
 export declare function setIsTrusted(_isTrusted: boolean): void;
-export declare function getPackagePath(packageName: string, fromPath: string[]): string | undefined;
+/**
+ * Get the path of a package's directory from the paths in `fromPath`, if `root` is set to false, it will return the path of the package's entry point
+ */
+export declare function getPackagePath(packageName: string, fromPath: string[], root?: boolean): string | undefined;
 export declare function importSvelteIntegration(fromPath: string): typeof svelte | undefined;
 export declare function importVueIntegration(fromPath: string): typeof vue | undefined;
 export declare function importPrettier(fromPath: string): typeof prettier | undefined;

package/dist/importPackage.js

@@ -7,13 +7,18 @@ function setIsTrusted(_isTrusted) {
     isTrusted = _isTrusted;
 }
 exports.setIsTrusted = setIsTrusted;
-function getPackagePath(packageName, fromPath) {
+/**
+ * Get the path of a package's directory from the paths in `fromPath`, if `root` is set to false, it will return the path of the package's entry point
+ */
+function getPackagePath(packageName, fromPath, root = true) {
     const paths = [];
     if (isTrusted) {
         paths.unshift(...fromPath);
     }
     try {
-        return (0, node_path_1.dirname)(require.resolve(packageName + '/package.json', { paths }));
+        return root
+            ? (0, node_path_1.dirname)(require.resolve(packageName + '/package.json', { paths }))
+            : require.resolve(packageName, { paths });
     }
     catch (e) {
         return undefined;
@@ -51,7 +56,7 @@ function importPrettier(fromPath) {
 }
 exports.importPrettier = importPrettier;
 function getPrettierPluginPath(fromPath) {
-    const prettierPluginPath = getPackagePath('prettier-plugin-astro', [fromPath, __dirname]);
+    const prettierPluginPath = getPackagePath('prettier-plugin-astro', [fromPath, __dirname], false);
     if (!prettierPluginPath) {
         return undefined;
     }

package/dist/languageServerPlugin.js

@@ -68,8 +68,7 @@ const plugin = (initOptions, modules) => ({
                     languages: ['astro'],
                     ignoreIdeOptions: true,
                     resolveConfigOptions: {
-                        // Prettier's cache is a bit cumbersome, because you need to reload the config yourself on change
-                        // TODO: Upstream a fix for this
+                        // This seems to be broken since Prettier 3, and it'll always use its cumbersome cache. Hopefully it works one day.
                         useCache: false,
                     },
                     additionalOptions: async (resolvedConfig) => {
@@ -77,7 +76,8 @@ const plugin = (initOptions, modules) => ({
                             if (!prettier || !prettierPluginPath) {
                                 return [];
                             }
-                            const hasPluginLoadedAlready = (await prettier.getSupportInfo()).languages.some((l) => l.name === 'astro');
+                            const hasPluginLoadedAlready = (await prettier.getSupportInfo()).languages.some((l) => l.name === 'astro') ||
+                                resolvedConfig.plugins?.includes('prettier-plugin-astro'); // getSupportInfo doesn't seems to work very well in Prettier 3 for plugins
                             return hasPluginLoadedAlready ? [] : [prettierPluginPath];
                         }
                         const plugins = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -22,20 +22,20 @@
   "dependencies": {
     "@astrojs/compiler": "1.5.7",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/kit": "~1.9.0",
-    "@volar/language-core": "~1.9.0",
-    "@volar/language-server": "~1.9.0",
-    "@volar/language-service": "~1.9.0",
-    "@volar/source-map": "~1.9.0",
-    "@volar/typescript": "~1.9.0",
+    "@volar/kit": "~1.10.0",
+    "@volar/language-core": "~1.10.0",
+    "@volar/language-server": "~1.10.0",
+    "@volar/language-service": "~1.10.0",
+    "@volar/source-map": "~1.10.0",
+    "@volar/typescript": "~1.10.0",
     "fast-glob": "^3.2.12",
     "muggle-string": "^0.3.1",
-    "volar-service-css": "0.0.10",
-    "volar-service-emmet": "0.0.10",
-    "volar-service-html": "0.0.10",
-    "volar-service-prettier": "0.0.10",
-    "volar-service-typescript": "0.0.10",
-    "volar-service-typescript-twoslash-queries": "0.0.10",
+    "volar-service-css": "0.0.11",
+    "volar-service-emmet": "0.0.11",
+    "volar-service-html": "0.0.11",
+    "volar-service-prettier": "0.0.11",
+    "volar-service-typescript": "0.0.11",
+    "volar-service-typescript-twoslash-queries": "0.0.11",
     "vscode-html-languageservice": "^5.0.6",
     "vscode-uri": "^3.0.7"
   },