From c7f1f04a75979687c7d259a0110c089fe9a117fa Mon Sep 17 00:00:00 2001
From: Alexander Marks <aomarks@google.com>
Date: Tue, 12 Jun 2018 13:16:56 -0700
Subject: [PATCH 1/4] Format esm-amd-loader.

---
 packages/esm-amd-loader/src/esm-amd-loader.ts | 32 +++++++++++--------
 packages/esm-amd-loader/test/src/suite.ts     | 30 ++++++++++-------
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/packages/esm-amd-loader/src/esm-amd-loader.ts b/packages/esm-amd-loader/src/esm-amd-loader.ts
index 8f4f8bd14..68c17dabe 100644
--- a/packages/esm-amd-loader/src/esm-amd-loader.ts
+++ b/packages/esm-amd-loader/src/esm-amd-loader.ts
@@ -16,7 +16,8 @@ interface Window {
   define: ((deps: string[], moduleBody: OnExecutedCallback) => void)&{
     _reset?: () => void;
   };
-  HTMLImports?: { importForElement: (element: Element) => HTMLLinkElement | undefined };
+  HTMLImports?:
+      {importForElement: (element: Element) => HTMLLinkElement | undefined};
 }
 
 type OnExecutedCallback = (...args: Array<{}>) => void;
@@ -268,9 +269,9 @@ function loadDeps(
       args.push({
         // We append "#<script index>" to top-level scripts so that they have
         // unique keys in the registry. We don't want to see that here.
-        url: (module.isTopLevel === true)
-          ? module.url.substring(0, module.url.lastIndexOf('#'))
-          : module.url
+        url: (module.isTopLevel === true) ?
+            module.url.substring(0, module.url.lastIndexOf('#')) :
+            module.url
       });
       continue;
     }
