- {
- Object.keys(this.props.settings).map(this.renderSetting)
- }
+ { Object.keys(this.props.settings).map(this.renderSetting) }
)
}
diff --git a/app/plugins/core/plugins/Preview/index.js b/app/plugins/core/plugins/Preview/index.js
index d17850b3..115de4e5 100644
--- a/app/plugins/core/plugins/Preview/index.js
+++ b/app/plugins/core/plugins/Preview/index.js
@@ -1,14 +1,16 @@
-import React, { PropTypes, Component } from 'react'
-import { KeyboardNav, KeyboardNavItem, Preload } from 'cerebro-ui'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+import { KeyboardNav, KeyboardNavItem, Preload } from '@cerebroapp/cerebro-ui'
+import { trackEvent } from 'lib/trackEvent'
+import { client } from 'lib/plugins'
+import plugins from 'plugins'
+import ReactMarkdown from 'react-markdown'
+
import ActionButton from './ActionButton.js'
import Settings from './Settings'
import getReadme from '../getReadme'
-import ReactMarkdown from 'react-markdown'
import styles from './styles.css'
-import { trackEvent } from 'lib/trackEvent'
import * as format from '../format'
-import { client } from 'lib/plugins'
-import plugins from 'plugins'
const isRelative = (src) => !src.match(/^(https?:|data:)/)
const urlTransform = (repo, src) => {
@@ -77,37 +79,50 @@ class Preview extends Component {
const settings = plugins[name] ? plugins[name].settings : null
return (
-
{format.name(name)} ({version})
+
+ {format.name(name)}
+ {' '}
+ (
+ {version}
+ )
+
{format.description(description)}
{
- settings &&
+ settings
+ && (
this.setState({ showSettings: !this.state.showSettings })}
>
Settings
+ )
}
{showSettings &&
}
{
- !isInstalled && !isDebugging &&
+ !isInstalled && !isDebugging
+ && (
+ )
}
{
- isInstalled &&
+ isInstalled
+ && (
+ )
}
{
- isUpdateAvailable &&
+ isUpdateAvailable
+ && (
+ )
}
{
- githubRepo &&
+ githubRepo
+ && (
this.setState({ showDescription: !this.state.showDescription })}
>
Details
+ )
}
diff --git a/app/plugins/core/plugins/Preview/styles.css b/app/plugins/core/plugins/Preview/styles.css
index da997e14..c1ea0080 100644
--- a/app/plugins/core/plugins/Preview/styles.css
+++ b/app/plugins/core/plugins/Preview/styles.css
@@ -9,11 +9,10 @@
}
.markdown {
- min-width: 100%;
font-size: .8em;
align-self: flex-start;
font-size: 16px;
- padding: 10px;
+ padding: 0 10px;
p {
font-size: 1em;
margin: 0 0 10px;
diff --git a/app/plugins/core/plugins/StatusBar/index.js b/app/plugins/core/plugins/StatusBar/index.js
index fe11d79a..91b91e52 100644
--- a/app/plugins/core/plugins/StatusBar/index.js
+++ b/app/plugins/core/plugins/StatusBar/index.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import styles from './styles.css'
const StatusBar = ({ value }) => (
diff --git a/app/plugins/core/plugins/format.js b/app/plugins/core/plugins/format.js
index d25ffb96..437bbf54 100644
--- a/app/plugins/core/plugins/format.js
+++ b/app/plugins/core/plugins/format.js
@@ -1,31 +1,40 @@
-import { flow, lowerCase, words, capitalize, trim, map, join } from 'lodash/fp'
+import { flow, words, capitalize, trim, map, join } from 'lodash/fp'
/**
- * Remove unnecessary information from plugin name or description
+ * Remove unnecessary information from plugin description
* like `Cerebro plugin for`
* @param {String} str
* @return {String}
*/
-const removeNoise = (str) => (
+const removeDescriptionNoise = str => (
(str || '').replace(/^cerebro\s?(plugin)?\s?(to|for)?/i, '')
)
-export const name = flow(
- lowerCase,
- removeNoise,
+
+/**
+ * Remove unnecessary information from plugin name
+ * like `cerebro-plugin-` or `cerebro-`
+ * @param {String} str
+ * @return {String}
+ */
+const removeNameNoise = str => (
+ (str || '').replace(/^cerebro-(plugin)?-?/i, '')
+)
+
+export const name = (text = '') => flow(
trim,
words,
map(capitalize),
join(' ')
-)
+)(removeNameNoise(text.toLowerCase()))
export const description = flow(
- removeNoise,
+ removeDescriptionNoise,
trim,
capitalize,
)
-export const version = (plugin) => (
+export const version = plugin => (
plugin.isUpdateAvailable ?
`${plugin.installedVersion} → ${plugin.version}` :
plugin.version
diff --git a/app/plugins/core/plugins/getAvailablePlugins.js b/app/plugins/core/plugins/getAvailablePlugins.js
index df7d5b40..475c9e43 100644
--- a/app/plugins/core/plugins/getAvailablePlugins.js
+++ b/app/plugins/core/plugins/getAvailablePlugins.js
@@ -10,18 +10,16 @@ const URL = 'https://registry.npmjs.com/-/v1/search?from=0&size=500&text=keyword
* Get all available plugins for Cerebro
* @return {Promise
## License
-MIT © [Alexandr Subbotin](https://github.com/KELiON)
+
+MIT © [Cerebro App](https://github.com/cerebroapp/cerebro/blob/master/LICENSE)
diff --git a/__mocks__/@electron/remote.js b/__mocks__/@electron/remote.js
new file mode 100644
index 00000000..e90881b1
--- /dev/null
+++ b/__mocks__/@electron/remote.js
@@ -0,0 +1,5 @@
+module.exports = {
+ app: {
+ getPath: jest.fn(),
+ }
+}
diff --git a/__mocks__/electron.js b/__mocks__/electron.js
new file mode 100644
index 00000000..34a8edb5
--- /dev/null
+++ b/__mocks__/electron.js
@@ -0,0 +1,8 @@
+module.exports = {
+ app: {
+ getPath: jest.fn(),
+ },
+ ipcRenderer: {
+ on: jest.fn(),
+ }
+}
diff --git a/__mocks__/fileMock.js b/__mocks__/fileMock.js
new file mode 100644
index 00000000..b0c50903
--- /dev/null
+++ b/__mocks__/fileMock.js
@@ -0,0 +1 @@
+module.exports = ''
diff --git a/__mocks__/lib/config.js b/__mocks__/lib/config.js
deleted file mode 100644
index 7acaac2b..00000000
--- a/__mocks__/lib/config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-
-}
diff --git a/__mocks__/lib/plugins.js b/__mocks__/lib/plugins.js
deleted file mode 100644
index cdca2b57..00000000
--- a/__mocks__/lib/plugins.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
- get: () => undefined
-}
diff --git a/__mocks__/plugins.js b/__mocks__/plugins.js
deleted file mode 100644
index 6f336ba0..00000000
--- a/__mocks__/plugins.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
- 'test-plugin': {
- fn: () => {}
- }
-}
diff --git a/app/background/background.js b/app/background/background.js
index 5329c3c7..dd950457 100644
--- a/app/background/background.js
+++ b/app/background/background.js
@@ -3,8 +3,9 @@ import ReactDOM from 'react-dom'
import plugins from 'plugins'
import { on, send } from 'lib/rpc'
import { settings as pluginSettings, modulesDirectory } from 'lib/plugins'
+import fixPath from 'fix-path'
-require('fix-path')()
+fixPath()
global.React = React
global.ReactDOM = ReactDOM
@@ -12,26 +13,25 @@ global.isBackground = true
on('initializePluginAsync', ({ name }) => {
console.group(`Initialize async plugin ${name}`)
+
try {
const { initializeAsync } = plugins[name]
? plugins[name]
: window.require(`${modulesDirectory}/${name}`)
+
if (!initializeAsync) {
console.log('no `initializeAsync` function, skipped')
return
}
+
console.log('running `initializeAsync`')
initializeAsync((data) => {
console.log('Done! Sending data back to main window')
// Send message back to main window with initialization result
- send('plugin.message', {
- name,
- data,
- })
+ send('plugin.message', { name, data })
}, pluginSettings.getUserSettings(name))
- } catch (err) {
- console.log('Failed', err)
- }
+ } catch (err) { console.log('Failed', err) }
+
console.groupEnd()
})
diff --git a/app/background/createWindow.js b/app/background/createWindow.js
index 4e537f51..2086e1a9 100644
--- a/app/background/createWindow.js
+++ b/app/background/createWindow.js
@@ -10,6 +10,7 @@ export default ({ src }) => {
contextIsolation: false
},
})
+
backgroundWindow.loadURL(src)
return backgroundWindow
}
diff --git a/app/background/index.html b/app/background/index.html
index ed56370c..888ceb9b 100644
--- a/app/background/index.html
+++ b/app/background/index.html
@@ -5,7 +5,9 @@
(function() {
const script = document.createElement('script');
script.async = true;
- script.src = (process.env.HOT) ? 'http://localhost:3000/dist/background.bundle.js' : '../dist/background.bundle.js';
+ script.src = (process.env.HOT)
+ ? 'http://localhost:3000/dist/background.bundle.js'
+ : '../dist/background.bundle.js';
document.write(script.outerHTML);
}());
diff --git a/app/initAutoUpdater.js b/app/initAutoUpdater.js
index dd4953b3..14b63a2d 100644
--- a/app/initAutoUpdater.js
+++ b/app/initAutoUpdater.js
@@ -1,11 +1,12 @@
-import * as os from "os";
-import { dialog, } from 'electron'
-import { autoUpdater } from "electron-updater";
+import { autoUpdater } from 'electron-updater'
const event = 'update-downloaded'
+const TEN_SECONDS = 10 * 1000
+const ONE_HOUR = 60 * 60 * 1000
+
export default (w) => {
- if (process.env.NODE_ENV === 'development' || os.platform() === "linux") {
+ if (process.env.NODE_ENV === 'development' || process.platform === 'linux') {
return
}
@@ -18,9 +19,9 @@ export default (w) => {
setTimeout(() => {
autoUpdater.checkForUpdates()
- }, 10 * 1000)
+ }, TEN_SECONDS)
setInterval(() => {
autoUpdater.checkForUpdates()
- }, 60 * 60 * 1000)
-}
\ No newline at end of file
+ }, ONE_HOUR)
+}
diff --git a/app/lib/config.js b/app/lib/config.js
index 40450bb4..e1fe07cb 100644
--- a/app/lib/config.js
+++ b/app/lib/config.js
@@ -1,9 +1,13 @@
-import { app, remote, ipcRenderer } from 'electron'
+import { app, ipcRenderer } from 'electron'
import fs from 'fs'
import { memoize } from 'cerebro-tools'
import { trackEvent } from './trackEvent'
import loadThemes from './loadThemes'
+const remote = process.type === 'browser'
+ ? undefined
+ : require('@electron/remote')
+
const electronApp = remote ? remote.app : app
// initiate portable mode
@@ -55,13 +59,13 @@ const readConfig = () => {
*/
const get = (key) => {
let config
+
if (!fs.existsSync(CONFIG_FILE)) {
// Save default config to local storage
config = defaultSettings()
fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2))
- } else {
- config = readConfig()
- }
+ } else { config = readConfig() }
+
return config[key]
}
@@ -87,6 +91,7 @@ const set = (key, value) => {
event: `Change ${key}`,
label: value
})
+
if (ipcRenderer) {
console.log('notify main process', key, value)
// Notify main process about settings changes
diff --git a/app/lib/getWindowPosition.js b/app/lib/getWindowPosition.js
index 866f06e2..813bee64 100644
--- a/app/lib/getWindowPosition.js
+++ b/app/lib/getWindowPosition.js
@@ -1,17 +1,27 @@
-import { screen } from 'electron'
-
+import { ipcRenderer, screen } from 'electron'
import {
WINDOW_WIDTH,
INPUT_HEIGHT,
RESULT_HEIGHT,
MIN_VISIBLE_RESULTS,
-} from '../main/constants/ui'
+} from 'main/constants/ui'
/**
* Computes window position
*/
export default ({ width, heightWithResults }) => {
+ if (process.type === 'renderer') {
+ const [x, y] = ipcRenderer.sendSync('get-window-position', { width, heightWithResults })
+ return [x, y]
+ }
+
+ const [x, y] = getWhenMainProcess({ width, heightWithResults })
+ return [x, y]
+}
+
+const getWhenMainProcess = ({ width, heightWithResults }) => {
const winWidth = typeof width !== 'undefined' ? width : WINDOW_WIDTH
+
const winHeight = typeof heightWithResults !== 'undefined'
? heightWithResults
: MIN_VISIBLE_RESULTS * RESULT_HEIGHT + INPUT_HEIGHT
@@ -20,6 +30,6 @@ export default ({ width, heightWithResults }) => {
const x = parseInt(display.bounds.x + (display.workAreaSize.width - winWidth) / 2, 10)
const y = parseInt(display.bounds.y + (display.workAreaSize.height - winHeight) / 2, 10)
+
return [x, y]
}
-
diff --git a/app/lib/initializePlugins.js b/app/lib/initializePlugins.js
index 201630f0..8a733ccc 100644
--- a/app/lib/initializePlugins.js
+++ b/app/lib/initializePlugins.js
@@ -4,6 +4,7 @@ import { settings as pluginSettings } from 'lib/plugins'
export const initializePlugin = (name) => {
const { initialize, initializeAsync } = plugins[name]
+
if (initialize) {
// Foreground plugin initialization
try {
diff --git a/app/lib/plugins/index.js b/app/lib/plugins/index.js
index ec4d798d..e0e8d5d3 100644
--- a/app/lib/plugins/index.js
+++ b/app/lib/plugins/index.js
@@ -1,4 +1,4 @@
-import { app, remote } from 'electron'
+import getAppDataPath from 'appdata-path'
import path from 'path'
import fs from 'fs'
import npm from './npm'
@@ -20,9 +20,9 @@ const EMPTY_PACKAGE_JSON = JSON.stringify({
dependencies: {}
}, null, 2)
-const electronApp = remote ? remote.app : app
-export const pluginsPath = path.join(electronApp.getPath('userData'), 'plugins')
+export const pluginsPath = path.join(getAppDataPath('Cerebro'), 'plugins')
export const modulesDirectory = path.join(pluginsPath, 'node_modules')
+export const cerebroappModulesDirectory = path.join(pluginsPath, 'node_modules', '@cerebroapp')
export const packageJsonPath = path.join(pluginsPath, 'package.json')
export const ensureFiles = () => {
diff --git a/app/lib/plugins/npm.js b/app/lib/plugins/npm.js
index dbfde714..306de6bc 100644
--- a/app/lib/plugins/npm.js
+++ b/app/lib/plugins/npm.js
@@ -1,20 +1,13 @@
import fs from 'fs'
import os from 'os'
-import rmdir from 'rmdir'
+import rimraf from 'rimraf'
import path from 'path'
import tar from 'tar-fs'
import zlib from 'zlib'
import https from 'https'
-import mv from 'mv'
+import moveFile from 'move-file'
-/**
- * Promise-wrapper for rmdir
- * @param {String} dir
- * @return {Promise}
- */
-const removeDir = dir => new Promise((resolve, reject) => {
- rmdir(dir, err => err ? reject(err) : resolve())
-})
+const removeDir = (dir) => rimraf.sync(dir)
/**
* Base url of npm API
@@ -30,33 +23,35 @@ const API_BASE = 'http://registry.npmjs.org/'
* @param {Object} header
* @return {Object}
*/
-const formatPackageFile = header => ({
+const formatPackageFile = (header) => ({
...header,
name: header.name.replace(/^package\//, '')
})
-const installPackage = (tarPath, destination, middleware) => {
+const installPackage = async (tarPath, destination, middleware) => {
console.log(`Extract ${tarPath} to ${destination}`)
- return new Promise((resolve, reject) => {
- const packageName = path.parse(destination).name
- const tempPath = `${os.tmpdir()}/${packageName}`
- console.log(`Download and extract to temp path: ${tempPath}`)
+
+ const packageName = path.parse(destination).name
+ const tempPath = path.join(os.tmpdir(), packageName)
+
+ console.log(`Download and extract to temp path: ${tempPath}`)
+
+ await new Promise((resolve, reject) => {
https.get(tarPath, (stream) => {
const result = stream
- // eslint-disable-next-line new-cap
.pipe(zlib.Unzip())
.pipe(tar.extract(tempPath, {
map: formatPackageFile
}))
result.on('error', reject)
result.on('finish', () => {
- middleware().then(() => {
- console.log(`Move ${tempPath} to ${destination}`)
- mv(tempPath, destination, err => err ? reject(err) : resolve())
- })
+ middleware().then(resolve)
})
})
})
+
+ console.log(`Move ${tempPath} to ${destination}`)
+ moveFile.sync(tempPath, destination)
}
/**
@@ -68,7 +63,7 @@ const installPackage = (tarPath, destination, middleware) => {
*/
export default (dir) => {
const packageJson = path.join(dir, 'package.json')
- const setConfig = config => (
+ const setConfig = (config) => (
fs.writeFileSync(packageJson, JSON.stringify(config, null, 2))
)
const getConfig = () => JSON.parse(fs.readFileSync(packageJson))
@@ -84,35 +79,37 @@ export default (dir) => {
* to temp folder, but before moving to real location
* @return {Promise}
*/
- install(name, options = {}) {
+ async install(name, options = {}) {
let versionToInstall
const version = options.version || null
const middleware = options.middleware || (() => Promise.resolve())
+
console.group('[npm] Install package', name)
- return fetch(`${API_BASE}${name}`)
- .then(response => response.json())
- .then((json) => {
- versionToInstall = version || json['dist-tags'].latest
- console.log('Version:', versionToInstall)
- return installPackage(
- json.versions[versionToInstall].dist.tarball,
- path.join(dir, 'node_modules', name),
- middleware
- )
- })
- .then(() => {
- const json = getConfig()
- json.dependencies[name] = versionToInstall
- console.log('Add package to dependencies')
- setConfig(json)
- console.groupEnd()
- })
- .catch((err) => {
- console.log('Error in package installation')
- console.log(err)
- console.groupEnd()
- })
+
+ try {
+ const resJson = await fetch(`${API_BASE}${name}`).then((response) => response.json())
+
+ versionToInstall = version || resJson['dist-tags'].latest
+ console.log('Version:', versionToInstall)
+ await installPackage(
+ resJson.versions[versionToInstall].dist.tarball,
+ path.join(dir, 'node_modules', name),
+ middleware
+ )
+
+ const json = getConfig()
+ json.dependencies[name] = versionToInstall
+ console.log('Add package to dependencies')
+ setConfig(json)
+ console.log('Finished installing', name)
+ console.groupEnd()
+ } catch (err) {
+ console.log('Error in package installation')
+ console.log(err)
+ console.groupEnd()
+ }
},
+
update(name) {
// Plugin update is downloading `.tar` and unarchiving it to temp folder
// Only if this part was succeeded, current version of plugin is uninstalled
@@ -120,41 +117,34 @@ export default (dir) => {
const middleware = () => this.uninstall(name)
return this.install(name, { middleware })
},
+
/**
* Uninstall npm package
*
* @param {String} name
* @return {Promise}
*/
- uninstall(name) {
+ async uninstall(name) {
const modulePath = path.join(dir, 'node_modules', name)
console.group('[npm] Uninstall package', name)
console.log('Remove package directory ', modulePath)
- return removeDir(modulePath)
- .then(() => {
- const json = getConfig()
- console.log('Update package.json')
- json.dependencies = Object
- .keys(json.dependencies || {})
- .reduce((acc, key) => {
- if (key !== name) {
- return {
- ...acc,
- [key]: json.dependencies[key]
- }
- }
- return acc
- }, {})
- console.log('Rewrite package.json')
- setConfig(json)
- console.groupEnd()
- return true
- })
- .catch((err) => {
- console.log('Error in package uninstallation')
- console.log(err)
- console.groupEnd()
- })
+ try {
+ removeDir(modulePath) // sync method
+
+ const json = getConfig()
+ console.log('Update package.json')
+ delete json.dependencies?.[name]
+
+ console.log('Rewrite package.json')
+ setConfig(json)
+
+ console.groupEnd()
+ return true
+ } catch (err) {
+ console.log('Error in package uninstallation')
+ console.log(err)
+ console.groupEnd()
+ }
}
}
}
diff --git a/app/lib/plugins/settings/get.js b/app/lib/plugins/settings/get.js
index b823e9bd..dc7685d4 100644
--- a/app/lib/plugins/settings/get.js
+++ b/app/lib/plugins/settings/get.js
@@ -5,12 +5,14 @@ const getSettings = pluginName => config.get('plugins')[pluginName] || {}
const getUserSettings = (pluginName) => {
const settings = getSettings(pluginName)
+
if (plugins[pluginName].settings) {
// Provide default values if nothing is set by user
Object.keys(plugins[pluginName].settings).forEach((key) => {
settings[key] = settings[key] || plugins[pluginName].settings[key].defaultValue
})
}
+
return settings
}
diff --git a/app/lib/rpc.js b/app/lib/rpc.js
index e4eeaeb7..a9577bfb 100644
--- a/app/lib/rpc.js
+++ b/app/lib/rpc.js
@@ -18,14 +18,11 @@ ipcRenderer.on(CHANNEL, (_, { message, payload }) => {
/**
* Send message to rpc-channel
* @param {String} message
- * @param {