@turnipxenon/pineapple 2.4.49 → 2.4.51

package/.idea/pineapple.iml

@@ -8,6 +8,7 @@
       <excludeFolder url="file://$MODULE_DIR$/.svelte-kit" />
       <excludeFolder url="file://$MODULE_DIR$/.vercel" />
       <excludeFolder url="file://$MODULE_DIR$/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

package/.idea/workspace.xml

@@ -4,8 +4,8 @@
     <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 default="true" id="accb6ba2-c343-4f84-ad30-6e2d71eceee5" name="Changes" comment="Add logs to observe queryTermMap in downstream package">
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -324,31 +324,9 @@
       <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>
-    </task>
-    <task id="LOCAL-00115" summary="Layout adjustments to PineappleBaseLayout">
-      <option name="closed" value="true" />
-      <created>1711680166876</created>
-      <option name="number" value="00115" />
-      <option name="presentableId" value="LOCAL-00115" />
-      <option name="project" value="LOCAL" />
-      <updated>1711680166877</updated>
+      <workItem from="1712533167568" duration="339000" />
+      <workItem from="1712533592123" duration="803000" />
+      <workItem from="1712534451700" duration="408000" />
     </task>
     <task id="LOCAL-00116" summary="Allow preventing NavigationComponent pagination">
       <option name="closed" value="true" />
@@ -718,7 +696,31 @@
       <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>
+    <task id="LOCAL-00164" summary="Add logs to observe queryTermMap in downstream package">
+      <option name="closed" value="true" />
+      <created>1712534850791</created>
+      <option name="number" value="00164" />
+      <option name="presentableId" value="LOCAL-00164" />
+      <option name="project" value="LOCAL" />
+      <updated>1712534850791</updated>
+    </task>
+    <option name="localTasksCounter" value="165" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -776,9 +778,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" />
     <MESSAGE value="Implement cdktf for empty AppService" />
@@ -801,6 +800,9 @@
     <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" />
+    <MESSAGE value="Add logs to observe queryTermMap in downstream package" />
+    <option name="LAST_COMMIT_MESSAGE" value="Add logs to observe queryTermMap in downstream package" />
   </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";
@@ -47,6 +47,7 @@ const syncQT = () => {
   seaweedTemplateData.queryTermMap = seaweedTemplateData.queryTermMap;
 };
 const parseQTTerms = async () => {
+  console.log("parsing", seaweedTemplateData.queryTermMap.size);
   const qtSet = /* @__PURE__ */ new Set();
   const rawTermList = [];
   [...Object.values(entryList).map((e) => e.default), selfContent].forEach((body) => {
@@ -64,6 +65,7 @@ const parseQTTerms = async () => {
     });
   });
   qtSet.forEach((t) => seaweedTemplateData.queryTermMap.set(t, true));
