diff --git a/default.nix b/default.nix index 4772e1c..2d6ae88 100644 --- a/default.nix +++ b/default.nix @@ -4,7 +4,7 @@ nix-gitignore, yarn-berry, - nodejs_22, + nodejs, cacert, quickshell-types ? null, }: stdenv.mkDerivation (final: let @@ -14,7 +14,7 @@ src = final.src; - nativeBuildInputs = [ nodejs_22 yarn-berry cacert ]; + nativeBuildInputs = [ nodejs yarn-berry cacert ]; configurePhase = '' mkdir garbage-tooling @@ -29,13 +29,6 @@ ''; buildPhase = '' - # build will fail once due to missing nodejs executable - # linking before running this won't work, it will just delete it - HOME=$(pwd)/garbage-tooling yarn install || true - - mkdir -p node_modules/node/bin - ln -s ${nodejs_22}/bin/node node_modules/node/bin/node - HOME=$(pwd)/garbage-tooling yarn install ''; @@ -43,7 +36,6 @@ # none of the cache path configs in yarnrc actually do anything # so we just copy node_modules manually - rm node_modules/node/bin/node # remove dep on nix package for output hash mv node_modules $out ''; @@ -51,7 +43,7 @@ outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "tZ4xuA7uNnMIEpSUmQ5TAWPdvRGFJWIgWyBa1QFFWWU="; + outputHash = "V1sjOLi6UOb3HQLiGTcGJInDU7H28fjzdmrxYXXI0ug="; }; in { pname = "quickshell-web"; diff --git a/package.json b/package.json index a9fcd68..ec2ab0e 100644 --- a/package.json +++ b/package.json @@ -12,21 +12,20 @@ "dependencies": { "@ark-ui/solid": "^3.5.0", "@astrojs/check": "^0.9.4", - "@astrojs/markdown-remark": "^5.3.0", - "@astrojs/mdx": "^3.1.8", - "@astrojs/sitemap": "^3.2.1", - "@astrojs/solid-js": "^4.4.2", + "@astrojs/markdown-remark": "^6.3.1", + "@astrojs/mdx": "^4.2.6", + "@astrojs/sitemap": "^3.4.0", + "@astrojs/solid-js": "^5.0.10", "@fontsource-variable/rubik": "^5.1.0", "@hbsnow/rehype-sectionize": "^1.0.7", "@pagefind/default-ui": "^1.1.1", - "@shikijs/rehype": "^1.22.0", + "@shikijs/rehype": "^3.4.2", "@types/node": "^20.14.11", - "astro": "^4.16.6", - "astro-breadcrumbs": "^2.3.1", - "astro-icon": "^1.1.1", + "astro": "^5.7.13", + "astro-breadcrumbs": "^3.3.1", + "astro-icon": "^1.1.5", "hast": "^1.0.0", "hast-util-from-html": "^2.0.3", - "node": "npm:22.7.0", "remark-github-blockquote-alert": "^1.2.1", "solid-devtools": "^0.30.1", "solid-js": "^1.8.18", diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 1341caa..6c8bc3e 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -12,7 +12,7 @@ const props = Astro.props;

Brought to you by:

outfoxxed - Lead Developer - Xanazf - Website Developer / Designer + xanazf - Website Developer / Designer and our contributors diff --git a/src/components/navigation/sidebars/nav/NavCollapsible.astro b/src/components/navigation/sidebars/nav/NavCollapsible.astro index aa45d63..ef3352b 100644 --- a/src/components/navigation/sidebars/nav/NavCollapsible.astro +++ b/src/components/navigation/sidebars/nav/NavCollapsible.astro @@ -9,7 +9,7 @@ interface Props { } const { title, link, current } = Astro.props; --- - +
{title}