[blog] /src/content/ -> /content/

[voidcannon] hydrate/nojs fixes
[pagex] fix html parser quirk

content/articles/labscore-deprecation-notice/labscore-deprecation-notice.pagex.js

@@ -1,13 +1,6 @@
-import {VoidcannonHeaderLayoutType, VoidcannonHeaderType, VoidcannonContentType} from "voidcannon";
+import {VoidcannonHeaderType, VoidcannonContentType} from "voidcannon";
-
-import bignutty from "../../authors/bignutty.pagex.js";
-
-import videogamesCollection from "../../collections/videogames.pagex.js";
-import testCollection from "../../collections/test.pagex.js";
-import featuredCollection from "../../collections/_featured.pagex.js";
 
 import {PagexResourceTransformer} from "pagex";
-import {ThemeVariants} from "pagex_commons";
 import labsCoreMaintainersPagex from "../../authors/labsCoreMaintainers.pagex.js";
 import discordPagex from "../../collections/discord.pagex.js";
 

content/articles/playground-p3/content.md

@@ -15,10 +15,10 @@ this is sample text (p3)
 ```javascript
 import {VoidcannonHeaderLayoutType, VoidcannonHeaderType, VoidcannonContentType} from "voidcannon";
 
-import bignutty from "../../authors/bignutty.pagex.js";
+import bignutty from "./bignutty.pagex.js";
 
-import testCollection from "../../collections/test.pagex.js";
+import testCollection from "./test.pagex.js";
-import featuredCollection from "../../collections/_featured.pagex.js";
+import featuredCollection from "./_featured.pagex.js";
 
 import {PagexResourceTransformer} from "pagex";
 

content/articles/playground-totk/content.md

@@ -15,10 +15,10 @@ console.log('hello') // [!code ++]
 ```js
 import {VoidcannonHeaderLayoutType, VoidcannonHeaderType, VoidcannonContentType} from "voidcannon";
 
-import bignutty from "../../authors/bignutty.pagex.js";
+import bignutty from "./bignutty.pagex.js";
 
-import testCollection from "../../collections/test.pagex.js";
+import testCollection from "./test.pagex.js";
-import featuredCollection from "../../collections/_featured.pagex.js";// [!code error]
+import featuredCollection from "./_featured.pagex.js";// [!code error]
 
 import {PagexResourceTransformer} from "pagex";// [!code warning]
 

content/authors/bignutty.pagex.js

@@ -1,7 +1,5 @@
 import {PagexResourceTransformer} from "pagex";
 import {VoidcannonContentType, VoidcannonLinksIconType} from "voidcannon";
