@astrojs/language-server 0.8.7 → 0.8.8

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @astrojs/language-server
 
+## 0.8.8
+
+### Patch Changes
+
+- 526d5c7: Bring back loading the user js/tsconfig.json, notably, this allow us to support aliases
+
 ## 0.8.7
 
 ### Patch Changes

package/dist/plugins/typescript/languageService.js

@@ -52,17 +52,31 @@ async function getLanguageServiceForPath(path, workspaceUris, docContext) {
 }
 exports.getLanguageServiceForPath = getLanguageServiceForPath;
 async function createLanguageService(tsconfigPath, workspaceRoot, docContext) {
+    var _a, _b, _c;
     const parseConfigHost = {
         ...ts.sys,
         readDirectory: (path, extensions, exclude, include, depth) => {
             return ts.sys.readDirectory(path, [...extensions, '.vue', '.svelte', '.astro', '.js', '.jsx'], exclude, include, depth);
         },
     };
-    const configJson = getDefaultJsConfig();
+    let configJson = (tsconfigPath && ts.readConfigFile(tsconfigPath, ts.sys.readFile).config) || {};
+    // If our user has types in their config but it doesn't include the types for ImportMeta, let's add them for them
+    if (((_a = configJson.compilerOptions) === null || _a === void 0 ? void 0 : _a.types) &&
+        !((_b = configJson.compilerOptions) === null || _b === void 0 ? void 0 : _b.types.includes("vite/client"))) {
+        configJson.compilerOptions.types.push("vite/client");
+    }
+    configJson.compilerOptions = Object.assign(getDefaultCompilerOptions(), configJson.compilerOptions);
+    // If the user supplied exclude, let's use theirs
+    (_c = configJson.exclude) !== null && _c !== void 0 ? _c : (configJson.exclude = getDefaultExclude());
+    // Delete include so that .astro files don't get mistakenly excluded by the user
+    delete configJson.include;
+    // Everything here will always, unconditionally, be in the resulting config, not the opposite, tricky
     const existingCompilerOptions = {
+        // Setting strict to true for .astro files leads to a lot of unrelated errors (see language-tools#91) so we force it off for .astro files
+        strict: false,
         jsx: ts.JsxEmit.Preserve,
         module: ts.ModuleKind.ESNext,
-        target: ts.ScriptTarget.ESNext
+        target: ts.ScriptTarget.ESNext,
     };
     const project = ts.parseJsonConfigFileContent(configJson, parseConfigHost, workspaceRoot, existingCompilerOptions, (0, path_1.basename)(tsconfigPath), undefined, [
         { extension: '.vue', isMixedContent: true, scriptKind: ts.ScriptKind.Deferred },
@@ -142,17 +156,13 @@ async function createLanguageService(tsconfigPath, workspaceRoot, docContext) {
         return doc;
     }
 }
-function getDefaultJsConfig() {
-    let compilerOptions = {
+function getDefaultCompilerOptions() {
+    return {
         maxNodeModuleJsDepth: 2,
         allowSyntheticDefaultImports: true,
         allowJs: true,
         // By providing vite/client here, our users get proper typing on import.meta in .astro files
-        types: ['vite/client']
-    };
-    return {
-        compilerOptions,
-        exclude: getDefaultExclude(),
+        types: ["vite/client"],
     };
 }
 function getDefaultExclude() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.8.7",
+  "version": "0.8.8",
   "author": "Skypack",
   "license": "MIT",
   "type": "commonjs",