Merge 25532f6 into 9cb4335

Author: bicknellr

package-lock.json

@@ -49,7 +49,7 @@
     "@types/chai": "^4.2.15",
     "@types/mocha": "^5.2.4",
     "@webcomponents/shadycss": "^1.10.2",
-    "@webcomponents/webcomponentsjs": "^2.5.0",
+    "@webcomponents/webcomponentsjs": "^2.6.0",
     "chai": "^4.3.3",
     "clang-format": "^1.5.0",
     "downlevel-dts": "^0.7.0",

package.json

@@ -1,20 +1,4 @@
-interface ShadyCSS {
-  styleElement(host: Element, overrideProps?: {[key: string]: string}): void;
-  getComputedStyleValue(element: Element, property: string): string;
-  ScopingShim: undefined|{
-    prepareAdoptedCssText(cssText: string[], name: string): void;
-  };
-  nativeShadow: boolean;
-}
-
-interface ShadyDOM {
-  inUse: boolean;
-  flush: () => void;
-}
-
 interface Window {
-  ShadyCSS?: ShadyCSS;
-  ShadyDOM?: ShadyDOM;
   ShadowRoot: typeof ShadowRoot;
 }
 

src/env.d.ts

@@ -22,6 +22,7 @@
   },
   "include": [
     "custom_typings/**/*.ts",
+    "node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.d.ts",
     "src/**/*.ts"
   ],
   "exclude": []