harald/blog
1
0
Fork 0
Code Activity

abridge update

Browse source 
Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
This commit is contained in:
Harald Hoyer 2024-03-22 09:36:26 +01:00
parent 03c1097fa3
commit ee2611a5d7
1 changed files with 71 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
package_abridge.js
View file

@ -8,6 +8,9 @@ const util = require("util");
const { exec } = require("child_process"); const { exec } = require("child_process");
const execPromise = util.promisify(exec); const execPromise = util.promisify(exec);
if (!(fs.existsSync('config.toml'))) {
throw new Error('ERROR: cannot find config.toml!');
}
const tomlString = String(fs.readFileSync('config.toml')); const tomlString = String(fs.readFileSync('config.toml'));
const data = TOML.parse(tomlString); const data = TOML.parse(tomlString);
const js_prestyle = data.extra.js_prestyle; const js_prestyle = data.extra.js_prestyle;
@ -37,17 +40,23 @@ async function execWrapper(cmd) {
console.log(stdout); console.log(stdout);
} }
if (stderr) { if (stderr) {
console.log('Error: '+stderr); console.log('ERROR: '+stderr);
} }
} }
async function abridge() { async function abridge() {
if (offline === false) { if (offline === false) {
replace.sync({files: 'config.toml', from: /base_url.*=.*/g, to: "base_url = \""+online_url+"\""}); if (typeof online_url !== 'undefined' && typeof online_indexformat !== 'undefined') {
replace.sync({files: 'config.toml', from: /index_format.*=.*/g, to: "index_format = \""+online_indexformat+"\""}); replace.sync({files: 'config.toml', from: /base_url.*=.*/g, to: "base_url = \""+online_url+"\""});
replace.sync({files: 'config.toml', from: /index_format.*=.*/g, to: "index_format = \""+online_indexformat+"\""});
}
} else if (offline === true) { } else if (offline === true) {
replace.sync({files: 'config.toml', from: /base_url.*=.*/g, to: "base_url = \""+__dirname+"\/public\""}); if (typeof online_url !== 'undefined' && typeof online_indexformat !== 'undefined') {
replace.sync({files: 'config.toml', from: /index_format.*=.*/g, to: "index_format = \"elasticlunr_javascript\""}); replace.sync({files: 'config.toml', from: /base_url.*=.*/g, to: "base_url = \""+__dirname+"\/public\""});
replace.sync({files: 'config.toml', from: /index_format.*=.*/g, to: "index_format = \"elasticlunr_javascript\""});
} else {
throw new Error('ERROR: offline = true requires that online_url and online_indexformat are set in config.toml, so that the base_url and index_format can be restored if offline is later set to false.');
}
} }
console.log('Zola Build to generate files for minification:'); console.log('Zola Build to generate files for minification:');
@ -105,64 +114,69 @@ async function abridge() {
} }
if (pwa) {// Update pwa settings, file list, and hashes. if (pwa) {// Update pwa settings, file list, and hashes.
// update from abridge theme. if (typeof pwa_VER !== 'undefined' && typeof pwa_NORM_TTL !== 'undefined' && typeof pwa_LONG_TTL !== 'undefined' && typeof pwa_TTL_NORM !== 'undefined' && typeof pwa_TTL_LONG !== 'undefined' && typeof pwa_TTL_EXEMPT !== 'undefined') {
fs.copyFileSync(bpath+'static/sw.js', 'static/sw.js'); // update from abridge theme.
fs.copyFileSync(bpath+'static/js/sw_load.js', 'static/js/sw_load.js'); fs.copyFileSync(bpath+'static/sw.js', 'static/sw.js');
// Update settings in PWA javascript file, using options parsed from config.toml. sw.min.js?v=3.10.0", "++" fs.copyFileSync(bpath+'static/js/sw_load.js', 'static/js/sw_load.js');
if (fs.existsSync('static/js/sw_load.js')) { // Update settings in PWA javascript file, using options parsed from config.toml. sw.min.js?v=3.10.0", "++"
sw_load_min = '.js?v='; if (fs.existsSync('static/js/sw_load.js')) {
if (js_bundle) { sw_load_min = '.js?v=';
sw_load_min = '.min.js?v='; if (js_bundle) {
sw_load_min = '.min.js?v=';
}
replace.sync({files: 'static/js/sw_load.js', from: /sw.*v=.*/g, to: "sw"+sw_load_min+pwa_VER+"\","});
} }
replace.sync({files: 'static/js/sw_load.js', from: /sw.*v=.*/g, to: "sw"+sw_load_min+pwa_VER+"\","}); if (fs.existsSync('static/sw.js')) {
} replace.sync({files: 'static/sw.js', from: /NORM_TTL.*=.*/g, to: "NORM_TTL = "+pwa_NORM_TTL+";"});
if (fs.existsSync('static/sw.js')) { replace.sync({files: 'static/sw.js', from: /LONG_TTL.*=.*/g, to: "LONG_TTL = "+pwa_LONG_TTL+";"});
replace.sync({files: 'static/sw.js', from: /NORM_TTL.*=.*/g, to: "NORM_TTL = "+pwa_NORM_TTL+";"}); replace.sync({files: 'static/sw.js', from: /TTL_NORM.*=.*/g, to: "TTL_NORM = ["+pwa_TTL_NORM+"];"});
replace.sync({files: 'static/sw.js', from: /LONG_TTL.*=.*/g, to: "LONG_TTL = "+pwa_LONG_TTL+";"}); replace.sync({files: 'static/sw.js', from: /TTL_LONG.*=.*/g, to: "TTL_LONG = ["+pwa_TTL_LONG+"];"});
replace.sync({files: 'static/sw.js', from: /TTL_NORM.*=.*/g, to: "TTL_NORM = ["+pwa_TTL_NORM+"];"}); replace.sync({files: 'static/sw.js', from: /TTL_EXEMPT.*=.*/g, to: "TTL_EXEMPT = ["+pwa_TTL_EXEMPT+"];"});
replace.sync({files: 'static/sw.js', from: /TTL_LONG.*=.*/g, to: "TTL_LONG = ["+pwa_TTL_LONG+"];"});
replace.sync({files: 'static/sw.js', from: /TTL_EXEMPT.*=.*/g, to: "TTL_EXEMPT = ["+pwa_TTL_EXEMPT+"];"});
}
if (pwa_cache_all) {
// Generate array from the list of files, for the entire site.
var dir = 'public';
try {
fs.mkdirSync(dir);
} catch(e) {
if (e.code != 'EEXIST') throw e;
} }
const path = './public/';
cache = 'this.BASE_CACHE_FILES = [';
files = fs.readdirSync(path, { recursive: true, withFileTypes: false })
.forEach(
(file) => {
// check if is directory, if not then add the path/file
if (!fs.lstatSync(path+file).isDirectory()) {
// format output
item = "/"+file.replace(/index\.html$/i,'');// strip index.html from path
item = item.replace(/^\/sw(\.min)?\.js/i,'');// dont cache service worker
// if formatted output is not empty line then append it to cache var if (pwa_cache_all === true) {
if (item != '') {// skip empty lines console.log('info: pwa_cache_all = true in config.toml, so caching the entire site.\n');
cache = cache+"'"+item+"',"; // Generate array from the list of files, for the entire site.
var dir = 'public';
try {
fs.mkdirSync(dir);
} catch(e) {
if (e.code != 'EEXIST') throw e;
}
const path = './public/';
cache = 'this.BASE_CACHE_FILES = [';
files = fs.readdirSync(path, { recursive: true, withFileTypes: false })
.forEach(
(file) => {
// check if is directory, if not then add the path/file
if (!fs.lstatSync(path+file).isDirectory()) {
// format output
item = "/"+file.replace(/index\.html$/i,'');// strip index.html from path
item = item.replace(/^\/sw(\.min)?\.js/i,'');// dont cache service worker
// if formatted output is not empty line then append it to cache var
if (item != '') {// skip empty lines
cache = cache+"'"+item+"',";
}
} }
} }
} );
); cache = cache.slice(0, -1)+'];'// remove the last comma and close the array
cache = cache.slice(0, -1)+'];'// remove the last comma and close the array } else if (pwa_BASE_CACHE_FILES) {
} else if (pwa_BASE_CACHE_FILES) { cache = 'this.BASE_CACHE_FILES = ['+pwa_BASE_CACHE_FILES+'];';
cache = 'this.BASE_CACHE_FILES = ['+pwa_BASE_CACHE_FILES+'];'; }
}
// update the BASE_CACHE_FILES variable in the sw.js service worker file // update the BASE_CACHE_FILES variable in the sw.js service worker file
results = replace.sync({ results = replace.sync({
files: 'static/sw.js', files: 'static/sw.js',
from: /this\.BASE_CACHE_FILES =.*/g, from: /this\.BASE_CACHE_FILES =.*/g,
to: cache, to: cache,
countMatches: true, countMatches: true,
}); });
} else {
throw new Error('ERROR: pwa requires that pwa_VER, pwa_NORM_TTL, pwa_LONG_TTL, pwa_TTL_NORM, pwa_TTL_LONG, pwa_TTL_EXEMPT are set in config.toml.');
}
} }
if (bpath === '') {// abridge used directly if (bpath === '') {// abridge used directly