Merge pull request #365 from sveltejs/cheap-watch

Use cheap-watch

package.json

@@ -19,7 +19,6 @@
     "test": "test"
   },
   "dependencies": {
-    "chokidar": "^2.0.4",
     "html-minifier": "^3.5.16",
     "source-map-support": "^0.5.6",
     "tslib": "^1.9.1"
@@ -30,6 +29,7 @@
     "@types/mocha": "^5.2.5",
     "@types/node": "^10.7.1",
     "@types/rimraf": "^2.0.2",
+    "cheap-watch": "^0.3.0",
     "compression": "^1.7.1",
     "cookie": "^0.3.1",
     "devalue": "^1.0.4",

src/api/dev.ts

@@ -119,21 +119,30 @@ class Watcher extends EventEmitter {
 		this.dev_server = new DevServer(dev_port);
 
 		this.filewatchers.push(
-			watch_files(locations.routes(), ['add', 'unlink'], () => {
-				const routes = create_routes();
-				create_main_manifests({ routes, dev_port });
-
-				try {
+			watch_dir(
+				locations.routes(),
+				({ path: file, stats }) => {
+					if (stats.isDirectory()) {
+						return path.basename(file)[0] !== '_';
+					}
+					return true;
+				},
+				() => {
 					const routes = create_routes();
 					create_main_manifests({ routes, dev_port });
-				} catch (err) {
-					this.emit('error', <events.ErrorEvent>{
-						message: err.message
-					});
-				}
-			}),
 
-			watch_files(`${locations.app()}/template.html`, ['change'], () => {
+					try {
+						const routes = create_routes();
+						create_main_manifests({ routes, dev_port });
+					} catch (err) {
+						this.emit('error', <events.ErrorEvent>{
+							message: err.message
+						});
+					}
+				}
+			),
+
+			fs.watch(`${locations.app()}/template.html`, () => {
 				this.dev_server.send({
 					action: 'reload'
 				});
@@ -453,25 +462,32 @@ class DevServer {
 
 function noop() {}
 
-function watch_files(pattern: string, events: string[], callback: () => void) {
-	let watcher;
+function watch_dir(
+	dir: string,
+	filter: ({ path, stats }: { path: string, stats: fs.Stats }) => boolean,
+	callback: () => void
+) {
+	let watch;
 	let closed = false;
 
-	import('chokidar').then((chokidar) => {
+	import('cheap-watch').then(CheapWatch => {
 		if (closed) return;
 
-		watcher = chokidar.watch(pattern, {
-			persistent: true,
-			ignoreInitial: true,
-			disableGlobbing: true
+		watch = new CheapWatch({ dir, filter, debounce: 50 });
+
+		watch.on('+', ({ isNew }) => {
+			if (isNew) callback();
 		});
 
-		events.forEach(event => {
-			watcher.on(event, callback);
-		});
+		watch.on('-', callback);
+
+		watch.init();
 	});
 
 	return {
-		close: () => watcher && watcher.close()
+		close: () => {
+			if (watch) watch.close();
+			closed = true;
+		}
 	};
-}
+}