@turnipxenon/pineapple 2.4.49 → 2.4.50

package/.idea/workspace.xml

@@ -4,9 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="accb6ba2-c343-4f84-ad30-6e2d71eceee5" name="Changes" comment="Add back gameSectionFirst behaviour">
-      <change beforePath="$PROJECT_DIR$/src/lib/template/seaweed/SeaweedTemplate.svelte" beforeDir="false" afterPath="$PROJECT_DIR$/src/lib/template/seaweed/SeaweedTemplate.svelte" afterDir="false" />
-    </list>
+    <list default="true" id="accb6ba2-c343-4f84-ad30-6e2d71eceee5" name="Changes" comment="Put parseQTTerms in afterUpdate instead of onMount" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -324,23 +322,8 @@
       <workItem from="1712476456680" duration="329000" />
       <workItem from="1712476890510" duration="1084000" />
       <workItem from="1712532951966" duration="51000" />
-      <workItem from="1712533167568" duration="73000" />
-    </task>
-    <task id="LOCAL-00113" summary="Fix default page sorting">
-      <option name="closed" value="true" />
-      <created>1711499848251</created>
-      <option name="number" value="00113" />
-      <option name="presentableId" value="LOCAL-00113" />
-      <option name="project" value="LOCAL" />
-      <updated>1711499848251</updated>
-    </task>
-    <task id="LOCAL-00114" summary="Fix double dor parsing issue in NavigationComponent">
-      <option name="closed" value="true" />
-      <created>1711587709413</created>
-      <option name="number" value="00114" />
-      <option name="presentableId" value="LOCAL-00114" />
-      <option name="project" value="LOCAL" />
-      <updated>1711587709414</updated>
+      <workItem from="1712533167568" duration="339000" />
+      <workItem from="1712533592123" duration="650000" />
     </task>
     <task id="LOCAL-00115" summary="Layout adjustments to PineappleBaseLayout">
       <option name="closed" value="true" />
@@ -718,7 +701,23 @@
       <option name="project" value="LOCAL" />
       <updated>1712477820038</updated>
     </task>
-    <option name="localTasksCounter" value="162" />
+    <task id="LOCAL-00162" summary="Delay parsing for query terms after page transformation">
+      <option name="closed" value="true" />
+      <created>1712533399159</created>
+      <option name="number" value="00162" />
+      <option name="presentableId" value="LOCAL-00162" />
+      <option name="project" value="LOCAL" />
+      <updated>1712533399160</updated>
+    </task>
+    <task id="LOCAL-00163" summary="Put parseQTTerms in afterUpdate instead of onMount">
+      <option name="closed" value="true" />
+      <created>1712533946790</created>
+      <option name="number" value="00163" />
+      <option name="presentableId" value="LOCAL-00163" />
+      <option name="project" value="LOCAL" />
+      <updated>1712533946790</updated>
+    </task>
+    <option name="localTasksCounter" value="164" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -776,8 +775,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Correct app_build_command in Azure SWA GithubActions&#10;&#10;app_build_command by default runs npm install when it should be running yarn install" />
-    <MESSAGE value="Add resolutions to use Node 20 in Azure SWA GithubActions" />
     <MESSAGE value="Add resolutions to use Node 20 in Azure SWA GithubActions&#10;&#10;Reference: https://github.com/Azure/static-web-apps-cli/issues/756#issuecomment-1775748572" />
     <MESSAGE value="Migrate from azure swa adapter to node adapter" />
     <MESSAGE value="Add cdktf" />
@@ -801,6 +798,8 @@
     <MESSAGE value="Fix yarn dependencies" />
     <MESSAGE value="Support swappable group for backwards compatibility" />
     <MESSAGE value="Add back gameSectionFirst behaviour" />
-    <option name="LAST_COMMIT_MESSAGE" value="Add back gameSectionFirst behaviour" />
+    <MESSAGE value="Delay parsing for query terms after page transformation" />
+    <MESSAGE value="Put parseQTTerms in afterUpdate instead of onMount" />
+    <option name="LAST_COMMIT_MESSAGE" value="Put parseQTTerms in afterUpdate instead of onMount" />
   </component>
 </project>

package/.svelte-kit/__package__/template/seaweed/SeaweedTemplate.svelte

@@ -1,4 +1,4 @@
-<script>import { onMount } from "svelte";
+<script>import { afterUpdate, onMount } from "svelte";
 import EntryOrderConfig from "./entry_order_config/EntryOrderConfig.svelte";
 import { runChaos } from "./RunChaos";
 import SocialSection from "../../components/SocialSection.svelte";
@@ -123,7 +123,12 @@ onMount(async () => {
   if (letChaos) {
     runChaos(document.body);
     chaosDone = true;
-  } else {
+  }
+});
+let isParsed = false;
+afterUpdate(async () => {
+  if (!letChaos && !isParsed) {
+    isParsed = true;
     await parseQTTerms();
   }
 });

package/dist/template/seaweed/SeaweedTemplate.svelte

@@ -1,4 +1,4 @@
-<script>import { onMount } from "svelte";
+<script>import { afterUpdate, onMount } from "svelte";
 import EntryOrderConfig from "./entry_order_config/EntryOrderConfig.svelte";
 import { runChaos } from "./RunChaos";
 import SocialSection from "../../components/SocialSection.svelte";
@@ -123,7 +123,12 @@ onMount(async () => {
   if (letChaos) {
     runChaos(document.body);
     chaosDone = true;
-  } else {
+  }
+});
+let isParsed = false;
+afterUpdate(async () => {
+  if (!letChaos && !isParsed) {
+    isParsed = true;
     await parseQTTerms();
   }
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@turnipxenon/pineapple",
   "description": "personal package for base styling for other personal projects",
-  "version": "2.4.49",
+  "version": "2.4.50",
   "scripts": {
     "dev": "vite dev",
     "build": "vite build && yarn package",

package/src/lib/template/seaweed/SeaweedTemplate.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type ComponentType, onMount } from "svelte";
+	import { afterUpdate, type ComponentType, onMount } from "svelte";
 	import EntryOrderConfig from "$pkg/template/seaweed/entry_order_config/EntryOrderConfig.svelte";
 	import { runChaos } from "$pkg/template/seaweed/RunChaos";
 	import SocialSection from "$pkg/components/SocialSection.svelte";
@@ -184,7 +184,15 @@
 		if (letChaos) {
 			runChaos(document.body);
 			chaosDone = true;
-		} else {
+		}
+	});
+
+	// the page may not yet be updated in onMount, so let's wait for the page to render according to what we
+	// want before proceeding the parsing the page
+	let isParsed = false;
+	afterUpdate(async () => {
+		if (!letChaos && !isParsed) {
+			isParsed = true;
 			await parseQTTerms();
 		}
 	});