From a3046f6600c9fcad7bfe77788fbba8020686342b Mon Sep 17 00:00:00 2001
From: zumbiepig <121742281+zumbiepig@users.noreply.github.com>
Date: Tue, 20 Aug 2024 08:15:02 -0700
Subject: [PATCH] .

---
 .gitignore                                          | 10 ++++++++--
 generateCacheAssetsList.js => generateAssetsList.js |  4 ++--
 package.json                                        |  6 +++---
 public/sw-full.js => src/sw-full.ts                 |  5 ++++-
 public/sw.js => src/sw.ts                           |  3 +++
 5 files changed, 20 insertions(+), 8 deletions(-)
 rename generateCacheAssetsList.js => generateAssetsList.js (76%)
 rename public/sw-full.js => src/sw-full.ts (92%)
 rename public/sw.js => src/sw.ts (97%)

diff --git a/.gitignore b/.gitignore
index e1cc182..882d7a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,12 @@
-.DS_Store
+# Build artifacts
+/public/assets.json
 /public/resources/scripts/
-/public/cacheAssets.json
+/public/sw.js
+/public/sw-full.js
+
+# System files
+.desktop.ini
+.DS_Store
 
 # Logs
 logs
diff --git a/generateCacheAssetsList.js b/generateAssetsList.js
similarity index 76%
rename from generateCacheAssetsList.js
rename to generateAssetsList.js
index 2e72b0b..e243357 100644
--- a/generateCacheAssetsList.js
+++ b/generateAssetsList.js
@@ -17,5 +17,5 @@ function getFiles(dir, files_) {
 	return files_;
 }
 
-const cacheAssets = getFiles(directoryPath);
-writeFileSync(join(import.meta.dirname, '/public/cacheAssets.json'), JSON.stringify(cacheAssets, null, 2));
+const assets = getFiles(directoryPath);
+writeFileSync(join(import.meta.dirname, '/public/assets.json'), JSON.stringify(assets, null, 2));
diff --git a/package.json b/package.json
index a43cae4..cc46a3e 100644
--- a/package.json
+++ b/package.json
@@ -5,11 +5,11 @@
 	"main": "./server.js",
 	"scripts": {
 		"start": "node ./server.js",
-		"build": "npm run build:clean && npm run build:compile && npm run build:obfuscate && npm run build:generateCacheAssetsList",
-		"build:clean": "rimraf ./public/resources/scripts ./public/cacheAssets.json",
+		"build": "npm run build:clean && npm run build:compile && npm run build:obfuscate && npm run build:generateAssetsList",
+		"build:clean": "rimraf ./public/resources/scripts ./public/assets.json",
 		"build:compile": "tsc",
 		"build:obfuscate": "javascript-obfuscator ./public/resources/scripts --output ./public/resources/scripts --options-preset high-obfuscation",
-		"build:generateCacheAssetsList": "node ./generateCacheAssetsList.js",
+		"build:generateAssetsList": "node ./generateAssetsList.js",
 		"lint": "eslint ./src",
 		"lint:fix": "eslint --fix ./src"
 	},
diff --git a/public/sw-full.js b/src/sw-full.ts
similarity index 92%
rename from public/sw-full.js
rename to src/sw-full.ts
index 7c0bc02..64a4d95 100644
--- a/public/sw-full.js
+++ b/src/sw-full.ts
@@ -1,10 +1,11 @@
+// @ts-nocheck
 const cacheVersion = '1.5';
 const cacheName = `minexlauncher-full-v${cacheVersion}`;
 
 self.addEventListener('install', (event) => {
 	event.waitUntil(
 		caches.open(cacheName).then(async (cache) => {
-			const response = await fetch('/cacheAssets.json');
+			const response = await fetch('/assets.json');
 			const cacheAssets = await response.json();
 			const totalAssets = cacheAssets.length;
 			let cachedAssets = 0;
@@ -28,6 +29,8 @@ self.addEventListener('activate', (event) => {
 					keyList.map((key) => {
 						if (key !== cacheName) {
 							return caches.delete(key);
+						} else {
+							return null;
 						}
 					})
 				);
diff --git a/public/sw.js b/src/sw.ts
similarity index 97%
rename from public/sw.js
rename to src/sw.ts
index a3e4109..b2cb87e 100644
--- a/public/sw.js
+++ b/src/sw.ts
@@ -1,3 +1,4 @@
+// @ts-nocheck
 const cacheVersion = '1.5';
 const cacheName = `minexlauncher-v${cacheVersion}`;
 const offlineUrl = '/offline.html';
@@ -49,6 +50,8 @@ self.addEventListener('activate', (event) => {
 				keyList.map((key) => {
 					if (key !== cacheName) {
 						return caches.delete(key);
+					} else {
+						return null;
 					}
 				})
 			);