GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-07-20 10:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

show blacklisted plugins in plugin manager

Browse Source
This commit is contained in:
Eugene Pankov
2021-06-22 11:51:45 +02:00
parent 170ef76721
commit e9e6211725
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/entry.ts
View File

@@ -12,7 +12,7 @@ import { ipcRenderer } from 'electron'
import { getRootModule } from './app.module' import { getRootModule } from './app.module'
import { findPlugins, initModuleLookup, loadPlugins } from './plugins' import { findPlugins, initModuleLookup, loadPlugins } from './plugins'
import { BootstrapData, BOOTSTRAP_DATA } from '../../terminus-core/src/api/mainProcess' import { BootstrapData, BOOTSTRAP_DATA, PluginInfo } from '../../terminus-core/src/api/mainProcess'
// Always land on the start view // Always land on the start view
location.hash = '' location.hash = ''
@@ -29,12 +29,12 @@ if (process.env.TERMINUS_DEV && !process.env.TERMINUS_FORCE_ANGULAR_PROD) {
enableProdMode() enableProdMode()
} }
async function bootstrap (bootstrapData: BootstrapData, safeMode = false): Promise<NgModuleRef<any>> { async function bootstrap (bootstrapData: BootstrapData, plugins: PluginInfo[], safeMode = false): Promise<NgModuleRef<any>> {
if (safeMode) { if (safeMode) {
bootstrapData.installedPlugins = bootstrapData.installedPlugins.filter(x => x.isBuiltin) plugins = plugins.filter(x => x.isBuiltin)
} }
const pluginModules = await loadPlugins(bootstrapData.installedPlugins, (current, total) => { const pluginModules = await loadPlugins(plugins, (current, total) => {
(document.querySelector('.progress .bar') as HTMLElement).style.width = `${100 * current / total}%` // eslint-disable-line (document.querySelector('.progress .bar') as HTMLElement).style.width = `${100 * current / total}%` // eslint-disable-line
}) })
const module = getRootModule(pluginModules) const module = getRootModule(pluginModules)
@@ -56,21 +56,21 @@ ipcRenderer.once('start', async (_$event, bootstrapData: BootstrapData) => {
initModuleLookup(bootstrapData.userPluginsPath) initModuleLookup(bootstrapData.userPluginsPath)
let plugins = await findPlugins() let plugins = await findPlugins()
bootstrapData.installedPlugins = plugins
if (bootstrapData.config.pluginBlacklist) { if (bootstrapData.config.pluginBlacklist) {
plugins = plugins.filter(x => !bootstrapData.config.pluginBlacklist.includes(x.name)) plugins = plugins.filter(x => !bootstrapData.config.pluginBlacklist.includes(x.name))
} }
plugins = plugins.filter(x => x.name !== 'web') plugins = plugins.filter(x => x.name !== 'web')
bootstrapData.installedPlugins = plugins
console.log('Starting with plugins:', plugins) console.log('Starting with plugins:', plugins)
try { try {
await bootstrap(bootstrapData) await bootstrap(bootstrapData, plugins)
} catch (error) { } catch (error) {
console.error('Angular bootstrapping error:', error) console.error('Angular bootstrapping error:', error)
console.warn('Trying safe mode') console.warn('Trying safe mode')
window['safeModeReason'] = error window['safeModeReason'] = error
try { try {
await bootstrap(bootstrapData, true) await bootstrap(bootstrapData, plugins, true)
} catch (error2) { } catch (error2) {
console.error('Bootstrap failed:', error2) console.error('Bootstrap failed:', error2)
} }