totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-18 05:25:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #500 from sveltejs/dont-buffer-logs

Browse Source 
don't buffer stdout/stderr
This commit is contained in:
Rich Harris
2018-10-27 11:18:50 -04:00
committed by GitHub
parent 73ff95c677 c5a80543b3
commit ab52aabd1d
4 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/dev.ts
View File

@@ -214,12 +214,9 @@ class Watcher extends EventEmitter {
// TODO watch the configs themselves? // TODO watch the configs themselves?
const compilers: Compilers = await create_compilers(this.bundler, cwd, src, dest, false); const compilers: Compilers = await create_compilers(this.bundler, cwd, src, dest, false);
let log = '';
const emitFatal = () => { const emitFatal = () => {
this.emit('fatal', <FatalEvent>{ this.emit('fatal', <FatalEvent>{
message: `Server crashed`, message: `Server crashed`
log
}); });
this.crashed = true; this.crashed = true;
@@ -236,7 +233,6 @@ class Watcher extends EventEmitter {
handle_result: (result: CompileResult) => { handle_result: (result: CompileResult) => {
deferred.promise.then(() => { deferred.promise.then(() => {
const restart = () => { const restart = () => {
log = '';
this.crashed = false; this.crashed = false;
ports.wait(this.port) ports.wait(this.port)
@@ -260,8 +256,7 @@ class Watcher extends EventEmitter {
if (this.crashed) return; if (this.crashed) return;
this.emit('fatal', <FatalEvent>{ this.emit('fatal', <FatalEvent>{
message: `Server is not listening on port ${this.port}`, message: `Server is not listening on port ${this.port}`
log
}); });
}); });
}; };
@@ -292,12 +287,10 @@ class Watcher extends EventEmitter {
}); });
this.proc.stdout.on('data', chunk => { this.proc.stdout.on('data', chunk => {
log += chunk;
this.emit('stdout', chunk); this.emit('stdout', chunk);
}); });
this.proc.stderr.on('data', chunk => { this.proc.stderr.on('data', chunk => {
log += chunk;
this.emit('stderr', chunk); this.emit('stderr', chunk);
}); });

18
src/cli.ts
View File

@@ -64,6 +64,14 @@ prog.command('dev')
let first = true; let first = true;
watcher.on('stdout', data => {
process.stdout.write(data);
});
watcher.on('stderr', data => {
process.stderr.write(data);
});
watcher.on('ready', async (event: ReadyEvent) => { watcher.on('ready', async (event: ReadyEvent) => {
if (first) { if (first) {
console.log(colors.bold.cyan(`> Listening on http://localhost:${event.port}`)); console.log(colors.bold.cyan(`> Listening on http://localhost:${event.port}`));
@@ -73,16 +81,6 @@ prog.command('dev')
} }
first = false; first = false;
} }
// TODO clear screen?
event.process.stdout.on('data', data => {
process.stdout.write(data);
});
event.process.stderr.on('data', data => {
process.stderr.write(data);
});
}); });
watcher.on('invalid', (event: InvalidEvent) => { watcher.on('invalid', (event: InvalidEvent) => {

1
src/interfaces.ts
View File

@@ -69,7 +69,6 @@ export type ErrorEvent = {
export type FatalEvent = { export type FatalEvent = {
message: string; message: string;
log?: string;
}; };
export type InvalidEvent = { export type InvalidEvent = {

2
test/apps/errors/test.ts
View File

@@ -127,9 +127,11 @@ describe('errors', function() {
await prefetchRoutes(); await prefetchRoutes();
await page.click('[href="enhance-your-calm"]'); await page.click('[href="enhance-your-calm"]');
await wait(50);
assert.equal(await title(), '420'); assert.equal(await title(), '420');
await page.goBack(); await page.goBack();
await wait(50);
assert.equal(await title(), 'No error here'); assert.equal(await title(), 'No error here');
}); });
}); });