🐛 (composable/event-loader) download先を修正, EVENTS_ZIP_URLを.envに追加

ynufes-tech · Oct 25, 2023 · b9cc493 · b9cc493
1 parent 60eedfe
commit b9cc493
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/deploy-gae.yaml b/.github/workflows/deploy-gae.yaml
@@ -32,9 +32,9 @@ jobs:
             echo "BASE_URL=/stg/23/tokiwa/" >> .env
           fi
         # switch service name to configure deployment target appropriately
-      - name: Download events.json from external URL
+      - name: Configure events data url
         run: |
-          curl "${{ secrets.EVENTS_DATA_URL }}" -o ./public/data/events.zip
+          echo "EVENTS_ZIP_URL=${{ secrets.EVENTS_DATA_URL }}" >> .env
       - name: yarn install
         run: yarn install
       - name: yarn build

diff --git a/composables/events-loader.ts b/composables/events-loader.ts
@@ -5,13 +5,12 @@ import { EventData } from "~/model/eventData";
 let events_data: EventData[] = [];
 
 export async function useDataLoader() {
+  const zipUrl = useRuntimeConfig().public.baseURL + "/data/events.zip";
   if (events_data.length > 0) return { events_data };
   events_data = await (async function (): Promise<EventData[]> {
     const downloaded_data: EventData[] = [];
     try {
-      const zip_data = await fetch("/data/events.zip").then((res) =>
-        res.blob(),
-      );
+      const zip_data = await fetch(zipUrl).then((res) => res.blob());
       const zip = await JSZip.loadAsync(zip_data);
       const fileNames = Object.keys(zip.files);
 

diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -32,4 +32,9 @@ export default defineNuxtConfig({
       ],
     },
   },
+  runtimeConfig: {
+    publicRuntimeConfig: {
+      eventsZipURL: process.env.EVENTS_ZIP_URL,
+    },
+  },
 });