From 1106b11491e421351788d3fae3ea6f788034e2b3 Mon Sep 17 00:00:00 2001 From: upiksaleh Date: Wed, 11 Oct 2023 14:39:14 +0800 Subject: [PATCH] fix vite env ci --- resources/js/app.js | 7 ++++--- resources/views/components/layouts/app.blade.php | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/js/app.js b/resources/js/app.js index 66c692e..1e831fe 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -3,13 +3,14 @@ import {dropFileComponent} from "./lib/drop-file-component"; import './editor'; import * as PusherPushNotifications from "@pusher/push-notifications-web"; -window.appOnLoad = (userId, beamsIsEnabled) => { - if (beamsIsEnabled) { +window.appOnLoad = (config) => { + const {userId, pusherBeamsInstanceId} = config; + if (pusherBeamsInstanceId) { const beamsTokenProvider = new PusherPushNotifications.TokenProvider({ url: `/app/pusher/beams-auth/${userId}`, }); const beamsClient = new PusherPushNotifications.Client({ - instanceId: import.meta.env.VITE_PUSHER_BEAMS_INSTANCE_ID, + instanceId: pusherBeamsInstanceId, }); beamsClient .start() diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php index 988d717..fc00d2d 100644 --- a/resources/views/components/layouts/app.blade.php +++ b/resources/views/components/layouts/app.blade.php @@ -14,7 +14,10 @@ @vite($viteAssets) + onload="window.appOnLoad(@js([ + "userId"=>Auth::id(), + "pusherBeamsInstanceId"=> config('services.pusher.beams_enabled') && config('services.pusher.beams_instance_id') ? config('services.pusher.beams_instance_id') : null + ]))">