From 04ce2744eb2ebefcf44b660fafd47372d41f80e1 Mon Sep 17 00:00:00 2001
From: grafixeyehero <grafixeyehero>
Date: Tue, 26 Nov 2019 23:03:03 +0300
Subject: [PATCH 1/4] bundle isn't working well on Firefox

---
 src/bundle.js       | 12 ------------
 src/scripts/site.js |  6 ++----
 webpack.common.js   |  6 ++++--
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/bundle.js b/src/bundle.js
index 6931b34dd0..5d18426b5c 100644
--- a/src/bundle.js
+++ b/src/bundle.js
@@ -4,12 +4,6 @@
 // Use define from require.js not webpack's define
 var _define = window.define;
 
-// document-register-element
-var docRegister = require("document-register-element");
-_define("document-register-element", function() {
-    return docRegister;
-});
-
 // fetch
 var fetch = require("whatwg-fetch");
 _define("fetch", function() {
@@ -78,12 +72,6 @@ _define("sortable", function() {
     return sortable;
 });
 
-// webcomponents
-var webcomponents = require("webcomponents.js-2");
-_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 e05712c076..6e1470dfe0 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -410,9 +410,9 @@ var AppInfo = {};
         if ("registerElement" in document) {
             define("registerElement", []);
         } else if (browser.msie) {
-            define("registerElement", ["webcomponents"], returnFirstDependency);
+            define("registerElement", [bowerPath + "/webcomponents-lite.min.js"], returnFirstDependency);
         } else {
-            define("registerElement", ["document-register-element"], returnFirstDependency);
+            define("registerElement", [bowerPath + "/document-register-element"], returnFirstDependency);
         }
 
         define("imageFetcher", [componentsPath + "/images/imageFetcher"], returnFirstDependency);
@@ -681,7 +681,6 @@ var AppInfo = {};
             },
             bundles: {
                 bundle: [
-                    "document-register-element",
                     "fetch",
                     "flvjs",
                     "jstree",
@@ -694,7 +693,6 @@ var AppInfo = {};
                     "swiper",
                     "sortable",
                     "libjass",
-                    "webcomponents"
                 ]
             },
             urlArgs: urlArgs,
diff --git a/webpack.common.js b/webpack.common.js
index 59a1c4e55e..852b0e3af9 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -5,7 +5,9 @@ const CopyPlugin = require("copy-webpack-plugin");
 
 const Assets = [
     "alameda/alameda.js",
-    "requirejs/require.js"
+    "requirejs/require.js",
+    "webcomponents.js-2/webcomponents-lite.min.js",
+    "document-register-element/build/document-register-element.js",
 ];
 
 module.exports = {
@@ -26,7 +28,7 @@ module.exports = {
             Assets.map(asset => {
                 return {
                     from: path.resolve(__dirname, `./node_modules/${asset}`),
-                    to: path.resolve(__dirname, './dist/libraries')
+                    to: path.resolve(__dirname, "./dist/libraries")
                 };
             })
         )

From e3c21d56d5997ed7de994d1868ab92112b45baf6 Mon Sep 17 00:00:00 2001
From: grafixeyehero <grafixeyehero>
Date: Tue, 26 Nov 2019 23:06:48 +0300
Subject: [PATCH 2/4] Fix style

---
 src/scripts/site.js | 2 +-
 webpack.common.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scripts/site.js b/src/scripts/site.js
index 6e1470dfe0..c1dad901e0 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -692,7 +692,7 @@ var AppInfo = {};
                     "shaka",
                     "swiper",
                     "sortable",
-                    "libjass",
+                    "libjass"
                 ]
             },
             urlArgs: urlArgs,
diff --git a/webpack.common.js b/webpack.common.js
index 852b0e3af9..894119cc5f 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -7,7 +7,7 @@ const Assets = [
     "alameda/alameda.js",
     "requirejs/require.js",
     "webcomponents.js-2/webcomponents-lite.min.js",
-    "document-register-element/build/document-register-element.js",
+    "document-register-element/build/document-register-element.js"
 ];
 
 module.exports = {

From be886982a211304ac69dbf95fc7cfdd090c47895 Mon Sep 17 00:00:00 2001
From: grafixeyehero <grafixeyehero>
Date: Wed, 27 Nov 2019 22:07:33 +0300
Subject: [PATCH 3/4] revert back  document-register-element

---
 src/bundle.js       | 6 ++++++
 src/scripts/site.js | 3 ++-
 webpack.common.js   | 3 +--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/bundle.js b/src/bundle.js
index 5d18426b5c..7cdfc1e858 100644
--- a/src/bundle.js
+++ b/src/bundle.js
@@ -4,6 +4,12 @@
 // Use define from require.js not webpack's define
 var _define = window.define;
 
+// document-register-element
+var docRegister = require("document-register-element");
+_define("document-register-element", function() {
+    return docRegister;
+});
+
 // fetch
 var fetch = require("whatwg-fetch");
 _define("fetch", function() {
diff --git a/src/scripts/site.js b/src/scripts/site.js
index c1dad901e0..05c70d7f90 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -412,7 +412,7 @@ var AppInfo = {};
         } else if (browser.msie) {
             define("registerElement", [bowerPath + "/webcomponents-lite.min.js"], returnFirstDependency);
         } else {
-            define("registerElement", [bowerPath + "/document-register-element"], returnFirstDependency);
+            define("registerElement", ["document-register-element"], returnFirstDependency);
         }
 
         define("imageFetcher", [componentsPath + "/images/imageFetcher"], returnFirstDependency);
@@ -681,6 +681,7 @@ var AppInfo = {};
             },
             bundles: {
                 bundle: [
+                    "document-register-element",
                     "fetch",
                     "flvjs",
                     "jstree",
diff --git a/webpack.common.js b/webpack.common.js
index 894119cc5f..acd6409726 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -6,8 +6,7 @@ const CopyPlugin = require("copy-webpack-plugin");
 const Assets = [
     "alameda/alameda.js",
     "requirejs/require.js",
-    "webcomponents.js-2/webcomponents-lite.min.js",
-    "document-register-element/build/document-register-element.js"
+    "webcomponents.js-2/webcomponents-lite.min.js"
 ];
 
 module.exports = {

From 0eddf1317cbdec8b5ab35d614d4627aa2daf79b7 Mon Sep 17 00:00:00 2001
From: grafixeyehero <grafixeyehero>
Date: Wed, 27 Nov 2019 23:55:41 +0300
Subject: [PATCH 4/4] 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 8eea3ca247..b5e7e82bb0 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 7cdfc1e858..508e2c3065 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 05c70d7f90..e05712c076 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 acd6409726..969c7d6e08 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 = {