From 90eb988c0988f53125256eac5e0c6ef25fff5ba5 Mon Sep 17 00:00:00 2001 From: Gandalf Date: Sat, 19 Jul 2025 22:41:12 +0200 Subject: [PATCH] Revert changes from recent commits in develop to clean history and keep only iframe crash fix --- docker-compose.dev.yml | 2 +- docker-compose.localbuild.yml | 2 +- docker-compose.prod.yml | 2 +- docker-compose.staging.yml | 2 +- src/server/server-html.jsx | 16 ---------------- src/shared/HtmlReady.js | 5 +---- 6 files changed, 5 insertions(+), 24 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index bb5c05af7..a3b76d5a2 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -19,7 +19,7 @@ services: SDC_IMAGE_PROXY_PREFIX: https://images.hive.blog/ SDC_UPLOAD_IMAGE_URL: https://images.hive.blog - SDC_HELMET_CONNECTSRC: "'self' http://hiveblog.local https://api.hive.blog https://images.hive.blog https://www.reddit.com *.ibytedtos.com https://pl.ecency.com" + SDC_HELMET_CONNECTSRC: "'self' http://hiveblog.local https://api.hive.blog https://images.hive.blog https://www.reddit.com *.ibytedtos.com" SDC_HELMET_STYLESRC: "'self' 'unsafe-inline' fonts.googleapis.com platform.twitter.com www.reddit.com cdn.embedly.com *.tiktokcdn.com" SDC_HELMET_FONTSRC: "data: fonts.gstatic.com cdn.embedly.com" volumes: diff --git a/docker-compose.localbuild.yml b/docker-compose.localbuild.yml index 98fd63f98..e3f8c9809 100644 --- a/docker-compose.localbuild.yml +++ b/docker-compose.localbuild.yml @@ -11,7 +11,7 @@ services: SDC_SITE_DOMAIN: hive.blog SDC_IMAGE_PROXY_PREFIX: https://images.hive.blog/ SDC_UPLOAD_IMAGE_URL: https://images.hive.blog - SDC_HELMET_CONNECTSRC: "'self' hive.blog https://hive.blog https://api.hive.blog https://anyx.io api.blocktrades.us https://images.hive.blog https://hivebuzz.me https://peakd.com https://www.reddit.com *.ibytedtos.com https://pl.ecency.com" + SDC_HELMET_CONNECTSRC: "'self' hive.blog https://hive.blog https://api.hive.blog https://anyx.io api.blocktrades.us https://images.hive.blog https://hivebuzz.me https://peakd.com https://www.reddit.com *.ibytedtos.com" SDC_HELMET_STYLESRC: "'self' 'unsafe-inline' fonts.googleapis.com platform.twitter.com www.reddit.com cdn.embedly.com *.tiktokcdn.com" SDC_HELMET_FONTSRC: "data: fonts.gstatic.com cdn.embedly.com" WALLET_URL: https://wallet.hive.blog diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index ee6f31ccd..d224f44a2 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -30,7 +30,7 @@ services: SDC_IMAGE_PROXY_PREFIX: https://images.hive.blog/ SDC_UPLOAD_IMAGE_URL: https://images.hive.blog SDC_ALT_API_ENDPOINTS: "https://api.hive.blog https://anyx.io https://api.openhive.network https://api.hivekings.com" - SDC_HELMET_CONNECTSRC: "'self' hive.blog https://hive.blog https://images.hive.blog https://api.hive.blog https://anyx.io https://api.openhive.network https://api.hivekings.com https://hivebuzz.me https://peakd.com https://www.reddit.com *.ibytedtos.com https://pl.ecency.com" + SDC_HELMET_CONNECTSRC: "'self' hive.blog https://hive.blog https://images.hive.blog https://api.hive.blog https://anyx.io https://api.openhive.network https://api.hivekings.com https://hivebuzz.me https://peakd.com https://www.reddit.com *.ibytedtos.com" SDC_HELMET_STYLESRC: "'self' 'unsafe-inline' fonts.googleapis.com platform.twitter.com www.reddit.com cdn.embedly.com *.tiktokcdn.com" SDC_HELMET_FONTSRC: "data: fonts.gstatic.com cdn.embedly.com" WALLET_URL: https://wallet.hive.blog diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index 3d0a8424e..e73f0c6d6 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -13,7 +13,7 @@ services: SDC_SITE_DOMAIN: staging-blog.hive.io SDC_IMAGE_PROXY_PREFIX: https://images.hive.blog/ SDC_UPLOAD_IMAGE_URL: https://images.hive.blog - SDC_HELMET_CONNECTSRC: "'self' https://api.hive.blog https://staging.hive.blog https://images.hive.blog https://anyx.io https://api.openhive.network https://api.hivekings.com https://hivebuzz.me https://peakd.com https://www.reddit.com *.ibytedtos.com https://pl.ecency.com" + SDC_HELMET_CONNECTSRC: "'self' https://api.hive.blog https://staging.hive.blog https://images.hive.blog https://anyx.io https://api.openhive.network https://api.hivekings.com https://hivebuzz.me https://peakd.com https://www.reddit.com *.ibytedtos.com" SDC_HELMET_STYLESRC: "'self' 'unsafe-inline' fonts.googleapis.com platform.twitter.com www.reddit.com cdn.embedly.com *.tiktokcdn.com" SDC_HELMET_FONTSRC: "data: fonts.gstatic.com cdn.embedly.com" WALLET_URL: https://wallet.hive.blog diff --git a/src/server/server-html.jsx b/src/server/server-html.jsx index 8de21609d..01517cbdc 100644 --- a/src/server/server-html.jsx +++ b/src/server/server-html.jsx @@ -100,22 +100,6 @@ export default function ServerHTML({ {assets.style.map((href) => ( ))} -