+  seaweedTemplateData.queryTermMap = seaweedTemplateData.queryTermMap;
   syncQT();
 };
 const filterSearchParams = (searchParams) => {

package/.svelte-kit/generated/server/internal.js

@@ -21,7 +21,7 @@ export const options = {
 		app: ({ head, body, assets, nonce, env }) => "<!DOCTYPE html>\n<html lang=\"en\">\n\t<head>\n\t\t<meta charset=\"utf-8\" />\n\t\t<link rel=\"icon\" href=\"" + assets + "/favicon.png\" />\n\t\t<meta name=\"viewport\" content=\"width=device-width\" />\n\t\t" + head + "\n\t</head>\n\n\t<body data-sveltekit-preload-data=\"hover\" data-theme=\"crimson\">\n\t\t<div style=\"display: contents\" class=\"h-full overflow-hidden\">" + body + "</div>\n\t</body>\n</html>\n",
 		error: ({ status, message }) => "<!doctype html>\n<html lang=\"en\">\n\t<head>\n\t\t<meta charset=\"utf-8\" />\n\t\t<title>" + message + "</title>\n\n\t\t<style>\n\t\t\tbody {\n\t\t\t\t--bg: white;\n\t\t\t\t--fg: #222;\n\t\t\t\t--divider: #ccc;\n\t\t\t\tbackground: var(--bg);\n\t\t\t\tcolor: var(--fg);\n\t\t\t\tfont-family:\n\t\t\t\t\tsystem-ui,\n\t\t\t\t\t-apple-system,\n\t\t\t\t\tBlinkMacSystemFont,\n\t\t\t\t\t'Segoe UI',\n\t\t\t\t\tRoboto,\n\t\t\t\t\tOxygen,\n\t\t\t\t\tUbuntu,\n\t\t\t\t\tCantarell,\n\t\t\t\t\t'Open Sans',\n\t\t\t\t\t'Helvetica Neue',\n\t\t\t\t\tsans-serif;\n\t\t\t\tdisplay: flex;\n\t\t\t\talign-items: center;\n\t\t\t\tjustify-content: center;\n\t\t\t\theight: 100vh;\n\t\t\t\tmargin: 0;\n\t\t\t}\n\n\t\t\t.error {\n\t\t\t\tdisplay: flex;\n\t\t\t\talign-items: center;\n\t\t\t\tmax-width: 32rem;\n\t\t\t\tmargin: 0 1rem;\n\t\t\t}\n\n\t\t\t.status {\n\t\t\t\tfont-weight: 200;\n\t\t\t\tfont-size: 3rem;\n\t\t\t\tline-height: 1;\n\t\t\t\tposition: relative;\n\t\t\t\ttop: -0.05rem;\n\t\t\t}\n\n\t\t\t.message {\n\t\t\t\tborder-left: 1px solid var(--divider);\n\t\t\t\tpadding: 0 0 0 1rem;\n\t\t\t\tmargin: 0 0 0 1rem;\n\t\t\t\tmin-height: 2.5rem;\n\t\t\t\tdisplay: flex;\n\t\t\t\talign-items: center;\n\t\t\t}\n\n\t\t\t.message h1 {\n\t\t\t\tfont-weight: 400;\n\t\t\t\tfont-size: 1em;\n\t\t\t\tmargin: 0;\n\t\t\t}\n\n\t\t\t@media (prefers-color-scheme: dark) {\n\t\t\t\tbody {\n\t\t\t\t\t--bg: #222;\n\t\t\t\t\t--fg: #ddd;\n\t\t\t\t\t--divider: #666;\n\t\t\t\t}\n\t\t\t}\n\t\t</style>\n\t</head>\n\t<body>\n\t\t<div class=\"error\">\n\t\t\t<span class=\"status\">" + status + "</span>\n\t\t\t<div class=\"message\">\n\t\t\t\t<h1>" + message + "</h1>\n\t\t\t</div>\n\t\t</div>\n\t</body>\n</html>\n"
 	},
-	version_hash: "193d8c0"
+	version_hash: "b1dnc"
 };
 
 export async function get_hooks() {

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";
@@ -47,6 +47,7 @@ const syncQT = () => {
   seaweedTemplateData.queryTermMap = seaweedTemplateData.queryTermMap;
 };
 const parseQTTerms = async () => {
+  console.log("parsing", seaweedTemplateData.queryTermMap.size);
   const qtSet = /* @__PURE__ */ new Set();
   const rawTermList = [];
   [...Object.values(entryList).map((e) => e.default), selfContent].forEach((body) => {
@@ -64,6 +65,7 @@ const parseQTTerms = async () => {
     });
   });
   qtSet.forEach((t) => seaweedTemplateData.queryTermMap.set(t, true));
+  seaweedTemplateData.queryTermMap = seaweedTemplateData.queryTermMap;
   syncQT();
 };
 const filterSearchParams = (searchParams) => {

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.51",
   "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";
@@ -62,6 +62,7 @@
 	};
 
 	const parseQTTerms = async () => {
+		console.log("parsing", seaweedTemplateData.queryTermMap.size);
 		const qtSet = new Set<string>();
 		const rawTermList: string[] = [];
 		[...Object.values(entryList).map(e => (e as RawGlob).default), selfContent].forEach(body => {
@@ -89,8 +90,9 @@
 			});
 		});
 
-		// activate svelte reactivity
 		qtSet.forEach(t => seaweedTemplateData.queryTermMap.set(t, true));
+		// force svelte update
+		seaweedTemplateData.queryTermMap = seaweedTemplateData.queryTermMap;
 		syncQT();
 	};