Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
12 changes: 6 additions & 6 deletions layout/_scripts/index.njk
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') }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
{%- 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
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/chat/chatra.njk
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
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/fancybox.njk
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/pace.njk
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 %}
5 changes: 2 additions & 3 deletions layout/_third-party/search/algolia-search.njk
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', { async: true }) }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
{{- next_js('third-party/search/algolia-search.js', { defer: true }) }}
4 changes: 2 additions & 2 deletions layout/_third-party/search/localsearch.njk
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', { async: true }) }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
{{ next_js('third-party/search/local-search.js', { defer: true }) }}
6 changes: 3 additions & 3 deletions layout/_third-party/statistics/firestore.njk
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', { async: true }) }}
{{ next_vendors('firebase_firestore', { async: true }) }}
Comment thread
wherewhere marked this conversation as resolved.
Outdated
{{ 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
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
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
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
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
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