Always point to server in /server, fix #568

vuejs · Dec 5, 2017 · 52322e4 · 52322e4
1 parent 2351dcf
commit 52322e4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1,490 deletions.
diff --git a/.vscodeignore b/.vscodeignore
@@ -1 +0,0 @@
-server/**/*

diff --git a/client/package.json b/client/package.json
@@ -11,8 +11,7 @@
   },
   "dependencies": {
     "vscode-languageclient": "^3.4.2",
-    "vscode-languageserver-types": "^3.4.0",
-    "vue-language-server": "0.0.25"
+    "vscode-languageserver-types": "^3.4.0"
   },
   "devDependencies": {
     "@types/node": "^8.0.51",

diff --git a/client/src/vueMain.ts b/client/src/vueMain.ts
@@ -15,7 +15,6 @@ import {
   DocumentColorRequest, DocumentColorParams, ColorPresentationRequest, ColorPresentationParams
 } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
 
-
 const EMPTY_ELEMENTS: string[] = [
   'area',
   'base',
@@ -35,7 +34,6 @@ const EMPTY_ELEMENTS: string[] = [
   'wbr'
 ];
 
-
 export function activate(context: ExtensionContext) {
   /**
    * Custom Block Grammar generation command
@@ -62,13 +60,12 @@ export function activate(context: ExtensionContext) {
   /**
    * Vue Language Server Initialization
    */
-  const serverModule = require.resolve('vue-language-server');
-  const debugServerModule = context.asAbsolutePath(path.join('server', 'dist', 'vueServerMain.js'));
+  const serverModule = context.asAbsolutePath(path.join('server', 'dist', 'vueServerMain.js'));
   const debugOptions = { execArgv: ['--nolazy', '--inspect=6005'] };
 
   const serverOptions: ServerOptions = {
     run: { module: serverModule, transport: TransportKind.ipc },
-    debug: { module: debugServerModule, transport: TransportKind.ipc, options: debugOptions }
+    debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions }
   };
 
   const documentSelector = ['vue'];