Bump lodash.merge from 4.6.1 to 4.6.2

Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>

browser/components/CodeEditor.js

@@ -63,7 +63,7 @@ export default class CodeEditor extends React.Component {
     this.focusHandler = () => {
       ipcRenderer.send('editor:focused', true)
     }
-    this.debouncedDeletionOfAttachments = _.debounce(
+    const debouncedDeletionOfAttachments = _.debounce(
       attachmentManagement.deleteAttachmentsNotPresentInNote,
       30000
     )
@@ -80,7 +80,7 @@ export default class CodeEditor extends React.Component {
       this.props.onBlur != null && this.props.onBlur(e)
       const { storageKey, noteKey } = this.props
       if (this.props.deleteUnusedAttachments === true) {
-        this.debouncedDeletionOfAttachments(
+        debouncedDeletionOfAttachments(
           this.editor.getValue(),
           storageKey,
           noteKey
@@ -810,8 +810,6 @@ export default class CodeEditor extends React.Component {
   }
 
   handleChange(editor, changeObject) {
-    this.debouncedDeletionOfAttachments.cancel()
-
     spellcheck.handleChange(editor, changeObject)
 
     // The current note contains an toc. We'll check for changes on headlines.

browser/lib/markdown.js

@@ -8,7 +8,7 @@ import markdownItTocAndAnchor from '@hikerpig/markdown-it-toc-and-anchor'
 import _ from 'lodash'
 import ConfigManager from 'browser/main/lib/ConfigManager'
 import katex from 'katex'
-import { escapeHtmlCharacters, lastFindInArray } from './utils'
+import { lastFindInArray } from './utils'
 
 function createGutter(str, firstLineNumber) {
   if (Number.isNaN(firstLineNumber)) firstLineNumber = 1
@@ -479,16 +479,6 @@ class Markdown {
       return true
     })
 
-    this.md.renderer.rules.code_inline = function(tokens, idx) {
-      const token = tokens[idx]
-
-      return (
-        '<code class="inline">' +
-        escapeHtmlCharacters(token.content) +
-        '</code>'
-      )
-    }
-
     if (config.preview.smartArrows) {
       this.md.use(smartArrows)
     }

browser/main/Main.js

@@ -18,7 +18,6 @@ import { getLocales } from 'browser/lib/Languages'
 import applyShortcuts from 'browser/main/lib/shortcutManager'
 import { chooseTheme, applyTheme } from 'browser/main/lib/ThemeManager'
 import { push } from 'connected-react-router'
-import { ipcRenderer } from 'electron'
 
 const path = require('path')
 const electron = require('electron')
@@ -185,7 +184,6 @@ class Main extends React.Component {
       this.toggleMenuBarVisible.bind(this)
     )
     eventEmitter.on('dispatch:push', this.changeRoutePush.bind(this))
-    eventEmitter.on('update', () => ipcRenderer.send('update-check', 'manual'))
   }
 
   componentWillUnmount() {

browser/main/index.js

@@ -12,7 +12,6 @@ import DevTools from './DevTools'
 require('./lib/ipcClient')
 require('../lib/customMeta')
 import i18n from 'browser/lib/i18n'
-import ConfigManager from './lib/ConfigManager'
 
 const electron = require('electron')
 
@@ -108,22 +107,6 @@ function updateApp() {
   }
 }
 
-function downloadUpdate() {
-  const index = dialog.showMessageBox(remote.getCurrentWindow(), {
-    type: 'warning',
-    message: i18n.__('Update Boostnote'),
-    detail: i18n.__('New Boostnote is ready to be downloaded.'),
-    buttons: [i18n.__('Download now'), i18n.__('Ignore updates')]
-  })
-
-  if (index === 0) {
-    ipcRenderer.send('update-download-confirm')
-  } else if (index === 1) {
-    ipcRenderer.send('update-cancel')
-    ConfigManager.set({ autoUpdateEnabled: false })
-  }
-}
-
 ReactDOM.render(
   <Provider store={store}>
     <ConnectedRouter history={history}>
@@ -164,12 +147,8 @@ ReactDOM.render(
     })
 
     ipcRenderer.on('update-found', function() {
-      downloadUpdate()
-    })
-
-    ipcRenderer.on('update-not-found', function(_, msg) {
-      notify('Update not found!', {
-        body: msg
+      notify('Update found!', {
+        body: 'Preparing to update...'
       })
     })
 

browser/main/lib/ConfigManager.js

@@ -18,9 +18,9 @@ const DEFAULT_MARKDOWN_LINT_CONFIG = `{
 
 const DEFAULT_CSS_CONFIG = `
 /* Drop Your Custom CSS Code Here */
-[data-theme="default"] p code.inline,
-[data-theme="default"] li code.inline,
-[data-theme="default"] td code.inline
+[data-theme="default"] p code,
+[data-theme="default"] li code,
+[data-theme="default"] td code
 {
   padding: 2px;
   border-width: 1px;

browser/main/lib/dataApi/formatHTML.js

@@ -638,74 +638,74 @@ code {
   direction: ltr;
 }
 
-p code.inline,
-li code.inline,
-td code.inline
+p code,
+li code,
+td code
 {
   padding: 2px;
   border-width: 1px;
   border-style: solid;
   border-radius: 5px;
 }
-[data-theme="default"] p code.inline,
-[data-theme="default"] li code.inline,
-[data-theme="default"] td code.inline
+[data-theme="default"] p code,
+[data-theme="default"] li code,
+[data-theme="default"] td code
 {
   background-color: #F4F4F4;
   border-color: #d9d9d9;
   color: inherit;
 }
-[data-theme="white"] p code.inline,
-[data-theme="white"] li code.inline,
-[data-theme="white"] td code.inline
+[data-theme="white"] p code,
+[data-theme="white"] li code,
+[data-theme="white"] td code
 {
   background-color: #F4F4F4;
   border-color: #d9d9d9;
   color: inherit;
 }
-[data-theme="dark"] p code.inline,
-[data-theme="dark"] li code.inline,
-[data-theme="dark"] td code.inline
+[data-theme="dark"] p code,
+[data-theme="dark"] li code,
+[data-theme="dark"] td code
 {
   background-color: #444444;
   border-color: #555;
   color: #FFFFFF;
 }
-[data-theme="dracula"] p code.inline,
-[data-theme="dracula"] li code.inline,
-[data-theme="dracula"] td code.inline
+[data-theme="dracula"] p code,
+[data-theme="dracula"] li code,
+[data-theme="dracula"] td code
 {
   background-color: #444444;
   border-color: #555;
   color: #FFFFFF;
 }
-[data-theme="monokai"] p code.inline,
-[data-theme="monokai"] li code.inline,
-[data-theme="monokai"] td code.inline
+[data-theme="monokai"] p code,
+[data-theme="monokai"] li code,
+[data-theme="monokai"] td code
 {
   background-color: #444444;
   border-color: #555;
   color: #FFFFFF;
 }
-[data-theme="nord"] p code.inline,
-[data-theme="nord"] li code.inline,
-[data-theme="nord"] td code.inline
+[data-theme="nord"] p code,
+[data-theme="nord"] li code,
+[data-theme="nord"] td code
 {
   background-color: #444444;
   border-color: #555;
   color: #FFFFFF;
 }
-[data-theme="solarized-dark"] p code.inline,
-[data-theme="solarized-dark"] li code.inline,
-[data-theme="solarized-dark"] td code.inline
+[data-theme="solarized-dark"] p code,
+[data-theme="solarized-dark"] li code,
+[data-theme="solarized-dark"] td code
 {
   background-color: #444444;
   border-color: #555;
   color: #FFFFFF;
 }
-[data-theme="vulcan"] p code.inline,
-[data-theme="vulcan"] li code.inline,
-[data-theme="vulcan"] td code.inline
+[data-theme="vulcan"] p code,
+[data-theme="vulcan"] li code,
+[data-theme="vulcan"] td code
 {
   background-color: #444444;
   border-color: #555;

browser/main/modals/PreferencesModal/InfoTab.js

@@ -16,78 +16,25 @@ class InfoTab extends React.Component {
     super(props)
 
     this.state = {
-      config: this.props.config,
-      subscriptionFormStatus: 'idle',
-      subscriptionFormErrorMessage: null,
-      subscriptionFormEmail: ''
+      config: this.props.config
     }
   }
 
-  componentDidMount() {
-    const { autoUpdateEnabled, amaEnabled } = ConfigManager.get()
-
-    this.setState({ config: { autoUpdateEnabled, amaEnabled } })
-  }
-
   handleLinkClick(e) {
     shell.openExternal(e.currentTarget.href)
     e.preventDefault()
   }
 
   handleConfigChange(e) {
-    const newConfig = {
-      amaEnabled: this.refs.amaEnabled.checked,
-      autoUpdateEnabled: this.refs.autoUpdateEnabled.checked
-    }
+    const newConfig = { amaEnabled: this.refs.amaEnabled.checked }
 
     this.setState({ config: newConfig })
-    return newConfig
-  }
-
-  handleSubscriptionFormSubmit(e) {
-    e.preventDefault()
-    this.setState({
-      subscriptionFormStatus: 'sending',
-      subscriptionFormErrorMessage: null
-    })
-
-    fetch(
-      'https://boostmails.boostio.co/api/public/lists/5f434dccd05f3160b41c0d49/subscriptions',
-      {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
-        },
-        method: 'POST',
-        body: JSON.stringify({ email: this.state.subscriptionFormEmail })
-      }
-    )
-      .then(response => {
-        if (response.status >= 400) {
-          return response.text().then(text => {
-            throw new Error(text)
-          })
-        }
-        this.setState({
-          subscriptionFormStatus: 'done'
-        })
-      })
-      .catch(error => {
-        this.setState({
-          subscriptionFormStatus: 'idle',
-          subscriptionFormErrorMessage: error.message
-        })
-      })
-  }
-
-  handleSubscriptionFormEmailChange(e) {
-    this.setState({
-      subscriptionFormEmail: e.target.value
-    })
   }
 
   handleSaveButtonClick(e) {
-    const newConfig = this.state.config
+    const newConfig = {
+      amaEnabled: this.state.config.amaEnabled
+    }
 
     if (!newConfig.amaEnabled) {
       AwsMobileAnalyticsConfig.recordDynamicCustomEvent('DISABLE_AMA')
@@ -114,17 +61,20 @@ class InfoTab extends React.Component {
     })
   }
 
+  toggleAutoUpdate() {
+    const newConfig = {
+      autoUpdateEnabled: !this.state.config.autoUpdateEnabled
+    }
+
+    this.setState({ config: newConfig })
+    ConfigManager.set(newConfig)
+  }
+
   infoMessage() {
     const { amaMessage } = this.state
     return amaMessage ? <p styleName='policy-confirm'>{amaMessage}</p> : null
   }
 
-  handleAutoUpdateChange() {
-    const { autoUpdateEnabled } = this.handleConfigChange()
-
-    ConfigManager.set({ autoUpdateEnabled })
-  }
-
   render() {
     return (
       <div styleName='root'>
@@ -184,40 +134,6 @@ class InfoTab extends React.Component {
 
         <hr />
 
-        <div styleName='group-header--sub'>Subscribe Update Notes</div>
-        {this.state.subscriptionFormStatus === 'done' ? (
-          <div>
-            <blockquote color={{ color: 'green' }}>
-              Thanks for the subscription!
-            </blockquote>
-          </div>
-        ) : (
-          <div>
-            {this.state.subscriptionFormErrorMessage != null && (
-              <blockquote style={{ color: 'red' }}>
-                {this.state.subscriptionFormErrorMessage}
-              </blockquote>
-            )}
-            <form onSubmit={e => this.handleSubscriptionFormSubmit(e)}>
-              <input
-                styleName='subscription-email-input'
-                placeholder='E-mail'
-                type='email'
-                onChange={e => this.handleSubscriptionFormEmailChange(e)}
-                disabled={this.state.subscriptionFormStatus === 'sending'}
-              />
-              <button
-                styleName='subscription-submit-button'
-                type='submit'
-                disabled={this.state.subscriptionFormStatus === 'sending'}
-              >
-                Subscribe
-              </button>
-            </form>
-          </div>
-        )}
-        <hr />
-
         <div styleName='group-header--sub'>{i18n.__('About')}</div>
 
         <div styleName='top'>
@@ -265,8 +181,7 @@ class InfoTab extends React.Component {
           <label>
             <input
               type='checkbox'
-              ref='autoUpdateEnabled'
-              onChange={() => this.handleAutoUpdateChange()}
+              onChange={this.toggleAutoUpdate.bind(this)}
               checked={this.state.config.autoUpdateEnabled}
             />
             {i18n.__('Enable Auto Update')}

browser/main/modals/PreferencesModal/InfoTab.styl

@@ -33,35 +33,6 @@
 .separate-line
   margin 40px 0
 
-.subscription-email-input
-  height 35px
-  vertical-align middle
-  width 200px
-  font-size $tab--button-font-size
-  border solid 1px $border-color
-  border-radius 2px
-  padding 0 5px
-  margin-right 5px
-  outline none
-  &:disabled
-    background-color $ui-input--disabled-backgroundColor
-
-.subscription-submit-button
-  margin-top 10px
-  height 35px
-  border-radius 2px
-  border none
-  background-color alpha(#1EC38B, 90%)
-  padding-left 20px
-  padding-right 20px
-  text-decoration none
-  color white
-  font-weight 600
-  font-size 16px
-  &:hover
-    background-color #1EC38B
-    transition 0.2s
-
 .policy-submit
   margin-top 10px
   height 35px

lib/main-app.js

@@ -26,7 +26,6 @@ if (!singleInstance) {
 }
 
 var isUpdateReady = false
-let updateFound = false
 
 var ghReleasesOpts = {
   repo: 'BoostIO/boost-releases',
@@ -37,33 +36,25 @@ const updater = new GhReleases(ghReleasesOpts)
 
 // Check for updates
 // `status` returns true if there is a new update available
-function checkUpdate(manualTriggered = false) {
+function checkUpdate() {
   if (!isPackaged) {
     // Prevents app from attempting to update when in dev mode.
     console.log('Updates are disabled in Development mode, see main-app.js')
     return true
   }
-
-  // End if auto updates disabled and it is an automatic check
-  if (!electronConfig.get('autoUpdateEnabled', true) && !manualTriggered) return
-
-  if (process.platform === 'linux' || isUpdateReady || updateFound) {
+  if (!electronConfig.get('autoUpdateEnabled', true)) return
+  if (process.platform === 'linux' || isUpdateReady) {
     return true
   }
-
   updater.check((err, status) => {
     if (err) {
       var isLatest = err.message === 'There is no newer version.'
       if (!isLatest) console.error('Updater error! %s', err.message)
-      mainWindow.webContents.send(
-        'update-not-found',
-        isLatest ? 'There is no newer version.' : 'Updater error'
-      )
       return
     }
     if (status) {
       mainWindow.webContents.send('update-found', 'Update available!')
-      updateFound = true
+      updater.download()
     }
   })
 }
@@ -72,7 +63,6 @@ updater.on('update-downloaded', info => {
   if (mainWindow != null) {
     mainWindow.webContents.send('update-ready', 'Update available!')
     isUpdateReady = true
-    updateFound = false
   }
 })
 
@@ -87,14 +77,6 @@ ipc.on('update-app-confirm', function(event, msg) {
   }
 })
 
-ipc.on('update-cancel', () => {
-  updateFound = false
-})
-
-ipc.on('update-download-confirm', () => {
-  updater.download()
-})
-
 app.on('window-all-closed', function() {
   app.quit()
 })
@@ -131,7 +113,7 @@ app.on('ready', function() {
       if (isUpdateReady) {
         mainWindow.webContents.send('update-ready', 'Update available!')
       } else {
-        checkUpdate(msg === 'manual')
+        checkUpdate()
       }
     })
   }, 10 * 1000)

lib/main-menu.js

@@ -178,18 +178,6 @@ const file = {
         mainWindow.webContents.send('list:isMarkdownNote', 'print')
         mainWindow.webContents.send('print')
       }
-    },
-    {
-      type: 'separator'
-    },
-    {
-      label: 'Update',
-      click() {
-        mainWindow.webContents.send('update')
-      }
-    },
-    {
-      type: 'separator'
     }
   ]
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "boost",
   "productName": "Boostnote",
-  "version": "0.16.1",
+  "version": "0.16.0",
   "main": "index.js",
   "description": "Boostnote",
   "license": "GPL-3.0",

readme.md

@@ -1,26 +1,12 @@
-> # New Boost Note app is available!
->
-> We've launched a new Boost Note app which supports real-time collaborative writing.
->
-> And it is open sourced too! Please check it out! https://github.com/BoostIO/BoostNote-App
->
-> ## 📦 Download App
->
-> ### 🖥 Desktop
->
-> - [🌎 Web App (boostnote.io)](https://boostnote.io)
-> - [🍎 macOS (.dmg)](https://github.com/BoostIO/BoostNote-App/releases/latest/download/boost-note-mac.dmg)
-> - [:framed_picture: Windows (.exe NSIS)](https://github.com/BoostIO/BoostNote-App/releases/latest/download/boost-note-win.exe)
-> - [🐧 Linux (.deb)](https://github.com/BoostIO/BoostNote-App/releases/latest/download/boost-note-linux.deb)
-> - [🐧 Linux (.rpm)](https://github.com/BoostIO/BoostNote-App/releases/latest/download/boost-note-linux.rpm)
->
-> ### 📱 Mobile
->
-> - [🌎 Mobile Web App (m.boostnote.io)](https://m.boostnote.io)
-> - [🍏 iOS (Apple App Store)](https://apps.apple.com/gb/app/boost-note-mobile/id1576176505)
-> - [🤖 Android (Google Play Store)](https://play.google.com/store/apps/details?id=com.boostio.boostnote2021)
+> [We've launched desktop and mobile app of the new Boost Note now.](https://github.com/BoostIO/BoostNote.next)
 
-<h1 align="center">BoostNote-Legacy</h1>
+> ### [Boost Note for Teams](https://boosthub.io/)
+>
+> We've developed a collaborative workspace app called "Boost Hub" for developer teams.
+>
+> It's customizable and easy to optimize for your team like rego blocks and even lets you edit documents together in real-time!
+
+![Boostnote app screenshot](./resources/repository/top.png)
 
 <h4 align="center">Note-taking app for programmers. </h4>
 <h5 align="center">Apps available for Mac, Windows and Linux.</h5>
@@ -35,6 +21,42 @@
 
 [Find the latest release of Boostnote here!](https://github.com/BoostIO/boost-releases/releases/)
 
+## Roadmap
+
+[Boost Note Roadmap 2020](https://medium.com/boostnote/boost-note-roadmap-2020-9f06a642f5f1)
+
+## Authors & Maintainers
+
+- [Rokt33r](https://github.com/rokt33r)
+- [KZ](https://github.com/kazup01)
+- [ZeroX-DG](https://github.com/ZeroX-DG)
+
+## Contributors
+
+Thank you to all the people who have contributed to Boostnote!
+
+<a href="https://github.com/BoostIO/Boostnote/graphs/contributors"><img src="https://opencollective.com/boostnoteio/contributors.svg?width=890" /></a>
+
+## Supporting Boostnote
+
+Boostnote is an open source project. It's an independent project with its ongoing development made possible thanks to the support by our amazing backers.
+
+Issues on Boostnote can be funded by anyone and the money will be distributed to contributors and maintainers. If you use Boostnote please consider becoming a backer:
+
+[![Let's fund issues in this repository](https://issuehunt.io/static/embed/issuehunt-button-v1.svg)](https://issuehunt.io/repos/53266139)
+
+## Community
+
+- [Facebook Group](https://www.facebook.com/groups/boostnote/)
+- [Twitter](https://twitter.com/boostnoteapp)
+- [Slack Group](https://join.slack.com/t/boostnote-group/shared_invite/zt-cun7pas3-WwkaezxHBB1lCbUHrwQLXw)
+- [Blog](https://medium.com/boostnote)
+- [Reddit](https://www.reddit.com/r/Boostnote/)
+
+### Boostnote mobile
+A community project developing a mobile cross-platform version of boostnote for iOS and Android can be found here: [NoteApp](https://github.com/T0M0F/NoteApp)
+
+
 #### More Information
 
 - Website: https://boostnote.io

yarn.lock

@@ -6138,8 +6138,9 @@ lodash.memoize@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
 lodash.merge@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
 lodash.mergewith@^4.6.0:
   version "4.6.2"