From 6953a7779b82a72d62de772b649e9cc09db97834 Mon Sep 17 00:00:00 2001 From: Chris <67816022+vhsdream@users.noreply.github.com> Date: Thu, 13 Mar 2025 10:35:10 -0400 Subject: [PATCH] Update Fluid Calendar for v1.2.0 (#3053) This commit breaks up the npm commands due to some breaking changes. It also modifies the env file to remove deprecated options and adds new ones. --- ct/fluid-calendar.sh | 6 ++++-- install/fluid-calendar-install.sh | 25 +++++++++---------------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/ct/fluid-calendar.sh b/ct/fluid-calendar.sh index 7c142f78a..f6721d547 100644 --- a/ct/fluid-calendar.sh +++ b/ct/fluid-calendar.sh @@ -46,8 +46,10 @@ function update_script() { cp -rf ${APP}-${RELEASE}/* /opt/fluid-calendar cd /opt/fluid-calendar export NEXT_TELEMETRY_DISABLED=1 - $STD npm run setup - $STD npm run build + $STD npm install --legacy-peer-deps + $STD npm run prisma:generate + $STD npm run prisma:migrate + $STD npm run build:os msg_ok "Updated $APP to v${RELEASE}" msg_info "Starting $APP" diff --git a/install/fluid-calendar-install.sh b/install/fluid-calendar-install.sh index aac13434c..5cc70f032 100644 --- a/install/fluid-calendar-install.sh +++ b/install/fluid-calendar-install.sh @@ -59,30 +59,23 @@ echo "${RELEASE}" >/opt/${APPLICATION}_version.txt cat </opt/fluid-calendar/.env DATABASE_URL="postgresql://${DB_USER}:${DB_PASS}@localhost:5432/${DB_NAME}" -# For OAuth integration with Google Calendar -# See https://console.cloud.google.com -GOOGLE_CLIENT_ID="" -GOOGLE_CLIENT_SECRET="" - # Change the URL below to your external URL NEXTAUTH_URL="http://localhost:3000" +NEXT_PUBLIC_APP_URL="http://localhost:3000" NEXTAUTH_SECRET="${NEXTAUTH_SECRET}" +NEXT_PUBLIC_SITE_URL="http://localhost:3000" -# For optional Outlook Calendar Integration -# Create at https://portal.azure.com -AZURE_AD_CLIENT_ID="" -AZURE_AD_CLIENT_SECRET="" -AZURE_AD_TENANT_ID="" +NEXT_PUBLIC_ENABLE_SAAS_FEATURES=false -# Logging configuration -# Options: debug, none (check logger.js for more details) -LOG_LEVEL="none" -DEBUG_ENABLED=0 +RESEND_API_KEY= +RESEND_EMAIL= EOF export NEXT_TELEMETRY_DISABLED=1 cd /opt/fluid-calendar -$STD npm run setup -$STD npm run build +$STD npm install --legacy-peer-deps +$STD npm run prisma:generate +$STD npm run prisma:migrate +$STD npm run build:os msg_ok "Setup ${APPLICATION}" msg_info "Creating Service"