Make <base> optional

runtime/src/app/app.ts

@@ -356,7 +356,7 @@ export async function hydrate_target(target: Target): Promise<{
 }
 
 function load_css(chunk: string) {
-	const href = `client/${chunk}`;
+	const href = initial_data.baseUrl + `/client/${chunk}`;
 	if (document.querySelector(`link[href="${href}"]`)) return;
 
 	return new Promise((fulfil, reject) => {

runtime/src/server/middleware/get_page_handler.ts

@@ -311,7 +311,7 @@ export function get_page_handler(
 				});
 
 				styles = Array.from(css_chunks)
-					.map(href => `<link rel="stylesheet" href="client/${href}">`)
+					.map(href => `<link rel="stylesheet" href="${req.baseUrl}/client/${href}">`)
 					.join('')
 			} else {
 				styles = (css && css.code ? `<style>${css.code}</style>` : '');
@@ -321,7 +321,7 @@ export function get_page_handler(
 			const nonce_attr = (res.locals && res.locals.nonce) ? ` nonce="${res.locals.nonce}"` : '';
 
 			const body = template()
-				.replace('%sapper.base%', () => `<base href="${req.baseUrl}/">`)
+				.replace('%sapper.base%', () => req.baseTag ? `<base href="${req.baseUrl}/">` : '<!-- no base -->')
 				.replace('%sapper.scripts%', () => `<script${nonce_attr}>${script}</script>`)
 				.replace('%sapper.html%', () => html)
 				.replace('%sapper.head%', () => `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)

runtime/src/server/middleware/index.ts

@@ -7,15 +7,19 @@ import { get_page_handler } from './get_page_handler';
 import { lookup } from './mime';
 
 export default function middleware(opts: {
+	baseTag: Boolean,
 	session?: (req: Req, res: Res) => any,
 	ignore?: any
 } = {}) {
-	const { session, ignore } = opts;
+	const { session, ignore, baseTag = true } = opts;
 
 	let emitted_basepath = false;
 
 	return compose_handlers(ignore, [
 		(req: Req, res: Res, next: () => void) => {
+			if (req.baseTag === undefined) {
+				req.baseTag = baseTag
+			}
 			if (req.baseUrl === undefined) {
 				let { originalUrl } = req;
 				if (req.url === '/' && originalUrl[originalUrl.length - 1] !== '/') {

test/apps/without-basetag/rollup.config.js

@@ -0,0 +1,58 @@
+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()
+		]
+	},
+
+	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']
+	},
+
+	serviceworker: {
+		input: config.serviceworker.input(),
+		output: config.serviceworker.output(),
+		plugins: [
+			resolve(),
+			replace({
+				'process.browser': true,
+				'process.env.NODE_ENV': JSON.stringify(mode)
+			})
+		]
+	}
+};

test/apps/without-basetag/src/client.js

@@ -0,0 +1,9 @@
+import * as sapper from '@sapper/app';
+
+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/without-basetag/src/routes/_error.svelte

@@ -0,0 +1,7 @@
+<script>
+  export let status, error = {};
+</script>
+
+<h1>{status}</h1>
+
+<p>{error.message}</p>

test/apps/without-basetag/src/routes/dirs/bar/[a].svelte

@@ -0,0 +1,3 @@
+<h1>A page</h1>
+
+<a href="../foo/xyz">same segment</a>

test/apps/without-basetag/src/routes/dirs/bar/index.svelte

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

test/apps/without-basetag/src/routes/dirs/foo/[b].svelte

@@ -0,0 +1 @@
+<h1>B page</h1>

test/apps/without-basetag/src/routes/dirs/foo/index.svelte

@@ -0,0 +1,2 @@
+<h1>foo</h1>
+<a href="bar">bar</a>

test/apps/without-basetag/src/server.js

@@ -0,0 +1,16 @@
+import sirv from 'sirv';
+import polka from 'polka';
+import * as sapper from '@sapper/server';
+
+import { start, dev } from '../../common.js';
+
+const app = polka()
+	.use(
+		sirv('static', { dev }),
+		sapper.middleware({
+      baseTag: false
+    })
+	);
+
+start(app);
+

test/apps/without-basetag/src/service-worker.js

@@ -0,0 +1,82 @@
+import * as sapper from '@sapper/service-worker';
+
+const ASSETS = `cache${sapper.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 = sapper.shell.concat(sapper.files);
+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${sapper.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/without-basetag/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/without-basetag/test.ts

@@ -0,0 +1,39 @@
+import * as assert from 'assert';
+import {build} from '../../../api';
+import {AppRunner} from '../AppRunner';
+
+describe('without-basetag', function() {
+	this.timeout(10000);
+
+	let r: AppRunner;
+
+	// hooks
+	before('build app', () => build({ cwd: __dirname }));
+	before('start runner', async () => {
+		r = await new AppRunner().start(__dirname);
+	});
+
+	after(() => r && r.end());
+
+	// tests
+	it('navigates between routes with empty parts', async () => {
+		await r.load('/dirs/foo');
+		await r.sapper.start();
+
+		assert.equal(await r.text('h1'), 'foo');
+		await r.page.click('[href="bar"]');
+		await r.wait();
+		assert.equal(await r.text('h1'), 'bar');
+	});
+
+	it('navigates between dynamic routes with same segments', async () => {
+		await r.load('/dirs/bar/xyz');
+		await r.sapper.start();
+
+		assert.equal(await r.text('h1'), 'A page');
+
+		await r.page.click('[href="../foo/xyz"]');
+		await r.wait();
+		assert.equal(await r.text('h1'), 'B page');
+	});
+});