core: Fixed web-view props cascading

Author: Prozilla

demo/package.json

@@ -25,12 +25,12 @@
 "@fortawesome/fontawesome-svg-core": "^6.5.2",
 "@fortawesome/free-solid-svg-icons": "^6.5.2",
 "@fortawesome/react-fontawesome": "^0.2.2",
-"@prozilla-os/ball-maze": "latest",
+"@prozilla-os/ball-maze": "^1.0.6",
 "@prozilla-os/bliss-radio": "latest",
 "@prozilla-os/logic-sim": "workspace:*",
-"@prozilla-os/minesweeper": "latest",
+"@prozilla-os/minesweeper": "^1.0.6",
 "@prozilla-os/skins": "workspace:*",
-"@prozilla-os/wordle": "latest",
+"@prozilla-os/wordle": "^1.1.7",
 "@taygotfound/melodix": "latest",
 "prozilla-os": "workspace:*",
 "react": "^18.3.1",

packages/core/src/components/_utils/web-view/WebView.tsx

@@ -35,13 +35,21 @@ export const WebView: FC<WebViewProps> = forwardRef<HTMLIFrameElement>(({ source
 setHovered(false);
 };
 
+const iframeProps = { ...props };
+
+delete iframeProps.active;
+delete iframeProps.close;
+delete iframeProps.setTitle;
+delete iframeProps.setIconUrl;
+delete iframeProps.standalone;
+
 return <div className={styles.WebView} onMouseOver={onMouseOver} onMouseOut={onMouseOut}>
 <iframe
 ref={ref}
 src={source}
 referrerPolicy="no-referrer"
 sandbox="allow-downloads allow-forms allow-modals allow-pointer-lock allow-popups allow-presentation allow-same-origin allow-scripts"
-{...props}
+{...iframeProps}
 />
 </div>;
 }) as FC;

packages/core/src/features/_utils/browser.utils.ts

@@ -37,13 +37,18 @@ export function setViewportTitle(title: string) {
 }
 
 export function setViewportIcon(url: string) {
-let link: HTMLLinkElement | null = document.querySelector("link[rel~='icon']");
-if (link == null) {
-link = document.createElement("link");
+const links = document.querySelectorAll("link[rel~='icon'], link[rel~='apple-touch-icon']");
+
+if (links.length == 0) {
+const link = document.createElement("link");
 link.rel = "icon";
+link.href = url;
 document.head.appendChild(link);
 }
-link.href = url;
+
+links.forEach((link) => {
+(link as HTMLLinkElement).href = url;
+});
 }
 
 export function getViewportParams(): Record<string, string> {

packages/dev-tools/src/plugins/stageSite.ts

@@ -164,7 +164,7 @@ function generateAppPages(context: PluginContext, template: string, options: Sta
 const canonicalRegex = /(?<=(<link rel="canonical" href="|<meta name="twitter:url" content="|<meta property="og:url" content="))(http(s)?:\/\/[a-zA-Z-.]+\/)(?=("\/?>))/g;
 html = html.replaceAll(canonicalRegex, baseUrl + appId);
 
-const iconRegex = /(?<=<link [^>]*rel="icon" [^>]*href=")[^"]+(?="[^>]*>)/g;
+const iconRegex = /(?<=<link [^>]*rel="(apple-touch-)?icon" [^>]*href=")[^"]+(?="[^>]*>)/g;
 html = html.replaceAll(iconRegex, `${appIcon}?x=${Math.round(Date.now() / 3_600_000)}`);
 
 const faqRegex = /(<!-- FAQ -->.*?)?<script type="application\/ld\+json">.*?<\/script>/gs;