Skip to content

Commit dd70457

Browse files
Merge pull request #875 from GSA/GSA/issue-866/astro-upgrade
Upgrade from Astro 4 to 5
2 parents c4cfc75 + dc94a52 commit dd70457

File tree

127 files changed

+1948
-3280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+1948
-3280
lines changed

package-lock.json

Lines changed: 1877 additions & 3248 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"link-checker": "npx linkinator http://localhost:4321/ --config linkinator-config.json"
2121
},
2222
"dependencies": {
23-
"@astrojs/mdx": "^3.0.0",
24-
"@astrojs/sitemap": "^3.1.4",
25-
"astro": "^4.9.1",
23+
"@astrojs/mdx": "^4.2.4",
24+
"@astrojs/sitemap": "^3.3.0",
25+
"astro": "^5.7.4",
2626
"hast-util-select": "^5.0.5",
2727
"marked": "^8.0.1",
2828
"marked-smartypants": "^1.1.2",

src/components/StateTaxSelection.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { getCollection } from 'astro:content';
33
44
const {current_state, label} = Astro.props;
5-
const states = await getCollection('state-taxes');
5+
const states = await getCollection('stateTaxes');
66
77
states.sort((a, b) => a.data.name.localeCompare(b.data.name));
88
---

src/content.config.ts

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import { z, defineCollection } from 'astro:content';
2+
import { glob } from "astro/loaders";
3+
4+
const nav = defineCollection({
5+
loader: glob({ pattern: "**/*.yaml", base: "./src/content/nav" })
6+
})
7+
8+
9+
// Define types for content collections
10+
const faqCollection = defineCollection({
11+
schema: z.object({
12+
title: z.string(),
13+
order: z.number(),
14+
description: z.string()
15+
}),
16+
});
17+
18+
const helpfulHints = defineCollection({})
19+
const about = defineCollection({})
20+
const contact = defineCollection({})
21+
const audits = defineCollection({})
22+
const merchants = defineCollection({})
23+
const smartBulletins = defineCollection({})
24+
const howItWorks = defineCollection({})
25+
const guidanceAndAudits = defineCollection({})
26+
const resources = defineCollection({})
27+
const smartTax = defineCollection({})
28+
const stakeholders = defineCollection({})
29+
const stateTaxes = defineCollection({})
30+
const travelPublications = defineCollection({})
31+
const publications = defineCollection({})
32+
const forumPresentations2023 = defineCollection({})
33+
34+
export const collections = {
35+
'faq': faqCollection,
36+
forumPresentations2023,
37+
nav,
38+
helpfulHints,
39+
about,
40+
contact,
41+
audits,
42+
merchants,
43+
smartBulletins,
44+
howItWorks,
45+
guidanceAndAudits,
46+
resources,
47+
smartTax,
48+
stakeholders,
49+
stateTaxes,
50+
travelPublications,
51+
publications
52+
};

src/content/config.ts

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/content/forum-presentations-2023/forum-presentations-2023.md renamed to src/content/forumPresentations2023/forum-presentations-2023.md

0 commit comments

Comments
 (0)