From 4036db442bac6661092fa278913c0b737d7cda82 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 27 Apr 2022 15:30:54 -0700
Subject: [PATCH] Upstream http://cl/368587394

---
 lib/legacy/class.d.ts      | 2 +-
 lib/legacy/polymer-fn.d.ts | 7 ++++---
 lib/utils/settings.d.ts    | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/legacy/class.d.ts b/lib/legacy/class.d.ts
index b395448773..44c47ce951 100644
--- a/lib/legacy/class.d.ts
+++ b/lib/legacy/class.d.ts
@@ -86,6 +86,6 @@ export {Class};
  *
  * @returns Generated class
  */
-declare function Class<T>(info: PolymerInit, mixin: (p0: T) => T): {new(): HTMLElement};
+declare function Class<T>(info: PolymerInit, mixin?: (p0: T) => T): {new(): HTMLElement};
 
 import {PolymerInit} from '../../interfaces';
diff --git a/lib/legacy/polymer-fn.d.ts b/lib/legacy/polymer-fn.d.ts
index 57a26a66ed..9180170f83 100644
--- a/lib/legacy/polymer-fn.d.ts
+++ b/lib/legacy/polymer-fn.d.ts
@@ -16,8 +16,9 @@ import {Class} from './class.js';
  *
  * @returns Generated class
  */
-declare function Polymer(info: PolymerInit): {new(): HTMLElement};
-
-export {Polymer};
+export const Polymer: {
+  (info: PolymerInit): {new(): HTMLElement};
+  Class: typeof Class;
+}
 
 import {PolymerInit} from '../../interfaces';
diff --git a/lib/utils/settings.d.ts b/lib/utils/settings.d.ts
index 9972531fa4..ab281c282e 100644
--- a/lib/utils/settings.d.ts
+++ b/lib/utils/settings.d.ts
@@ -153,3 +153,5 @@ export {setUseAdoptedStyleSheetsWithBuiltCSS};
  * Sets `useAdoptedStyleSheetsWithBuiltCSS` globally.
  */
 declare function setUseAdoptedStyleSheetsWithBuiltCSS(value: boolean): void;
+
+export let legacyOptimizations: boolean;