From ff24877d8fbd2c70b8ada165224fab636697bf90 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 23 Sep 2018 23:21:37 -0400 Subject: [PATCH] -> v0.21.1 --- CHANGELOG.md | 4 ++++ package.json | 2 +- src/core/read_template.ts | 4 ++-- src/middleware.ts | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b684eb3da..20a552d20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # sapper changelog +## 0.21.1 + +* Read template from build directory in production + ## 0.21.0 * Change project folder structure ([#432](https://github.com/sveltejs/sapper/issues/432)) diff --git a/package.json b/package.json index c0d9340b8..1cd808f75 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sapper", - "version": "0.21.0", + "version": "0.21.1", "description": "Military-grade apps, engineered by Svelte", "main": "dist/middleware.js", "bin": { diff --git a/src/core/read_template.ts b/src/core/read_template.ts index ee87cfa98..330f33e05 100644 --- a/src/core/read_template.ts +++ b/src/core/read_template.ts @@ -1,9 +1,9 @@ import * as fs from 'fs'; import { locations } from '../config'; -export default function read_template() { +export default function read_template(dir = locations.src()) { try { - return fs.readFileSync(`${locations.src()}/template.html`, 'utf-8'); + return fs.readFileSync(`${dir}/template.html`, 'utf-8'); } catch (err) { if (fs.existsSync(`app/template.html`)) { throw new Error(`As of Sapper 0.21, the default folder structure has been changed: diff --git a/src/middleware.ts b/src/middleware.ts index 4d37ec8c1..582d42308 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -290,7 +290,7 @@ function get_page_handler( const template = dev() ? () => read_template() - : (str => () => str)(read_template()); + : (str => () => str)(read_template(output)); const { server_routes, pages } = manifest; const error_route = manifest.error;