@@ -555,33 +556,36 @@ function getBaseUrl(): NormalizedUrl {
 }
 
 /**
- * Get the url of the current document. If the document is the main document, the base
- * url is returned. Otherwise if the module was imported by a HTML import we need to
- * resolve the URL relative to the HTML import.
+ * Get the url of the current document. If the document is the main document,
+ * the base url is returned. Otherwise if the module was imported by a HTML
+ * import we need to resolve the URL relative to the HTML import.
  *
- * document.currentScript does not work in IE11, but the HTML import polyfill mocks it
- * when executing an import so for this case that's ok
+ * document.currentScript does not work in IE11, but the HTML import polyfill
+ * mocks it when executing an import so for this case that's ok
  */
 function getDocumentUrl() {
-  const { currentScript } = document;
+  const {currentScript} = document;
   // On IE11 document.currentScript is not defined when not in a HTML import
   if (!currentScript) {
     return baseUrl;
   }
 
   if (window.HTMLImports) {
-    // When the HTMLImports polyfill is active, we can take the path from the link element
+    // When the HTMLImports polyfill is active, we can take the path from the
+    // link element
     const htmlImport = window.HTMLImports.importForElement(currentScript);
     if (!htmlImport) {
-      // If there is no import for the current script, we are in the index.html. Take the base url.
+      // If there is no import for the current script, we are in the index.html.
+      // Take the base url.
       return baseUrl;
     }
 
     // Return the import href
     return htmlImport.href;
   } else {
-    // On chrome's native implementation it's not possible to get a direct reference to the link element,
-    // create an anchor and let the browser resolve the url.
+    // On chrome's native implementation it's not possible to get a direct
+    // reference to the link element, create an anchor and let the browser
+    // resolve the url.
     const a = currentScript.ownerDocument.createElement('a');
     a.href = '';
     return a.href;
diff --git a/packages/esm-amd-loader/test/src/suite.ts b/packages/esm-amd-loader/test/src/suite.ts
index 34d49ec4d..9c46ce4e3 100644
--- a/packages/esm-amd-loader/test/src/suite.ts
+++ b/packages/esm-amd-loader/test/src/suite.ts
@@ -407,16 +407,16 @@ suite('html imports', () => {
   }
 
   function testImport(href: string, expectedOrder: string[], done: () => void) {
-     // Each time an amd module in the chain is executed, it registers itself.
-     // If we've reached the length of modules we are expecing to be loaded,
-     // we check if the right modules were loaded in the expected order
-     window.addExecutedForImport = (name: string) => {
-       window.executionOrder.push(name);
-       if (window.executionOrder.length === expectedOrder.length) {
-         assert.deepEqual(window.executionOrder, expectedOrder);
-         done();
-       }
-     };
+    // Each time an amd module in the chain is executed, it registers itself.
+    // If we've reached the length of modules we are expecing to be loaded,
+    // we check if the right modules were loaded in the expected order
+    window.addExecutedForImport = (name: string) => {
+      window.executionOrder.push(name);
+      if (window.executionOrder.length === expectedOrder.length) {
+        assert.deepEqual(window.executionOrder, expectedOrder);
+        done();
+      }
+    };
 
     importHref(href);
   }
@@ -426,11 +426,17 @@ suite('html imports', () => {
   });
 
   test('modules inside deeper level html import', (done) => {
-    testImport('../html-import/y/deep-import.html', ['x', 'z', 'y', 'deep-import'], done);
+    testImport(
+        '../html-import/y/deep-import.html',
+        ['x', 'z', 'y', 'deep-import'],
+        done);
   });
 
   test('imports with child imports', (done) => {
-    testImport('../html-import/parent-import.html', ['z', 'y', 'child-import', 'x', 'parent-import'], done);
+    testImport(
+        '../html-import/parent-import.html',
+        ['z', 'y', 'child-import', 'x', 'parent-import'],
+        done);
   });
 
   test('import with meta', (done) => {

From e779ee0ad23fcad3978673482841dff2e04c6bd1 Mon Sep 17 00:00:00 2001
From: Alexander Marks <aomarks@google.com>
Date: Tue, 12 Jun 2018 13:26:22 -0700
Subject: [PATCH 2/4] Make esm-amd-loader dynamic require 404 test not flaky.

Previously this test used a 1 second timeout to wait to see how many
times the error callback was called, which was flaky on CI. Now we
capture 404 errors and check callback calls after two 404s.

Fixes #507
---
 packages/esm-amd-loader/test/src/suite.ts | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/esm-amd-loader/test/src/suite.ts b/packages/esm-amd-loader/test/src/suite.ts
index 9c46ce4e3..1aa60615c 100644
--- a/packages/esm-amd-loader/test/src/suite.ts
+++ b/packages/esm-amd-loader/test/src/suite.ts
@@ -268,19 +268,25 @@ suite('dynamic require', () => {
   });
 
   test('calls error callback only once on multiple 404s', (done) => {
-    let numErrors = 0;
+    let num404s = 0;
+    let numCallbackCalls = 0;
+
+    window.addEventListener('error', on404, true);
+
+    function on404() {
+      if (++num404s === 2) {
+        window.removeEventListener('error', on404);
+        assert.equal(numCallbackCalls, 1);
+        done();
+      }
+    }
 
     define(['require'], (require: any) => {
       require(
           ['./not-found-a.js', './not-found-b.js'],
           () => assert.fail(),
-          () => numErrors++);
+          () => numCallbackCalls++);
     });
-
-    setTimeout(() => {
-      assert.equal(numErrors, 1);
-      done();
-    }, 1000);
   });
 });
 

From 8e0a160630a61d802fe2e9d6f4e83bb82b52ac31 Mon Sep 17 00:00:00 2001
From: Alexander Marks <aomarks@google.com>
Date: Tue, 12 Jun 2018 14:07:00 -0700
Subject: [PATCH 3/4] Inert conditional.

---
 packages/esm-amd-loader/test/src/suite.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/esm-amd-loader/test/src/suite.ts b/packages/esm-amd-loader/test/src/suite.ts
index 1aa60615c..59b4300e0 100644
--- a/packages/esm-amd-loader/test/src/suite.ts
+++ b/packages/esm-amd-loader/test/src/suite.ts
@@ -274,7 +274,8 @@ suite('dynamic require', () => {
     window.addEventListener('error', on404, true);
 
     function on404() {
-      if (++num404s === 2) {
+      num404s++;
+      if (num404s === 2) {
         window.removeEventListener('error', on404);
         assert.equal(numCallbackCalls, 1);
         done();

From 11152c37791aa94691dac21d750b0d1569b6b468 Mon Sep 17 00:00:00 2001
From: Alexander Marks <aomarks@google.com>
Date: Tue, 12 Jun 2018 14:20:33 -0700
Subject: [PATCH 4/4] Add a tick.

---
 packages/esm-amd-loader/test/src/suite.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/esm-amd-loader/test/src/suite.ts b/packages/esm-amd-loader/test/src/suite.ts
index 59b4300e0..0d29b2d19 100644
--- a/packages/esm-amd-loader/test/src/suite.ts
+++ b/packages/esm-amd-loader/test/src/suite.ts
@@ -277,8 +277,11 @@ suite('dynamic require', () => {
       num404s++;
       if (num404s === 2) {
         window.removeEventListener('error', on404);
-        assert.equal(numCallbackCalls, 1);
-        done();
+        // Need a tick to ensure the loader error handlers have fired.
+        setTimeout(() => {
+          assert.equal(numCallbackCalls, 1);
+          done();
+        });
       }
     }