Merge pull request #702 from HerringtonDarkholme/watch

partially fix #355, a crude watcher
vuejs · Feb 20, 2018 · 3f260a5 · 3f260a5
2 parents 481602d + a7f9248
commit 3f260a5
Show file tree

Hide file tree

Showing 4 changed files with 618 additions and 10 deletions.
diff --git a/server/package.json b/server/package.json
@@ -21,7 +21,9 @@
   },
   "homepage": "https://github.com/vuejs/vetur/tree/master/server",
   "dependencies": {
+    "@types/chokidar": "^1.7.4",
     "bootstrap-vue-helper-json": "^1.1.1",
+    "chokidar": "^2.0.2",
     "element-helper-json": "^2.0.2",
     "eslint": "^4.13.1",
     "eslint-plugin-vue": "^4.0.0",

diff --git a/server/src/modes/script/javascript.ts b/server/src/modes/script/javascript.ts
@@ -384,7 +384,7 @@ export function getJavascriptMode(
       jsDocuments.onDocumentRemoved(document);
     },
     dispose() {
-      serviceHost.getService().dispose();
+      serviceHost.dispose();
       jsDocuments.dispose();
     }
   };

diff --git a/server/src/modes/script/serviceHost.ts b/server/src/modes/script/serviceHost.ts
@@ -8,6 +8,7 @@ import { LanguageModelCache } from '../languageModelCache';
 import { createUpdater, parseVue, isVue } from './preprocess';
 import { getFileFsPath, getFilePath } from '../../utils/paths';
 import * as bridge from './bridge';
+import * as chokidar from 'chokidar';
 
 // Patch typescript functions to insert `import Vue from 'vue'` and `new Vue` around export default.
 // NOTE: this is a global hack that all ts instances after is changed
@@ -68,6 +69,19 @@ export function getServiceHost(workspacePath: string, jsDocuments: LanguageModel
     ...parsedConfig.options
   };
   compilerOptions.allowNonTsExtensions = true;
+  const watcher = chokidar.watch(workspacePath, {
+    ignoreInitial: true,
+    ignored: defaultIgnorePatterns(workspacePath)
+  });
+
+  watcher
+    .on('change', filterNonScript(path => {
+      const ver = versions.get(path) || 0;
+      versions.set(path, ver + 1);
+    }))
+    .on('add', filterNonScript(path => {
+      files.push(path);
+    }));
 
   function updateCurrentTextDocument(doc: TextDocument) {
     const fileFsPath = getFileFsPath(doc.uri);
@@ -198,7 +212,10 @@ export function getServiceHost(workspacePath: string, jsDocuments: LanguageModel
   return {
     updateCurrentTextDocument,
     getScriptDocByFsPath,
-    getService: () => jsLanguageService
+    dispose: () => {
+      watcher.close();
+      jsLanguageService.dispose();
+    },
   };
 }
 
@@ -257,3 +274,12 @@ function getParsedConfig(workspacePath: string) {
     [{ extension: 'vue', isMixedContent: true }]
   );
 }
+
+function filterNonScript(func: (path: string) => void) {
+  return (path: string) => {
+    if (!/(tsx?|vue|jsx?)$/.test(path)) {
+      return;
+    }
+    func(path);
+  };
+}