@teambit/ts-server 0.0.43 → 0.0.44

package/dist/ts-server-client.js

@@ -283,16 +283,16 @@ class TsserverClient {
             return this.options.tsServerPath;
         }
         const tsServerPath = path_1.default.join('typescript', 'lib', 'tsserver.js');
-        // 1) look into .yarn/sdks of workspace root
-        const sdk = (0, modules_resolver_1.findPathToYarnSdk)(this.projectPath, tsServerPath);
-        if (sdk) {
-            return sdk;
-        }
-        // 2) look into node_modules of workspace root
+        // 1) look into node_modules of workspace root
         const executable = (0, modules_resolver_1.findPathToModule)(this.projectPath, tsServerPath);
         if (executable) {
             return executable;
         }
+        // 2) look into .yarn/sdks of workspace root
+        const sdk = (0, modules_resolver_1.findPathToYarnSdk)(this.projectPath, tsServerPath);
+        if (sdk) {
+            return sdk;
+        }
         // 3) use globally installed tsserver
         if (command_exists_1.default.sync((0, utils_1.getTsserverExecutable)())) {
             return (0, utils_1.getTsserverExecutable)();

package/dist/ts-server-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"ts-server-client.js","sourceRoot":"","sources":["../ts-server-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ts-server-client.js","sourceRoot":"","sources":["../ts-server-client.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/ts-server",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "homepage": "https://bit.dev/teambit/typescript/ts-server",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.typescript",
     "name": "ts-server",
-    "version": "0.0.43"
+    "version": "0.0.44"
   },
   "dependencies": {
     "typescript": "4.7.4",

package/ts-server-client.ts

@@ -285,16 +285,16 @@ export class TsserverClient {
       return this.options.tsServerPath;
     }
     const tsServerPath = path.join('typescript', 'lib', 'tsserver.js');
-    // 1) look into .yarn/sdks of workspace root
-    const sdk = findPathToYarnSdk(this.projectPath, tsServerPath);
-    if (sdk) {
-      return sdk;
-    }
-    // 2) look into node_modules of workspace root
+    // 1) look into node_modules of workspace root
     const executable = findPathToModule(this.projectPath, tsServerPath);
     if (executable) {
       return executable;
     }
+    // 2) look into .yarn/sdks of workspace root
+    const sdk = findPathToYarnSdk(this.projectPath, tsServerPath);
+    if (sdk) {
+      return sdk;
+    }
     // 3) use globally installed tsserver
     if (commandExists.sync(getTsserverExecutable())) {
       return getTsserverExecutable();