1
1
Fork 0

Compare commits

...

2 commits

Author SHA1 Message Date
Ava Gaiety W
43c3c334f2 cleanup build and start commands 2025-04-18 18:26:02 -06:00
Ava Gaiety W
0d6a0143c0 upgrade to eleventy v3.x 2025-04-18 18:01:27 -06:00
5 changed files with 2236 additions and 910 deletions

View file

@ -41,11 +41,11 @@ setup(hljs);
const md = markdownit({ const md = markdownit({
linkify: true, linkify: true,
html: true, html: true,
highlight: function(str, lang) { highlight: function (str, lang) {
if (lang && hljs.getLanguage(lang)) { if (lang && hljs.getLanguage(lang)) {
try { try {
return hljs.highlight(str, { language: lang }).value; return hljs.highlight(str, { language: lang }).value;
} catch (__) {} } catch (__) { }
} }
return ''; // use external default escaping return ''; // use external default escaping
@ -53,7 +53,7 @@ const md = markdownit({
}); });
md.use(markdownitClass, markdownClassMapping); md.use(markdownitClass, markdownClassMapping);
module.exports = function(eleventyConfig) { module.exports = function (eleventyConfig) {
let nunjucksEnvironment = new Nunjucks.Environment( let nunjucksEnvironment = new Nunjucks.Environment(
new Nunjucks.FileSystemLoader("_includes") new Nunjucks.FileSystemLoader("_includes")
); );

View file

@ -6,28 +6,17 @@ Uses [mise](https://mise.jdx.dev/), install necessary runtimes with `mise instal
## Developing ## Developing
In two terminals
```sh ```sh
# first terminal
npm start npm start
# second terminal
npm run start:site
```
## Building for production, static site
```sh
npm run build
``` ```
## Deploy steps ## Deploy steps
Requires Docker, NodeJS
_Docker container automatically performs dependency install and build_ _Docker container automatically performs dependency install and build_
```sh ```sh
npm run deploy npm run deploy
# or...
docker compose up --build -d
``` ```

View file

@ -25,6 +25,7 @@
<meta property="og:image:alt" content="Gaiety's visual representation as a fursona (an original furry fandom character) depicted as an animated gif falling downward with a controlled hand outstretched. Faer hair and tail waves in the wind while their floppy dog ears flop about as well. Fae are an anthromorphic canine like a german shepherd clothed like a human in a t-shirt and denim shorts. Art is by Lynte." /> <meta property="og:image:alt" content="Gaiety's visual representation as a fursona (an original furry fandom character) depicted as an animated gif falling downward with a controlled hand outstretched. Faer hair and tail waves in the wind while their floppy dog ears flop about as well. Fae are an anthromorphic canine like a german shepherd clothed like a human in a t-shirt and denim shorts. Art is by Lynte." />
{% endif %} {% endif %}
<meta property="og:url" content="https://gaiety.me{{ page.url }}" /> <meta property="og:url" content="https://gaiety.me{{ page.url }}" />
<meta name="generator" content="Eleventy v3.0.0">
<link href="/styles.css" rel="stylesheet"> <link href="/styles.css" rel="stylesheet">
<link href="/catppuccin.variables.css" rel="stylesheet"> <link href="/catppuccin.variables.css" rel="stylesheet">

3115
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -5,10 +5,12 @@
"author": "Ava Gaiety W. <ava@wroten.me> (https://www.gaiety.me/)", "author": "Ava Gaiety W. <ava@wroten.me> (https://www.gaiety.me/)",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"start": "npx postcss styles.css -o _site/styles.css --watch", "prestart": "npm run build",
"start": "run-p start:*",
"start:styles": "npx postcss styles.css -o _site/styles.css --watch",
"start:site": "npx @11ty/eleventy --serve", "start:site": "npx @11ty/eleventy --serve",
"build": "npx @11ty/eleventy", "build": "npx @11ty/eleventy",
"postbuild": "npm run postbuild:styles && npm run postbuild:highlighttheme", "postbuild": "run-s postbuild:*",
"postbuild:highlighttheme": "cp ./node_modules/@catppuccin/highlightjs/css/catppuccin.variables.css ./_site", "postbuild:highlighttheme": "cp ./node_modules/@catppuccin/highlightjs/css/catppuccin.variables.css ./_site",
"postbuild:styles": "npx tailwindcss -i styles.css -o _site/styles.css --env production", "postbuild:styles": "npx tailwindcss -i styles.css -o _site/styles.css --env production",
"optimize": "rm -rf _site/_jampack && jampack _site", "optimize": "rm -rf _site/_jampack && jampack _site",
@ -27,7 +29,7 @@
} }
}, },
"devDependencies": { "devDependencies": {
"@11ty/eleventy": "^2.0.1", "@11ty/eleventy": "^3.0.0",
"@11ty/eleventy-plugin-syntaxhighlight": "^3.1.3", "@11ty/eleventy-plugin-syntaxhighlight": "^3.1.3",
"@catppuccin/highlightjs": "^0.1.4", "@catppuccin/highlightjs": "^0.1.4",
"@catppuccin/tailwindcss": "^0.1.6", "@catppuccin/tailwindcss": "^0.1.6",
@ -40,6 +42,7 @@
"highlightjs-glimmer": "^2.2.1", "highlightjs-glimmer": "^2.2.1",
"install": "^0.13.0", "install": "^0.13.0",
"npm": "^10.5.0", "npm": "^10.5.0",
"npm-run-all": "^4.1.5",
"postcss": "^8.3.11", "postcss": "^8.3.11",
"postcss-cli": "^9.0.1", "postcss-cli": "^9.0.1",
"tailwindcss": "^3.4.1", "tailwindcss": "^3.4.1",