Revert "Revert "Fix sveltejs#1579""

This reverts commit f2cb6f4.

Author: rodoch

test/apps/css-nested-layout/rollup.config.js

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

test/apps/css-nested-layout/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/css-nested-layout/src/routes/_components/Test.svelte

@@ -0,0 +1,8 @@
+<h3>This is content defined in a component imported by a layout in a nested routes.</h3>
+
+<style>
+	h3 {
+		background-color: rgb(255, 0, 0);
+		color: #fff;
+	}
+</style>

test/apps/css-nested-layout/src/routes/_error.svelte

@@ -0,0 +1,18 @@
+<script>
+	export let status;
+	export let error;
+</script>
+
+<style>
+	h1 {
+		color: purple;
+	}
+</style>
+
+<h1>This is an error page</h1>
+
+<h2>{status}</h2>
+
+<p>{error.message}</p>
+
+<pre>{error.stack}</pre>

test/apps/css-nested-layout/src/routes/index.svelte

@@ -0,0 +1,7 @@
+<h1>Great success!</h1>
+
+<style>
+	h1 {
+		color: red;
+	}
+</style>

test/apps/css-nested-layout/src/routes/nested/_layout.svelte

@@ -0,0 +1,17 @@
+<script>
+    import Test from '../_components/Test.svelte';
+</script>
+
+<h2>This is content defined in a layout in a nested route. It should have a green background.</h2>
+
+<Test/>
+
+<slot></slot>
+
+<style>
+    h2 {
+        background-color: rgb(0, 128, 0);
+        color: #fff;
+        margin-bottom: 2rem;
+    }
+</style>

test/apps/css-nested-layout/src/routes/nested/index.svelte

@@ -0,0 +1 @@
+<p>This is slotted page content in a nested routes.</p>

test/apps/css-nested-layout/src/server.js

@@ -0,0 +1,9 @@
+import polka from 'polka';
+import * as sapper from '@sapper/server';
+
+import { start } from '../../common.js';
+
+const app = polka()
+	.use(sapper.middleware());
+
+start(app);

test/apps/css-nested-layout/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/css-nested-layout/src/template.html

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

test/apps/css-nested-layout/test.ts

@@ -0,0 +1,40 @@
+import * as assert from 'assert';
+import { build } from '../../../api';
+import { AppRunner } from '../AppRunner';
+
+describe('css-nested-layout', 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('includes CSS defined in nested layout with server render', async () => {
+		await r.load('/nested');
+
+		assert.strictEqual(
+			await r.page.$eval('h2', node => getComputedStyle(node).backgroundColor),
+			'rgb(0, 128, 0)'
+		);
+	});
+
+	it('includes CSS defined in component imported by nested layout with server render', async () => {
+		await r.load('/nested');
+
+		assert.strictEqual(
+			await r.page.$eval('h3', node => getComputedStyle(node).backgroundColor),
+			'rgb(255, 0, 0)'
+		);
+	});
+
+	it('survives the tests with no server errors', () => {
+		assert.deepStrictEqual(r.errors, []);
+	});
+});