From 45142cd037395f82a5d44577989b1e27e0ca69f7 Mon Sep 17 00:00:00 2001 From: Rich-Harris Date: Fri, 6 Apr 2018 14:44:50 -0700 Subject: [PATCH] fix missing service worker --- src/middleware.ts | 4 ++-- test/common/test.js | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/middleware.ts b/src/middleware.ts index af002232b..57c1d679c 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -245,11 +245,11 @@ function get_route_handler(chunks: Record, routes: RouteObject[] `baseUrl: "${req.baseUrl}"`, serialized.preloaded && `preloaded: ${serialized.preloaded}`, serialized.store && `store: ${serialized.store}` - ].filter(Boolean).join(',')}}` + ].filter(Boolean).join(',')}};`; const has_service_worker = fs.existsSync(path.join(locations.dest(), 'service-worker.js')); if (has_service_worker) { - `if ('serviceWorker' in navigator) navigator.serviceWorker.register('${req.baseUrl}/service-worker.js')` + inline_script += `if ('serviceWorker' in navigator) navigator.serviceWorker.register('${req.baseUrl}/service-worker.js');`; } const page = template() diff --git a/test/common/test.js b/test/common/test.js index ca4a063d3..61351607b 100644 --- a/test/common/test.js +++ b/test/common/test.js @@ -559,6 +559,12 @@ function run({ mode, basepath = '' }) { assert.equal(title, 'woohoo!'); }); }); + + it('includes service worker', () => { + return nightmare.goto(base).page.html().then(html => { + assert.ok(html.indexOf('service-worker.js') !== -1); + }); + }); }); describe('headers', () => {