From 5230694e2c6464f527e660f593469388aa278e79 Mon Sep 17 00:00:00 2001 From: Neha Prasad Date: Sat, 13 Sep 2025 00:32:17 +0530 Subject: [PATCH] fix: dynamic adapter imports not working in self-hosted instances (#23784) * export const CalendarServiceMap * fix: resolve linting issues in video and calendar adapter fixes - Remove unused isCalendarService function - Fix any type usage in getCalendar - Add eslint-disable for necessary app-store imports in videoClient - Maintain architectural separation while fixing core functionality * revert --------- Co-authored-by: unknown --- packages/app-store-cli/src/build.ts | 6 ++-- .../app-store/analytics.services.generated.ts | 11 ++++--- .../app-store/calendar.services.generated.ts | 31 ++++++++++--------- .../app-store/video.adapters.generated.ts | 31 ++++++++++--------- 4 files changed, 41 insertions(+), 38 deletions(-) diff --git a/packages/app-store-cli/src/build.ts b/packages/app-store-cli/src/build.ts index 51c3078a32..06fb4e8511 100644 --- a/packages/app-store-cli/src/build.ts +++ b/packages/app-store-cli/src/build.ts @@ -377,7 +377,7 @@ function generateFiles() { calendarOutput.push( exportLine.replace( "export const CalendarServiceMap = {", - "export const CalendarServiceMap = process.env.NEXT_PUBLIC_IS_E2E ? {} : {" + "export const CalendarServiceMap = process.env.NEXT_PUBLIC_IS_E2E === '1' ? {} : {" ), ...objectContent, "};" @@ -414,7 +414,7 @@ function generateFiles() { analyticsOutput.push( exportLine.replace( "export const AnalyticsServiceMap = {", - "export const AnalyticsServiceMap = process.env.NEXT_PUBLIC_IS_E2E ? {} : {" + "export const AnalyticsServiceMap = process.env.NEXT_PUBLIC_IS_E2E === '1' ? {} : {" ), ...objectContent, "};" @@ -466,7 +466,7 @@ function generateFiles() { videoOutput.push( exportLine.replace( "export const VideoApiAdapterMap = {", - "export const VideoApiAdapterMap = process.env.NEXT_PUBLIC_IS_E2E ? {} : {" + "export const VideoApiAdapterMap = process.env.NEXT_PUBLIC_IS_E2E === '1' ? {} : {" ), ...objectContent, "};" diff --git a/packages/app-store/analytics.services.generated.ts b/packages/app-store/analytics.services.generated.ts index 17e8216bcc..92bc722083 100644 --- a/packages/app-store/analytics.services.generated.ts +++ b/packages/app-store/analytics.services.generated.ts @@ -2,8 +2,9 @@ This file is autogenerated using the command `yarn app-store:build --watch`. Don't modify this file manually. **/ -export const AnalyticsServiceMap = process.env.NEXT_PUBLIC_IS_E2E - ? {} - : { - dub: import("./dub/lib/AnalyticsService"), - }; +export const AnalyticsServiceMap = + process.env.NEXT_PUBLIC_IS_E2E === "1" + ? {} + : { + dub: import("./dub/lib/AnalyticsService"), + }; diff --git a/packages/app-store/calendar.services.generated.ts b/packages/app-store/calendar.services.generated.ts index c6f07b8910..9795cfe01e 100644 --- a/packages/app-store/calendar.services.generated.ts +++ b/packages/app-store/calendar.services.generated.ts @@ -2,18 +2,19 @@ This file is autogenerated using the command `yarn app-store:build --watch`. Don't modify this file manually. **/ -export const CalendarServiceMap = process.env.NEXT_PUBLIC_IS_E2E - ? {} - : { - applecalendar: import("./applecalendar/lib/CalendarService"), - caldavcalendar: import("./caldavcalendar/lib/CalendarService"), - exchange2013calendar: import("./exchange2013calendar/lib/CalendarService"), - exchange2016calendar: import("./exchange2016calendar/lib/CalendarService"), - exchangecalendar: import("./exchangecalendar/lib/CalendarService"), - feishucalendar: import("./feishucalendar/lib/CalendarService"), - googlecalendar: import("./googlecalendar/lib/CalendarService"), - "ics-feedcalendar": import("./ics-feedcalendar/lib/CalendarService"), - larkcalendar: import("./larkcalendar/lib/CalendarService"), - office365calendar: import("./office365calendar/lib/CalendarService"), - zohocalendar: import("./zohocalendar/lib/CalendarService"), - }; +export const CalendarServiceMap = + process.env.NEXT_PUBLIC_IS_E2E === "1" + ? {} + : { + applecalendar: import("./applecalendar/lib/CalendarService"), + caldavcalendar: import("./caldavcalendar/lib/CalendarService"), + exchange2013calendar: import("./exchange2013calendar/lib/CalendarService"), + exchange2016calendar: import("./exchange2016calendar/lib/CalendarService"), + exchangecalendar: import("./exchangecalendar/lib/CalendarService"), + feishucalendar: import("./feishucalendar/lib/CalendarService"), + googlecalendar: import("./googlecalendar/lib/CalendarService"), + "ics-feedcalendar": import("./ics-feedcalendar/lib/CalendarService"), + larkcalendar: import("./larkcalendar/lib/CalendarService"), + office365calendar: import("./office365calendar/lib/CalendarService"), + zohocalendar: import("./zohocalendar/lib/CalendarService"), + }; diff --git a/packages/app-store/video.adapters.generated.ts b/packages/app-store/video.adapters.generated.ts index 693e69168e..4df261a206 100644 --- a/packages/app-store/video.adapters.generated.ts +++ b/packages/app-store/video.adapters.generated.ts @@ -2,18 +2,19 @@ This file is autogenerated using the command `yarn app-store:build --watch`. Don't modify this file manually. **/ -export const VideoApiAdapterMap = process.env.NEXT_PUBLIC_IS_E2E - ? {} - : { - dailyvideo: import("./dailyvideo/lib/VideoApiAdapter"), - huddle01video: import("./huddle01video/lib/VideoApiAdapter"), - jelly: import("./jelly/lib/VideoApiAdapter"), - jitsivideo: import("./jitsivideo/lib/VideoApiAdapter"), - nextcloudtalk: import("./nextcloudtalk/lib/VideoApiAdapter"), - office365video: import("./office365video/lib/VideoApiAdapter"), - shimmervideo: import("./shimmervideo/lib/VideoApiAdapter"), - sylapsvideo: import("./sylapsvideo/lib/VideoApiAdapter"), - tandemvideo: import("./tandemvideo/lib/VideoApiAdapter"), - webex: import("./webex/lib/VideoApiAdapter"), - zoomvideo: import("./zoomvideo/lib/VideoApiAdapter"), - }; +export const VideoApiAdapterMap = + process.env.NEXT_PUBLIC_IS_E2E === "1" + ? {} + : { + dailyvideo: import("./dailyvideo/lib/VideoApiAdapter"), + huddle01video: import("./huddle01video/lib/VideoApiAdapter"), + jelly: import("./jelly/lib/VideoApiAdapter"), + jitsivideo: import("./jitsivideo/lib/VideoApiAdapter"), + nextcloudtalk: import("./nextcloudtalk/lib/VideoApiAdapter"), + office365video: import("./office365video/lib/VideoApiAdapter"), + shimmervideo: import("./shimmervideo/lib/VideoApiAdapter"), + sylapsvideo: import("./sylapsvideo/lib/VideoApiAdapter"), + tandemvideo: import("./tandemvideo/lib/VideoApiAdapter"), + webex: import("./webex/lib/VideoApiAdapter"), + zoomvideo: import("./zoomvideo/lib/VideoApiAdapter"), + };