Loading optimizations, minor fixes

Justfile

@@ -0,0 +1,16 @@
+default:
+    just --list
+
+# construct 'future' git branch from stack
+git-future:
+    #!/bin/bash
+    set -eu -o pipefail
+
+    git checkout future
+
+    git reset --hard develop
+
+    for branch in $@; do
+        git merge $branch
+        git commit || :
+    done

Makefile

@@ -1,48 +1,67 @@
 CONFIG_JSON_PATH = "${APPDATA}/unofficial-homestuck-collection/config.json"
 
+.SECONDEXPANSION:
+.SUFFIXES:
+
 default: test
 
+## Setup
+
+yarn.lock: package.json
+	yarn install # --ignore-optional
+	touch yarn.lock
+
 # We do actually use a dummy install file to track this
 install: package.json yarn.lock
-	yarn install --ignore-optional
+	yarn install
 	touch install
 
+## Prep actions
+
+.PHONY: clean
 clean:
+	yarn cache clean
+	-rm yarn-error.log
 	-rm ./install src/imods.tar.gz
 	-rm -r node_modules/.cache/
 	-rm -r dist/ dist_electron/*/
 
-lint: install 
+.PHONY: lint
+lint: install
 	yarn run vue-cli-service lint
 	# yarn lint
 
+
+## Intermediate files
+
+src/imods.tar.gz: $(wildcard src/imods/*) $(wildcard src/imods/*/*)
+	# cd src && tar -czf imods.tar.gz imods/
+	cd src && tar -cf - imods/ | gzip -9 - > imods.tar.gz
+# 	-jq '.appVersion = "2.0.0"' ${CONFIG_JSON_PATH} > ${CONFIG_JSON_PATH}.tmp
+# 	-mv ${CONFIG_JSON_PATH}.tmp ${CONFIG_JSON_PATH}
+
+## Running live
+
 # Run 'SERVE_FLAGS="--reset-last-version" make src/imods.tar.gz test' to make imods and pass --reset-last-version through
+.PHONY: test
 test: install src/imods.tar.gz
 	yarn run vue-cli-service electron:serve $(SERVE_FLAGS)
 	# yarn dev
 
+
+## Building output
+
+.PHONY: build
 build: install src/imods.tar.gz
 	yarn run vue-cli-service electron:build
 	# yarn electron:build
 
-publish_release: install src/imods.tar.gz
-	yarn run vue-cli-service electron:build -p always
-
-vuebuild: install src/imods.tar.gz
-	yarn run vue-cli-service build
 
-src/imods.tar.gz: $(wildcard src/imods/*) $(wildcard src/imods/*/*)
-	# cd src && tar -czf imods.tar.gz imods/
-	cd src && tar -cf - imods/ | gzip -9 - > imods.tar.gz
-# 	-jq '.appVersion = "2.0.0"' ${CONFIG_JSON_PATH} > ${CONFIG_JSON_PATH}.tmp
-# 	-mv ${CONFIG_JSON_PATH}.tmp ${CONFIG_JSON_PATH}
+.PHONY: publish-release
+publish-release: install src/imods.tar.gz
+	yarn run vue-cli-service electron:build -p always
 
+.PHONY: help
 help:
-	@echo 'Usage:'
-	@echo '  make clean      try to clean old build artifacts'
-	@echo '  make test       start a development version now'
-	@echo '  make build      create a production version'
-	@echo '  make lint       lints and fixes files'
-
-
-.PHONY: clean test build publish help lint test
+	grep -E '(^[^.#[:space:]].*:)|(##)' Makefile
+

gh_export_all.sh

@@ -0,0 +1,32 @@
+#!/bin/bash -i
+
+set -eu -o pipefail
+
+mkdir -p github
+
+if ! gh auth status | grep -q 'read:project'; then
+  (set -x; gh auth login --scopes read:project)
+fi
+
+(
+
+  echo Saving PRs
+
+  pr_out="github/pull_requests.json"
+  # all_pr_fields="$(echo $(gh pr list --json 2>&1 | tail -n +2) | sed 's/ /,/g')"
+  # gh pr list -L 50 --json "$all_pr_fields" | jq > $pr_out
+  gh api repos/bambosh/unofficial-homestuck-collection/pulls --paginate > $pr_out
+
+  logparam "Saved" $(jq '.|length' < "$pr_out") "pull requests to" "$pr_out"
+)
+
+(
+  echo Saving Issues
+
+  issue_out="github/issues.json"
+  # all_issue_fields="$(echo $(gh issue list --json 2>&1 | tail -n +2) | sed 's/ /,/g')"
+  # gh issue list -L 50 --json "$all_issue_fields" | jq > $issue_out
+  gh api repos/bambosh/unofficial-homestuck-collection/issues --paginate > $issue_out
+
+  logparam "Saved" $(jq '.|length' < "$issue_out") "issues to" "$issue_out"
+)

