From f9e66ac70453b7958eedc614c7a63e0e8b86c499 Mon Sep 17 00:00:00 2001 From: Lars den Bakker Date: Sun, 3 Jun 2018 17:29:25 +0200 Subject: [PATCH 1/6] Don't run loader if it was already loaded --- packages/esm-amd-loader/src/esm-amd-loader.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/esm-amd-loader/src/esm-amd-loader.ts b/packages/esm-amd-loader/src/esm-amd-loader.ts index 6c03b0203..b219d2eda 100644 --- a/packages/esm-amd-loader/src/esm-amd-loader.ts +++ b/packages/esm-amd-loader/src/esm-amd-loader.ts @@ -23,6 +23,10 @@ type onFailedCallback = (error: Error) => void; type NormalizedUrl = string&{_normalized: never}; (function() { +if (window.define) { + /* The loader was already loaded, make sure we don't reset it's state. */ + return; +} // Set to true for more logging. Anything guarded by an // `if (debugging)` check will not appear in the final output. From 76f66c56151c3cae00e5ce8e171b84856cbb63ed Mon Sep 17 00:00:00 2001 From: Lars den Bakker Date: Sun, 3 Jun 2018 17:38:10 +0200 Subject: [PATCH 2/6] Update goldens --- .../test/fixtures/build-modules/expected/bundled-amd/index.html | 2 +- .../fixtures/build-modules/expected/unbundled-amd/index.html | 2 +- .../bower_components/test-modules/golden/test-suite-no-wct.html | 2 +- .../bower_components/test-modules/golden/test-suite-wct.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/cli/test/fixtures/build-modules/expected/bundled-amd/index.html b/packages/cli/test/fixtures/build-modules/expected/bundled-amd/index.html index 82ce35c0b..f319e8264 100644 --- a/packages/cli/test/fixtures/build-modules/expected/bundled-amd/index.html +++ b/packages/cli/test/fixtures/build-modules/expected/bundled-amd/index.html @@ -1,6 +1,6 @@ - + diff --git a/packages/cli/test/fixtures/build-modules/expected/unbundled-amd/index.html b/packages/cli/test/fixtures/build-modules/expected/unbundled-amd/index.html index c5370fccb..fd0192fda 100644 --- a/packages/cli/test/fixtures/build-modules/expected/unbundled-amd/index.html +++ b/packages/cli/test/fixtures/build-modules/expected/unbundled-amd/index.html @@ -1,6 +1,6 @@ - + diff --git a/packages/polyserve/test/bower_components/test-modules/golden/test-suite-no-wct.html b/packages/polyserve/test/bower_components/test-modules/golden/test-suite-no-wct.html index fff206b6d..89d81771d 100644 --- a/packages/polyserve/test/bower_components/test-modules/golden/test-suite-no-wct.html +++ b/packages/polyserve/test/bower_components/test-modules/golden/test-suite-no-wct.html @@ -1,5 +1,5 @@ - + diff --git a/packages/polyserve/test/bower_components/test-modules/golden/test-suite-wct.html b/packages/polyserve/test/bower_components/test-modules/golden/test-suite-wct.html index 59d8012e1..87a158be7 100644 --- a/packages/polyserve/test/bower_components/test-modules/golden/test-suite-wct.html +++ b/packages/polyserve/test/bower_components/test-modules/golden/test-suite-wct.html @@ -22,7 +22,7 @@ - + - + diff --git a/packages/cli/test/fixtures/build-modules/expected/unbundled-amd/index.html b/packages/cli/test/fixtures/build-modules/expected/unbundled-amd/index.html index 1e12821e4..24ad74a88 100644 --- a/packages/cli/test/fixtures/build-modules/expected/unbundled-amd/index.html +++ b/packages/cli/test/fixtures/build-modules/expected/unbundled-amd/index.html @@ -1,6 +1,6 @@ - + diff --git a/packages/cli/test/fixtures/build-simple/expected/bundled-compiled/index.html b/packages/cli/test/fixtures/build-simple/expected/bundled-compiled/index.html index 81f2dd780..74af8eb1e 100644 --- a/packages/cli/test/fixtures/build-simple/expected/bundled-compiled/index.html +++ b/packages/cli/test/fixtures/build-simple/expected/bundled-compiled/index.html @@ -1 +1 @@ -
hello world
\ No newline at end of file +
hello world
\ No newline at end of file diff --git a/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/index.html b/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/index.html index 23e19e536..bd9cc6f53 100644 --- a/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/index.html +++ b/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/index.html @@ -1 +1 @@ -
hello world
\ No newline at end of file +
hello world
\ No newline at end of file diff --git a/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/service-worker.js b/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/service-worker.js index 522ee4728..c0181d177 100644 --- a/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/service-worker.js +++ b/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/service-worker.js @@ -37,7 +37,7 @@ /* eslint-disable indent, no-unused-vars, no-multiple-empty-lines, max-nested-callbacks, space-before-function-paren, quotes, comma-spacing */ 'use strict'; -var precacheConfig = [["index.html","f8baa97e9fec3d75a3fb51d4874df838"]]; +var precacheConfig = [["index.html","fbcf2e26c12cb1ff823f54a853ea3a37"]]; var cacheName = 'sw-precache-v3--' + (self.registration ? self.registration.scope : ''); diff --git a/packages/polyserve/test/bower_components/test-modules/golden/test-suite-no-wct.html b/packages/polyserve/test/bower_components/test-modules/golden/test-suite-no-wct.html index 68c51f797..a331cfaf6 100644 --- a/packages/polyserve/test/bower_components/test-modules/golden/test-suite-no-wct.html +++ b/packages/polyserve/test/bower_components/test-modules/golden/test-suite-no-wct.html @@ -1,5 +1,5 @@ - + diff --git a/packages/polyserve/test/bower_components/test-modules/golden/test-suite-wct.html b/packages/polyserve/test/bower_components/test-modules/golden/test-suite-wct.html index 5c8d0907f..7dd2428d0 100644 --- a/packages/polyserve/test/bower_components/test-modules/golden/test-suite-wct.html +++ b/packages/polyserve/test/bower_components/test-modules/golden/test-suite-wct.html @@ -1,6 +1,6 @@ - + +
hello world
\ No newline at end of file +
hello world
\ No newline at end of file diff --git a/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/index.html b/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/index.html index bd9cc6f53..23e19e536 100644 --- a/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/index.html +++ b/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/index.html @@ -1 +1 @@ -
hello world
\ No newline at end of file +
hello world
\ No newline at end of file diff --git a/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/service-worker.js b/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/service-worker.js index c0181d177..522ee4728 100644 --- a/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/service-worker.js +++ b/packages/cli/test/fixtures/build-with-preset/expected/es5-bundled/service-worker.js @@ -37,7 +37,7 @@ /* eslint-disable indent, no-unused-vars, no-multiple-empty-lines, max-nested-callbacks, space-before-function-paren, quotes, comma-spacing */ 'use strict'; -var precacheConfig = [["index.html","fbcf2e26c12cb1ff823f54a853ea3a37"]]; +var precacheConfig = [["index.html","f8baa97e9fec3d75a3fb51d4874df838"]]; var cacheName = 'sw-precache-v3--' + (self.registration ? self.registration.scope : '');