From ee2d120c42f94c595d946743a650164abd7c906a Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 13 Nov 2019 17:51:35 -0800
Subject: [PATCH 1/7] Fix a type generation error in ElementMixin.

---
 gen-tsd.json                | 1 +
 lib/mixins/element-mixin.js | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gen-tsd.json b/gen-tsd.json
index abb67b6cab..0b9e9713e7 100644
--- a/gen-tsd.json
+++ b/gen-tsd.json
@@ -8,6 +8,7 @@
     "index.html"
   ],
   "excludeIdentifiers": [
+    "ElementMixinPatchedBase",
     "templatizedBase"
   ],
   "removeReferences": [
diff --git a/lib/mixins/element-mixin.js b/lib/mixins/element-mixin.js
index c41b0751ba..0efb190f99 100644
--- a/lib/mixins/element-mixin.js
+++ b/lib/mixins/element-mixin.js
@@ -104,8 +104,13 @@ export const ElementMixin = dedupingMixin(base => {
   // Optimizations for ShadyDOM's on-demand patching that pre-patches
   // elements to work with ShadyDOM.
   if (window.ShadyDOM && window.ShadyDOM.patchOnDemand) {
-    base = class extends base {};
-    ShadyDOM.patchElementProto(base.prototype);
+    // `ElementMixinPatchedBase` is explicitly ignored in `gen-tsd.json` so
+    // that it doesn't attempt to export a type for it: the type generator
+    // attempts to declare it as extending `base` but no type is generated for
+    // `base`.
+    class ElementMixinPatchedBase extends base {};
+    ShadyDOM.patchElementProto(ElementMixinPatchedBase.prototype);
+    base = ElementMixinPatchedBase;
   }
 
   /**

From 1fb240d704f73c8d6e40b5b37c626ef842304b4a Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 13 Nov 2019 18:04:44 -0800
Subject: [PATCH 2/7] Update polyfills.

---
 package-lock.json | 12 ++++++------
 package.json      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 566c38215c..41ffb4d01a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1300,14 +1300,14 @@
       }
     },
     "@webcomponents/shadycss": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.9.1.tgz",
-      "integrity": "sha512-IaZOnWOKXHghqk/WfPNDRIgDBi3RsVPY2IFAw6tYiL9UBGvQRy5R6uC+Fk7qTZsReTJ0xh5MTT8yAcb3MUR4mQ=="
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.9.3.tgz",
+      "integrity": "sha512-fRuET+UGrH84hG0UF4iHbFqWZKUoan4/ki+iCOJ/vnKltPSHv/ZVbcA6sT/pRreznt8aKEGqN2KdHvgRxn4xjA=="
     },
     "@webcomponents/webcomponentsjs": {
-      "version": "2.2.10",
-      "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.10.tgz",
-      "integrity": "sha512-5dzhUhP+h0qMiK0IWb7VNb0OGBoXO3AuI6Qi8t9PoKT50s5L1jv0xnwnLq+cFgPuTB8FLTNP8xIDmyoOsKBy9Q==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.4.0.tgz",
+      "integrity": "sha512-kEClEz2nu9/i6SvyBJTV4pCc6CyCzMhK7zEeJ6QhiJoulBp4YZ06Zfj2E2HUXfWfHJIjtKriJYMtfhettKEjEg==",
       "dev": true
     },
     "abbrev": {
diff --git a/package.json b/package.json
index a30c075a50..f0a676029a 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "@polymer/gen-typescript-declarations": "^1.5.1",
     "@polymer/iron-component-page": "^3.0.0-pre.12",
     "@polymer/test-fixture": "^3.0.0-pre.12",
-    "@webcomponents/webcomponentsjs": "^2.2.10",
+    "@webcomponents/webcomponentsjs": "^2.4.0",
     "babel-eslint": "^7.2.3",
     "babel-preset-minify": "^0.2.0",
     "del": "^3.0.0",
@@ -65,7 +65,7 @@
     "type-detect": "1.0.0"
   },
   "dependencies": {
-    "@webcomponents/shadycss": "^1.9.1"
+    "@webcomponents/shadycss": "^1.9.3"
   },
   "files": [
     "externs",

From a92c47e02b390f5ffc20576611fc35e31c295967 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 13 Nov 2019 18:17:19 -0800
Subject: [PATCH 3/7] Fix lint errors.

---
 lib/mixins/element-mixin.js | 2 +-
 lib/utils/settings.js       | 2 +-
 test/unit/lazy-define.html  | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/mixins/element-mixin.js b/lib/mixins/element-mixin.js
index 0efb190f99..efb82a552c 100644
--- a/lib/mixins/element-mixin.js
+++ b/lib/mixins/element-mixin.js
@@ -108,7 +108,7 @@ export const ElementMixin = dedupingMixin(base => {
     // that it doesn't attempt to export a type for it: the type generator
     // attempts to declare it as extending `base` but no type is generated for
     // `base`.
-    class ElementMixinPatchedBase extends base {};
+    class ElementMixinPatchedBase extends base {}
     ShadyDOM.patchElementProto(ElementMixinPatchedBase.prototype);
     base = ElementMixinPatchedBase;
   }
diff --git a/lib/utils/settings.js b/lib/utils/settings.js
index 582327e392..21a1e9cf43 100644
--- a/lib/utils/settings.js
+++ b/lib/utils/settings.js
@@ -312,7 +312,7 @@ export let lazyDefine =
  */
 export const setLazyDefine = function(useLazyDefine) {
   lazyDefine = useLazyDefine;
-}
+};
 
 /**
  * Setting to disable `dom-change` and `rendered-item-count` events from
diff --git a/test/unit/lazy-define.html b/test/unit/lazy-define.html
index 168d280565..664241193b 100644
--- a/test/unit/lazy-define.html
+++ b/test/unit/lazy-define.html
@@ -66,7 +66,6 @@
   <x-lazy-declarative></x-lazy-declarative>
 
 <script type="module">
-  import { Polymer } from '../../polymer-legacy.js';
   import { registrations } from '../../lib/utils/telemetry.js';
 
   const getCtorFromTelemetry = (is) => {
@@ -76,7 +75,7 @@
         return ctor;
       }
     }
-  }
+  };
 
   suite('lazy-define', function() {
 

From 9750d836879d3f5c05000590725d5cb6c225607f Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Mon, 18 Nov 2019 12:07:09 -0800
Subject: [PATCH 4/7] Stop forcing the custom elements polyfill in browsers
 that natively support it.

---
 test/runner.html | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/test/runner.html b/test/runner.html
index 6136ca9710..4d3b8f1b43 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -112,8 +112,6 @@
       return previous + (previous ? '&' : '') + next;
     }
 
-    // test shadowdom/custom elements polyfills together
-    // preferring both if possible.
     let flags = [''];
     if (window.customElements) {
       // NOTE: disabled because Native ShadowDOM and Polyfilled CustomElements is not an expected use-case.
@@ -125,11 +123,6 @@
     }
     // always test ShadyDOM on-demand patching
     flags.push('wc-shadydom=true&wc-noPatch=on-demand');
-    // Both sd and ce are supported, force both polyfills
-    if (flags.length === 2) {
-      // ce + sd becomes a single test iteration.
-      flags.push('wc-ce=true&wc-shadydom=true');
-    }
 
     // economize testing by testing css shimming
     // only against 1 environment (native or polyfill).

From 7080162ec493a12635bf7eeef4237ccea5a18250 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Mon, 18 Nov 2019 12:08:01 -0800
Subject: [PATCH 5/7] Remove unused code.

---
 test/runner.html | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/test/runner.html b/test/runner.html
index 4d3b8f1b43..7d0f1fbf03 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -113,10 +113,6 @@
     }
 
     let flags = [''];
-    if (window.customElements) {
-      // NOTE: disabled because Native ShadowDOM and Polyfilled CustomElements is not an expected use-case.
-      // flags.push('wc-ce=true');
-    }
     // if native is available, make sure to test polyfill
     if (Element.prototype.attachShadow && Node.prototype.getRootNode) {
       flags.push('wc-shadydom=true');
@@ -124,13 +120,6 @@
     // always test ShadyDOM on-demand patching
     flags.push('wc-shadydom=true&wc-noPatch=on-demand');
 
-    // economize testing by testing css shimming
-    // only against 1 environment (native or polyfill).
-    if (window.CSS && CSS.supports && CSS.supports('box-shadow', '0 0 0 var(--foo)')) {
-      // Note: Disabled to speed up testing, may be reenabled at a later date when the test timing is less of an issue.
-      // let last = flags.length === 1 ? '' : flags[flags.length - 1];
-      // flags.push(addUrlOption(last, 'wc-shimcssproperties=true'));
-    }
     suites = combinations(suites, flags);
     console.log('Testing suites:\n\t' + suites.join('\n\t'));
 

From 01ba5a79481a97bd381b1cdb05cc447dc2bcec9f Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 8 Jan 2020 13:44:18 -0800
Subject: [PATCH 6/7] Update ShadyCSS

---
 package-lock.json | 41 ++++++++++++-----------------------------
 package.json      |  2 +-
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 41ffb4d01a..0ba8355765 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1300,9 +1300,9 @@
       }
     },
     "@webcomponents/shadycss": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.9.3.tgz",
-      "integrity": "sha512-fRuET+UGrH84hG0UF4iHbFqWZKUoan4/ki+iCOJ/vnKltPSHv/ZVbcA6sT/pRreznt8aKEGqN2KdHvgRxn4xjA=="
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.9.4.tgz",
+      "integrity": "sha512-tgNcVEaKssyeZPbUBjVQf4aryO5Fi7fxRvOxV982ZJuRVDcefmIblBh0SXAbcvAAlQ2zpNEP4SuQUnr8uApIpw=="
     },
     "@webcomponents/webcomponentsjs": {
       "version": "2.4.0",
@@ -13333,8 +13333,7 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -13362,7 +13361,6 @@
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -13377,8 +13375,7 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "concat-map": {
               "version": "0.0.1",
@@ -13389,8 +13386,7 @@
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -13507,8 +13503,7 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "ini": {
               "version": "1.3.5",
@@ -13520,7 +13515,6 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -13535,7 +13529,6 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -13543,14 +13536,12 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -13569,7 +13560,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -13650,8 +13640,7 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -13663,7 +13652,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -13749,8 +13737,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -13786,7 +13773,6 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -13806,7 +13792,6 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -13850,14 +13835,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
diff --git a/package.json b/package.json
index f0a676029a..bc68b870ac 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "type-detect": "1.0.0"
   },
   "dependencies": {
-    "@webcomponents/shadycss": "^1.9.3"
+    "@webcomponents/shadycss": "^1.9.4"
   },
   "files": [
     "externs",

From c9c660f8dee41cf76b6cc59a634a9eedaa4eefe3 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Thu, 9 Jan 2020 10:21:43 -0800
Subject: [PATCH 7/7] Update webcomponentsjs

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0ba8355765..7cb0472708 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1305,9 +1305,9 @@
       "integrity": "sha512-tgNcVEaKssyeZPbUBjVQf4aryO5Fi7fxRvOxV982ZJuRVDcefmIblBh0SXAbcvAAlQ2zpNEP4SuQUnr8uApIpw=="
     },
     "@webcomponents/webcomponentsjs": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.4.0.tgz",
-      "integrity": "sha512-kEClEz2nu9/i6SvyBJTV4pCc6CyCzMhK7zEeJ6QhiJoulBp4YZ06Zfj2E2HUXfWfHJIjtKriJYMtfhettKEjEg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.4.1.tgz",
+      "integrity": "sha512-7jxBb+KoWncKb/JGFyTY40PjV4yRx2zd35ZLuvRP+6WndJDL7X32ZIZ7bN3sSQIl+NzJkCo7chfXJyzn+6WZaQ==",
       "dev": true
     },
     "abbrev": {
diff --git a/package.json b/package.json
index bc68b870ac..699dd0b610 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "@polymer/gen-typescript-declarations": "^1.5.1",
     "@polymer/iron-component-page": "^3.0.0-pre.12",
     "@polymer/test-fixture": "^3.0.0-pre.12",
-    "@webcomponents/webcomponentsjs": "^2.4.0",
+    "@webcomponents/webcomponentsjs": "^2.4.1",
     "babel-eslint": "^7.2.3",
     "babel-preset-minify": "^0.2.0",
     "del": "^3.0.0",