Merge branch 'ProjectDepot:main' into main

parsehex · web-flow · commit fe74b6b7ee7f · 2025-11-17T19:36:56.000-05:00
diff --git a/astro.config.mjs b/astro.config.mjs
@@ -1,9 +1,11 @@
 import { defineConfig } from 'astro/config';
+import { loadEnv } from 'vite';
 import vue from '@astrojs/vue';
 import tailwindcss from '@tailwindcss/vite';
 import { nodePolyfills } from 'vite-plugin-node-polyfills';
 
-console.log('Using username', process.env.VITE_GITHUB_ACTOR);
+const env = loadEnv('', process.cwd());
+console.log('Using username', env.VITE_GITHUB_ACTOR);
 
 export default defineConfig({
 	integrations: [
@@ -14,7 +16,9 @@ export default defineConfig({
 	vite: {
 		define: {
 			__DEV__: process.env.NODE_ENV === 'development',
-			VITE_GITHUB_ACTOR: process.env.VITE_GITHUB_ACTOR,
+			GITHUB_ACTOR: JSON.stringify(
+				env.VITE_GITHUB_ACTOR || process.env.VITE_GITHUB_ACTOR || 'gh_username'
+			),
 		},
 		plugins: [tailwindcss(), nodePolyfills()],
 		build: {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,6 +32,7 @@
   "devDependencies": {
     "@eslint/js": "^9.19.0",
     "@tailwindcss/typography": "^0.5.16",
+    "@vitejs/plugin-vue": "^6.0.1",
     "eslint": "^9.19.0",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-refresh": "^0.4.18",
diff --git a/src/env.d.ts b/src/env.d.ts
@@ -1,3 +1,5 @@
 /// <reference types="astro/client" />
 declare module '*.vue';
 declare module '*.md';
+
+declare const GITHUB_ACTOR: string;
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -2,7 +2,7 @@
 import App from '../App.vue';
 import config from '../config.json';
 
-const ghUsername = import.meta.env.VITE_GITHUB_ACTOR || 'your_username';
+const ghUsername = GITHUB_ACTOR || 'your_username';
 
 let siteTitle = '';
 if (config.siteTitle === undefined) siteTitle = "{username}'s Sites";
@@ -24,7 +24,7 @@ const description = `List of ${ghUsername}'s GitHub projects`;
   </head>
   <body class="bg-gray-100 dark:bg-gray-900 dark:text-gray-100">
     <div id="app">
-      <App client:load config={config} ghUsername={import.meta.env.VITE_GITHUB_ACTOR || 'your_username'} />
+      <App client:load config={config} ghUsername={ghUsername} />
     </div>
   </body>
 </html>
