Skip to content

Commit

Permalink
Merge pull request #545 from nblackburn/upgrade-deps
Browse files Browse the repository at this point in the history
Upgrade deps
  • Loading branch information
nblackburn committed Aug 9, 2024
2 parents 44d7aed + 19014c6 commit cd39325
Show file tree
Hide file tree
Showing 15 changed files with 558 additions and 689 deletions.
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@nblackburn/website",
"private": true,
"version": "1.45.0",
"version": "1.46.0",
"type": "module",
"scripts": {
"start": "astro dev",
Expand All @@ -15,20 +15,20 @@
"packageManager": "[email protected]",
"devDependencies": {
"@astrojs/check": "^0.9.2",
"@commitlint/cli": "^19.0.3",
"@commitlint/config-conventional": "^19.0.3",
"@playwright/test": "^1.42.1",
"@commitlint/cli": "^19.4.0",
"@commitlint/config-conventional": "^19.2.2",
"@playwright/test": "^1.46.0",
"@types/eslint": "^8",
"@types/node": "^20.11.27",
"@types/node": "^20.14.15",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"@vanilla-extract/vite-plugin": "^3.9.5",
"checkly": "^4.6.1",
"@vanilla-extract/vite-plugin": "^4.0.13",
"checkly": "^4.8.0",
"eslint": "^8.57.0",
"eslint-plugin-astro": "^1.2.3",
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"husky": "^9.1.4",
"lint-staged": "^15.2.8",
"prettier": "^3.3.3",
"ts-node": "^10.9.2",
"typescript": "^5.3.3"
},
Expand All @@ -37,14 +37,14 @@
"@astrojs/sitemap": "^3.1.6",
"@astrojs/vercel": "^7.7.2",
"@astrojs/vue": "^4.5.0",
"@fontsource/nunito-sans": "^5.0.12",
"@vanilla-extract/css": "^1.14.1",
"@fontsource/nunito-sans": "^5.0.13",
"@vanilla-extract/css": "^1.15.3",
"astro": "^4.13.2",
"date-fns": "^3.3.1",
"sharp": "^0.33.2",
"vue": "^3.4.21"
"date-fns": "^3.6.0",
"sharp": "^0.33.4",
"vue": "^3.4.37"
},
"resolutions": {
"deep-object-diff": "^1.1.9"
}
}
}
4 changes: 2 additions & 2 deletions src/components/button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import * as styles from './button.css';
interface Props {
disabled?: boolean
disabled?: boolean;
}
defineProps<Props>()
defineProps<Props>();
</script>
8 changes: 6 additions & 2 deletions src/components/fieldSet.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<template>
<fieldset :class="[styles.fieldSet, validated ? styles.validated : '']" :name="name" ref="fieldSet">
<fieldset
:class="[styles.fieldSet, validated ? styles.validated : '']"
:name="name"
ref="fieldSet"
>
<slot />
</fieldset>
</template>
Expand All @@ -10,7 +14,7 @@ import listenOnce from '@utilities/listenOnce';
import * as styles from '@components/fieldSet.css';
interface Props {
name?: string
name?: string;
}
defineProps<Props>();
Expand Down
6 changes: 3 additions & 3 deletions src/components/header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<AccentBar />
<div :class="styles.container">
<Link href="/">
<Logo />
<Logo />
</Link>
<Navbar :links="nav" :active-page="activePage" />
</div>
Expand All @@ -19,8 +19,8 @@ import Navbar from '@components/navBar.vue';
import AccentBar from '@components/accentBar.vue';
interface Props {
activePage?: string
};
activePage?: string;
}
defineProps<Props>();
</script>
29 changes: 19 additions & 10 deletions src/components/input.vue
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
<template>
<input :type="type" :name="name" :id="id" :required="required" :disabled="disabled" :value="modelValue"
:class="[styles.input, validated ? styles.validated : '']" @invalid="onValidated" @valid="onValidated"
@input="$emit('update:modelValue', $event?.target?.value)" />
<input
:type="type"
:name="name"
:id="id"
:required="required"
:disabled="disabled"
:value="modelValue"
:class="[styles.input, validated ? styles.validated : '']"
@invalid="onValidated"
@valid="onValidated"
@input="$emit('update:modelValue', $event?.target?.value)"
/>
</template>
<script lang="ts" setup>
import { ref } from 'vue';
import * as styles from './input.css';
interface Props {
type?: string,
name?: string,
id?: string,
required?: boolean,
disabled?: boolean,
modelValue?: string
};
type?: string;
name?: string;
id?: string;
required?: boolean;
disabled?: boolean;
modelValue?: string;
}
defineProps<Props>();
defineEmits(['update:modelValue']);
Expand Down
6 changes: 3 additions & 3 deletions src/components/link.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import config from '@app/config';
import { isExternalLink, buildRefLink } from '@utilities/refLink';
interface Props {
href?: string,
referrer?: string
};
href?: string;
referrer?: string;
}
const props = withDefaults(defineProps<Props>(), {
referrer: config.seo.ref
Expand Down
35 changes: 26 additions & 9 deletions src/components/linkGroups.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,31 @@
<template>
<div :class="styles.linkGroups">
<section v-for="group in groups" :key="group.id" :class="styles.linkGroup">
<section
v-for="group in groups"
:key="group.id"
:class="styles.linkGroup"
>
<h3 :class="styles.heading">{{ group.name }}</h3>
<ol :class="styles.items">
<li v-for="item in group.items" :key="item.id" :class="styles.item">
<Link :href="item.href" :class="styles.link" :aria-label="item.title + ' (External link)'">
<svg width="24" height="24" role="img" :class="styles.icon">
<use href="#external" />
</svg>
<span>{{ item.title }}</span>
<li
v-for="item in group.items"
:key="item.id"
:class="styles.item"
>
<Link
:href="item.href"
:class="styles.link"
:aria-label="item.title + ' (External link)'"
>
<svg
width="24"
height="24"
role="img"
:class="styles.icon"
>
<use href="#external" />
</svg>
<span>{{ item.title }}</span>
</Link>
</li>
</ol>
Expand All @@ -28,8 +45,8 @@ type Item = {
};
interface Props {
groups?: Group[]
};
groups?: Group[];
}
defineProps<Props>();
</script>
34 changes: 27 additions & 7 deletions src/components/logo.vue
Original file line number Diff line number Diff line change
@@ -1,23 +1,43 @@
<template>
<svg :width="size" :height="size" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
<svg
:width="size"
:height="size"
role="img"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 128 128"
>
<title>Logo</title>
<ellipse cx="22.831" cy="105.296" rx="10.031" ry="9.904" :fill="`rgb(${secondaryAccent})`" />
<ellipse
cx="22.831"
cy="105.296"
rx="10.031"
ry="9.904"
:fill="`rgb(${secondaryAccent})`"
/>
<path
d="M12.8,22.704c0,-5.466 4.495,-9.904 10.031,-9.904c2.769,-0 5.276,1.109 7.092,2.902l0.002,-0.001l31.381,30.983l-0.005,0.006c1.674,1.77 2.699,4.146 2.699,6.756c0,5.467 -4.495,9.905 -10.031,9.905c-2.645,-0 -5.051,-1.013 -6.844,-2.666l-0.005,0.006l-14.257,-14.076l-0,14.076c-0,5.466 -4.495,9.904 -10.032,9.904c-5.536,0 -10.031,-4.438 -10.031,-9.904l0,-37.987Z"
:fill="`rgb(${primaryAccent})`" />
<ellipse cx="105.169" cy="22.704" rx="10.031" ry="9.904" :fill="`rgb(${primaryAccent})`" />
:fill="`rgb(${primaryAccent})`"
/>
<ellipse
cx="105.169"
cy="22.704"
rx="10.031"
ry="9.904"
:fill="`rgb(${primaryAccent})`"
/>
<path
d="M95.137,67.309c0,-5.466 4.495,-9.904 10.032,-9.904c5.536,-0 10.031,4.438 10.031,9.904l0,37.987c0,5.466 -4.495,9.904 -10.031,9.904c-2.769,0 -5.276,-1.109 -7.092,-2.902l-0.002,0.001l-31.381,-30.983l0.005,-0.006c-1.674,-1.77 -2.699,-4.146 -2.699,-6.756c-0,-5.467 4.495,-9.905 10.031,-9.905c2.645,0 5.051,1.013 6.844,2.666l0.005,-0.006l14.257,14.076l0,-14.076Z"
:fill="`rgb(${secondaryAccent})`" />
:fill="`rgb(${secondaryAccent})`"
/>
</svg>
</template>

<script lang="ts" setup>
import { primaryAccent, secondaryAccent } from '@styles/theme.css';
interface Props {
size?: number
};
size?: number;
}
withDefaults(defineProps<Props>(), {
size: 48
Expand Down
16 changes: 11 additions & 5 deletions src/components/navBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@
<nav :class="styles.navBar">
<ol :class="styles.items">
<li v-for="link in links" :class="styles.item">
<NavLink :href="link.href" :key="link.id" :active="isActive(link)"
:aria-current="isActive(link) ? 'page' : false" secondary>{{ link.title }}</NavLink>
<NavLink
:href="link.href"
:key="link.id"
:active="isActive(link)"
:aria-current="isActive(link) ? 'page' : false"
secondary
>{{ link.title }}</NavLink
>
</li>
</ol>
</nav>
Expand All @@ -15,9 +21,9 @@ import type { NavItem } from '@config/nav';
import NavLink from '@components/navLink.vue';
interface Props {
activePage?: string,
links: NavItem[]
};
activePage?: string;
links: NavItem[];
}
const props = withDefaults(defineProps<Props>(), {
links: () => []
Expand Down
31 changes: 17 additions & 14 deletions src/components/navLink.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<template>
<Link :class="[
styles.navLink,
icon ? styles.icon : '',
active ? styles.active : '',
disabled ? styles.disabled : '',
secondary ? styles.secondary : styles.primary
]" :href="href">
<slot />
<Link
:class="[
styles.navLink,
icon ? styles.icon : '',
active ? styles.active : '',
disabled ? styles.disabled : '',
secondary ? styles.secondary : styles.primary
]"
:href="href"
>
<slot />
</Link>
</template>

Expand All @@ -15,12 +18,12 @@ import * as styles from './navLink.css';
import Link from '@components/link.vue';
interface Props {
href?: string,
icon?: boolean,
active?: boolean,
disabled?: boolean,
secondary?: boolean
};
href?: string;
icon?: boolean;
active?: boolean;
disabled?: boolean;
secondary?: boolean;
}
withDefaults(defineProps<Props>(), {
icon: false,
Expand Down
6 changes: 3 additions & 3 deletions src/components/pageHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import * as styles from './pageHeader.css';
interface Props {
title: string,
subTitle: string
};
title: string;
subTitle: string;
}
defineProps<Props>();
</script>
24 changes: 18 additions & 6 deletions src/components/pagination.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,24 @@
<nav :class="styles.pagination">
<ol :class="styles.items">
<li :class="styles.item">
<NavLink :class="styles.link" :href="links.prev" :disabled="!links.prev" :aria-disabled="!links.prev">
Previous</NavLink>
<NavLink
:class="styles.link"
:href="links.prev"
:disabled="!links.prev"
:aria-disabled="!links.prev"
>
Previous</NavLink
>
</li>
<li :class="styles.item">
<NavLink :class="styles.link" :href="links.next" :disabled="!links.next" :aria-disabled="!links.next">
Next</NavLink>
<NavLink
:class="styles.link"
:href="links.next"
:disabled="!links.next"
:aria-disabled="!links.next"
>
Next</NavLink
>
</li>
</ol>
</nav>
Expand All @@ -23,8 +35,8 @@ type URL = {
};
interface Props {
links: URL
};
links: URL;
}
withDefaults(defineProps<Props>(), {
links: () => {
Expand Down
Loading

1 comment on commit cd39325

@vercel
Copy link

@vercel vercel bot commented on cd39325 Aug 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.