⬆️ update deps; Astro 3x (#23)

scottnath · Sep 11, 2023 · d05ee7a · d05ee7a
1 parent a6e9476
commit d05ee7a
Show file tree

Hide file tree

Showing 11 changed files with 3,761 additions and 3,241 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v18
diff --git a/package-lock.json b/package-lock.json
diff --git a/workspaces/components/package.json b/workspaces/components/package.json
@@ -14,7 +14,7 @@
   "author": "scottnath",
   "license": "MIT",
   "devDependencies": {
-    "storydocker-storybook": "^0.0.11",
-    "storydocker-utilities": "^0.0.3"
+    "storydocker-storybook": "^0.0.16",
+    "storydocker-utilities": "^0.0.11"
   }
 }
diff --git a/workspaces/website/README.md b/workspaces/website/README.md
@@ -6,7 +6,7 @@
 
 [ ] get astro-icons working
 [ ] convert resume to web-component/lit
-[ ] make repo a workspace with separate component library and astro site
 [ ] add linter
-[ ] make work with testing-library at least
-[ ] need favicon
+[ ] make work with testing-library
+[ ] need favicon
+[ ] add github graph: https://github.com/enpitsuLin/wc-github-graph/blob/master/README.md
diff --git a/workspaces/website/astro.config.mjs b/workspaces/website/astro.config.mjs
@@ -17,7 +17,4 @@ export default defineConfig({
       },
     }),
   ],
-	experimental: {
-	 assets: true
-	}
 });
diff --git a/workspaces/website/package.json b/workspaces/website/package.json
@@ -14,31 +14,31 @@
     "site-files": "npm run 404file && npm run jekyllfile && npm run cname"
   },
   "dependencies": {
-    "@astrojs/lit": "^2.1.1",
-    "@astrojs/mdx": "^0.19.7",
-    "@astrojs/react": "^2.2.2",
-    "@astrojs/rss": "^2.4.4",
-    "@astrojs/sitemap": "^2.0.2",
-    "@types/react": "^18.2.20",
+    "@astrojs/lit": "^3.0.0",
+    "@astrojs/mdx": "^1.0.3",
+    "@astrojs/react": "^3.0.2",
+    "@astrojs/rss": "^3.0.0",
+    "@astrojs/sitemap": "^3.0.0",
+    "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.7",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "airtable": "^0.12.1",
-    "astro": "^2.10.8",
+    "airtable": "^0.12.2",
+    "astro": "^3.0.12",
     "github-user-repo-card": "^0.6.9",
     "lit": "^2.8.0",
-    "marked": "^7.0.3",
+    "marked": "^9.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "typescript": "^5.1.6"
+    "typescript": "^5.2.2"
   },
   "devDependencies": {
-    "@astrojs/partytown": "^1.2.3",
+    "@astrojs/partytown": "^2.0.0",
     "@storybook/testing-library": "^0.2.0",
     "@testing-library/react": "^14.0.0",
     "astro-icon": "^0.8.1",
     "postcss-nested": "^6.0.1",
     "prop-types": "^15.8.1",
-    "sass": "^1.65.1",
+    "sass": "^1.66.1",
     "vite": "^4.4.9"
   }
 }
diff --git a/workspaces/website/sandbox.config.json b/workspaces/website/sandbox.config.json
@@ -4,8 +4,8 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
-    "node": "18"
+    "node": "20"
   }
 }
diff --git a/workspaces/website/src/env.d.ts b/workspaces/website/src/env.d.ts
@@ -1,2 +1,2 @@
 /// <reference path="../.astro/types.d.ts" />
-/// <reference types="astro/client-image" />
+/// <reference types="astro/client" />
diff --git a/workspaces/website/src/layouts/SiteWide.astro b/workspaces/website/src/layouts/SiteWide.astro
@@ -13,7 +13,7 @@ const { title, description, image } = Astro.props;
 
 	<body>
 		<Header />
-		<main>
+		<main transition:animate="slide">
       <slot />
 		</main>
 		<Footer />

diff --git a/workspaces/website/src/pages/_rss.xml.js b/workspaces/website/src/pages/_rss.xml.js
@@ -0,0 +1,16 @@
+import rss from '@astrojs/rss';
+import { getCollection } from 'astro:content';
+import { SITE_TITLE, SITE_DESCRIPTION } from '../consts';
+
+export async function get(context) {
+	const posts = await getCollection('blahg');
+	return rss({
+		title: SITE_TITLE,
+		description: SITE_DESCRIPTION,
+		site: context.site,
+		items: posts.map((post) => ({
+			...post.data,
+			link: `/blahg/${post.slug}/`,
+		})),
+	});
+}
diff --git a/workspaces/website/src/pages/blahg/[...slug].astro b/workspaces/website/src/pages/blahg/[...slug].astro
@@ -1,5 +1,6 @@
 ---
-import { CollectionEntry, getCollection } from 'astro:content';
+import { getCollection } from 'astro:content';
+import type { CollectionEntry } from 'astro:content';
 import BlogPost from '../../layouts/BlogPost.astro';
 
 export async function getStaticPaths() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,4 @@ export default defineConfig({ @@
           },
         }),
       ],
-    	experimental: {
-    	 assets: true
-    	}
     });