From 59aab143944e80424442d5c65b2a5104d5885fcb Mon Sep 17 00:00:00 2001 From: Rob Wormald Date: Tue, 4 Sep 2018 11:08:47 -0700 Subject: [PATCH] refactor(docs-infra): simplify custom-element polyfill setup (#25806) PR Close #25806 --- aio/package.json | 2 +- aio/src/index.html | 22 ---------------------- aio/src/polyfills.ts | 3 ++- aio/yarn.lock | 6 +++--- 4 files changed, 6 insertions(+), 27 deletions(-) diff --git a/aio/package.json b/aio/package.json index da34125074..8120e6d401 100644 --- a/aio/package.json +++ b/aio/package.json @@ -79,7 +79,7 @@ "@angular/platform-browser-dynamic": "6.1.0-rc.3", "@angular/router": "6.1.0-rc.3", "@angular/service-worker": "6.1.0-rc.3", - "@webcomponents/custom-elements": "^1.0.8", + "@webcomponents/custom-elements": "^1.2.0", "classlist.js": "^1.1.20150312", "core-js": "^2.4.1", "rxjs": "6.2.2", diff --git a/aio/src/index.html b/aio/src/index.html index 500a7c31c9..6f2893ba17 100644 --- a/aio/src/index.html +++ b/aio/src/index.html @@ -83,28 +83,6 @@ - - diff --git a/aio/src/polyfills.ts b/aio/src/polyfills.ts index babba81e97..287fffedca 100644 --- a/aio/src/polyfills.ts +++ b/aio/src/polyfills.ts @@ -36,7 +36,8 @@ * Zone JS is required by Angular itself. */ import 'zone.js/dist/zone'; // Included with Angular CLI. - +import '@webcomponents/custom-elements'; // Custom Elements Polyfill +import '@webcomponents/custom-elements/src/native-shim'; /*************************************************************************************************** diff --git a/aio/yarn.lock b/aio/yarn.lock index 4b1c2b3f5d..f0bd0dfa43 100644 --- a/aio/yarn.lock +++ b/aio/yarn.lock @@ -468,9 +468,9 @@ "@webassemblyjs/wast-parser" "1.4.3" long "^3.2.0" -"@webcomponents/custom-elements@^1.0.8": - version "1.0.8" - resolved "https://registry.yarnpkg.com/@webcomponents/custom-elements/-/custom-elements-1.0.8.tgz#b7b8ef7248f7681d1ad4286a0ada5fe3c2bc7228" +"@webcomponents/custom-elements@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@webcomponents/custom-elements/-/custom-elements-1.2.0.tgz#7fc8da6c8243b15b4f69c74c65dfe2a4996c694c" JSONStream@^1.2.1: version "1.3.1"