@volar/vscode 1.10.10-alpha.0 → 1.10.10-alpha.1

package/out/features/tsVersion.d.ts

@@ -1,9 +1,8 @@
-import * as path from 'typesafe-path';
 import * as vscode from 'vscode';
 import type { BaseLanguageClient } from 'vscode-languageclient';
 export declare function activate(cmd: string, context: vscode.ExtensionContext, client: BaseLanguageClient, shouldStatusBarShow: (document: vscode.TextDocument) => boolean, resolveStatusText: (text: string) => string, disableTakeOverMode: boolean): Promise<vscode.Disposable>;
 export declare function getTsdk(context: vscode.ExtensionContext): Promise<{
-    tsdk: string | path.PosixPath;
+    tsdk: string;
     version: string | undefined;
     isWorkspacePath: boolean;
 }>;

package/out/features/tsVersion.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTsdk = exports.activate = void 0;
-const path = require("typesafe-path");
+const path = require("path-browserify");
 const vscode = require("vscode");
 const common_1 = require("../common");
 const defaultTsdkPath = 'node_modules/typescript/lib';
@@ -111,26 +111,27 @@ function resolveWorkspaceTsdk(tsdk) {
     if (path.isAbsolute(tsdk)) {
         try {
             if (require.resolve('./typescript.js', { paths: [tsdk] })) {
-                return tsdk.replace(/\\/g, '/');
+                return tsdk;
             }
         }
         catch { }
     }
-    const workspaceFolderFsPaths = (vscode.workspace.workspaceFolders ?? []).map(folder => folder.uri.fsPath);
-    for (const folder of workspaceFolderFsPaths) {
-        const _path = path.join(folder, tsdk);
-        try {
-            if (require.resolve('./typescript.js', { paths: [_path] })) {
-                return _path.replace(/\\/g, '/');
+    if (vscode.workspace.workspaceFolders) {
+        for (const folder of vscode.workspace.workspaceFolders) {
+            const tsdkPath = path.join(folder.uri.fsPath.replace(/\\/g, '/'), tsdk);
+            try {
+                if (require.resolve('./typescript.js', { paths: [tsdkPath] })) {
+                    return tsdkPath;
+                }
             }
+            catch { }
         }
-        catch { }
     }
 }
 async function getVScodeTsdk() {
     const nightly = vscode.extensions.getExtension('ms-vscode.vscode-typescript-next');
     if (nightly) {
-        const libPath = path.join(nightly.extensionPath, 'node_modules/typescript/lib').replace(/\\/g, '/');
+        const libPath = path.join(nightly.extensionPath.replace(/\\/g, '/'), 'node_modules/typescript/lib');
         return {
             path: libPath,
             version: await getTsVersion(libPath),
@@ -138,7 +139,7 @@ async function getVScodeTsdk() {
         };
     }
     if (vscode.env.appRoot) {
-        const libPath = path.join(vscode.env.appRoot, 'extensions/node_modules/typescript/lib').replace(/\\/g, '/');
+        const libPath = path.join(vscode.env.appRoot.replace(/\\/g, '/'), 'extensions/node_modules/typescript/lib');
         return {
             path: libPath,
             version: await getTsVersion(libPath),
@@ -154,7 +155,7 @@ async function getVScodeTsdk() {
     };
 }
 function getConfigTsdkPath() {
-    return vscode.workspace.getConfiguration('typescript').get('tsdk');
+    return vscode.workspace.getConfiguration('typescript').get('tsdk')?.replace(/\\/g, '/');
 }
 function isUseWorkspaceTsdk(context) {
     return context.workspaceState.get('typescript.useWorkspaceTsdk', false);

package/out/features/tsconfig.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = void 0;
 const vscode = require("vscode");
 const protocol_1 = require("@volar/language-server/protocol");
-const path = require("typesafe-path");
+const path = require("path-browserify");
 async function activate(cmd, client, shouldStatusBarShow) {
     const subscriptions = [];
     const statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right);
@@ -26,7 +26,7 @@ async function activate(cmd, client, shouldStatusBarShow) {
             const tsconfig = await client.sendRequest(protocol_1.GetMatchTsConfigRequest.type, client.code2ProtocolConverter.asTextDocumentIdentifier(vscode.window.activeTextEditor.document));
             if (tsconfig?.uri) {
                 currentTsconfigUri = vscode.Uri.parse(tsconfig.uri);
-                statusBar.text = path.relative((vscode.workspace.rootPath || '/'), currentTsconfigUri.fsPath);
+                statusBar.text = path.relative((vscode.workspace.rootPath?.replace(/\\/g, '/') || '/'), currentTsconfigUri.fsPath.replace(/\\/g, '/'));
                 statusBar.command = cmd;
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/vscode",
-	"version": "1.10.10-alpha.0",
+	"version": "1.10.10-alpha.1",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,12 +13,13 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "1.10.10-alpha.0",
-		"typesafe-path": "^0.2.2",
+		"@volar/language-server": "1.10.10-alpha.1",
+		"path-browserify": "^1.0.1",
 		"vscode-nls": "^5.2.0"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
+		"@types/path-browserify": "latest",
 		"@types/vscode": "^1.82.0",
 		"vscode-languageclient": "^9.0.1"
 	},
@@ -30,5 +31,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "82c2a3fbd190fad9b9d8293b34587b5d17bed545"
+	"gitHead": "7bf9da2be16293e5dd5d7ac886d0193c00749ff2"
 }