Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3787b55ca5 | ||
|
|
1f16f5dd44 | ||
|
|
e7cfb3dbd9 | ||
|
|
b21e74307e |
+1
-1
Submodule cinny updated: 76e5f960d1...f0495cccca
@@ -1,5 +1,6 @@
|
|||||||
import React, { useEffect } from 'react';
|
import React, { useEffect } from 'react';
|
||||||
import { MatrixClient } from 'matrix-js-sdk';
|
import { MatrixClient } from 'matrix-js-sdk';
|
||||||
|
import * as lucide from 'lucide-react';
|
||||||
import { Plugin, createPluginContext } from '@paarrot/plugin-manager';
|
import { Plugin, createPluginContext } from '@paarrot/plugin-manager';
|
||||||
import { pluginMarketplaceManager, pluginRegistry } from './PluginAPI';
|
import { pluginMarketplaceManager, pluginRegistry } from './PluginAPI';
|
||||||
import { sendNotification } from '../../../utils/tauri';
|
import { sendNotification } from '../../../utils/tauri';
|
||||||
@@ -80,6 +81,7 @@ export function PluginLoader({ matrixClient, children }: PluginLoaderProps) {
|
|||||||
matrixClient.off(eventType as any, handler as any),
|
matrixClient.off(eventType as any, handler as any),
|
||||||
},
|
},
|
||||||
React,
|
React,
|
||||||
|
lucide,
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log('[PluginLoader] compatContext.React:', !!compatContext.React);
|
console.log('[PluginLoader] compatContext.React:', !!compatContext.React);
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "paarrot",
|
"name": "paarrot",
|
||||||
"version": "4.11.184",
|
"version": "4.11.186",
|
||||||
"description": "Paarrot - A Matrix client based on Cinny",
|
"description": "Paarrot - A Matrix client based on Cinny",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18.0.0"
|
"node": ">=18.0.0"
|
||||||
|
|||||||
@@ -33,7 +33,8 @@ if (cinnyStatus.trim()) {
|
|||||||
// Ensure android/ junction is excluded from the cinny git view — otherwise
|
// Ensure android/ junction is excluded from the cinny git view — otherwise
|
||||||
// `git stash -u` would traverse the junction into the root android/ directory
|
// `git stash -u` would traverse the junction into the root android/ directory
|
||||||
// and delete files there when the stash is created.
|
// 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') : '';
|
const excludeContent = existsSync(cinnyExclude) ? readFileSync(cinnyExclude, 'utf8') : '';
|
||||||
if (!excludeContent.includes('android/')) {
|
if (!excludeContent.includes('android/')) {
|
||||||
writeFileSync(cinnyExclude, excludeContent + (excludeContent.endsWith('\n') || !excludeContent ? '' : '\n') + 'android/\n', 'utf8');
|
writeFileSync(cinnyExclude, excludeContent + (excludeContent.endsWith('\n') || !excludeContent ? '' : '\n') + 'android/\n', 'utf8');
|
||||||
|
|||||||
Reference in New Issue
Block a user