v0.5.7

Author: MrVauxs

.github/workflows/main.yml

@@ -40,17 +40,14 @@ jobs:
                VET_SEO_IS_SKIP_UA_ETC: true
             run: |
                npm run build:seo -- ${{ env.RELEASE_VERSION }}
-         # Merge and minify scripts, data, etc.
+         # Merge and minify scripts, data, etc. + Build Service Worker
+         # Remove entries from the `.gitignore` so the gh-pages action can correctly add+commit them to the pages branch
          -  name: Build Prod
             env:
                VET_BASE_SITE_URL: https://pf2etools.com/
                VET_SEO_IS_SKIP_UA_ETC: true
             run: |
-               npm run build:deploy:prod
-         # Remove entries from the `.gitignore` so the gh-pages action can correctly add+commit them to the pages branch
-         -  name: Build Service Worker
-            run: |
-               npm run build:sw:prod
+               npm run build:deploy:prod -- ${{ env.RELEASE_VERSION }}
                sed -i 's/sw.js//g' .gitignore
                sed -i 's/sw-injector.js//g' .gitignore
          # See: https://github.com/JamesIves/github-pages-deploy-action

build/deploy-prep-prod.sh

@@ -50,25 +50,4 @@ find . -maxdepth 1 -type f -name '*.html' -print0 |
     done
 
 # Rebuild the service worker index, to use our compressed files
-npm run build:sw
-
-echo "Installing Query Strings."
-# JS files
-for file in js/*; do
-    find . -maxdepth 1 -type f -name '*.html' -print0 |
-    while IFS= read -r -d $'\0' line; do
-        sed -i -e "s;$file;$file?v=${version};g" $line
-    done
-done
-# Handle the unique service worker .js strings
-find . -maxdepth 1 -type f -name '*.html' -print0 |
-while IFS= read -r -d $'\0' line; do
-    sed -i -e "s;/sw.js;/sw.js?v=${version};g" $line
-done
-# CSS files
-for file in css/*; do
-    find . -maxdepth 1 -type f -name '*.html' -print0 |
-    while IFS= read -r -d $'\0' line; do
-        sed -i -e "s;$file;$file?v=${version};g" $line
-    done
-done
+npm run build:sw

data/changelog.json

@@ -129,6 +129,11 @@
 			"ver": "0.5.6",
 			"date": "2022-06-13",
 			"txt": "- Fix production script"
+		},
+		{
+			"ver": "0.5.7",
+			"date": "2022-06-13",
+			"txt": "- Fix data preparation script\n- Fix service worker script"
 		}
 	]
 }

js/utils.js

@@ -5,7 +5,7 @@ if (typeof module !== "undefined") require("./parser.js");
 
 // in deployment, `IS_DEPLOYED = "<version number>";` should be set below.
 IS_DEPLOYED = undefined;
-VERSION_NUMBER = /* PF2ETOOLS_VERSION__OPEN */"0.5.6"/* PF2ETOOLS_VERSION__CLOSE */;
+VERSION_NUMBER = /* PF2ETOOLS_VERSION__OPEN */"0.5.7"/* PF2ETOOLS_VERSION__CLOSE */;
 DEPLOYED_STATIC_ROOT = ""; // ""; // FIXME re-enable this when we have a CDN again
 IS_VTT = false;
 

node/prepare-data-prod.js

@@ -35,9 +35,9 @@ async function replaceReferences (folder) {
 					const cat_id = Parser._parse_bToA(Parser.CAT_ID_TO_PROP, obj.tag);
 					const page = UrlUtil.CAT_TO_PAGE[cat_id];
 					const hash = obj.hash || UrlUtil.URL_TO_HASH_BUILDER[page](obj);
-					const out = Renderer.hover._getFromCache(page, obj.source, hash);
+					const out = {type: "data", tag: obj.tag, data: Renderer.hover._getFromCache(page, obj.source, hash)};
 					if (!out) throw new Error(`Could not find ${page}:${obj.source}:${hash}`);
-					delete out.__prop;
+					delete out.data.__prop;
 					return out;
 				}
 				return obj

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "pf2etools",
 	"author": "Pf2eTools",
-	"version": "0.5.6",
+	"version": "0.5.7",
 	"license": "MIT",
 	"description": "A site dedicated to making playing games with your friends as easy as possible.",
 	"scripts": {