From a18f4c3b8df40b13dc3d64fe6fcdc9844466389e Mon Sep 17 00:00:00 2001 From: Aaron Qian Date: Fri, 11 Nov 2022 17:44:02 -0800 Subject: [PATCH] set explicit comparisions for feature envvars so js can properly optimize --- assets/scripts/features/darkmode/darkreader.js | 4 +++- assets/scripts/features/darkmode/index.js | 4 +++- assets/scripts/features/flowchart/index.js | 2 +- assets/scripts/features/index.js | 14 +++++++------- assets/scripts/features/math/index.js | 2 +- assets/scripts/features/syntaxhighlight/index.js | 2 +- assets/scripts/features/videoplayer/index.js | 2 +- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/assets/scripts/features/darkmode/darkreader.js b/assets/scripts/features/darkmode/darkreader.js index a7886fb..d32f81c 100644 --- a/assets/scripts/features/darkmode/darkreader.js +++ b/assets/scripts/features/darkmode/darkreader.js @@ -1,4 +1,4 @@ -import { enable, disable, auto } from 'darkreader'; +import { enable, disable, auto, setFetchMethod } from 'darkreader'; import { darkmode } from "@params"; const { @@ -7,6 +7,8 @@ const { fixes, } = darkmode.darkreader; +setFetchMethod(window.fetch) + export function setSchemeDark() { enable(theme, fixes); } diff --git a/assets/scripts/features/darkmode/index.js b/assets/scripts/features/darkmode/index.js index 3d9f55e..9809483 100644 --- a/assets/scripts/features/darkmode/index.js +++ b/assets/scripts/features/darkmode/index.js @@ -1,9 +1,11 @@ const PERSISTENCE_KEY = 'darkmode:color-scheme'; async function getService() { - if(process.env.FEATURE_DARKMODE_DARKREADER) { + if(process.env.FEATURE_DARKMODE_DARKREADER === '1') { return await import('./darkreader'); } + + throw Error(' No service defined for feature markMode.'); } window.addEventListener('DOMContentLoaded', async () => { diff --git a/assets/scripts/features/flowchart/index.js b/assets/scripts/features/flowchart/index.js index a989758..bafc03c 100644 --- a/assets/scripts/features/flowchart/index.js +++ b/assets/scripts/features/flowchart/index.js @@ -1,3 +1,3 @@ -if (process.env.FEATURE_FLOWCHART_MERMAID) { +if (process.env.FEATURE_FLOWCHART_MERMAID === '1') { import('./mermaid'); } diff --git a/assets/scripts/features/index.js b/assets/scripts/features/index.js index 19e7414..df7d50d 100644 --- a/assets/scripts/features/index.js +++ b/assets/scripts/features/index.js @@ -1,27 +1,27 @@ -if (process.env.FEATURE_VIDEOPLAYER) { +if (process.env.FEATURE_VIDEOPLAYER === '1') { import('./videoplayer'); } -if (process.env.FEATURE_TOC) { +if (process.env.FEATURE_TOC === '1') { import('./toc'); } -if (process.env.FEATURE_DARKMODE) { +if (process.env.FEATURE_DARKMODE === '1') { import('./darkmode'); } -if (process.env.FEATURE_FLOWCHART) { +if (process.env.FEATURE_FLOWCHART === '1') { import('./flowchart'); } -if (process.env.FEATURE_SYNTAXHIGHLIGHT) { +if (process.env.FEATURE_SYNTAXHIGHLIGHT === '1') { import('./syntaxhighlight'); } -if (process.env.FEATURE_MATH) { +if (process.env.FEATURE_MATH === '1') { import('./math'); } -if (process.env.FEATURE_EMBEDPDF) { +if (process.env.FEATURE_EMBEDPDF === '1') { import('./embedpdf'); } diff --git a/assets/scripts/features/math/index.js b/assets/scripts/features/math/index.js index c06fad4..d23672e 100644 --- a/assets/scripts/features/math/index.js +++ b/assets/scripts/features/math/index.js @@ -1,3 +1,3 @@ -if (process.env.FEATURE_MATH_KATEX) { +if (process.env.FEATURE_MATH_KATEX === '1') { import('./katex'); } diff --git a/assets/scripts/features/syntaxhighlight/index.js b/assets/scripts/features/syntaxhighlight/index.js index 689e67a..4db5520 100644 --- a/assets/scripts/features/syntaxhighlight/index.js +++ b/assets/scripts/features/syntaxhighlight/index.js @@ -1,3 +1,3 @@ -if (process.env.FEATURE_SYNTAXHIGHLIGHT_HLJS) { +if (process.env.FEATURE_SYNTAXHIGHLIGHT_HLJS === '1') { import('./hljs'); } diff --git a/assets/scripts/features/videoplayer/index.js b/assets/scripts/features/videoplayer/index.js index 76c2a3d..e015ea6 100644 --- a/assets/scripts/features/videoplayer/index.js +++ b/assets/scripts/features/videoplayer/index.js @@ -1,3 +1,3 @@ -if (process.env.FEATURE_VIDEOPLAYER_PLYR) { +if (process.env.FEATURE_VIDEOPLAYER_PLYR === '1') { import('./plyr'); }