Skip to content

Add script import option #952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wherewhere wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add script import option #952

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b469f42
Add options for next_vendors
wherewhere Mar 14, 2026
679b07f
Set all defer manually
wherewhere Mar 14, 2026
d38bdb5
Treat every script load by next_js as user scripts
wherewhere Mar 14, 2026
712c78d
Set the dependences of defer script defer
wherewhere Mar 14, 2026
71f5160
Add warn when defer and async both true
wherewhere Mar 14, 2026
18dbb8e
Set scripts which need page:loaded event to defer
wherewhere Mar 14, 2026
9564b7a
Set defer to false if async is true
wherewhere Mar 14, 2026
76a9671
Add defer or async for some next_vendors
wherewhere Mar 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion layout/_partials/comments.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
</div>
{%- endfor %}
{{- next_js('comments-buttons.js', { pjax: true }) }}
{{- next_js('comments-buttons.js', { pjax: true, async: true }) }}
{%- elif theme.comments.style == 'tabs' %}
<div class="tabs tabs-comment">
<ul class="nav-tabs">
Expand Down
2 changes: 1 addition & 1 deletion layout/_partials/page/schedule.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="event-list">
</div>
{{- next_js('schedule.js', { pjax: true }) }}
{{- next_js('schedule.js', { pjax: true, async: true }) }}
14 changes: 7 additions & 7 deletions layout/_scripts/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{%- include 'vendors.njk' -%}

{%- if theme.injects.comment.length > 1 %}
{{- next_js('comments.js') }}
{{- next_js('comments.js', { defer: true }) }}
{%- endif %}

{{- next_js('utils.js') }}
{{- next_js('utils.js', { defer: true }) }}
{%- if theme.motion.enable %}
{{- next_js('motion.js') }}
{{- next_js('motion.js', { defer: true }) }}
{%- endif %}

{%- if theme.sidebar.display !== 'remove' %}
{{- next_js('sidebar.js') }}
{{- next_js('sidebar.js', { defer: true }) }}
{%- endif %}

