From 0e2219e6828ce7f522b901c29ab44878155487d1 Mon Sep 17 00:00:00 2001 From: Sebastien Chopin Date: Tue, 16 May 2017 18:11:58 +0200 Subject: [PATCH 1/4] fix: prefetch should not have `as` attribute --- src/server/template-renderer/index.js | 2 +- test/ssr/ssr-template.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/template-renderer/index.js b/src/server/template-renderer/index.js index 121c4c5debc..4d923b2755d 100644 --- a/src/server/template-renderer/index.js +++ b/src/server/template-renderer/index.js @@ -181,7 +181,7 @@ export default class TemplateRenderer { } return this.prefetchFiles.map(file => { if (!alreadyRendered(file)) { - return `` + return `` } else { return '' } diff --git a/test/ssr/ssr-template.spec.js b/test/ssr/ssr-template.spec.js index 2229c9fbcc6..199fa6c0558 100644 --- a/test/ssr/ssr-template.spec.js +++ b/test/ssr/ssr-template.spec.js @@ -230,7 +230,7 @@ describe('SSR: template option', () => { (options.preloadOtherAssets ? `` : ``) + (options.preloadOtherAssets ? `` : ``) + // unused chunks should have prefetch - `` + + `` + // css assets should be loaded `` + `` + From 76900c1d12e3245007d5781b5f7eb1e1cb4e0347 Mon Sep 17 00:00:00 2001 From: Sebastien Chopin Date: Fri, 19 May 2017 14:09:24 +0200 Subject: [PATCH 2/4] feat: Add `async` to body script tags --- src/server/template-renderer/index.js | 2 +- test/ssr/ssr-template.spec.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/template-renderer/index.js b/src/server/template-renderer/index.js index 4d923b2755d..862121671b5 100644 --- a/src/server/template-renderer/index.js +++ b/src/server/template-renderer/index.js @@ -209,7 +209,7 @@ export default class TemplateRenderer { const async = this.getUsedAsyncFiles(context) const needed = [initial[0]].concat(async || [], initial.slice(1)) return needed.filter(isJS).map(file => { - return `` + return `` }).join('') } else { return '' diff --git a/test/ssr/ssr-template.spec.js b/test/ssr/ssr-template.spec.js index 199fa6c0558..c09376e4982 100644 --- a/test/ssr/ssr-template.spec.js +++ b/test/ssr/ssr-template.spec.js @@ -238,10 +238,10 @@ describe('SSR: template option', () => { // state should be inlined before scripts `` + // manifest chunk should be first - `` + + `` + // async chunks should be before main chunk - `` + - `` + + `` + + `` + `` createClientManifestAssertions(true) From 0d580b0b2582a508266f2e855559e873caf1b77d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= Date: Sun, 21 May 2017 14:32:58 +0200 Subject: [PATCH 3/4] Use defer instead of async --- src/server/template-renderer/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/template-renderer/index.js b/src/server/template-renderer/index.js index 862121671b5..f73214f5550 100644 --- a/src/server/template-renderer/index.js +++ b/src/server/template-renderer/index.js @@ -209,7 +209,7 @@ export default class TemplateRenderer { const async = this.getUsedAsyncFiles(context) const needed = [initial[0]].concat(async || [], initial.slice(1)) return needed.filter(isJS).map(file => { - return `` + return `` }).join('') } else { return '' From cb6f4b33b7d6d2171ebed860af694a4965e944fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= Date: Sun, 21 May 2017 14:33:28 +0200 Subject: [PATCH 4/4] Use defer instead of async --- test/ssr/ssr-template.spec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/ssr/ssr-template.spec.js b/test/ssr/ssr-template.spec.js index c09376e4982..c0a5fca5c78 100644 --- a/test/ssr/ssr-template.spec.js +++ b/test/ssr/ssr-template.spec.js @@ -238,10 +238,10 @@ describe('SSR: template option', () => { // state should be inlined before scripts `` + // manifest chunk should be first - `` + + `` + // async chunks should be before main chunk - `` + - `` + + `` + + `` + `` createClientManifestAssertions(true)