-import {GramophoneIcon} from "webicons/icons/Gramophone.icon.js";
-import {ThemeVariants} from "pagex_commons";
 
 export default {
     type: VoidcannonContentType.AUTHOR,
@@ -9,7 +7,7 @@ export default {
     name: "bignutty",
     avatar: {
         _transform: PagexResourceTransformer.MEDIA,
-        path: "/content/authors/assets/bignutty.png"
+        path: "/authors/assets/bignutty.png"
     },
     theme: {
         partial: true,

content/authors/labsCoreMaintainers.pagex.js

@@ -1,5 +1,5 @@
 import {PagexResourceTransformer} from "pagex";
-import {VoidcannonContentType, VoidcannonEmojiStyle, VoidcannonLinksIconType} from "voidcannon";
+import {VoidcannonContentType, VoidcannonLinksIconType} from "voidcannon";
 
 export default {
     type: VoidcannonContentType.AUTHOR,
@@ -7,7 +7,7 @@ export default {
     name: "labsCore Maintainers",
     avatar: {
         _transform: PagexResourceTransformer.MEDIA,
-        path: "/content/authors/assets/labscore.webp"
+        path: "/authors/assets/labscore.webp"
     },
     theme: {
         partial: true,

content/authors/placeholder.pagex.js

@@ -0,0 +1,7 @@
+import {VoidcannonContentType} from "voidcannon";
+
+export default {
+    type: VoidcannonContentType.AUTHOR,
+    id: "placeholder",
+    name: "Placeholder Author",
+}

content/authors/testauthor.pagex.js

@@ -1,5 +1,4 @@
-import {PagexResourceTransformer} from "pagex";
+import {VoidcannonContentType} from "voidcannon";
-import {VoidcannonContentType, VoidcannonEmojiStyle, VoidcannonLinksIconType} from "voidcannon";
 
 export default {
     type: VoidcannonContentType.AUTHOR,

content/collections/discord.pagex.js

@@ -1,5 +1,4 @@
 import {VoidcannonCollectionColor, VoidcannonCollectionIconType, VoidcannonContentType} from "voidcannon";
-import {PagexResourceTransformer} from "pagex";
 
 export default {
     type: VoidcannonContentType.COLLECTION,

content/editorial/home/home.pagex.js

@@ -4,13 +4,7 @@ import {
 } from "voidcannon";
 
 import {PagexResourceTransformer} from "pagex";
-import CollectionContentTransformer from "voidcannon/src/transformers/CollectionContent.transformer.js";
 import RecentContentTransformer from "voidcannon/src/transformers/RecentContent.transformer.js";
-import ContentByIdentifierTransformer from "voidcannon/src/transformers/ContentByIdentifier.transformer.js";
-
-import playground from "../../articles/playground/playground.pagex.js";
-import playgroundP3 from "../../articles/playground-p3/playground-p3.pagex.js";
-import playgroundEmpty from "../../articles/playground-empty/playground-empty.pagex.js";
 
 import recentArticles from "../recent-articles/recent-articles.pagex.js";
 

content/editorial/recent-articles/recent-articles.pagex.js

@@ -4,13 +4,7 @@ import {
     VoidcannonSectionType
 } from "voidcannon";
 
-import {PagexResourceTransformer} from "pagex";
-import CollectionContentTransformer from "voidcannon/src/transformers/CollectionContent.transformer.js";
 import RecentContentTransformer from "voidcannon/src/transformers/RecentContent.transformer.js";
-import ContentByIdentifierTransformer from "voidcannon/src/transformers/ContentByIdentifier.transformer.js";
-import playground from "../../articles/playground/playground.pagex.js";
-import playgroundP3 from "../../articles/playground-p3/playground-p3.pagex.js";
-import playgroundTotk from "../../articles/playground-totk/playground-totk.pagex.js";
 
 export default {
     type: VoidcannonContentType.EDITORIAL,

package-lock.json

@@ -981,6 +981,12 @@
         "@types/unist": "*"
       }
     },
+    "node_modules/@types/moo": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/@types/moo/-/moo-0.5.10.tgz",
+      "integrity": "sha512-W6KzyZjXUYpwQfLK1O1UDzqcqYlul+lO7Bt71luyIIyNlOZwJaNeWWdqFs1C/f2hohZvUFHMk6oFNe9Rg48DbA==",
+      "license": "MIT"
+    },
     "node_modules/@types/node": {
       "version": "16.18.126",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.126.tgz",
@@ -1186,9 +1192,9 @@
       }
     },
     "node_modules/ajv": {
-      "version": "8.17.1",
+      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -2071,6 +2077,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/gqlmin": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/gqlmin/-/gqlmin-0.3.1.tgz",
+      "integrity": "sha512-UTkeFjVvfdAOyPVCw05WlysiYaelNxjGo/6n+T5fTwUjS4qH1xitdSqVziWlckYONrZvsGoTVSmHQtG//vTNLA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/moo": "^0.5.9",
+        "moo": "^0.5.2"
+      },
+      "bin": {
+        "gqlmin": "bin/cli.js"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -2914,6 +2933,12 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
+    "node_modules/moo": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz",
+      "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==",
+      "license": "BSD-3-Clause"
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -3253,9 +3278,9 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.14.1",
+      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz",
-      "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
+      "integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.1.0"
@@ -4273,6 +4298,7 @@
         "@literals/html-css-minifier": "^3.0.1",
         "@rsbuild/core": "^1.7.2",
         "fastify": "^5.6.1",
+        "gqlmin": "^0.3.1",
         "html-minifier-terser": "^7.2.0",
         "image-size": "^2.0.2",
         "lightningcss": "^1.31.1"

pagex.config.js

@@ -8,7 +8,7 @@ export default {
     },
     resources: {
         content: {
-            path: "./src/",
+            path: "./content/",
             resolvers: {
                 "pagex.js": "builtin"
             }

src/content/authors/placeholder.pagex.js

@@ -1,8 +0,0 @@
-import {PagexResourceTransformer} from "pagex";
-import {VoidcannonContentType, VoidcannonEmojiStyle} from "voidcannon";
-
-export default {
-    type: VoidcannonContentType.AUTHOR,
-    id: "placeholder",
-    name: "Placeholder Author",
-}