From 0eddf1317cbdec8b5ab35d614d4627aa2daf79b7 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Wed, 27 Nov 2019 23:55:41 +0300 Subject: [PATCH] pick webcomponents-lite --- package.json | 2 +- src/bundle.js | 6 ++++++ src/scripts/site.js | 5 +++-- webpack.common.js | 3 +-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8eea3ca24..b5e7e82bb 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "shaka-player": "^2.5.5", "sortablejs": "^1.9.0", "swiper": "^3.4.2", - "webcomponents.js-2": "^0.7.24", + "webcomponents.js": "^0.7.24", "whatwg-fetch": "^1.1.1" }, "scripts": { diff --git a/src/bundle.js b/src/bundle.js index 7cdfc1e85..508e2c306 100644 --- a/src/bundle.js +++ b/src/bundle.js @@ -78,6 +78,12 @@ _define("sortable", function() { return sortable; }); +// webcomponents +var webcomponents = require("webcomponents.js/webcomponents-lite"); +_define("webcomponents", function() { + return webcomponents +}); + // libjass var libjass = require("libjass"); require("libjass/libjass.css"); diff --git a/src/scripts/site.js b/src/scripts/site.js index 05c70d7f9..e05712c07 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -410,7 +410,7 @@ var AppInfo = {}; if ("registerElement" in document) { define("registerElement", []); } else if (browser.msie) { - define("registerElement", [bowerPath + "/webcomponents-lite.min.js"], returnFirstDependency); + define("registerElement", ["webcomponents"], returnFirstDependency); } else { define("registerElement", ["document-register-element"], returnFirstDependency); } @@ -693,7 +693,8 @@ var AppInfo = {}; "shaka", "swiper", "sortable", - "libjass" + "libjass", + "webcomponents" ] }, urlArgs: urlArgs, diff --git a/webpack.common.js b/webpack.common.js index acd640972..969c7d6e0 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -5,8 +5,7 @@ const CopyPlugin = require("copy-webpack-plugin"); const Assets = [ "alameda/alameda.js", - "requirejs/require.js", - "webcomponents.js-2/webcomponents-lite.min.js" + "requirejs/require.js" ]; module.exports = {