Merge pull request #227 from HerringtonDarkholme/master

merge vue-language-server

Author: octref

.gitignore

@@ -4,8 +4,9 @@ node_modules/
 out/
 
 client/server
+server/dist
 
 docs/_book
 
 *.zip
-*.vsix
+*.vsix

client/package.json

@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "vscode-languageclient": "^3.2.1",
+    "vue-language-server": "0.0.2",
     "vscode-languageserver-types": "^3.0.3"
   },
   "devDependencies": {

client/src/htmlMain.ts

@@ -11,7 +11,7 @@ namespace ColorSymbolRequest {
 export function activate (context: ExtensionContext) {
 
   // The server is implemented in node
-  const serverModule = context.asAbsolutePath(path.join('client', 'server', 'vueServerMain.js'));
+  const serverModule = require.resolve('vue-language-server');
   // The debug options for the server
   const debugOptions = { execArgv: ['--nolazy', '--debug=6005'] };
 
@@ -55,4 +55,4 @@ export function activate (context: ExtensionContext) {
       }
     ],
   });
-}
+}

server/.editorconfig

@@ -0,0 +1,2 @@
+[*]
+indent_size=2

server/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+dist

server/README.md

@@ -0,0 +1,14 @@
+VueJS Language Server
+-----
+
+Extracted from [vetur](https://github.com/octref/vetur).
+
+This can be used for different editors.
+
+
+Usage
+-----
+
+Clone this repo. `npm install` and `npm link`.
+
+Then configure your editor to use `vls` as language server command.

server/bin/vls

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require('../dist/vueServerMain.js')

server/package.json

@@ -1,28 +1,42 @@
 {
-  "name": "vetur-server",
-  "description": "vetur language server",
-  "version": "0.1.0",
+  "name": "vue-language-server",
+  "description": "vue-language-server",
+  "version": "0.0.2",
   "author": "Pine Wu <[email protected]>",
   "license": "MIT",
+  "main": "dist/vueServerMain.js",
+  "bin": {
+    "vls": "./bin/vls"
+  },
   "engines": {
     "node": "*"
   },
+  "files": [
+    "dist",
+    "bin"
+  ],
   "dependencies": {
-    "de-indent": "^1.0.2",
-    "he": "^1.1.1",
     "js-beautify": "^1.6.14",
     "lodash": "^4.17.4",
-    "typescript": "^2.2.2",
+    "stylus": "^0.54.5",
+    "typescript": "^2.3.4",
     "vscode-css-languageservice": "^2.0.0",
     "vscode-languageserver": "^3.2.1",
-    "vscode-uri": "^1.0.0"
+    "vscode-uri": "^1.0.0",
+    "vue-template-compiler": "^2.3.3"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.62",
-    "@types/node": "^6.0.54"
+    "@types/js-beautify": "0.0.30",
+    "@types/lodash": "^4.14.65",
+    "@types/mocha": "^2.2.41",
+    "@types/node": "^6.0.77",
+    "mocha": "^3.4.2",
+    "source-map-support": "^0.4.15"
   },
   "scripts": {
-    "compile": "installServerIntoExtension ../client ./package.json ./tsconfig.json && tsc -p .",
-    "watch": "installServerIntoExtension ../client ./package.json ./tsconfig.json && tsc --watch -p ."
+    "compile": "tsc",
+    "watch": "tsc --watch",
+    "test": "mocha",
+    "preversion": "npm run compile && npm test"
   }
 }