@astrojs/language-server 2.7.7 → 2.8.0

package/dist/core/astro2tsx.d.ts

@@ -40,7 +40,7 @@ export declare function safeConvertToTSX(content: string, options: ConvertToTSXO
 };
 export declare function getTSXRangesAsLSPRanges(tsx: TSXResult): LSPTSXRanges;
 export declare function astro2tsx(input: string, fileName: string, htmlDocument: HTMLDocument): {
-    virtualCode: VirtualCode<string>;
+    virtualCode: VirtualCode;
     diagnostics: import("@astrojs/compiler").DiagnosticMessage[] | {
         code: 1000;
         location: {

package/dist/core/index.js

@@ -168,6 +168,7 @@ class AstroVirtualCode {
         this.htmlDocument = htmlDocument;
         const scriptTags = (0, parseJS_js_1.extractScriptTags)(this.snapshot, htmlDocument, astroMetadata.ast);
         this.scriptCodeIds = scriptTags.map((scriptTag) => scriptTag.id);
+        htmlVirtualCode.embeddedCodes = [];
         htmlVirtualCode.embeddedCodes.push(...(0, parseCSS_1.extractStylesheets)(this.snapshot, htmlDocument, astroMetadata.ast), ...scriptTags);
         this.embeddedCodes = [];
         this.embeddedCodes.push(htmlVirtualCode);

package/dist/languageServerPlugin.d.ts

@@ -1,3 +1,3 @@
 import { Connection } from '@volar/language-server/node';
-import type { ServerOptions, createServerBase } from '@volar/language-server/lib/server.js';
-export declare function createServerOptions(connection: Connection, server: ReturnType<typeof createServerBase>): ServerOptions;
+import type { ServerOptions } from '@volar/language-server/lib/server.js';
+export declare function createServerOptions(connection: Connection, ts: typeof import('typescript')): ServerOptions;

package/dist/languageServerPlugin.js

@@ -16,7 +16,7 @@ const astro_js_1 = require("./plugins/astro.js");
 const html_js_1 = require("./plugins/html.js");
 const index_js_1 = require("./plugins/typescript-addons/index.js");
 const index_js_2 = require("./plugins/typescript/index.js");
-function createServerOptions(connection, server) {
+function createServerOptions(connection, ts) {
     return {
         watchFileExtensions: [
             'js',
@@ -33,7 +33,6 @@ function createServerOptions(connection, server) {
             'svelte',
         ],
         getServicePlugins() {
-            const ts = getTypeScriptModule();
             return [
                 (0, html_js_1.create)(),
                 (0, volar_service_css_1.create)(),
@@ -46,7 +45,6 @@ function createServerOptions(connection, server) {
             ];
         },
         getLanguagePlugins(serviceEnv, projectContext) {
-            const ts = getTypeScriptModule();
             const languagePlugins = [
                 (0, vue_js_1.getVueLanguageModule)(),
                 (0, svelte_js_1.getSvelteLanguageModule)(),
@@ -55,7 +53,7 @@ function createServerOptions(connection, server) {
                 const rootPath = projectContext.typescript.configFileName
                     ? projectContext.typescript.configFileName.split('/').slice(0, -1).join('/')
                     : serviceEnv.typescript.uriToFileName(serviceEnv.workspaceFolder);
-                const nearestPackageJson = server.modules.typescript?.findConfigFile(rootPath, ts.sys.fileExists, 'package.json');
+                const nearestPackageJson = ts.findConfigFile(rootPath, ts.sys.fileExists, 'package.json');
                 const astroInstall = (0, utils_js_1.getAstroInstall)([rootPath], {
                     nearestPackageJson: nearestPackageJson,
                     readDirectory: ts.sys.readDirectory,
@@ -71,13 +69,6 @@ function createServerOptions(connection, server) {
             return languagePlugins;
         },
     };
-    function getTypeScriptModule() {
-        const tsModule = server.modules.typescript;
-        if (!tsModule) {
-            throw new Error('TypeScript module is missing');
-        }
-        return tsModule;
-    }
     function getPrettierService() {
         let prettier;
         let prettierPluginPath;
@@ -117,6 +108,7 @@ function createServerOptions(connection, server) {
                     parser: 'astro',
                 };
             },
+            allowImportError: true,
         });
     }
 }

package/dist/nodeServer.js

@@ -6,7 +6,12 @@ const connection = (0, node_1.createConnection)();
 const server = (0, node_1.createServer)(connection);
 connection.listen();
 connection.onInitialize((params) => {
-    return server.initialize(params, node_1.createTypeScriptProjectProvider, (0, languageServerPlugin_js_1.createServerOptions)(connection, server));
+    const tsdk = params.initializationOptions?.typescript?.tsdk;
+    if (!tsdk) {
+        throw new Error('The `typescript.tsdk` init option is required. It should point to a directory containing a `typescript.js` or `tsserverlibrary.js` file, such as `node_modules/typescript/lib`.');
+    }
+    const { typescript, diagnosticMessages } = (0, node_1.loadTsdkByPath)(tsdk, params.locale);
+    return server.initialize(params, (0, node_1.createTypeScriptProjectProviderFactory)(typescript, diagnosticMessages), (0, languageServerPlugin_js_1.createServerOptions)(connection, typescript));
 });
 connection.onInitialized(() => {
     server.initialized();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.7.7",
+  "version": "2.8.0",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -20,20 +20,20 @@
     "astro-ls": "./bin/nodeServer.js"
   },
   "dependencies": {
-    "@astrojs/compiler": "^2.4.0",
+    "@astrojs/compiler": "^2.7.0",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/kit": "~2.0.4",
-    "@volar/language-core": "~2.0.4",
-    "@volar/language-server": "~2.0.4",
-    "@volar/language-service": "~2.0.4",
-    "@volar/typescript": "~2.0.4",
+    "@volar/kit": "~2.1.2",
+    "@volar/language-core": "~2.1.2",
+    "@volar/language-server": "~2.1.2",
+    "@volar/language-service": "~2.1.2",
+    "@volar/typescript": "~2.1.2",
     "fast-glob": "^3.2.12",
-    "volar-service-css": "0.0.30",
-    "volar-service-emmet": "0.0.30",
-    "volar-service-html": "0.0.30",
-    "volar-service-prettier": "0.0.30",
-    "volar-service-typescript": "0.0.30",
-    "volar-service-typescript-twoslash-queries": "0.0.30",
+    "volar-service-css": "0.0.31",
+    "volar-service-emmet": "0.0.31",
+    "volar-service-html": "0.0.31",
+    "volar-service-prettier": "0.0.31-patch.1",
+    "volar-service-typescript": "0.0.31",
+    "volar-service-typescript-twoslash-queries": "0.0.31",
     "vscode-html-languageservice": "^5.1.2",
     "vscode-uri": "^3.0.8"
   },
@@ -44,7 +44,7 @@
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.17.8",
-    "@volar/test-utils": "~2.0.4",
+    "@volar/test-utils": "~2.1.2",
     "astro": "^4.3.5",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",