This commit is contained in:
Eugene Pankov
2017-04-24 21:26:59 +02:00
parent 64556806e6
commit 2d1dca41d7
9 changed files with 48 additions and 27 deletions

View File

@@ -27,7 +27,9 @@ if (!process.env.TERMINUS_PLUGINS) {
process.env.TERMINUS_PLUGINS = ''
}
process.env.TERMINUS_PLUGINS += `:${path.resolve(__dirname, '..')}`
if (process.env.DEV) {
process.env.TERMINUS_PLUGINS += `:${path.resolve(__dirname, '..')}`
}
setupWindowManagement = () => {
let windowCloseable

View File

@@ -12,7 +12,7 @@ import { enableProdMode } from '@angular/core'
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
import { getRootModule } from './app.module'
import { loadPlugins } from './plugins'
import { findPlugins, loadPlugins } from './plugins'
if ((<any>global).require('electron-is-dev')) {
console.warn('Running in debug mode')
@@ -20,9 +20,10 @@ if ((<any>global).require('electron-is-dev')) {
enableProdMode()
}
loadPlugins((current, total) => {
(<HTMLElement>document.querySelector('.progress .bar')).style.width = 100 * current / total + '%'
}).then(async plugins => {
let module = await getRootModule(plugins)
findPlugins().then(async plugins => {
let pluginsModules = loadPlugins(plugins, (current, total) => {
(<HTMLElement>document.querySelector('.progress .bar')).style.width = 100 * current / total + '%'
})
let module = await getRootModule(pluginsModules)
platformBrowserDynamic().bootstrapModule(module)
})

View File

@@ -19,27 +19,46 @@ if (process.env.TERMINUS_PLUGINS) {
export declare type ProgressCallback = (current, total) => void
interface IFoundPlugin {
interface IPluginEntry {
name: string
path: string
info: any
}
export async function loadPlugins (progress: ProgressCallback): Promise<any[]> {
export async function findPlugins (): Promise<IPluginEntry[]> {
let paths = nodeModule.globalPaths
let plugins: any[] = []
let foundPlugins: IFoundPlugin[] = []
let foundPlugins: IPluginEntry[] = []
progress(0, 1)
for (let pluginDir of paths) {
pluginDir = normalizePath(pluginDir)
if (!await fs.exists(pluginDir)) {
continue
}
let pluginNames = await fs.readdir(pluginDir)
pluginNames.filter(pluginName => /^terminus-/.exec(pluginName)).forEach(name => {
foundPlugins.push({ name, path: path.join(pluginDir, name) })
})
for (let pluginName of pluginNames.filter(x => /^terminus-/.exec(x))) {
let pluginPath = path.join(pluginDir, pluginName)
let infoPath = path.join(pluginPath, 'package.json')
if (!await fs.exists(infoPath)) {
continue
}
try {
foundPlugins.push({
name: pluginName,
path: pluginPath,
info: await fs.readJson(infoPath),
})
} catch (error) {
console.error('Cannot load package info for', pluginName)
}
}
}
return foundPlugins
}
export function loadPlugins (foundPlugins: IPluginEntry[], progress: ProgressCallback): any[] {
let plugins: any[] = []
progress(0, 1)
foundPlugins.forEach((foundPlugin, index) => {
console.info(`Loading ${foundPlugin.name}: ${(<any>global).require.resolve(foundPlugin.path)}`)
progress(index, foundPlugins.length)
@@ -50,7 +69,6 @@ export async function loadPlugins (progress: ProgressCallback): Promise<any[]> {
console.error(`Could not load ${foundPlugin.name}:`, error)
}
})
progress(1, 1)
return plugins
}