fix: use BASE_URL consistently

digidem · Sep 6, 2024 · 0e1833a · 0e1833a
1 parent 1aa2327
commit 0e1833a
Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/github-pages.yaml b/.github/workflows/github-pages.yaml
@@ -32,7 +32,7 @@ jobs:
           NOTION_API_KEY: ${{ secrets.NOTION_API_KEY }}
           DATABASE_ID: ${{ secrets.DATABASE_ID }}
           WEBSITE_TAG: ${{ secrets.WEBSITE_TAG }}
-          BASE_URL: /${{ github.event.repository.name }}/
+          BASE_URL: /${{ github.event.repository.name }}
         run: bun run build --no-cache
 
       - name: List build directory contents

diff --git a/src/components/Link.jsx b/src/components/Link.jsx
@@ -2,8 +2,7 @@ import React from 'react';
 import { Link as RouterLink } from 'react-router-dom';
 
 const Link = ({ to, children, ...props }) => {
-  const baseUrl = import.meta.env.BASE_URL;
-  const adjustedTo = to.startsWith('/') ? `${baseUrl}${to.slice(1)}` : to;
+  const adjustedTo = to.startsWith('/') ? `${import.meta.env.BASE_URL}${to.slice(1)}` : to;
 
   return (
     <RouterLink to={adjustedTo} {...props}>

diff --git a/vite.config.js b/vite.config.js
@@ -9,7 +9,7 @@ export default defineConfig({
     host: "::",
     port: "8080",
   },
-  base: process.env.GITHUB_ACTIONS ? process.env.BASE_URL : '/',
+  base: process.env.BASE_URL || '/',
   plugins: [react()],
   resolve: {
     alias: [