Merge pull request #95 from calimania/feat/fix-deploy-2

Trying deployment fixes

.github/workflows/deploy.yml

@@ -31,7 +31,9 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: dist
+          name: github-pages-${{ github.run_id }}
+          path: ./dist
+          retention-days: 1
   deploy:
     needs: build
     runs-on: ubuntu-latest

.gitignore

@@ -16,6 +16,7 @@ pnpm-debug.log*
 # environment variables
 .env
 .env.production
+.env.local
 
 # macOS-specific files
 .DS_Store

astro.config.ts

@@ -10,7 +10,7 @@ import { markketplace } from "./src/config";
  * @type {import('astro/types').RuntimeConfig}
  */
 export default defineConfig({
-  site: markketplace.url,
+  site: markketplace?.url,
   integrations: [
     tailwind({
       applyBaseStyles: true,
@@ -41,5 +41,5 @@ export default defineConfig({
     },
   },
   scopedStyleStrategy: "where",
-  outDir: "dist",
+  outDir: "./dist",
 });

src/config.ts

@@ -1,5 +1,11 @@
 import type { Site, SocialObjects } from "./types";
 
+const BASE_URL = ((process.env.BASE_URL || import.meta.env.BASE_URL) as string);
+
+const url = BASE_URL.startsWith('http') ? BASE_URL : 'https://markket.place/';
+
+console.log({ url, BASE_URL });
+
 /**
  * @type {{[string]: string}} Global Configuration attributes for the markket instance
  */
@@ -11,6 +17,7 @@ export const markketplace = {
     accent: import.meta.env.COLOR_ACCENT as string || '#38b2ac',
   },
   POSTHOG_ID: import.meta.env.POSTHOG_ID as string || '',
+  url,
 };
 
 /**