src/App.vue

@@ -271,7 +271,7 @@
       // Ask for a fresh copy of the archive
       // Root must exist to receive it, so this calls from inside the app
       // and the app must have registered the receipt listener first to accept it!
-      this.$root.loadState = "LOADING"
+      this.$root.loadState = "WAITING_ON_DATA"
       ipcRenderer.send("RELOAD_ARCHIVE_DATA")
 
       document.addEventListener('dragover', event => event.preventDefault())

src/components/AppMenu/TitleBar.vue

@@ -44,7 +44,7 @@ export default {
       // Give the OS 2500 ms, then force close
       setTimeout(function() {
         ipcRenderer.sendSync('win-close-sync')
-      }, 2500)
+      }, 500)
     }
   },
   mounted() {

src/components/SystemPages/Setup.vue

@@ -123,9 +123,9 @@
 
           </div>
           <div class="wizardNavigation">
-            <button v-if="newReaderCardIndex > 0" @click="wizardNextPage(-1)" style="right: 94px;">&lt; Previous</button>
+            <button v-if="newReaderCardIndex > 0" @click="wizardNextPage(-1)" class="prev">&lt; Previous</button>
             <button v-if="newReaderCardIndex < lastNewReaderCard" 
-              @click="wizardNextPage(1)" style="right: 20px;"
+              @click="wizardNextPage(1)" class="next"
               :disabled="wizardForwardButtonDisabled">Next &gt;</button>
             <!--<button v-if="newReaderCardIndex == lastNewReaderCard" @click="">Finish</button>-->
           </div>
@@ -287,13 +287,14 @@ export default {
       loadStages: {
         "": "Awaiting reactivity",
         "MOUNTED": "Entangling connections",
+        "WAITING_ON_DATA": "Demanding firehose",
         "ARCHIVE": "Raking filesystem",
         "MODS": "Turbulating canon",
         "PATCHES": "Applying spackle",
         "LOADED_ARCHIVE_VANILLA": "Deferring responsibility",
-        "EXTRACT_IMODS": "Applying day 1 patch",
+        "EXTRACT_IMODS": "Applying day-one patch",
         "READ_MODS": "Indexing paraphernalia",
-        "BAKE_ROUTES": "Convoluting Routing Table",
+        "BAKE_ROUTES": "Convoluting routing table",
         "MODS_DONE": "Disparaging EMCAScript",
       },
       spiroPos: [
@@ -599,6 +600,12 @@ export default {
         font-size: 16px;
         position: absolute;
         margin: 0 2px;
+        &.next {
+          right: 20px;
+        }
+        &.prev {
+          right: 94px;
+        }
       }
     }
   }

src/components/TabFrame.vue

@@ -288,7 +288,9 @@ export default {
                     //     page_num = this.$vizToMspa(this.routeParams.base, page_num).p
                     // }
 
-                    const isTzPassword = (this.$archive.tweaks.tzPasswordPages.includes(page_num))
+                    const isTzPassword = !this.$archive
+                        ? false
+                        : (this.$archive.tweaks.tzPasswordPages.includes(page_num))
                     
                     if (!(page_num && story_id)) component = 'Error404'
                     else if (this.$pageIsSpoiler(page_num, true) && !isTzPassword) component = 'Spoiler'

src/mods.js

@@ -1,8 +1,8 @@
 // isWebApp for main-process electron execution
 const isWebApp = ((typeof window !== 'undefined') && window.isWebApp) || false
 
-const importSassJs = import('sass.js')
-const importYaml = import('js-yaml')
+const importSassJs = () => import('sass.js')
+const importYaml = () => import('js-yaml')
 const importResources = import("@/resources.js")
 
 var Resources // lazy
@@ -442,7 +442,7 @@ async function crawlFileTree(root, recursive = false) {
 
 async function buildApi(mod) {
   Resources = Resources || await importResources
-  yaml = yaml || await importYaml
+  yaml = yaml || await importYaml()
 
   function safetyChecks(local_path) {
     if (mod._singlefile) throw new Error(`Singlefile mods cannot use this method`)
@@ -816,7 +816,7 @@ function getMainMixin(){
   return {
     mounted() {
       const addScssStyle = (style_id, body) => {
-        importSassJs.then(SassJs => {
+        importSassJs().then(SassJs => {
           SassJs.compile(body, (result) => {
             if (result.status !== 0) throw Error(JSON.stringify(result))
             this.stylesheets.push({

vue.config.js

@@ -18,7 +18,7 @@ module.exports = {
     optimization: {
       splitChunks: {
         minSize: 10000,
-        maxSize: 250000,
+        maxSize: 250000
       }
     },
     devtool: "source-map",