From 62dffa02c1be44957331bb9d16e8d2fed53b6ebf Mon Sep 17 00:00:00 2001 From: bignutty <3515180-bignutty@users.noreply.gitlab.com> Date: Wed, 18 Feb 2026 00:32:30 +0100 Subject: [PATCH] [blog] /src/content/ -> /content/ [voidcannon] hydrate/nojs fixes [pagex] fix html parser quirk --- .../assets/header/background.webp | Bin .../labscore-deprecation-notice/content.md | 0 .../labscore-deprecation-notice.pagex.js | 9 +---- .../articles/playground-empty/content.md | 0 .../playground-empty.pagex.js | 0 .../playground-full/playground-full.pagex.js | 0 .../playground-gm3/playground-gm3.pagex.js | 0 .../assets/header/background_p3.png | Bin .../assets/header/immersive_left/base_p3.png | Bin .../assets/header/immersive_left/full_p3.png | Bin .../assets/header/immersive_left/outer_p3.png | Bin .../playground-p3/assets/header/logo_p3.png | Bin .../articles/playground-p3/content.md | 6 +-- .../playground-p3/playground-p3.pagex.js | 0 .../assets/header/background_totk.png | Bin .../assets/header/immersive_right/inner.png | Bin .../assets/header/immersive_right/outer.png | Bin .../playground-totk/assets/header/logo.png | Bin .../articles/playground-totk/content.md | 6 +-- .../playground-totk/playground-totk.pagex.js | 0 .../playground/assets/Cat_using_computer.jpg | Bin .../assets/feature/feature_lower.png | Bin .../assets/feature/feature_upper.png | Bin .../assets/header/background-street.png | Bin .../playground/assets/header/background.png | Bin .../assets/header/immersive_left/base_v2.png | Bin .../assets/header/immersive_left/full.png | Bin .../assets/header/immersive_left/outer_v2.png | Bin .../assets/header/immersive_right/full.png | Bin .../assets/header/immersive_right/inner.png | Bin .../assets/header/immersive_right/outer.png | Bin .../playground/assets/header/logo.png | Bin .../articles/playground/content.md | 0 .../articles/playground/media/enemy.jpg | Bin .../articles/playground/media/joker.jpg | Bin .../articles/playground/media/menu.jpg | Bin .../articles/playground/playground.pagex.js | 0 .../authors/assets/bignutty.png | Bin .../authors/assets/labscore.webp | Bin .../authors/bignutty.pagex.js | 4 +- .../authors/labsCoreMaintainers.pagex.js | 4 +- content/authors/placeholder.pagex.js | 7 ++++ .../authors/testauthor.pagex.js | 3 +- .../collections/_featured.pagex.js | 0 .../collections/assets/gramophone.png | Bin .../collections/discord.pagex.js | 1 - .../collections/gramophone.pagex.js | 0 .../collections/snacked.png | Bin .../collections/test.pagex.js | 0 .../collections/videogames.pagex.js | 0 .../editorial/home-debug/content.md | 0 .../editorial/home-debug/home-debug.pagex.js | 0 .../editorial/home/content.md | 0 .../editorial/home/home.pagex.js | 6 --- .../recent-articles/recent-articles.pagex.js | 6 --- .../static/404/404.pagex.js | 0 gm3 | 2 +- package-lock.json | 38 +++++++++++++++--- pagex | 2 +- pagex.config.js | 2 +- src/content/authors/placeholder.pagex.js | 8 ---- voidcannon | 2 +- webicons | 2 +- 63 files changed, 55 insertions(+), 53 deletions(-) rename {src/content => content}/articles/labscore-deprecation-notice/assets/header/background.webp (100%) rename {src/content => content}/articles/labscore-deprecation-notice/content.md (100%) rename {src/content => content}/articles/labscore-deprecation-notice/labscore-deprecation-notice.pagex.js (71%) rename {src/content => content}/articles/playground-empty/content.md (100%) rename {src/content => content}/articles/playground-empty/playground-empty.pagex.js (100%) rename {src/content => content}/articles/playground-full/playground-full.pagex.js (100%) rename {src/content => content}/articles/playground-gm3/playground-gm3.pagex.js (100%) rename {src/content => content}/articles/playground-p3/assets/header/background_p3.png (100%) rename {src/content => content}/articles/playground-p3/assets/header/immersive_left/base_p3.png (100%) rename {src/content => content}/articles/playground-p3/assets/header/immersive_left/full_p3.png (100%) rename {src/content => content}/articles/playground-p3/assets/header/immersive_left/outer_p3.png (100%) rename {src/content => content}/articles/playground-p3/assets/header/logo_p3.png (100%) rename {src/content => content}/articles/playground-p3/content.md (91%) rename {src/content => content}/articles/playground-p3/playground-p3.pagex.js (100%) rename {src/content => content}/articles/playground-totk/assets/header/background_totk.png (100%) rename {src/content => content}/articles/playground-totk/assets/header/immersive_right/inner.png (100%) rename {src/content => content}/articles/playground-totk/assets/header/immersive_right/outer.png (100%) rename {src/content => content}/articles/playground-totk/assets/header/logo.png (100%) rename {src/content => content}/articles/playground-totk/content.md (91%) rename {src/content => content}/articles/playground-totk/playground-totk.pagex.js (100%) rename {src/content => content}/articles/playground/assets/Cat_using_computer.jpg (100%) rename {src/content => content}/articles/playground/assets/feature/feature_lower.png (100%) rename {src/content => content}/articles/playground/assets/feature/feature_upper.png (100%) rename {src/content => content}/articles/playground/assets/header/background-street.png (100%) rename {src/content => content}/articles/playground/assets/header/background.png (100%) rename {src/content => content}/articles/playground/assets/header/immersive_left/base_v2.png (100%) rename {src/content => content}/articles/playground/assets/header/immersive_left/full.png (100%) rename {src/content => content}/articles/playground/assets/header/immersive_left/outer_v2.png (100%) rename {src/content => content}/articles/playground/assets/header/immersive_right/full.png (100%) rename {src/content => content}/articles/playground/assets/header/immersive_right/inner.png (100%) rename {src/content => content}/articles/playground/assets/header/immersive_right/outer.png (100%) rename {src/content => content}/articles/playground/assets/header/logo.png (100%) rename {src/content => content}/articles/playground/content.md (100%) rename {src/content => content}/articles/playground/media/enemy.jpg (100%) rename {src/content => content}/articles/playground/media/joker.jpg (100%) rename {src/content => content}/articles/playground/media/menu.jpg (100%) rename {src/content => content}/articles/playground/playground.pagex.js (100%) rename {src/content => content}/authors/assets/bignutty.png (100%) rename {src/content => content}/authors/assets/labscore.webp (100%) rename {src/content => content}/authors/bignutty.pagex.js (86%) rename {src/content => content}/authors/labsCoreMaintainers.pagex.js (82%) create mode 100644 content/authors/placeholder.pagex.js rename {src/content => content}/authors/testauthor.pagex.js (72%) rename {src/content => content}/collections/_featured.pagex.js (100%) rename {src/content => content}/collections/assets/gramophone.png (100%) rename {src/content => content}/collections/discord.pagex.js (89%) rename {src/content => content}/collections/gramophone.pagex.js (100%) rename {src/content => content}/collections/snacked.png (100%) rename {src/content => content}/collections/test.pagex.js (100%) rename {src/content => content}/collections/videogames.pagex.js (100%) rename {src/content => content}/editorial/home-debug/content.md (100%) rename {src/content => content}/editorial/home-debug/home-debug.pagex.js (100%) rename {src/content => content}/editorial/home/content.md (100%) rename {src/content => content}/editorial/home/home.pagex.js (72%) rename {src/content => content}/editorial/recent-articles/recent-articles.pagex.js (62%) rename {src/content => content}/static/404/404.pagex.js (100%) delete mode 100644 src/content/authors/placeholder.pagex.js diff --git a/src/content/articles/labscore-deprecation-notice/assets/header/background.webp b/content/articles/labscore-deprecation-notice/assets/header/background.webp similarity index 100% rename from src/content/articles/labscore-deprecation-notice/assets/header/background.webp rename to content/articles/labscore-deprecation-notice/assets/header/background.webp diff --git a/src/content/articles/labscore-deprecation-notice/content.md b/content/articles/labscore-deprecation-notice/content.md similarity index 100% rename from src/content/articles/labscore-deprecation-notice/content.md rename to content/articles/labscore-deprecation-notice/content.md diff --git a/src/content/articles/labscore-deprecation-notice/labscore-deprecation-notice.pagex.js b/content/articles/labscore-deprecation-notice/labscore-deprecation-notice.pagex.js similarity index 71% rename from src/content/articles/labscore-deprecation-notice/labscore-deprecation-notice.pagex.js rename to content/articles/labscore-deprecation-notice/labscore-deprecation-notice.pagex.js index 81a6239..2e550c3 100644 --- a/src/content/articles/labscore-deprecation-notice/labscore-deprecation-notice.pagex.js +++ b/content/articles/labscore-deprecation-notice/labscore-deprecation-notice.pagex.js @@ -1,13 +1,6 @@ -import {VoidcannonHeaderLayoutType, 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 {VoidcannonHeaderType, VoidcannonContentType} from "voidcannon"; import {PagexResourceTransformer} from "pagex"; -import {ThemeVariants} from "pagex_commons"; import labsCoreMaintainersPagex from "../../authors/labsCoreMaintainers.pagex.js"; import discordPagex from "../../collections/discord.pagex.js"; diff --git a/src/content/articles/playground-empty/content.md b/content/articles/playground-empty/content.md similarity index 100% rename from src/content/articles/playground-empty/content.md rename to content/articles/playground-empty/content.md diff --git a/src/content/articles/playground-empty/playground-empty.pagex.js b/content/articles/playground-empty/playground-empty.pagex.js similarity index 100% rename from src/content/articles/playground-empty/playground-empty.pagex.js rename to content/articles/playground-empty/playground-empty.pagex.js diff --git a/src/content/articles/playground-full/playground-full.pagex.js b/content/articles/playground-full/playground-full.pagex.js similarity index 100% rename from src/content/articles/playground-full/playground-full.pagex.js rename to content/articles/playground-full/playground-full.pagex.js diff --git a/src/content/articles/playground-gm3/playground-gm3.pagex.js b/content/articles/playground-gm3/playground-gm3.pagex.js similarity index 100% rename from src/content/articles/playground-gm3/playground-gm3.pagex.js rename to content/articles/playground-gm3/playground-gm3.pagex.js diff --git a/src/content/articles/playground-p3/assets/header/background_p3.png b/content/articles/playground-p3/assets/header/background_p3.png similarity index 100% rename from src/content/articles/playground-p3/assets/header/background_p3.png rename to content/articles/playground-p3/assets/header/background_p3.png diff --git a/src/content/articles/playground-p3/assets/header/immersive_left/base_p3.png b/content/articles/playground-p3/assets/header/immersive_left/base_p3.png similarity index 100% rename from src/content/articles/playground-p3/assets/header/immersive_left/base_p3.png rename to content/articles/playground-p3/assets/header/immersive_left/base_p3.png diff --git a/src/content/articles/playground-p3/assets/header/immersive_left/full_p3.png b/content/articles/playground-p3/assets/header/immersive_left/full_p3.png similarity index 100% rename from src/content/articles/playground-p3/assets/header/immersive_left/full_p3.png rename to content/articles/playground-p3/assets/header/immersive_left/full_p3.png diff --git a/src/content/articles/playground-p3/assets/header/immersive_left/outer_p3.png b/content/articles/playground-p3/assets/header/immersive_left/outer_p3.png similarity index 100% rename from src/content/articles/playground-p3/assets/header/immersive_left/outer_p3.png rename to content/articles/playground-p3/assets/header/immersive_left/outer_p3.png diff --git a/src/content/articles/playground-p3/assets/header/logo_p3.png b/content/articles/playground-p3/assets/header/logo_p3.png similarity index 100% rename from src/content/articles/playground-p3/assets/header/logo_p3.png rename to content/articles/playground-p3/assets/header/logo_p3.png diff --git a/src/content/articles/playground-p3/content.md b/content/articles/playground-p3/content.md similarity index 91% rename from src/content/articles/playground-p3/content.md rename to content/articles/playground-p3/content.md index 7ba65c2..5aabded 100644 --- a/src/content/articles/playground-p3/content.md +++ b/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 featuredCollection from "../../collections/_featured.pagex.js"; +import testCollection from "./test.pagex.js"; +import featuredCollection from "./_featured.pagex.js"; import {PagexResourceTransformer} from "pagex"; diff --git a/src/content/articles/playground-p3/playground-p3.pagex.js b/content/articles/playground-p3/playground-p3.pagex.js similarity index 100% rename from src/content/articles/playground-p3/playground-p3.pagex.js rename to content/articles/playground-p3/playground-p3.pagex.js diff --git a/src/content/articles/playground-totk/assets/header/background_totk.png b/content/articles/playground-totk/assets/header/background_totk.png similarity index 100% rename from src/content/articles/playground-totk/assets/header/background_totk.png rename to content/articles/playground-totk/assets/header/background_totk.png diff --git a/src/content/articles/playground-totk/assets/header/immersive_right/inner.png b/content/articles/playground-totk/assets/header/immersive_right/inner.png similarity index 100% rename from src/content/articles/playground-totk/assets/header/immersive_right/inner.png rename to content/articles/playground-totk/assets/header/immersive_right/inner.png diff --git a/src/content/articles/playground-totk/assets/header/immersive_right/outer.png b/content/articles/playground-totk/assets/header/immersive_right/outer.png similarity index 100% rename from src/content/articles/playground-totk/assets/header/immersive_right/outer.png rename to content/articles/playground-totk/assets/header/immersive_right/outer.png diff --git a/src/content/articles/playground-totk/assets/header/logo.png b/content/articles/playground-totk/assets/header/logo.png similarity index 100% rename from src/content/articles/playground-totk/assets/header/logo.png rename to content/articles/playground-totk/assets/header/logo.png diff --git a/src/content/articles/playground-totk/content.md b/content/articles/playground-totk/content.md similarity index 91% rename from src/content/articles/playground-totk/content.md rename to content/articles/playground-totk/content.md index ad897ab..40e18f9 100644 --- a/src/content/articles/playground-totk/content.md +++ b/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 featuredCollection from "../../collections/_featured.pagex.js";// [!code error] +import testCollection from "./test.pagex.js"; +import featuredCollection from "./_featured.pagex.js";// [!code error] import {PagexResourceTransformer} from "pagex";// [!code warning] diff --git a/src/content/articles/playground-totk/playground-totk.pagex.js b/content/articles/playground-totk/playground-totk.pagex.js similarity index 100% rename from src/content/articles/playground-totk/playground-totk.pagex.js rename to content/articles/playground-totk/playground-totk.pagex.js diff --git a/src/content/articles/playground/assets/Cat_using_computer.jpg b/content/articles/playground/assets/Cat_using_computer.jpg similarity index 100% rename from src/content/articles/playground/assets/Cat_using_computer.jpg rename to content/articles/playground/assets/Cat_using_computer.jpg diff --git a/src/content/articles/playground/assets/feature/feature_lower.png b/content/articles/playground/assets/feature/feature_lower.png similarity index 100% rename from src/content/articles/playground/assets/feature/feature_lower.png rename to content/articles/playground/assets/feature/feature_lower.png diff --git a/src/content/articles/playground/assets/feature/feature_upper.png b/content/articles/playground/assets/feature/feature_upper.png similarity index 100% rename from src/content/articles/playground/assets/feature/feature_upper.png rename to content/articles/playground/assets/feature/feature_upper.png diff --git a/src/content/articles/playground/assets/header/background-street.png b/content/articles/playground/assets/header/background-street.png similarity index 100% rename from src/content/articles/playground/assets/header/background-street.png rename to content/articles/playground/assets/header/background-street.png diff --git a/src/content/articles/playground/assets/header/background.png b/content/articles/playground/assets/header/background.png similarity index 100% rename from src/content/articles/playground/assets/header/background.png rename to content/articles/playground/assets/header/background.png diff --git a/src/content/articles/playground/assets/header/immersive_left/base_v2.png b/content/articles/playground/assets/header/immersive_left/base_v2.png similarity index 100% rename from src/content/articles/playground/assets/header/immersive_left/base_v2.png rename to content/articles/playground/assets/header/immersive_left/base_v2.png diff --git a/src/content/articles/playground/assets/header/immersive_left/full.png b/content/articles/playground/assets/header/immersive_left/full.png similarity index 100% rename from src/content/articles/playground/assets/header/immersive_left/full.png rename to content/articles/playground/assets/header/immersive_left/full.png diff --git a/src/content/articles/playground/assets/header/immersive_left/outer_v2.png b/content/articles/playground/assets/header/immersive_left/outer_v2.png similarity index 100% rename from src/content/articles/playground/assets/header/immersive_left/outer_v2.png rename to content/articles/playground/assets/header/immersive_left/outer_v2.png diff --git a/src/content/articles/playground/assets/header/immersive_right/full.png b/content/articles/playground/assets/header/immersive_right/full.png similarity index 100% rename from src/content/articles/playground/assets/header/immersive_right/full.png rename to content/articles/playground/assets/header/immersive_right/full.png diff --git a/src/content/articles/playground/assets/header/immersive_right/inner.png b/content/articles/playground/assets/header/immersive_right/inner.png similarity index 100% rename from src/content/articles/playground/assets/header/immersive_right/inner.png rename to content/articles/playground/assets/header/immersive_right/inner.png diff --git a/src/content/articles/playground/assets/header/immersive_right/outer.png b/content/articles/playground/assets/header/immersive_right/outer.png similarity index 100% rename from src/content/articles/playground/assets/header/immersive_right/outer.png rename to content/articles/playground/assets/header/immersive_right/outer.png diff --git a/src/content/articles/playground/assets/header/logo.png b/content/articles/playground/assets/header/logo.png similarity index 100% rename from src/content/articles/playground/assets/header/logo.png rename to content/articles/playground/assets/header/logo.png diff --git a/src/content/articles/playground/content.md b/content/articles/playground/content.md similarity index 100% rename from src/content/articles/playground/content.md rename to content/articles/playground/content.md diff --git a/src/content/articles/playground/media/enemy.jpg b/content/articles/playground/media/enemy.jpg similarity index 100% rename from src/content/articles/playground/media/enemy.jpg rename to content/articles/playground/media/enemy.jpg diff --git a/src/content/articles/playground/media/joker.jpg b/content/articles/playground/media/joker.jpg similarity index 100% rename from src/content/articles/playground/media/joker.jpg rename to content/articles/playground/media/joker.jpg diff --git a/src/content/articles/playground/media/menu.jpg b/content/articles/playground/media/menu.jpg similarity index 100% rename from src/content/articles/playground/media/menu.jpg rename to content/articles/playground/media/menu.jpg diff --git a/src/content/articles/playground/playground.pagex.js b/content/articles/playground/playground.pagex.js similarity index 100% rename from src/content/articles/playground/playground.pagex.js rename to content/articles/playground/playground.pagex.js diff --git a/src/content/authors/assets/bignutty.png b/content/authors/assets/bignutty.png similarity index 100% rename from src/content/authors/assets/bignutty.png rename to content/authors/assets/bignutty.png diff --git a/src/content/authors/assets/labscore.webp b/content/authors/assets/labscore.webp similarity index 100% rename from src/content/authors/assets/labscore.webp rename to content/authors/assets/labscore.webp diff --git a/src/content/authors/bignutty.pagex.js b/content/authors/bignutty.pagex.js similarity index 86% rename from src/content/authors/bignutty.pagex.js rename to content/authors/bignutty.pagex.js index 8c6a015..2536f07 100644 --- a/src/content/authors/bignutty.pagex.js +++ b/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, diff --git a/src/content/authors/labsCoreMaintainers.pagex.js b/content/authors/labsCoreMaintainers.pagex.js similarity index 82% rename from src/content/authors/labsCoreMaintainers.pagex.js rename to content/authors/labsCoreMaintainers.pagex.js index 16f4a46..04793a1 100644 --- a/src/content/authors/labsCoreMaintainers.pagex.js +++ b/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, diff --git a/content/authors/placeholder.pagex.js b/content/authors/placeholder.pagex.js new file mode 100644 index 0000000..16168f5 --- /dev/null +++ b/content/authors/placeholder.pagex.js @@ -0,0 +1,7 @@ +import {VoidcannonContentType} from "voidcannon"; + +export default { + type: VoidcannonContentType.AUTHOR, + id: "placeholder", + name: "Placeholder Author", +} \ No newline at end of file diff --git a/src/content/authors/testauthor.pagex.js b/content/authors/testauthor.pagex.js similarity index 72% rename from src/content/authors/testauthor.pagex.js rename to content/authors/testauthor.pagex.js index b927b19..8a69171 100644 --- a/src/content/authors/testauthor.pagex.js +++ b/content/authors/testauthor.pagex.js @@ -1,5 +1,4 @@ -import {PagexResourceTransformer} from "pagex"; -import {VoidcannonContentType, VoidcannonEmojiStyle, VoidcannonLinksIconType} from "voidcannon"; +import {VoidcannonContentType} from "voidcannon"; export default { type: VoidcannonContentType.AUTHOR, diff --git a/src/content/collections/_featured.pagex.js b/content/collections/_featured.pagex.js similarity index 100% rename from src/content/collections/_featured.pagex.js rename to content/collections/_featured.pagex.js diff --git a/src/content/collections/assets/gramophone.png b/content/collections/assets/gramophone.png similarity index 100% rename from src/content/collections/assets/gramophone.png rename to content/collections/assets/gramophone.png diff --git a/src/content/collections/discord.pagex.js b/content/collections/discord.pagex.js similarity index 89% rename from src/content/collections/discord.pagex.js rename to content/collections/discord.pagex.js index 1e3f403..21775a1 100644 --- a/src/content/collections/discord.pagex.js +++ b/content/collections/discord.pagex.js @@ -1,5 +1,4 @@ import {VoidcannonCollectionColor, VoidcannonCollectionIconType, VoidcannonContentType} from "voidcannon"; -import {PagexResourceTransformer} from "pagex"; export default { type: VoidcannonContentType.COLLECTION, diff --git a/src/content/collections/gramophone.pagex.js b/content/collections/gramophone.pagex.js similarity index 100% rename from src/content/collections/gramophone.pagex.js rename to content/collections/gramophone.pagex.js diff --git a/src/content/collections/snacked.png b/content/collections/snacked.png similarity index 100% rename from src/content/collections/snacked.png rename to content/collections/snacked.png diff --git a/src/content/collections/test.pagex.js b/content/collections/test.pagex.js similarity index 100% rename from src/content/collections/test.pagex.js rename to content/collections/test.pagex.js diff --git a/src/content/collections/videogames.pagex.js b/content/collections/videogames.pagex.js similarity index 100% rename from src/content/collections/videogames.pagex.js rename to content/collections/videogames.pagex.js diff --git a/src/content/editorial/home-debug/content.md b/content/editorial/home-debug/content.md similarity index 100% rename from src/content/editorial/home-debug/content.md rename to content/editorial/home-debug/content.md diff --git a/src/content/editorial/home-debug/home-debug.pagex.js b/content/editorial/home-debug/home-debug.pagex.js similarity index 100% rename from src/content/editorial/home-debug/home-debug.pagex.js rename to content/editorial/home-debug/home-debug.pagex.js diff --git a/src/content/editorial/home/content.md b/content/editorial/home/content.md similarity index 100% rename from src/content/editorial/home/content.md rename to content/editorial/home/content.md diff --git a/src/content/editorial/home/home.pagex.js b/content/editorial/home/home.pagex.js similarity index 72% rename from src/content/editorial/home/home.pagex.js rename to content/editorial/home/home.pagex.js index 6c77d58..ca8121d 100644 --- a/src/content/editorial/home/home.pagex.js +++ b/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"; diff --git a/src/content/editorial/recent-articles/recent-articles.pagex.js b/content/editorial/recent-articles/recent-articles.pagex.js similarity index 62% rename from src/content/editorial/recent-articles/recent-articles.pagex.js rename to content/editorial/recent-articles/recent-articles.pagex.js index 53bf279..86da703 100644 --- a/src/content/editorial/recent-articles/recent-articles.pagex.js +++ b/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, diff --git a/src/content/static/404/404.pagex.js b/content/static/404/404.pagex.js similarity index 100% rename from src/content/static/404/404.pagex.js rename to content/static/404/404.pagex.js diff --git a/gm3 b/gm3 index 2489dd7..cf2dfe6 160000 --- a/gm3 +++ b/gm3 @@ -1 +1 @@ -Subproject commit 2489dd711c5a72996080678f89f11df7f9c4f3df +Subproject commit cf2dfe6e9d7148de034b6abf6c12b0a05972a0ff diff --git a/package-lock.json b/package-lock.json index 6f25c0b..f1b5bad 100644 --- a/package-lock.json +++ b/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", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "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", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", - "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz", + "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" diff --git a/pagex b/pagex index 0a6ff63..10d2724 160000 --- a/pagex +++ b/pagex @@ -1 +1 @@ -Subproject commit 0a6ff63dd5074755cbfe0e3b4941d601e7418b81 +Subproject commit 10d2724cfdbb26e2b288d7ed51b3b6b4c79dc974 diff --git a/pagex.config.js b/pagex.config.js index e8dc5c6..61279b5 100644 --- a/pagex.config.js +++ b/pagex.config.js @@ -8,7 +8,7 @@ export default { }, resources: { content: { - path: "./src/", + path: "./content/", resolvers: { "pagex.js": "builtin" } diff --git a/src/content/authors/placeholder.pagex.js b/src/content/authors/placeholder.pagex.js deleted file mode 100644 index 8318c88..0000000 --- a/src/content/authors/placeholder.pagex.js +++ /dev/null @@ -1,8 +0,0 @@ -import {PagexResourceTransformer} from "pagex"; -import {VoidcannonContentType, VoidcannonEmojiStyle} from "voidcannon"; - -export default { - type: VoidcannonContentType.AUTHOR, - id: "placeholder", - name: "Placeholder Author", -} \ No newline at end of file diff --git a/voidcannon b/voidcannon index d9d1d1d..8e96384 160000 --- a/voidcannon +++ b/voidcannon @@ -1 +1 @@ -Subproject commit d9d1d1d6b6214c8b1f11e286e5653636ee8cae05 +Subproject commit 8e963849d2a3c541c929ca5652d4edce98d6a678 diff --git a/webicons b/webicons index c804b0a..7772b83 160000 --- a/webicons +++ b/webicons @@ -1 +1 @@ -Subproject commit c804b0a9fd55f1fb29857609957fb3438c841139 +Subproject commit 7772b835322f321417486d6fa4ec531079a1881a