Skip to content

Commit 87a96cd

Browse files
committed
release zip, deactivate sw on SPA
1 parent dc5401f commit 87a96cd

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

build.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ function buildRelease() {
2727
let zipname = `igc2kmz-${matches[1]}.zip`;
2828
let zip = new JSZip();
2929
['igc2kmz.cmd.js', 'igc2kmz.min.js', 'igc2kmz.js'].forEach(f => zip.file('dist/' + f, fs.readFileSync('dist/' + f, { encoding: 'utf8', flag: 'r' })));
30+
['igc2kmz.html', 'README.md', 'LICENSE', 'sw.js', 'igc2kmz.webmanifest', 'favicon.ico', 'assets/googleearth-32.png', 'assets/googleearth-64.png', 'assets/googleearth-128.png', 'assets/googleearth-256.png', 'assets/googleearth-512.png'].forEach(f => zip.file(f, fs.readFileSync(f, { encoding: 'utf8', flag: 'r' })));
3031
zip.file('igc2kmz_spa.html', fs.readFileSync('dist/igc2kmz_spa.html', { encoding: 'utf8', flag: 'r' }));
31-
['igc2kmz.html', 'README.md', 'LICENSE'].forEach(f => zip.file(f, fs.readFileSync(f, { encoding: 'utf8', flag: 'r' })));
3232
zip
3333
.generateNodeStream({ type: 'nodebuffer', streamFiles: true })
3434
.pipe(fs.createWriteStream(zipname))
@@ -104,6 +104,7 @@ async function buildAction(buildmode) {
104104
let htmli2k = fs.readFileSync('./igc2kmz.html', { encoding: 'utf8', flag: 'r' });
105105
let matches = null;
106106
let count = 0;
107+
htmli2k = htmli2k.replace(/useSW\s*=\s*true/g, 'useSW = false').replaceAll(/<link\s+[^>]+>/gi, '');
107108
while ((matches = htmli2k.match(regminifyjs)) != null && count++ < 10) {
108109
if (matches.length < 2) continue;
109110
const minifiedjs = await esbuild.transform(matches[1], { loader: 'js', minify: true });

igc2kmz.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<meta name="viewport" content="initial-scale=1.0, maximum-scale=2.0, user-scalable=yes">
66
<link rel="manifest" href="igc2kmz.webmanifest">
7-
<link rel="icon" type="image/x-icon" href="/igc2kmz/favicon.ico">
7+
<link rel="icon" type="image/x-icon" href="./favicon.ico">
88
<title>igc2kmz</title>
99
<script src="./dist/igc2kmz.min.js"></script>
1010
<style>
@@ -260,6 +260,7 @@
260260
var nbrfiles = 0;
261261
var i2koptions = {};
262262
var helptimer = null;
263+
var useSW = true;
263264

264265
function convertigc() {
265266
igc2kmz(igccontent, filename, taskcontent, photos, i2koptions).catch(err => {
@@ -598,7 +599,7 @@
598599
];
599600

600601
// Registering Service Worker
601-
if ('serviceWorker' in navigator) {
602+
if (useSW && 'serviceWorker' in navigator) {
602603
navigator.serviceWorker.register('/igc2kmz/sw.js');
603604
}
604605
</script>

0 commit comments

Comments
 (0)