Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix loading assets from CDN

Browse Source
This commit is contained in:
Pig Fang 2020-06-28 15:54:41 +08:00
parent 9b6bf7ba7a
commit d87791ab3d
No known key found for this signature in database
GPG Key ID: A8198F548DADA9E2
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
resources/assets/src/scripts/init.ts
View File

@ -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/`
}

2
resources/views/shared/head.twig
View File

@ -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>