Merge branch 'master' into junyi/electron-library-call

Jigsaw-Code · Nov 18, 2024 · 2a38297 · 2a38297
2 parents 2bf6f6c + ba3cfa0
commit 2a38297
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/client/package.json b/client/package.json
@@ -47,6 +47,7 @@
     "cordova-plugin-splashscreen": "^6.0.0",
     "cordova-plugin-statusbar": "^2.2.3",
     "electron-updater": "^5.0.5",
+    "element-internals-polyfill": "^1.3.12",
     "fs-extra": "^11.2.0",
     "koffi": "^2.9.1",
     "lit": "^2.2.2",

diff --git a/client/src/www/ui_components/app-root.js b/client/src/www/ui_components/app-root.js
@@ -14,6 +14,7 @@
   limitations under the License.
 */
 
+import 'element-internals-polyfill';
 import '@material/web/all.js';
 import '@polymer/polymer/polymer-legacy.js';
 import '@polymer/polymer/lib/legacy/polymer.dom.js';

diff --git a/package-lock.json b/package-lock.json