From 4fc7de6766d242b5a3c6cad1dc48f9b23ae11d41 Mon Sep 17 00:00:00 2001
From: chemzqm <chemzqm@gmail.com>
Date: Thu, 20 Jun 2019 19:37:40 +0800
Subject: [PATCH] fix tsserver module not resolved
---
src/server/utils/versionProvider.ts | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/server/utils/versionProvider.ts b/src/server/utils/versionProvider.ts
index 3aeed55..ba6b50a 100644
--- a/src/server/utils/versionProvider.ts
+++ b/src/server/utils/versionProvider.ts
@@ -7,6 +7,9 @@ import path from 'path'
import { workspace, Uri } from 'coc.nvim'
import API from './api'
import { TypeScriptServiceConfiguration } from './configuration'
+declare var __webpack_require__: any
+declare var __non_webpack_require__: any
+const requireFunc = typeof __webpack_require__ === "function" ? __non_webpack_require__ : require
export class TypeScriptVersion {
private _api: API | null | undefined
@@ -112,7 +115,7 @@ export class TypeScriptVersionProvider {
}
public get bundledVersion(): TypeScriptVersion | null {
- const file = require.resolve('typescript')
+ const file = requireFunc.resolve('typescript')
if (!file || !fs.existsSync(file)) {
workspace.showMessage('Bundled typescript module not found', 'error')
return null