totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-19 05:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #286 from sveltejs/invalidate-client-assets

Browse Source 
always refresh client_assets in dev
This commit is contained in:
Rich Harris
2018-06-18 12:22:37 -04:00
committed by GitHub
parent 5375422633 e1a33c6a9b
commit e91edaee12
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/middleware.ts
View File

@@ -56,8 +56,6 @@ export default function middleware({ App, routes, store }: {
const output = locations.dest(); const output = locations.dest();
const client_assets = JSON.parse(fs.readFileSync(path.join(output, 'client_assets.json'), 'utf-8'));
let emitted_basepath = false; let emitted_basepath = false;
const middleware = compose_handlers([ const middleware = compose_handlers([
@@ -105,7 +103,7 @@ export default function middleware({ App, routes, store }: {
cache_control: 'max-age=31536000' cache_control: 'max-age=31536000'
}), }),
get_route_handler(client_assets, App, routes, store) get_route_handler(App, routes, store)
].filter(Boolean)); ].filter(Boolean));
return middleware; return middleware;
@@ -148,7 +146,13 @@ function serve({ prefix, pathname, cache_control }: {
}; };
} }
function get_route_handler(chunks: Record<string, string>, App: Component, routes: RouteObject[], store_getter: (req: Req) => Store) { function get_route_handler(App: Component, routes: RouteObject[], store_getter: (req: Req) => Store) {
const output = locations.dest();
const get_chunks = dev()
? () => JSON.parse(fs.readFileSync(path.join(output, 'client_assets.json'), 'utf-8'))
: (assets => () => assets)(JSON.parse(fs.readFileSync(path.join(output, 'client_assets.json'), 'utf-8')));
const template = dev() const template = dev()
? () => fs.readFileSync(`${locations.app()}/template.html`, 'utf-8') ? () => fs.readFileSync(`${locations.app()}/template.html`, 'utf-8')
: (str => () => str)(fs.readFileSync(`${locations.dest()}/template.html`, 'utf-8')); : (str => () => str)(fs.readFileSync(`${locations.dest()}/template.html`, 'utf-8'));
@@ -159,6 +163,8 @@ function get_route_handler(chunks: Record<string, string>, App: Component, route
const handlers = route.handlers[Symbol.iterator](); const handlers = route.handlers[Symbol.iterator]();
function next() { function next() {
const chunks: Record<string, string> = get_chunks();
try { try {
const { value: handler, done } = handlers.next(); const { value: handler, done } = handlers.next();
@@ -384,7 +390,7 @@ function get_route_handler(chunks: Record<string, string>, App: Component, route
function render_page({ head, css, html }) { function render_page({ head, css, html }) {
const page = template() const page = template()
.replace('%sapper.base%', `<base href="${req.baseUrl}/">`) .replace('%sapper.base%', `<base href="${req.baseUrl}/">`)
.replace('%sapper.scripts%', `<script>__SAPPER__={baseUrl: "${req.baseUrl}"}</script><script src='${req.baseUrl}/client/${chunks.main}'></script>`) .replace('%sapper.scripts%', `<script>__SAPPER__={baseUrl: "${req.baseUrl}"}</script><script src='${req.baseUrl}/client/${get_chunks().main}'></script>`)
.replace('%sapper.html%', html) .replace('%sapper.html%', html)
.replace('%sapper.head%', `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`) .replace('%sapper.head%', `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)
.replace('%sapper.styles%', (css && css.code ? `<style>${css.code}</style>` : '')); .replace('%sapper.styles%', (css && css.code ? `<style>${css.code}</style>` : ''));