Skip to content

Commit

Permalink
Merge pull request #295 from jakemulley/astro
Browse files Browse the repository at this point in the history
Move site to Astro
  • Loading branch information
jakemulley authored Nov 29, 2023
2 parents 85ccb21 + 7cbe19a commit 9ca04c0
Show file tree
Hide file tree
Showing 55 changed files with 8,097 additions and 3,612 deletions.
41 changes: 0 additions & 41 deletions .eleventy.js

This file was deleted.

1 change: 0 additions & 1 deletion .eleventyignore

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/ci.yml

This file was deleted.

30 changes: 15 additions & 15 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ name: Deploy to GitHub Pages

on:
push:
branches:
- main
branches: [main]
pull_request:
branches: [main]
workflow_dispatch:

permissions:
Expand All @@ -16,21 +17,20 @@ concurrency:
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: withastro/action@v1
with:
node-version: 20
deploy:
if: ${{ github.ref == 'refs/heads/main' }}
needs: build
runs-on: ubuntu-latest
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '18.x'
- run: npm ci
- run: npm run build
- uses: actions/configure-pages@v3
- uses: actions/upload-pages-artifact@v2
with:
path: './docs'
- id: deployment
uses: actions/deploy-pages@v2
- uses: actions/deploy-pages@v2
id: deployment
22 changes: 20 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
node_modules
# build output
dist/

# generated types
.astro/

# dependencies
node_modules/

# logs
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*

# environment variables
.env
.env.production

# macOS-specific files
.DS_Store
docs/
4 changes: 4 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"recommendations": ["astro-build.astro-vscode"],
"unwantedRecommendations": []
}
11 changes: 11 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"version": "0.2.0",
"configurations": [
{
"command": "./node_modules/.bin/astro dev",
"name": "Development server",
"request": "launch",
"type": "node-terminal"
}
]
}
46 changes: 46 additions & 0 deletions astro.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import { defineConfig } from "astro/config";
import mdx from "@astrojs/mdx";
import sitemap from "@astrojs/sitemap";
import tailwind from "@astrojs/tailwind";
import compress from "astro-compress";

// https://astro.build/config
export default defineConfig({
site: "https://jakemulley.com",
integrations: [
mdx(),
sitemap(),
tailwind(),
compress({
HTML: {
"html-minifier-terser": {
caseSensitive: false,
collapseInlineTagWhitespace: false,
collapseWhitespace: true,
continueOnParseError: false,
html5: true,
ignoreCustomComments: [/^!/, /^\s*#/],
includeAutoGeneratedTags: true,
keepClosingSlash: false,
minifyCSS: false,
minifyJS: false,
minifyURLs: false,
noNewlinesBeforeTagClose: false,
preventAttributesEscaping: false,
processConditionalComments: false,
processScripts: [],
quoteCharacter: '"',
removeAttributeQuotes: false,
removeComments: true,
removeScriptTypeAttributes: false,
removeStyleLinkTypeAttributes: false,
removeTagWhitespace: false,
sortAttributes: false,
sortClassName: false,
trimCustomFragments: false,
useShortDoctype: true,
},
},
}),
],
});
Loading

0 comments on commit 9ca04c0

Please sign in to comment.