-> v0.23.5

fix lazy css bug, add tests

CHANGELOG.md

@@ -1,5 +1,19 @@
 # sapper changelog
 
+## 0.23.5
+
+* Include lazily-imported CSS in main CSS chunk ([#492](https://github.com/sveltejs/sapper/pull/492))
+* Make search param decoding spec-compliant ([#493](https://github.com/sveltejs/sapper/pull/493))
+* Handle async route errors ([#488](https://github.com/sveltejs/sapper/pull/488))
+
+## 0.23.4
+
+* Ignore empty anchors when exporting ([#491](https://github.com/sveltejs/sapper/pull/491))
+
+## 0.23.3
+
+* Clear `error` and `status` on successful render ([#477](https://github.com/sveltejs/sapper/pull/477))
+
 ## 0.23.2
 
 * Fix entry point CSS ([#471](https://github.com/sveltejs/sapper/pull/471))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sapper",
-  "version": "0.23.2",
+  "version": "0.23.5",
   "description": "Military-grade apps, engineered by Svelte",
   "bin": {
     "sapper": "./sapper"

src/api/export.ts

@@ -187,6 +187,6 @@ async function _export({
 }
 
 function get_href(attrs: string) {
-	const match = /href\s*=\s*(?:"(.+?)"|'(.+?)'|([^\s>]+))/.exec(attrs);
+	const match = /href\s*=\s*(?:"(.*?)"|'(.+?)'|([^\s>]+))/.exec(attrs);
 	return match[1] || match[2] || match[3];
 }

src/core/create_compilers/extract_css.ts

@@ -219,7 +219,7 @@ export default function extract_css(client_result: CompileResult, components: Pa
 	});
 
 	unclaimed.forEach(file => {
-		entry_css_modules.push(css_map.get(file));
+		entry_css_modules.push(file);
 	});
 
 	const leftover = get_css_from_modules(entry_css_modules, css_map, dirs);

templates/src/client/app.ts

@@ -90,8 +90,8 @@ export function select_route(url: URL): Target {
 			const query: Record<string, string | true> = {};
 			if (url.search.length > 0) {
 				url.search.slice(1).split('&').forEach(searchParam => {
-					const [, key, value] = /([^=]+)(?:=(.*))?/.exec(searchParam);
+					const [, key, value] = /([^=]*)(?:=(.*))?/.exec(searchParam);
-					query[key] = decodeURIComponent((value || '').replace(/\+/g, ' '));
+					query[decodeURIComponent(key)] = decodeURIComponent((value || '').replace(/\+/g, ' '));
 				});
 			}
 			return { url, path, page, match, query };
@@ -310,7 +310,7 @@ export function prepare_page(target: Target): Promise<{
 			};
 		}
 
-		const props = { path, query };
+		const props = { path, query, error: null, status: null };
 		const data = {
 			path,
 			preloading: false,

templates/src/server/middleware/get_server_route_handler.ts

@@ -2,7 +2,7 @@ import { IGNORE } from '../placeholders';
 import { Req, Res, ServerRoute } from './types';
 
 export function get_server_route_handler(routes: ServerRoute[]) {
-	function handle_route(route: ServerRoute, req: Req, res: Res, next: () => void) {
+	async function handle_route(route: ServerRoute, req: Req, res: Res, next: () => void) {
 		req.params = route.params(route.pattern.exec(req.path));
 
 		const method = req.method.toLowerCase();
@@ -53,7 +53,7 @@ export function get_server_route_handler(routes: ServerRoute[]) {
 			};
 
 			try {
-				handle_method(req, res, handle_next);
+				await handle_method(req, res, handle_next);
 			} catch (err) {
 				handle_next(err);
 			}

test/apps/AppRunner.ts

@@ -58,7 +58,8 @@ export class AppRunner {
 			start: () => this.page.evaluate(() => start()),
 			prefetchRoutes: () => this.page.evaluate(() => prefetchRoutes()),
 			prefetch: (href: string) => this.page.evaluate((href: string) => prefetch(href), href),
-			goto: (href: string) => this.page.evaluate((href: string) => goto(href), href)
+			goto: (href: string) => this.page.evaluate((href: string) => goto(href), href),
+			title: () => this.page.$eval('h1', node => node.textContent)
 		};
 	}
 

test/apps/css/rollup.config.js

@@ -0,0 +1,64 @@
+import resolve from 'rollup-plugin-node-resolve';
+import replace from 'rollup-plugin-replace';
+import svelte from 'rollup-plugin-svelte';
+
+const mode = process.env.NODE_ENV;
+const dev = mode === 'development';
+
+const config = require('../../../config/rollup.js');
+
+export default {
+	client: {
+		input: config.client.input(),
+		output: config.client.output(),
+		plugins: [
+			replace({
+				'process.browser': true,
+				'process.env.NODE_ENV': JSON.stringify(mode)
+			}),
+			svelte({
+				dev,
+				hydratable: true,
+				emitCss: true
+			}),
+			resolve()
+		],
+
+		// temporary, pending Rollup 1.0
+		experimentalCodeSplitting: true
+	},
+
+	server: {
+		input: config.server.input(),
+		output: config.server.output(),
+		plugins: [
+			replace({
+				'process.browser': false,
+				'process.env.NODE_ENV': JSON.stringify(mode)
+			}),
+			svelte({
+				generate: 'ssr',
+				dev
+			}),
+			resolve({
+				preferBuiltins: true
+			})
+		],
+		external: ['sirv', 'polka'],
+
+		// temporary, pending Rollup 1.0
+		experimentalCodeSplitting: true
+	},
+
+	serviceworker: {
+		input: config.serviceworker.input(),
+		output: config.serviceworker.output(),
+		plugins: [
+			resolve(),
+			replace({
+				'process.browser': true,
+				'process.env.NODE_ENV': JSON.stringify(mode)
+			})
+		]
+	}
+};

test/apps/css/src/client.js

@@ -0,0 +1,9 @@
+import * as sapper from '../__sapper__/client.js';
+
+window.start = () => sapper.start({
+	target: document.querySelector('#sapper')
+});
+
+window.prefetchRoutes = () => sapper.prefetchRoutes();
+window.prefetch = href => sapper.prefetch(href);
+window.goto = href => sapper.goto(href);

test/apps/css/src/routes/_components/Title.html

@@ -0,0 +1,7 @@
+<h1>Title</h1>
+
+<style>
+	h1 {
+		color: green;
+	}
+</style>

test/apps/css/src/routes/_error.html

@@ -0,0 +1,3 @@
+<h1>{status}</h1>
+
+<p>{error.message}</p>

test/apps/css/src/routes/bar.html

@@ -0,0 +1,11 @@
+<svelte:component this={Title}/>
+
+<script>
+	export default {
+		oncreate() {
+			import('./_components/Title.html').then(({ default: Title }) => {
+				this.set({ Title });
+			});
+		}
+	};
+</script>

test/apps/css/src/routes/foo.html

@@ -0,0 +1,7 @@
+<h1>Foo</h1>
+
+<style>
+	h1 {
+		color: blue;
+	}
+</style>

test/apps/css/src/routes/index.html

@@ -0,0 +1,10 @@
+<h1>Great success!</h1>
+
+<a href="foo">foo</a>
+<a href="bar">bar</a>
+
+<style>
+	h1 {
+		color: red;
+	}
+</style>

test/apps/css/src/server.js

@@ -0,0 +1,8 @@
+import polka from 'polka';
+import * as sapper from '../__sapper__/server.js';
+
+const { PORT } = process.env;
+
+polka()
+	.use(sapper.middleware())
+	.listen(PORT);

test/apps/css/src/service-worker.js

@@ -0,0 +1,82 @@
+import { timestamp, files, shell, routes } from '../__sapper__/service-worker.js';
+
+const ASSETS = `cache${timestamp}`;
+
+// `shell` is an array of all the files generated by webpack,
+// `files` is an array of everything in the `static` directory
+const to_cache = shell.concat(ASSETS);
+const cached = new Set(to_cache);
+
+self.addEventListener('install', event => {
+	event.waitUntil(
+		caches
+			.open(ASSETS)
+			.then(cache => cache.addAll(to_cache))
+			.then(() => {
+				self.skipWaiting();
+			})
+	);
+});
+
+self.addEventListener('activate', event => {
+	event.waitUntil(
+		caches.keys().then(async keys => {
+			// delete old caches
+			for (const key of keys) {
+				if (key !== ASSETS) await caches.delete(key);
+			}
+
+			self.clients.claim();
+		})
+	);
+});
+
+self.addEventListener('fetch', event => {
+	if (event.request.method !== 'GET') return;
+
+	const url = new URL(event.request.url);
+
+	// don't try to handle e.g. data: URIs
+	if (!url.protocol.startsWith('http')) return;
+
+	// ignore dev server requests
+	if (url.hostname === self.location.hostname && url.port !== self.location.port) return;
+
+	// always serve assets and webpack-generated files from cache
+	if (url.host === self.location.host && cached.has(url.pathname)) {
+		event.respondWith(caches.match(event.request));
+		return;
+	}
+
+	// for pages, you might want to serve a shell `index.html` file,
+	// which Sapper has generated for you. It's not right for every
+	// app, but if it's right for yours then uncomment this section
+	/*
+	if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) {
+		event.respondWith(caches.match('/index.html'));
+		return;
+	}
+	*/
+
+	if (event.request.cache === 'only-if-cached') return;
+
+	// for everything else, try the network first, falling back to
+	// cache if the user is offline. (If the pages never change, you
+	// might prefer a cache-first approach to a network-first one.)
+	event.respondWith(
+		caches
+			.open(`offline${timestamp}`)
+			.then(async cache => {
+				try {
+					const response = await fetch(event.request);
+					cache.put(event.request, response.clone());
+					return response;
+				} catch(err) {
+					const response = await cache.match(event.request);
+					if (response) return response;
+
+					throw err;
+				}
+			})
+	);
+});

test/apps/css/src/template.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset='utf-8'>
+
+	%sapper.base%
+	%sapper.styles%
+	%sapper.head%
+</head>
+<body>
+	<div id='sapper'>%sapper.html%</div>
+	%sapper.scripts%
+</body>
+</html>

test/apps/css/test.ts

@@ -0,0 +1,78 @@
+import * as assert from 'assert';
+import * as puppeteer from 'puppeteer';
+import { build } from '../../../api';
+import { AppRunner } from '../AppRunner';
+import { wait } from '../../utils';
+
+describe('css', function() {
+	this.timeout(10000);
+
+	let runner: AppRunner;
+	let page: puppeteer.Page;
+	let base: string;
+
+	// helpers
+	let start: () => Promise<void>;
+	let prefetchRoutes: () => Promise<void>;
+	let prefetch: (href: string) => Promise<void>;
+	let goto: (href: string) => Promise<void>;
+	let title: () => Promise<string>;
+
+	// hooks
+	before(async () => {
+		await build({ cwd: __dirname });
+
+		runner = new AppRunner(__dirname, '__sapper__/build/server/server.js');
+		({ base, page, start, prefetchRoutes, prefetch, goto, title } = await runner.start());
+	});
+
+	after(() => runner.end());
+
+	it('includes critical CSS with server render', async () => {
+		await page.goto(base);
+
+		assert.equal(
+			await page.evaluate(() => {
+				const h1 = document.querySelector('h1');
+				return getComputedStyle(h1).color;
+			}),
+			'rgb(255, 0, 0)'
+		);
+	});
+
+	it('loads CSS when navigating client-side', async () => {
+		await page.goto(base);
+
+		await start();
+		await prefetchRoutes();
+
+		await page.click(`[href="foo"]`);
+		await wait(50);
+
+		assert.equal(
+			await page.evaluate(() => {
+				const h1 = document.querySelector('h1');
+				return getComputedStyle(h1).color;
+			}),
+			'rgb(0, 0, 255)'
+		);
+	});
+
+	it('loads CSS for a lazily-rendered component', async () => {
+		await page.goto(base);
+
+		await start();
+		await prefetchRoutes();
+
+		await page.click(`[href="bar"]`);
+		await wait(50);
+
+		assert.equal(
+			await page.evaluate(() => {
+				const h1 = document.querySelector('h1');
+				return getComputedStyle(h1).color;
+			}),
+			'rgb(0, 128, 0)'
+		);
+	});
+});

test/apps/encoding/src/routes/echo/page/[slug].html

@@ -1,11 +1,10 @@
-<h1>{slug} ({message})</h1>
+<h1>{slug} {JSON.stringify(query)}</h1>
 
 <script>
 	export default {
-		preload({ params, query }) {
+		preload({ params }) {
 			return {
-				slug: params.slug,
+				slug: params.slug
-				message: query.message
 			};
 		}
 	};

test/apps/encoding/src/routes/index.html

@@ -1,3 +1,3 @@
 <h1>Great success!</h1>
 
-<a href="echo/page/encöded?message=hëllö+wörld">link</a>
+<a href="echo/page/encöded?message=hëllö+wörld&föo=bar&=baz">link</a>

test/apps/encoding/test.ts

@@ -35,11 +35,11 @@ describe('encoding', function() {
 	});
 
 	it('encodes req.params and req.query for server-rendered pages', async () => {
-		await page.goto(`${base}/echo/page/encöded?message=hëllö+wörld`);
+		await page.goto(`${base}/echo/page/encöded?message=hëllö+wörld&föo=bar&=baz`);
 
 		assert.equal(
 			await page.$eval('h1', node => node.textContent),
-			'encöded (hëllö wörld)'
+			'encöded {"message":"hëllö wörld","föo":"bar","":"baz"}'
 		);
 	});
 
@@ -48,12 +48,12 @@ describe('encoding', function() {
 		await start();
 		await prefetchRoutes();
 
-		await page.click('a[href="echo/page/encöded?message=hëllö+wörld"]');
+		await page.click('a[href="echo/page/encöded?message=hëllö+wörld&föo=bar&=baz"]');
 		await wait(50);
 
 		assert.equal(
 			await page.$eval('h1', node => node.textContent),
-			'encöded (hëllö wörld)'
+			'encöded {"message":"hëllö wörld","föo":"bar","":"baz"}'
 		);
 	});
 

test/apps/errors/src/routes/async-throw.json.js

@@ -0,0 +1,3 @@
+export function get(req, res) {
+  return Promise.reject(new Error('oops'));
+}

test/apps/errors/src/routes/enhance-your-calm.html

@@ -0,0 +1,7 @@
+<script>
+	export default {
+		preload() {
+			this.error(420, 'Enhance your calm');
+		}
+	};
+</script>

test/apps/errors/src/routes/no-error.html

@@ -0,0 +1,3 @@
+<h1>{error ? error.message : 'No error here'}</h1>
+
+<a href="enhance-your-calm">Enhance your calm</a>

test/apps/errors/test.ts

@@ -14,13 +14,14 @@ describe('errors', function() {
 	// helpers
 	let start: () => Promise<void>;
 	let prefetchRoutes: () => Promise<void>;
+	let title: () => Promise<string>;
 
 	// hooks
 	before(async () => {
 		await build({ cwd: __dirname });
 
 		runner = new AppRunner(__dirname, '__sapper__/build/server/server.js');
-		({ base, page, start, prefetchRoutes } = await runner.start());
+		({ base, page, start, prefetchRoutes, title } = await runner.start());
 	});
 
 	after(() => runner.end());
@@ -110,4 +111,25 @@ describe('errors', function() {
 			'oops'
 		);
 	});
+
+	it('does not serve error page for async non-page error', async () => {
+		await page.goto(`${base}/async-throw.json`);
+
+		assert.equal(
+			await page.evaluate(() => document.body.textContent),
+			'oops'
+		);
+	});
+
+	it('clears props.error on successful render', async () => {
+		await page.goto(`${base}/no-error`);
+		await start();
+		await prefetchRoutes();
+
+		await page.click('[href="enhance-your-calm"]');
+		assert.equal(await title(), '420');
+
+		await page.goBack();
+		assert.equal(await title(), 'No error here');
+	});
 });

test/apps/export/src/routes/index.html

@@ -1,3 +1,4 @@
 <h1>Great success!</h1>
 
 <a href="blog">blog</a>
+<a href="">empty anchor</a>