From 400ab1a89535aaf6c1610dfe9dbfa39c17abbc4a Mon Sep 17 00:00:00 2001
From: Aritra Banerjee <103491935+AritraLeo@users.noreply.github.com>
Date: Sun, 19 May 2024 19:09:33 +0530
Subject: [PATCH 4/6] Resolved non code issues
---
rollup.config.js | 35 +-
www/css/app.css | 3 -
www/index.html | 1720 +++++++++++++++++++++++++++-------------------
3 files changed, 1025 insertions(+), 733 deletions(-)
diff --git a/rollup.config.js b/rollup.config.js
index 91ed0d367..80d70693e 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -44,7 +44,6 @@ const config = {
targets: [{
src: ['www/js/lib/*dec-wasm.wasm', 'www/js/lib/libzim-asm.js', 'www/js/lib/libzim-wasm.*', 'www/js/lib/webpHeroBundle*',
'node_modules/bootstrap/dist/js/bootstrap.bundle.min.*',
- // 'node_modules/jquery/dist/jquery.slim.min.*',
'!www/js/lib/libzim-wasm.dev*'],
dest: 'dist/www/js'
},
@@ -76,18 +75,18 @@ if (process.env.BUILD === 'production') {
transform: async (contents, filename) => {
const result = await minify(
contents.toString()
- // Replace the entry point with the bundle
+ // Replace the entry point with the bundle
.replace(/(www[\\/]js[\\/])app.js/, '$1bundle.min.js')
- // Remove all the lib files that will be included in the bundle
+ // Remove all the lib files that will be included in the bundle
.replace(/,\s+["']www[\\/]js[\\/]lib[\\/]abstractFilesystemAccess[\s\S]+zimfile.js["']\s*/, '')
- // Replace any references to node_modules
+ // Replace any references to node_modules
.replace(/node_modules\/.*dist\/((?:js|css)\/)?/g, function (m, p1) {
p1 = p1 || 'js/';
return 'www/' + p1;
})
- // Alter remaining lib references
+ // Alter remaining lib references
.replace(/([\\/])js[\\/]lib/g, '$1js')
- // Remove unneeded ASM/WASM binaries
+ // Remove unneeded ASM/WASM binaries
.replace(/["']www[\\/]js[\\/].*dec.*js["'],\s*/g, '')
);
return result.code;
@@ -127,13 +126,12 @@ if (process.env.BUILD === 'production') {
dest: 'dist/www',
// Link the html to the new bundle entry point
transform: (contents, filename) => contents.toString()
- // Uncomment the bundle link
+ // Uncomment the bundle link
.replace(//, '$1')
.replace(/bundle\.js/, 'bundle.min.js')
- // Comment out the old app.js link
+ // Comment out the old app.js link
.replace(/(