Vite fixes and PWA setup

.gitignore

@@ -1,5 +1,5 @@
 /dist/
-/vite-dist/
+/dist-vite/
 index.php
 electron-builder.env
 node_modules/

index.html

@@ -196,7 +196,7 @@
 	
 	</div>
 
-	<script type="text/javascript" type="module">
+	<script type="module">
 		if (!window.Blockbench?.setup_successful) {
 			document.getElementById('loading_error_message').style.display = 'block'
 			if (window.require) {

js/interface/interface.js

@@ -406,9 +406,6 @@ export const Interface = {
 		resizeWindow();
 	}
 }
-window.Interface = Interface;
-
-console.log('define interface')
 
 export const Panels = Interface.Panels;
 Interface.panel_definers = []
@@ -624,8 +621,8 @@ export function setupInterface() {
 		}
 
 		obj.val(val)
-		eval(obj.attr('oninput'))
-		eval(obj.attr('onmouseup'))
+		// eval(obj.attr('oninput'))
+		// eval(obj.attr('onmouseup'))
 	})
 
 	//Mousemove

js/main.js

@@ -123,7 +123,3 @@ import "./io/formats/image.js"
 import "./boot_loader"
 import "./globals.js"
 
-
-
-console.log('FULLY LOADED')
-

package.json

@@ -13,6 +13,7 @@
 		"url": "https://github.com/JannisX11/blockbench"
 	},
 	"main": "main.js",
+	"type": "module",
 	"build": {
 		"afterSign": "scripts/notarize.js",
 		"appId": "blockbench",
@@ -120,10 +121,9 @@
 		"preview": "vite preview",
 		"dist": "electron-builder",
 		"build-beta": "electron-builder --windows portable",
-		"publish-windows": "npm run bundle && electron-builder -w --publish=onTagOrDraft && node ./scripts/rename_portable.js && electron-builder --windows portable --publish=onTagOrDraft",
-		"pwa": "node ./scripts/generate_pwa.js",
-		"prepublish": "npm run bundle && npm run pwa",
-		"prepublish-beta": "node ./scripts/enable_beta.js && npm run bundle && npm run pwa",
+		"publish-windows": "npm run build && electron-builder -w --publish=onTagOrDraft && node ./scripts/rename_portable.js && electron-builder --windows portable --publish=onTagOrDraft",
+		"prepublish": "npm run build",
+		"prepublish-beta": "node ./scripts/enable_beta.js && npm run build",
 		"webapp": "git checkout gh-pages && git pull && git merge master && git push && git checkout master"
 	},
 	"devDependencies": {
@@ -131,6 +131,7 @@
 		"electron": "^33.3.1",
 		"electron-builder": "^24.13.3",
 		"vite": "^6.2.0",
+		"vite-plugin-pwa": "^0.21.1",
 		"workbox-build": "^6.5.3"
 	},
 	"dependencies": {

vite.config.js

@@ -1,18 +1,40 @@
 import { fileURLToPath, URL } from 'node:url'
 
 import { defineConfig } from 'vite'
+import { VitePWA } from 'vite-plugin-pwa'
 // import vue from '@vitejs/plugin-vue'
 
 // https://vitejs.dev/config/
 export default defineConfig({
   build: {
-    outDir: './vite-dist'
-  }
-  /*
+    outDir: './dist-vite'
+  },
   plugins: [
-    vue(),
+    VitePWA({
+      registerType: 'autoUpdate',
+      workbox: {
+        cacheId: 'blockbench',
+        globDirectory: './',
+        globPatterns: [
+          './index.html',
+          './favicon.png',
+          './icon_maskable.png',
+
+          './js/**/*',
+          './bundle.js',
+          './lib/**/*',
+          './css/**/*',
+          './assets/**/*',
+          './font/*',
+        ],
+        swDest: './service_worker.js',
+        maximumFileSizeToCacheInBytes: 4_096_000,
+        sourcemap: false
+      }
+      
+    })
+    //vue(),
   ],
-  */
   /*
   resolve: {
     alias: {