{{- next_js('next-boot.js') }}
{{- next_js('next-boot.js', { defer: true }) }}
{%- if theme.bookmark.enable %}
{{- next_js('bookmark.js') }}
{{- next_js('bookmark.js', { defer: true }) }}
{%- endif %}
{%- if theme.pjax %}
{{- next_js('pjax.js') }}
{{- next_js('pjax.js', { defer: true }) }}
{%- endif %}
2 changes: 1 addition & 1 deletion layout/_third-party/addtoany.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{%- if theme.addtoany.enable %}
{{ next_js('third-party/addtoany.js') }}
{{ next_js('third-party/addtoany.js', { defer: true }) }}
{%- endif %}
2 changes: 1 addition & 1 deletion layout/_third-party/analytics/baidu-analytics.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- if theme.baidu_analytics %}
{{ next_js('third-party/analytics/baidu-analytics.js') }}
{{ next_js('third-party/analytics/baidu-analytics.js', { async: true }) }}
<script async src="https://hm.baidu.com/hm.js?{{ theme.baidu_analytics }}"></script>
{%- endif %}
2 changes: 1 addition & 1 deletion layout/_third-party/analytics/google-analytics.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<script async src="https://www.googletagmanager.com/gtag/js?id={{ theme.google_analytics.tracking_id }}"></script>
{%- endif %}
{{ next_data('google_analytics', theme.google_analytics) }}
{{ next_js('third-party/analytics/google-analytics.js') }}
{{ next_js('third-party/analytics/google-analytics.js', { async: true }) }}
{%- endif %}
2 changes: 1 addition & 1 deletion layout/_third-party/analytics/growingio.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{%- if theme.growingio_analytics %}
<script async src="//assets.growingio.com/2.1/gio.js"></script>
{{ next_data('growingio_analytics', theme.growingio_analytics) }}
{{ next_js('third-party/analytics/growingio.js') }}
{{ next_js('third-party/analytics/growingio.js', { async: true }) }}
{%- endif %}
2 changes: 1 addition & 1 deletion layout/_third-party/analytics/matomo.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- if theme.matomo.enable %}
{{ next_data('matomo', theme.matomo) }}
{{ next_js('third-party/analytics/matomo.js') }}
{{ next_js('third-party/analytics/matomo.js', { async: true }) }}
{%- endif %}
2 changes: 1 addition & 1 deletion layout/_third-party/chat/chatra.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{{ next_data('chatra', theme.chatra) }}
{{ next_js('third-party/chat/chatra.js') }}
{{ next_js('third-party/chat/chatra.js', { defer: true }) }}
<script{{ ' async' if theme.chatra.async }} src="https://call.chatra.io/chatra.js"></script>
2 changes: 1 addition & 1 deletion layout/_third-party/chat/tidio.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<script src="//code.tidio.co/{{ theme.tidio.key }}.js"></script>
{{ next_js('third-party/chat/tidio.js') }}
{{ next_js('third-party/chat/tidio.js', { defer: true }) }}
2 changes: 1 addition & 1 deletion layout/_third-party/comments/changyan.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{ next_data('changyan', theme.changyan) }}
{{ next_js('third-party/comments/changyan.js') }}
{{ next_js('third-party/comments/changyan.js', { async: true }) }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
2 changes: 1 addition & 1 deletion layout/_third-party/comments/disqus.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
disqus: __('disqus')
}
}) }}
{{ next_js('third-party/comments/disqus.js') }}
{{ next_js('third-party/comments/disqus.js', { async: true }) }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
2 changes: 1 addition & 1 deletion layout/_third-party/comments/disqusjs.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
{{ next_data('disqusjs', theme.disqusjs, {
js: theme.vendors.disqusjs_js
}) }}
{{ next_js('third-party/comments/disqusjs.js') }}
{{ next_js('third-party/comments/disqusjs.js', { async: true }) }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
2 changes: 1 addition & 1 deletion layout/_third-party/comments/gitalk.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
js: theme.vendors.gitalk_js,
path_md5: gitalk_md5(page.path)
}) }}
{{ next_js('third-party/comments/gitalk.js') }}
{{ next_js('third-party/comments/gitalk.js', { async: true }) }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
2 changes: 1 addition & 1 deletion layout/_third-party/comments/isso.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{ next_data('isso', theme.isso) }}
{{ next_js('third-party/comments/isso.js') }}
{{ next_js('third-party/comments/isso.js', { async: true }) }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
2 changes: 1 addition & 1 deletion layout/_third-party/comments/livere.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{ next_js('third-party/comments/livere.js') }}
{{ next_js('third-party/comments/livere.js', { async: true }) }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
2 changes: 1 addition & 1 deletion layout/_third-party/comments/utterances.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{ next_data('utterances', theme.utterances) }}
{{ next_js('third-party/comments/utterances.js') }}
{{ next_js('third-party/comments/utterances.js', { async: true }) }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
2 changes: 1 addition & 1 deletion layout/_third-party/fancybox.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{%- if theme.fancybox %}
{{ next_js('third-party/fancybox.js') }}
{{ next_js('third-party/fancybox.js', { defer: true }) }}
{%- endif %}
2 changes: 1 addition & 1 deletion layout/_third-party/math/katex.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
{{ next_data('katex', {
copy_tex_js: theme.vendors.copy_tex_js
}) }}
{{ next_js('third-party/math/katex.js') }}
{{ next_js('third-party/math/katex.js', { async: true }) }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
{%- endif %}
2 changes: 1 addition & 1 deletion layout/_third-party/math/mathjax.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ next_data('mathjax', theme.math.mathjax, {
js: theme.vendors.mathjax
}) }}
{{ next_js('third-party/math/mathjax.js') }}
{{ next_js('third-party/math/mathjax.js', { async: true }) }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
2 changes: 1 addition & 1 deletion layout/_third-party/pace.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{%- if theme.pace.enable %}
{{ next_js('third-party/pace.js') }}
{{ next_js('third-party/pace.js', { defer: true }) }}
{%- endif %}
2 changes: 1 addition & 1 deletion layout/_third-party/quicklink.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
{{ next_data('quicklink', page.quicklink, {
url: url | replace(r/index\.html$/, '')
}) }}
{{ next_js('third-party/quicklink.js') }}
{{ next_js('third-party/quicklink.js', { async: true }) }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
{%- endif %}
5 changes: 2 additions & 3 deletions layout/_third-party/search/algolia-search.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
{{ next_vendors('algolia_search') }}

{{- next_js('third-party/search/algolia-search.js') }}
{{ next_vendors('algolia_search', { defer: true }) }}
{{- next_js('third-party/search/algolia-search.js', { defer: true }) }}
4 changes: 2 additions & 2 deletions layout/_third-party/search/localsearch.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{ next_vendors('local_search') }}
{{ next_js('third-party/search/local-search.js') }}
{{ next_vendors('local_search', { defer: true }) }}
{{ next_js('third-party/search/local-search.js', { defer: true }) }}
6 changes: 3 additions & 3 deletions layout/_third-party/statistics/firestore.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{%- if theme.firestore.enable %}
{{ next_vendors('firebase_app') }}
{{ next_vendors('firebase_firestore') }}
{{ next_vendors('firebase_app', { defer: true }) }}
{{ next_vendors('firebase_firestore', { defer: true }) }}
{{ next_data('firestore', theme.firestore) }}
{{ next_js('third-party/statistics/firestore.js') }}
{{ next_js('third-party/statistics/firestore.js', { defer: true }) }}
{%- endif %}
2 changes: 1 addition & 1 deletion layout/_third-party/statistics/lean-analytics.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- if theme.leancloud_visitors.enable %}
{{ next_data('leancloud_visitors', theme.leancloud_visitors) }}
{{ next_js('third-party/statistics/lean-analytics.js') }}
{{ next_js('third-party/statistics/lean-analytics.js', { defer: true }) }}
{%- endif %}
2 changes: 1 addition & 1 deletion layout/_third-party/tags/mermaid.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
{{ next_data('mermaid', theme.mermaid, {
js: theme.vendors.mermaid
}) }}
{{ next_js('third-party/tags/mermaid.js') }}
{{ next_js('third-party/tags/mermaid.js', { defer: true }) }}
{%- endif %}
2 changes: 1 addition & 1 deletion layout/_third-party/tags/pdf.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
object_url: theme.vendors.pdfobject,
url: url_for('lib/pdf/web/viewer.html')
}) }}
{{ next_js('third-party/tags/pdf.js') }}
{{ next_js('third-party/tags/pdf.js', { defer: true }) }}
{%- endif %}
2 changes: 1 addition & 1 deletion layout/_third-party/tags/wavedrom.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
{{ next_data('wavedrom_skin', theme.wavedrom, {
js: theme.vendors.wavedrom_skin
}) }}
{{ next_js('third-party/tags/wavedrom.js') }}
{{ next_js('third-party/tags/wavedrom.js', { defer: true }) }}
{%- endif %}
15 changes: 10 additions & 5 deletions scripts/helpers/engine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ hexo.extend.helper.register('next_inject', function(point) {

hexo.extend.helper.register('next_js', function(file, {
pjax = false,
module = false
module = false,
defer = false,
async = false
} = {}) {
Comment thread
wherewhere marked this conversation as resolved.
Comment thread
wherewhere marked this conversation as resolved.
Comment thread
wherewhere marked this conversation as resolved.
const { next_version } = this;
const { internal, custom_cdn_url } = this.theme.vendors;
Expand All @@ -32,18 +34,21 @@ hexo.extend.helper.register('next_js', function(file, {
custom : custom_cdn_url
});
const src = links[internal] || links.local;
return `<script ${pjax ? 'data-pjax ' : ''}${module ? 'type="module" ' : ''}src="${src}" defer></script>`;
return `<script ${pjax ? 'data-pjax ' : ''}${module ? 'type="module" ' : ''}${defer ? 'defer ' : ''}${async ? 'async ' : ''}src="${src}"></script>`;
Comment thread
wherewhere marked this conversation as resolved.
Comment thread
wherewhere marked this conversation as resolved.
});

hexo.extend.helper.register('next_vendors', function(name) {
hexo.extend.helper.register('next_vendors', function(name, {
defer = false,
async = false
} = {}) {
const { url, integrity } = this.theme.vendors[name];
const type = url.endsWith('css') ? 'css' : 'js';
if (type === 'css') {
if (integrity) return `<link rel="stylesheet" href="${url}" integrity="${integrity}" crossorigin="anonymous">`;
return `<link rel="stylesheet" href="${url}">`;
}
if (integrity) return `<script src="${url}" integrity="${integrity}" crossorigin="anonymous" defer></script>`;
return `<script src="${url}" defer></script>`;
if (integrity) return `<script ${defer ? 'defer ' : ''}${async ? 'async ' : ''}src="${url}" integrity="${integrity}" crossorigin="anonymous"></script>`;
return `<script ${defer ? 'defer ' : ''}${async ? 'async ' : ''}src="${url}"></script>`;
Comment thread
wherewhere marked this conversation as resolved.
Comment thread
wherewhere marked this conversation as resolved.
});
Comment on lines +37 to 60

hexo.extend.helper.register('next_data', function(name, ...data) {
Expand Down
Loading