From d87791ab3d1b6d2adfbe3b603ce432419cd611ad Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sun, 28 Jun 2020 15:54:41 +0800
Subject: [PATCH] fix loading assets from CDN

---
 resources/assets/src/scripts/init.ts | 17 +++++++++--------
 resources/views/shared/head.twig     |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/resources/assets/src/scripts/init.ts b/resources/assets/src/scripts/init.ts
index 1f57e24f..6caeb031 100644
--- a/resources/assets/src/scripts/init.ts
+++ b/resources/assets/src/scripts/init.ts
@@ -1,13 +1,14 @@
 /* eslint-disable prefer-const */
 /* eslint-disable @typescript-eslint/camelcase */
 
-// @ts-ignore
 declare let __webpack_public_path__: string
 
-const url = new URL(blessing.base_url)
-url.port = '8080'
-
-__webpack_public_path__ =
-  process.env.NODE_ENV === 'development'
-    ? url.toString()
-    : `${blessing.base_url}/app/`
+if (process.env.NODE_ENV === 'development') {
+  const url = new URL(blessing.base_url)
+  url.port = '8080'
+  __webpack_public_path__ = url.toString()
+} else {
+  const link = document.querySelector<HTMLLinkElement>('link#cdn-host')
+  const base = link?.href ?? blessing.base_url
+  __webpack_public_path__ = `${base}/app/`
+}
diff --git a/resources/views/shared/head.twig b/resources/views/shared/head.twig
index 9c537659..d187ca60 100644
--- a/resources/views/shared/head.twig
+++ b/resources/views/shared/head.twig
@@ -8,7 +8,7 @@
 {{ seo.extra|striptags('<meta>')|raw }}
 <link rel="preconnect" href="https://cdn.jsdelivr.net/" crossorigin>
 {% if custom_cdn_host %}
-  <link rel="preconnect" href="{{ custom_cdn_host }}" crossorigin>
+  <link rel="preconnect" href="{{ custom_cdn_host }}" id="cdn-host" crossorigin>
 {% endif %}
 <script id="blessing-globals" type="application/json">{{ blessing|json_encode|raw }}</script>
 <script src="{{ url('/meta.js') }}"></script>