Skip to content

Commit

Permalink
Merge pull request #22 from tomByrer/main
Browse files Browse the repository at this point in the history
upgrade to Astro3.0
  • Loading branch information
ChristineTham authored Sep 14, 2023
2 parents 6a8145f + 7e4ca93 commit 710b1d4
Show file tree
Hide file tree
Showing 6 changed files with 633 additions and 450 deletions.
22 changes: 21 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,25 @@
},
"files.associations": {
"*.mdoc": "markdown"
}
},
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#c14c58",
"activityBar.background": "#c14c58",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#64c659",
"activityBarBadge.foreground": "#15202b",
"commandCenter.border": "#e7e7e799",
"sash.hoverBorder": "#c14c58",
"statusBar.background": "#a23843",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#c14c58",
"statusBarItem.remoteBackground": "#a23843",
"statusBarItem.remoteForeground": "#e7e7e7",
"titleBar.activeBackground": "#a23843",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#a2384399",
"titleBar.inactiveForeground": "#e7e7e799"
},
"peacock.color": "#a23843"
}
9 changes: 4 additions & 5 deletions astro.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@ export default defineConfig({
}
},
site: 'https://hellotham.github.io',
base: '/hello-astro',
base: '/hello-astro/',
integrations: [tailwind(), sitemap(), mdx(), alpinejs(), robotsTxt(), markdoc()],
experimental: {
viewTransitions: true,
assets: true
},
markdown: {
extendDefaultPlugins: true,
Expand All @@ -37,6 +35,7 @@ export default defineConfig({
langs: [],
// Enable word wrap to prevent horizontal scrolling
wrap: true
}
}
},
},
scopedStyleStrategy: "where",
});
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
},
"devDependencies": {
"@akebifiky/remark-simple-plantuml": "^1.0.2",
"@astrojs/alpinejs": "^0.2.2",
"@astrojs/mdx": "^0.19.7",
"@astrojs/sitemap": "^2.0.2",
"@astrojs/tailwind": "^4.0.0",
"@astrojs/alpinejs": "^0.3.0",
"@astrojs/mdx": "^1.0.2",
"@astrojs/sitemap": "^3.0.0",
"@astrojs/tailwind": "^5.0.0",
"@tailwindcss/aspect-ratio": "^0.4.2",
"@tailwindcss/forms": "^0.5.4",
"@tailwindcss/line-clamp": "^0.4.4",
Expand All @@ -29,10 +29,10 @@
"@types/photoswipe": "^4.1.2",
"@typescript-eslint/parser": "^6.4.0",
"alpinejs": "^3.12.3",
"astro": "^2.10.9",
"astro-robots-txt": "^0.5.0",
"astro": "^3.0.10",
"astro-robots-txt": "^1.0.0",
"eslint": "^8.47.0",
"eslint-plugin-astro": "^0.28.0",
"eslint-plugin-astro": "^0.29.0",
"eslint-plugin-css": "^0.8.1",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-markdown": "^3.0.1",
Expand All @@ -41,23 +41,23 @@
"mdast-util-to-string": "^4.0.0",
"prettier": "^3.0.2",
"prettier-config-standard": "^7.0.0",
"prettier-plugin-astro": "^0.11.1",
"prettier-plugin-astro": "^0.12.0",
"prettier-plugin-tailwindcss": "^0.5.3",
"reading-time": "^1.5.0",
"rehype-katex": "^6.0.3",
"remark-emoji": "^4.0.0",
"remark-math": "^5.1.1",
"schema-dts": "^1.1.2",
"tailwindcss": "^3.3.3",
"typescript": "~5.1.6",
"typescript": "~5.2.2",
"unist-util-visit": "^5.0.0",
"vite": "^4.4.9"
},
"dependencies": {
"@astrojs/markdoc": "^0.4.4",
"@astrojs/rss": "^2.4.4",
"@astrojs/markdoc": "^0.5.0",
"@astrojs/rss": "^3.0.0",
"astro-icon": "^0.8.1",
"astro-seo": "^0.7.5",
"astro-seo": "^0.8.0",
"hero-patterns": "^2.1.0",
"katex": "^0.16.8",
"leaflet": "^1.9.4",
Expand Down
Loading

0 comments on commit 710b1d4

Please sign in to comment.