From 69ff29dd08c1894b54b2923f8879ea4f333e6cd2 Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Mon, 18 Nov 2024 16:20:01 -0500 Subject: [PATCH] fix(client/ios): add element-internals polyfill to fix rendering issues on ios < 17 --- client/package.json | 1 + client/src/www/ui_components/app-root.js | 1 + package-lock.json | 12 ++++++++++++ 3 files changed, 14 insertions(+) diff --git a/client/package.json b/client/package.json index 5b0af96015..c46891ce15 100644 --- 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", "lit": "^2.2.2", "ShadowsocksConfig": "github:Jigsaw-Code/outline-shadowsocksconfig#v0.2.1", diff --git a/client/src/www/ui_components/app-root.js b/client/src/www/ui_components/app-root.js index ca9325cdf5..5f8745d700 100644 --- 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 index 79cd9a234a..0a4a83b102 100644 --- a/package-lock.json +++ b/package-lock.json @@ -82,6 +82,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", "lit": "^2.2.2", "ShadowsocksConfig": "github:Jigsaw-Code/outline-shadowsocksconfig#v0.2.1", @@ -16315,6 +16316,11 @@ "integrity": "sha512-84iSqGXoO+Ha16j8pRZ/L90vDMKX04QTYMTfYeE1WrjWaZXuchBehGUZEpNgx7JnmlrIHdnABmpjrQjhCnNldQ==", "dev": true }, + "node_modules/element-internals-polyfill": { + "version": "1.3.12", + "resolved": "https://registry.npmjs.org/element-internals-polyfill/-/element-internals-polyfill-1.3.12.tgz", + "integrity": "sha512-KW1k+cMGwXlx3X9nqhgmuElAfR/c/ccFt0pG4KpwK++Mx9Y+mPExxJW+jgQnqux/NQrJejgOxxg4Naf3f6y67Q==" + }, "node_modules/elementtree": { "version": "0.1.7", "dev": true, @@ -40802,6 +40808,7 @@ "electron": "19.1.9", "electron-builder": "^23.6.0", "electron-updater": "^5.0.5", + "element-internals-polyfill": "^1.3.12", "eslint": "^8.15.0", "eslint-import-resolver-typescript": "^3.4.0", "eslint-plugin-compat": "^4.0.2", @@ -50181,6 +50188,11 @@ } } }, + "element-internals-polyfill": { + "version": "1.3.12", + "resolved": "https://registry.npmjs.org/element-internals-polyfill/-/element-internals-polyfill-1.3.12.tgz", + "integrity": "sha512-KW1k+cMGwXlx3X9nqhgmuElAfR/c/ccFt0pG4KpwK++Mx9Y+mPExxJW+jgQnqux/NQrJejgOxxg4Naf3f6y67Q==" + }, "elementtree": { "version": "0.1.7", "dev": true,