update to astro 5
This commit is contained in:
parent
e151d8c304
commit
a449f976c7
5 changed files with 1205 additions and 831 deletions
14
default.nix
14
default.nix
|
@ -4,7 +4,7 @@
|
||||||
nix-gitignore,
|
nix-gitignore,
|
||||||
|
|
||||||
yarn-berry,
|
yarn-berry,
|
||||||
nodejs_22,
|
nodejs,
|
||||||
cacert,
|
cacert,
|
||||||
quickshell-types ? null,
|
quickshell-types ? null,
|
||||||
}: stdenv.mkDerivation (final: let
|
}: stdenv.mkDerivation (final: let
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
src = final.src;
|
src = final.src;
|
||||||
|
|
||||||
nativeBuildInputs = [ nodejs_22 yarn-berry cacert ];
|
nativeBuildInputs = [ nodejs yarn-berry cacert ];
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
mkdir garbage-tooling
|
mkdir garbage-tooling
|
||||||
|
@ -29,13 +29,6 @@
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildPhase = ''
|
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
|
HOME=$(pwd)/garbage-tooling yarn install
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -43,7 +36,6 @@
|
||||||
# none of the cache path configs in yarnrc actually do anything
|
# none of the cache path configs in yarnrc actually do anything
|
||||||
# so we just copy node_modules manually
|
# 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
|
mv node_modules $out
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -51,7 +43,7 @@
|
||||||
|
|
||||||
outputHashMode = "recursive";
|
outputHashMode = "recursive";
|
||||||
outputHashAlgo = "sha256";
|
outputHashAlgo = "sha256";
|
||||||
outputHash = "tZ4xuA7uNnMIEpSUmQ5TAWPdvRGFJWIgWyBa1QFFWWU=";
|
outputHash = "V1sjOLi6UOb3HQLiGTcGJInDU7H28fjzdmrxYXXI0ug=";
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
pname = "quickshell-web";
|
pname = "quickshell-web";
|
||||||
|
|
17
package.json
17
package.json
|
@ -12,21 +12,20 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@ark-ui/solid": "^3.5.0",
|
"@ark-ui/solid": "^3.5.0",
|
||||||
"@astrojs/check": "^0.9.4",
|
"@astrojs/check": "^0.9.4",
|
||||||
"@astrojs/markdown-remark": "^5.3.0",
|
"@astrojs/markdown-remark": "^6.3.1",
|
||||||
"@astrojs/mdx": "^3.1.8",
|
"@astrojs/mdx": "^4.2.6",
|
||||||
"@astrojs/sitemap": "^3.2.1",
|
"@astrojs/sitemap": "^3.4.0",
|
||||||
"@astrojs/solid-js": "^4.4.2",
|
"@astrojs/solid-js": "^5.0.10",
|
||||||
"@fontsource-variable/rubik": "^5.1.0",
|
"@fontsource-variable/rubik": "^5.1.0",
|
||||||
"@hbsnow/rehype-sectionize": "^1.0.7",
|
"@hbsnow/rehype-sectionize": "^1.0.7",
|
||||||
"@pagefind/default-ui": "^1.1.1",
|
"@pagefind/default-ui": "^1.1.1",
|
||||||
"@shikijs/rehype": "^1.22.0",
|
"@shikijs/rehype": "^3.4.2",
|
||||||
"@types/node": "^20.14.11",
|
"@types/node": "^20.14.11",
|
||||||
"astro": "^4.16.6",
|
"astro": "^5.7.13",
|
||||||
"astro-breadcrumbs": "^2.3.1",
|
"astro-breadcrumbs": "^3.3.1",
|
||||||
"astro-icon": "^1.1.1",
|
"astro-icon": "^1.1.5",
|
||||||
"hast": "^1.0.0",
|
"hast": "^1.0.0",
|
||||||
"hast-util-from-html": "^2.0.3",
|
"hast-util-from-html": "^2.0.3",
|
||||||
"node": "npm:22.7.0",
|
|
||||||
"remark-github-blockquote-alert": "^1.2.1",
|
"remark-github-blockquote-alert": "^1.2.1",
|
||||||
"solid-devtools": "^0.30.1",
|
"solid-devtools": "^0.30.1",
|
||||||
"solid-js": "^1.8.18",
|
"solid-js": "^1.8.18",
|
||||||
|
|
|
@ -12,7 +12,7 @@ const props = Astro.props;
|
||||||
<section class="credits">
|
<section class="credits">
|
||||||
<p class="hint">Brought to you by:</p>
|
<p class="hint">Brought to you by:</p>
|
||||||
<a href="https://outfoxxed.me" target="_blank">outfoxxed - <span class="hint">Lead Developer</span></a>
|
<a href="https://outfoxxed.me" target="_blank">outfoxxed - <span class="hint">Lead Developer</span></a>
|
||||||
<a href="https://xanazf.github.io" target="_blank">Xanazf - <span class="hint">Website Developer / Designer</span></a>
|
<a href="https://xanazf.github.io" target="_blank">xanazf - <span class="hint">Website Developer / Designer</span></a>
|
||||||
<a href="https://github.com/quickshell-mirror/quickshell/graphs/contributors" target="_blank">
|
<a href="https://github.com/quickshell-mirror/quickshell/graphs/contributors" target="_blank">
|
||||||
and our contributors
|
and our contributors
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -9,7 +9,7 @@ interface Props {
|
||||||
}
|
}
|
||||||
const { title, link, current } = Astro.props;
|
const { title, link, current } = Astro.props;
|
||||||
---
|
---
|
||||||
<Accordion class=`nav-component nav-collapsible ${current ? "nav-current" : ""}` {...(current ? { open: "" } : {})}>
|
<Accordion class=`nav-component nav-collapsible ${current ? "nav-current" : ""}` {...(current ? { open: "_" } : {})}>
|
||||||
<div slot="header">
|
<div slot="header">
|
||||||
<a class=`nav-link ${current ? "nav-current" : ""}` href={link}>{title}</a>
|
<a class=`nav-link ${current ? "nav-current" : ""}` href={link}>{title}</a>
|
||||||
<div class="nav-collapse-marker">
|
<div class="nav-collapse-marker">
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue