From 422236f0c418f7f4afe1c54ebc7f81026804b160 Mon Sep 17 00:00:00 2001 From: EugeneHlushko Date: Sun, 18 Mar 2018 13:44:32 +0200 Subject: [PATCH 1/2] fix(bug) #5964 convert MS into S for scripts timeout attr --- lib/web/JsonpMainTemplatePlugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/JsonpMainTemplatePlugin.js b/lib/web/JsonpMainTemplatePlugin.js index 1f3a195fc05..18252bd3251 100644 --- a/lib/web/JsonpMainTemplatePlugin.js +++ b/lib/web/JsonpMainTemplatePlugin.js @@ -98,7 +98,7 @@ class JsonpMainTemplatePlugin { ? `script.type = ${JSON.stringify(jsonpScriptType)};` : "", "script.charset = 'utf-8';", - `script.timeout = ${chunkLoadTimeout};`, + `script.timeout = ${chunkLoadTimeout / 1000};`, crossOriginLoading ? `script.crossOrigin = ${JSON.stringify(crossOriginLoading)};` : "", From c4678e3e3596a3df8dc700a62b748f783f887f78 Mon Sep 17 00:00:00 2001 From: EugeneHlushko Date: Mon, 19 Mar 2018 10:58:09 +0200 Subject: [PATCH 2/2] fix(bug) #5964 convert MS into S for scripts timeout attr: update expected bytes values --- test/statsCases/import-context-filter/expected.txt | 2 +- test/statsCases/module-deduplication-named/expected.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/statsCases/import-context-filter/expected.txt b/test/statsCases/import-context-filter/expected.txt index 01de86162ea..1c9cc83bd61 100644 --- a/test/statsCases/import-context-filter/expected.txt +++ b/test/statsCases/import-context-filter/expected.txt @@ -5,7 +5,7 @@ Built at: Thu Jan 01 1970 00:00:00 GMT 0.js 305 bytes 0 [emitted] 1.js 314 bytes 1 [emitted] 2.js 308 bytes 2 [emitted] -entry.js 7.81 KiB 3 [emitted] entry +entry.js 7.8 KiB 3 [emitted] entry Entrypoint entry = entry.js [0] ./templates/bar.js 38 bytes {0} [optional] [built] [1] ./templates/baz.js 38 bytes {1} [optional] [built] diff --git a/test/statsCases/module-deduplication-named/expected.txt b/test/statsCases/module-deduplication-named/expected.txt index 4b4a051d308..21628da890e 100644 --- a/test/statsCases/module-deduplication-named/expected.txt +++ b/test/statsCases/module-deduplication-named/expected.txt @@ -2,9 +2,9 @@ async3.js 818 bytes 0 [emitted] async3 async1.js 818 bytes 1 [emitted] async1 async2.js 818 bytes 2 [emitted] async2 - e1.js 8.03 KiB 3 [emitted] e1 - e2.js 8.05 KiB 4 [emitted] e2 - e3.js 8.07 KiB 5 [emitted] e3 + e1.js 8.02 KiB 3 [emitted] e1 + e2.js 8.04 KiB 4 [emitted] e2 + e3.js 8.06 KiB 5 [emitted] e3 Entrypoint e1 = e1.js Entrypoint e2 = e2.js Entrypoint e3 = e3.js