From 768d2ef4dc38e435f3c9b7f7e8597526ea931c70 Mon Sep 17 00:00:00 2001 From: stevejpurves Date: Mon, 1 Apr 2024 21:42:54 +0100 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=9A=A5=20allow=20CONTENT=5FCDN=20host?= =?UTF-8?q?=20to=20be=20speced?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/article/app/utils/loaders.server.ts | 5 ++++- themes/book/app/utils/loaders.server.ts | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/themes/article/app/utils/loaders.server.ts b/themes/article/app/utils/loaders.server.ts index b93422162..7fe0c164a 100644 --- a/themes/article/app/utils/loaders.server.ts +++ b/themes/article/app/utils/loaders.server.ts @@ -10,8 +10,10 @@ import { } from '@myst-theme/common'; import { responseNoArticle, responseNoSite, getDomainFromRequest } from '@myst-theme/site'; +const HOST_URL = process.env.CONTENT_CDN_HOST ? new URL(process.env.CONTENT_CDN_HOST) : undefined; +const CONTENT_CDN_HOST = HOST_URL ? HOST_URL.hostname : 'localhost'; const CONTENT_CDN_PORT = process.env.CONTENT_CDN_PORT ?? '3100'; -const CONTENT_CDN = `http://localhost:${CONTENT_CDN_PORT}`; +const CONTENT_CDN = `http://${CONTENT_CDN_HOST}:${CONTENT_CDN_PORT}`; export async function getConfig(): Promise { const url = `${CONTENT_CDN}/config.json`; @@ -34,6 +36,7 @@ function updateLink(url: string) { if (process.env.MODE === 'static') { return `/myst_assets_folder${url}`; } + console.log('rewriting:', url, `${CONTENT_CDN}${url}`); return `${CONTENT_CDN}${url}`; } diff --git a/themes/book/app/utils/loaders.server.ts b/themes/book/app/utils/loaders.server.ts index 33380a18e..b618e7f91 100644 --- a/themes/book/app/utils/loaders.server.ts +++ b/themes/book/app/utils/loaders.server.ts @@ -10,8 +10,10 @@ import { import { redirect } from '@remix-run/node'; import { responseNoArticle, responseNoSite, getDomainFromRequest } from '@myst-theme/site'; +const HOST_URL = process.env.CONTENT_CDN_HOST ? new URL(process.env.CONTENT_CDN_HOST) : undefined; +const CONTENT_CDN_HOST = HOST_URL ? HOST_URL.hostname : 'localhost'; const CONTENT_CDN_PORT = process.env.CONTENT_CDN_PORT ?? '3100'; -const CONTENT_CDN = `http://localhost:${CONTENT_CDN_PORT}`; +const CONTENT_CDN = `http://${CONTENT_CDN_HOST}:${CONTENT_CDN_PORT}`; export async function getConfig(): Promise { const url = `${CONTENT_CDN}/config.json`; @@ -34,6 +36,7 @@ function updateLink(url: string) { if (process.env.MODE === 'static') { return `/myst_assets_folder${url}`; } + console.log('rewriting:', url, `${CONTENT_CDN}${url}`); return `${CONTENT_CDN}${url}`; } From 09e13d19a48d47ac07783e4deac4dd7b55ecd2de Mon Sep 17 00:00:00 2001 From: stevejpurves Date: Mon, 1 Apr 2024 22:11:24 +0100 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=93=87=20allow=20origin=20or=20hostna?= =?UTF-8?q?me=20in=20CONTENT=5FCDN=5FHOST?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/article/app/utils/loaders.server.ts | 6 ++++-- themes/book/app/utils/loaders.server.ts | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/themes/article/app/utils/loaders.server.ts b/themes/article/app/utils/loaders.server.ts index 7fe0c164a..266398f5a 100644 --- a/themes/article/app/utils/loaders.server.ts +++ b/themes/article/app/utils/loaders.server.ts @@ -10,8 +10,10 @@ import { } from '@myst-theme/common'; import { responseNoArticle, responseNoSite, getDomainFromRequest } from '@myst-theme/site'; -const HOST_URL = process.env.CONTENT_CDN_HOST ? new URL(process.env.CONTENT_CDN_HOST) : undefined; -const CONTENT_CDN_HOST = HOST_URL ? HOST_URL.hostname : 'localhost'; +const CONTENT_CDN_HOST = + process.env.CONTENT_CDN_HOST && process.env.CONTENT_CDN_HOST.startsWith('http') + ? new URL(process.env.CONTENT_CDN_HOST).hostname + : process.env.CONTENT_CDN_HOST ?? 'localhost'; const CONTENT_CDN_PORT = process.env.CONTENT_CDN_PORT ?? '3100'; const CONTENT_CDN = `http://${CONTENT_CDN_HOST}:${CONTENT_CDN_PORT}`; diff --git a/themes/book/app/utils/loaders.server.ts b/themes/book/app/utils/loaders.server.ts index b618e7f91..7eb794a97 100644 --- a/themes/book/app/utils/loaders.server.ts +++ b/themes/book/app/utils/loaders.server.ts @@ -10,8 +10,10 @@ import { import { redirect } from '@remix-run/node'; import { responseNoArticle, responseNoSite, getDomainFromRequest } from '@myst-theme/site'; -const HOST_URL = process.env.CONTENT_CDN_HOST ? new URL(process.env.CONTENT_CDN_HOST) : undefined; -const CONTENT_CDN_HOST = HOST_URL ? HOST_URL.hostname : 'localhost'; +const CONTENT_CDN_HOST = + process.env.CONTENT_CDN_HOST && process.env.CONTENT_CDN_HOST.startsWith('http') + ? new URL(process.env.CONTENT_CDN_HOST).hostname + : process.env.CONTENT_CDN_HOST ?? 'localhost'; const CONTENT_CDN_PORT = process.env.CONTENT_CDN_PORT ?? '3100'; const CONTENT_CDN = `http://${CONTENT_CDN_HOST}:${CONTENT_CDN_PORT}`; From 4cfbebdb718a5b799096716115586d9613dd2fd4 Mon Sep 17 00:00:00 2001 From: stevejpurves Date: Mon, 1 Apr 2024 22:13:31 +0100 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=93=97changeset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/serious-beds-jog.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/serious-beds-jog.md diff --git a/.changeset/serious-beds-jog.md b/.changeset/serious-beds-jog.md new file mode 100644 index 000000000..9e345b14e --- /dev/null +++ b/.changeset/serious-beds-jog.md @@ -0,0 +1,6 @@ +--- +'@myst-theme/article': patch +'@myst-theme/book': patch +--- + +Theme now looks to CONTENT_CDN_HOST for static url re-writing From 099883f77d08ce93cd0aba042a860458b37a25fa Mon Sep 17 00:00:00 2001 From: Steve Purves Date: Tue, 2 Apr 2024 21:36:19 +0100 Subject: [PATCH 4/5] Update themes/book/app/utils/loaders.server.ts Co-authored-by: Rowan Cockett --- themes/book/app/utils/loaders.server.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/themes/book/app/utils/loaders.server.ts b/themes/book/app/utils/loaders.server.ts index 7eb794a97..52d0a0257 100644 --- a/themes/book/app/utils/loaders.server.ts +++ b/themes/book/app/utils/loaders.server.ts @@ -38,7 +38,6 @@ function updateLink(url: string) { if (process.env.MODE === 'static') { return `/myst_assets_folder${url}`; } - console.log('rewriting:', url, `${CONTENT_CDN}${url}`); return `${CONTENT_CDN}${url}`; } From d4eca58c0e4cb34111126e5f5025fadcd0a2acaa Mon Sep 17 00:00:00 2001 From: Steve Purves Date: Tue, 2 Apr 2024 21:36:26 +0100 Subject: [PATCH 5/5] Update themes/article/app/utils/loaders.server.ts Co-authored-by: Rowan Cockett --- themes/article/app/utils/loaders.server.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/themes/article/app/utils/loaders.server.ts b/themes/article/app/utils/loaders.server.ts index 266398f5a..2d21d1893 100644 --- a/themes/article/app/utils/loaders.server.ts +++ b/themes/article/app/utils/loaders.server.ts @@ -38,7 +38,6 @@ function updateLink(url: string) { if (process.env.MODE === 'static') { return `/myst_assets_folder${url}`; } - console.log('rewriting:', url, `${CONTENT_CDN}${url}`); return `${CONTENT_CDN}${url}`; }