-> v0.17.1

show which file is causing an error/warning

CHANGELOG.md

@@ -1,5 +1,17 @@
 # sapper changelog
 
+## 0.17.1
+
+* Print which file is causing build errors/warnings ([#371](https://github.com/sveltejs/sapper/pull/371))
+
+## 0.17.0
+
+* Use `cheap-watch` instead of `chokidar` ([#364](https://github.com/sveltejs/sapper/issues/364))
+
+## 0.16.1
+
+* Fix file watching regression in previous version
+
 ## 0.16.0
 
 * Slim down installed package ([#363](https://github.com/sveltejs/sapper/pull/363))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sapper",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "description": "Military-grade apps, engineered by Svelte",
   "main": "dist/middleware.ts.js",
   "bin": {
@@ -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'], () => {
+			watch_dir(
-				const routes = create_routes();
+				locations.routes(),
-				create_main_manifests({ routes, dev_port });
+				({ path: file, stats }) => {
-
+					if (stats.isDirectory()) {
-				try {
+						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,24 +462,32 @@ class DevServer {
 
 function noop() {}
 
-function watch_files(pattern: string, events: string[], callback: () => void) {
+function watch_dir(
-	let watcher;
+	dir: string,
+	filter: ({ path, stats }: { path: string, stats: fs.Stats }) => boolean,
+	callback: () => void
+) {
+	let watch;
+	let closed = false;
 
-	import('chokidar').then(({ default: chokidar }) => {
+	import('cheap-watch').then(CheapWatch => {
 		if (closed) return;
 
-		watcher = chokidar.watch(pattern, {
+		watch = new CheapWatch({ dir, filter, debounce: 50 });
-			persistent: true,
+
-			ignoreInitial: true,
+		watch.on('+', ({ isNew }) => {
-			disableGlobbing: true
+			if (isNew) callback();
 		});
 
-		events.forEach(event => {
+		watch.on('-', callback);
-			watcher.on(event, callback);
+
-		});
+		watch.init();
 	});
 
 	return {
-		close: () => watcher && watcher.close()
+		close: () => {
+			if (watch) watch.close();
+			closed = true;
+		}
 	};
 }

src/api/interfaces.ts

@@ -26,8 +26,8 @@ export type InvalidEvent = {
 
 export type BuildEvent = {
 	type: string;
-	errors: Array<{ message: string, duplicate: boolean }>;
+	errors: Array<{ file: string, message: string, duplicate: boolean }>;
-	warnings: Array<{ message: string, duplicate: boolean }>;
+	warnings: Array<{ file: string, message: string, duplicate: boolean }>;
 	duration: number;
 	webpack_stats: any;
 }

src/cli/dev.ts

@@ -13,7 +13,7 @@ export function dev(opts: { port: number, open: boolean }) {
 
 		watcher.on('ready', (event: events.ReadyEvent) => {
 			if (first) {
-				console.log(`${colors.bold.cyan(`> Listening on http://localhost:${event.port}`)}`);
+				console.log(colors.bold.cyan(`> Listening on http://localhost:${event.port}`));
 				if (opts.open) child_process.exec(`open http://localhost:${event.port}`);
 				first = false;
 			}
@@ -35,20 +35,21 @@ export function dev(opts: { port: number, open: boolean }) {
 		});
 
 		watcher.on('error', (event: events.ErrorEvent) => {
-			console.log(`${colors.red(`✗ ${event.type}`)}`);
+			console.log(colors.red(`✗ ${event.type}`));
-			console.log(`${colors.red(event.message)}`);
+			console.log(colors.red(event.message));
 		});
 
 		watcher.on('fatal', (event: events.FatalEvent) => {
-			console.log(`${colors.bold.red(`> ${event.message}`)}`);
+			console.log(colors.bold.red(`> ${event.message}`));
 			if (event.log) console.log(event.log);
 		});
 
 		watcher.on('build', (event: events.BuildEvent) => {
 			if (event.errors.length) {
-				console.log(`${colors.bold.red(`✗ ${event.type}`)}`);
+				console.log(colors.bold.red(`✗ ${event.type}`));
 
 				event.errors.filter(e => !e.duplicate).forEach(error => {
+					if (error.file) console.log(colors.bold(error.file));
 					console.log(error.message);
 				});
 
@@ -57,9 +58,10 @@ export function dev(opts: { port: number, open: boolean }) {
 					console.log(`${hidden} duplicate ${hidden === 1 ? 'error' : 'errors'} hidden\n`);
 				}
 			} else if (event.warnings.length) {
-				console.log(`${colors.bold.yellow(`• ${event.type}`)}`);
+				console.log(colors.bold.yellow(`• ${event.type}`));
 
 				event.warnings.filter(e => !e.duplicate).forEach(warning => {
+					if (warning.file) console.log(colors.bold(warning.file));
 					console.log(warning.message);
 				});
 
@@ -72,7 +74,7 @@ export function dev(opts: { port: number, open: boolean }) {
 			}
 		});
 	} catch (err) {
-		console.log(`${colors.bold.red(`> ${err.message}`)}`);
+		console.log(colors.bold.red(`> ${err.message}`));
 		process.exit(1);
 	}
 }