overhaul tests

test/apps/ignore/__test__.ts

@@ -0,0 +1,82 @@
+import * as path from 'path';
+import * as assert from 'assert';
+import * as puppeteer from 'puppeteer';
+import { build } from '../../../api';
+import { AppRunner } from '../AppRunner';
+
+describe('ignore', function() {
+	this.timeout(10000);
+
+	let runner: AppRunner;
+	let page: puppeteer.Page;
+	let base: string;
+
+	// hooks
+	before(() => {
+		return new Promise((fulfil, reject) => {
+			// TODO this is brittle. Make it unnecessary
+			process.chdir(__dirname);
+			process.env.NODE_ENV = 'production';
+
+			// TODO this API isn't great. Rethink it
+			const emitter = build({
+				bundler: 'rollup'
+			}, {
+				src: path.join(__dirname, 'src'),
+				routes: path.join(__dirname, 'src/routes'),
+				dest: path.join(__dirname, '__sapper__/build')
+			});
+
+			emitter.on('error', reject);
+
+			emitter.on('done', async () => {
+				try {
+					runner = new AppRunner(__dirname, '__sapper__/build/server/server.js');
+					({ base, page } = await runner.start());
+
+					fulfil();
+				} catch (err) {
+					reject(err);
+				}
+			});
+		});
+	});
+
+	after(() => runner.end());
+
+	it('respects `options.ignore` values (RegExp)', async () => {
+		await page.goto(`${base}/foobar`);
+
+		assert.equal(
+			await page.evaluate(() => document.documentElement.textContent),
+			'foobar'
+		);
+	});
+
+	it('respects `options.ignore` values (String #1)', async () => {
+		await page.goto(`${base}/buzz`);
+
+		assert.equal(
+			await page.evaluate(() => document.documentElement.textContent),
+			'buzz'
+		);
+	});
+
+	it('respects `options.ignore` values (String #2)', async () => {
+		await page.goto(`${base}/fizzer`);
+
+		assert.equal(
+			await page.evaluate(() => document.documentElement.textContent),
+			'fizzer'
+		);
+	});
+
+	it('respects `options.ignore` values (Function)', async () => {
+		await page.goto(`${base}/hello`);
+
+		assert.equal(
+			await page.evaluate(() => document.documentElement.textContent),
+			'hello'
+		);
+	});
+});

test/apps/ignore/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/ignore/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/ignore/src/routes/[slug].html

@@ -0,0 +1 @@
+<h1>{params.slug.toUpperCase()}</h1>

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

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

test/apps/ignore/src/routes/a.html

@@ -0,0 +1 @@
+<h1>a</h1>

test/apps/ignore/src/routes/b/index.html

@@ -0,0 +1,11 @@
+<h1>{letter}</h1>
+
+<script>
+	export default {
+		preload() {
+			return this.fetch('b.json').then(r => r.json()).then(letter => {
+				return { letter };
+			});
+		}
+	};
+</script>

test/apps/ignore/src/routes/b/index.json.js

@@ -0,0 +1,3 @@
+export function get(req, res) {
+	res.end(JSON.stringify('b'));
+}

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

@@ -0,0 +1,3 @@
+<h1>Great success!</h1>
+
+<a href="a">a</a>

test/apps/ignore/src/server.js

@@ -0,0 +1,19 @@
+import polka from 'polka';
+import * as sapper from '../__sapper__/server.js';
+
+const { PORT } = process.env;
+
+const app = polka().use(sapper.middleware({
+	ignore: [
+		/foobar/i,
+		'/buzz',
+		'fizz',
+		x => x === '/hello'
+	]
+}));
+
+['foobar', 'buzz', 'fizzer', 'hello'].forEach(uri => {
+	app.get('/'+uri, (req, res) => res.end(uri));
+});
+
+app.listen(PORT);

test/apps/ignore/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/ignore/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>