From 1f16f5dd4481d8acc00507102812a5e2f78f5d2d Mon Sep 17 00:00:00 2001 From: litruv Date: Tue, 13 Oct 2026 16:53:56 +1100 Subject: [PATCH] fix: provide ctx.lucide to plugins; resolve submodule gitdir in apply-overlay --- overlay/src/app/features/settings/plugins/PluginLoader.tsx | 2 ++ scripts/apply-overlay.mjs | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/overlay/src/app/features/settings/plugins/PluginLoader.tsx b/overlay/src/app/features/settings/plugins/PluginLoader.tsx index 3f3f41b..606bb6e 100644 --- a/overlay/src/app/features/settings/plugins/PluginLoader.tsx +++ b/overlay/src/app/features/settings/plugins/PluginLoader.tsx @@ -1,5 +1,6 @@ import React, { useEffect } from 'react'; import { MatrixClient } from 'matrix-js-sdk'; +import * as lucide from 'lucide-react'; import { Plugin, createPluginContext } from '@paarrot/plugin-manager'; import { pluginMarketplaceManager, pluginRegistry } from './PluginAPI'; import { sendNotification } from '../../../utils/tauri'; @@ -80,6 +81,7 @@ export function PluginLoader({ matrixClient, children }: PluginLoaderProps) { matrixClient.off(eventType as any, handler as any), }, React, + lucide, }); console.log('[PluginLoader] compatContext.React:', !!compatContext.React); diff --git a/scripts/apply-overlay.mjs b/scripts/apply-overlay.mjs index f379c6b..08636f1 100644 --- a/scripts/apply-overlay.mjs +++ b/scripts/apply-overlay.mjs @@ -33,7 +33,8 @@ if (cinnyStatus.trim()) { // Ensure android/ junction is excluded from the cinny git view — otherwise // `git stash -u` would traverse the junction into the root android/ directory // and delete files there when the stash is created. - const cinnyExclude = join(CINNY, '.git', 'info', 'exclude'); + const gitDir = resolve(CINNY, execSync('git rev-parse --git-dir', { cwd: CINNY, encoding: 'utf8' }).trim()); + const cinnyExclude = join(gitDir, 'info', 'exclude'); const excludeContent = existsSync(cinnyExclude) ? readFileSync(cinnyExclude, 'utf8') : ''; if (!excludeContent.includes('android/')) { writeFileSync(cinnyExclude, excludeContent + (excludeContent.endsWith('\n') || !excludeContent ? '' : '\n') + 'android/\n', 'utf8');