@astrojs/language-server 2.6.0 → 2.6.2

package/dist/core/index.d.ts

@@ -2,7 +2,7 @@ import type { DiagnosticMessage } from '@astrojs/compiler/types';
 import { FileCapabilities, FileKind, type Language, type VirtualFile } from '@volar/language-core';
 import type ts from 'typescript/lib/tsserverlibrary';
 import type { HTMLDocument } from 'vscode-html-languageservice';
-import type { AstroInstall } from '../utils.js';
+import { type AstroInstall } from '../utils.js';
 import { AstroMetadata } from './parseAstro';
 export declare function getLanguageModule(astroInstall: AstroInstall | undefined, ts: typeof import('typescript/lib/tsserverlibrary.js')): Language<AstroFile>;
 export declare class AstroFile implements VirtualFile {

package/dist/core/index.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstroFile = exports.getLanguageModule = void 0;
 const language_core_1 = require("@volar/language-core");
 const path = __importStar(require("node:path"));
+const utils_js_1 = require("../utils.js");
 const astro2tsx_1 = require("./astro2tsx");
 const parseAstro_1 = require("./parseAstro");
 const parseCSS_1 = require("./parseCSS");
@@ -54,32 +55,25 @@ function getLanguageModule(astroInstall, ts) {
                     return host.resolveModuleName?.(moduleName, impliedNodeFormat) ?? moduleName;
                 },
                 getScriptFileNames() {
-                    let languageServerDirectory;
-                    try {
-                        languageServerDirectory = path.dirname(require.resolve('@astrojs/language-server'));
-                    }
-                    catch (e) {
-                        languageServerDirectory = __dirname;
-                    }
+                    const languageServerTypesDirectory = (0, utils_js_1.getLanguageServerTypesDir)(ts);
                     const fileNames = host.getScriptFileNames();
                     const addedFileNames = [];
                     if (astroInstall) {
                         addedFileNames.push(...['./env.d.ts', './astro-jsx.d.ts'].map((filePath) => ts.sys.resolvePath(path.resolve(astroInstall.path, filePath))));
                         // If Astro version is < 4.0.8, add jsx-runtime-augment.d.ts to the files to fake `JSX` being available from "astro/jsx-runtime".
                         // TODO: Remove this once a majority of users are on Astro 4.0.8+, erika - 2023-12-28
-                        if (astroInstall.version.major >= 4 &&
-                            (astroInstall.version.minor > 0 || astroInstall.version.patch >= 8)) {
-                            addedFileNames.push(...['../jsx-runtime-augment.d.ts'].map((filePath) => ts.sys.resolvePath(path.resolve(languageServerDirectory, filePath))));
+                        if (astroInstall.version.major < 4 ||
+                            (astroInstall.version.major === 4 &&
+                                astroInstall.version.minor === 0 &&
+                                astroInstall.version.patch < 8)) {
+                            addedFileNames.push(...['./jsx-runtime-augment.d.ts'].map((filePath) => ts.sys.resolvePath(path.resolve(languageServerTypesDirectory, filePath))));
+                            console.log(addedFileNames);
                         }
                     }
                     else {
                         // If we don't have an Astro installation, add the fallback types from the language server.
                         // See the README in packages/language-server/types for more information.
-                        addedFileNames.push(...[
-                            '../types/env.d.ts',
-                            '../types/astro-jsx.d.ts',
-                            '../types/jsx-runtime-fallback.d.ts',
-                        ].map((f) => ts.sys.resolvePath(path.resolve(languageServerDirectory, f))));
+                        addedFileNames.push(...['./env.d.ts', './astro-jsx.d.ts', './jsx-runtime-fallback.d.ts'].map((f) => ts.sys.resolvePath(path.resolve(languageServerTypesDirectory, f))));
                     }
                     return [...fileNames, ...addedFileNames];
                 },

package/dist/utils.d.ts

@@ -7,6 +7,7 @@ export interface AstroInstall {
         patch: number;
     };
 }
+export declare function getLanguageServerTypesDir(ts: typeof import('typescript')): string;
 export declare function getAstroInstall(basePaths: string[], checkForAstro?: {
     nearestPackageJson: string | undefined;
     readDirectory: typeof import('typescript/lib/tsserverlibrary.js').sys.readDirectory;

package/dist/utils.js

@@ -23,9 +23,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAstroInstall = void 0;
+exports.getAstroInstall = exports.getLanguageServerTypesDir = void 0;
 const path = __importStar(require("node:path"));
 const importPackage_js_1 = require("./importPackage.js");
+function getLanguageServerTypesDir(ts) {
+    return ts.sys.resolvePath(path.resolve(__dirname, '../types'));
+}
+exports.getLanguageServerTypesDir = getLanguageServerTypesDir;
 function getAstroInstall(basePaths, checkForAstro) {
     let astroPath;
     let version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "author": "withastro",
   "license": "MIT",
   "repository": {