-> v0.13.6

Merge pull request #298 from sveltejs/gh-296
fix req.baseUrl synthesis
2026-01-13 19:45:26 +00:00 · 2018-06-27 17:20:45 -04:00 · 2018-06-27 17:19:55 -04:00 · 2018-06-27 16:57:04 -04:00 · 2018-06-26 18:30:46 -04:00 · 2018-06-26 18:29:56 -04:00
6 changed files with 52 additions and 16 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # sapper changelog

+## 0.13.6
+
+* Fix `baseUrl` synthesis ([#296](https://github.com/sveltejs/sapper/issues/296))
+
+## 0.13.5
+
+* Fix handling of fatal errors ([#289](https://github.com/sveltejs/sapper/issues/289))
+
 ## 0.13.4

 * Focus `<body>` after navigation ([#287](https://github.com/sveltejs/sapper/issues/287))
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sapper",
-  "version": "0.13.4",
+  "version": "0.13.6",
  "description": "Military-grade apps, engineered by Svelte",
  "main": "dist/middleware.ts.js",
  "bin": {
--- a/src/api/dev.ts
+++ b/src/api/dev.ts
@@ -33,6 +33,7 @@ class Watcher extends EventEmitter {
 		server: Deferred;
 	};

+	crashed: boolean;
 	restarting: boolean;
 	current_build: {
 		changed: Set<string>;
@@ -130,10 +131,16 @@ class Watcher extends EventEmitter {
 		// TODO watch the configs themselves?
 		const compilers = create_compilers({ webpack: this.dirs.webpack });

+		let log = '';
+
 		const emitFatal = () => {
 			this.emit('fatal', <events.FatalEvent>{
-				message: `Server crashed`
+				message: `Server crashed`,
+				log
 			});
+
+			this.crashed = true;
+			this.proc = null;
 		};

 		this.watch(compilers.server, {
@@ -149,18 +156,30 @@ class Watcher extends EventEmitter {

 				this.deferreds.client.promise.then(() => {
 					const restart = () => {
-						ports.wait(this.port).then((() => {
-							this.emit('ready', <events.ReadyEvent>{
-								port: this.port,
-								process: this.proc
-							});
+						log = '';
+						this.crashed = false;

-							this.deferreds.server.fulfil();
+						ports.wait(this.port)
+							.then((() => {
+								this.emit('ready', <events.ReadyEvent>{
+									port: this.port,
+									process: this.proc
+								});

-							this.dev_server.send({
-								status: 'completed'
+								this.deferreds.server.fulfil();
+
+								this.dev_server.send({
+									status: 'completed'
+								});
+							}))
+							.catch(err => {
+								if (this.crashed) return;
+
+								this.emit('fatal', <events.FatalEvent>{
+									message: `Server is not listening on port ${this.port}`,
+									log
+								});
 							});
-						}));
 					};

 					if (this.proc) {
@@ -180,10 +199,12 @@ class Watcher extends EventEmitter {
 					});

 					this.proc.stdout.on('data', chunk => {
+						log += chunk;
 						this.emit('stdout', chunk);
 					});

 					this.proc.stderr.on('data', chunk => {
+						log += chunk;
 						this.emit('stderr', chunk);
 					});

@@ -301,7 +322,7 @@ class Watcher extends EventEmitter {
 			if (err) {
 				this.emit('error', <events.ErrorEvent>{
 					type: name,
-					error: err
+					message: err.message
 				});
 			} else {
 				const messages = format_messages(stats);
--- a/src/api/interfaces.ts
+++ b/src/api/interfaces.ts
@@ -12,6 +12,7 @@ export type ErrorEvent = {

 export type FatalEvent = {
 	message: string;
+	log?: string;
 };

 export type InvalidEvent = {
--- a/src/cli/dev.ts
+++ b/src/cli/dev.ts
@@ -36,11 +36,12 @@ 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.error.message)}`);
+			console.log(`${colors.red(event.message)}`);
 		});

 		watcher.on('fatal', (event: events.FatalEvent) => {
-			console.log(`${colors.bold.red(`> ${event.error.message}`)}`);
+			console.log(`${colors.bold.red(`> ${event.message}`)}`);
+			if (event.log) console.log(event.log);
 		});

 		watcher.on('build', (event: events.BuildEvent) => {
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -61,8 +61,13 @@ export default function middleware({ App, routes, store }: {
 	const middleware = compose_handlers([
 		(req: Req, res: ServerResponse, next: () => void) => {
 			if (req.baseUrl === undefined) {
-				req.baseUrl = req.originalUrl
-					? req.originalUrl.slice(0, -req.url.length)
+				let { originalUrl } = req;
+				if (req.url === '/' && originalUrl[originalUrl.length - 1] !== '/') {
+					originalUrl += '/';
+				}
+
+				req.baseUrl = originalUrl
+					? originalUrl.slice(0, -req.url.length)
 					: '';
 			}
Author	SHA1	Message	Date
Rich Harris	f821c19528	-> v0.13.6	2018-06-27 17:20:45 -04:00
Rich Harris	b9a120164a	Merge pull request #298 from sveltejs/gh-296 fix req.baseUrl synthesis	2018-06-27 17:19:55 -04:00
Rich Harris	087356f781	fix req.baseUrl synthesis	2018-06-27 16:57:04 -04:00
Rich Harris	31110a5326	-> v0.13.5	2018-06-26 18:30:46 -04:00
Rich Harris	667a68768c	Merge pull request #294 from sveltejs/gh-289 fix handling of fatal errors	2018-06-26 18:29:56 -04:00
Rich Harris	5075981a90	fix handling of fatal errors - fixes #289	2018-06-26 13:49:11 -04:00