Update to v0.11.6

5 files changed, 69 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 054c8349b2d3..de0cb48d4c9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = boostnote
 	pkgdesc = Open source note-taking app for programmers
-	pkgver = 0.11.4
-	pkgrel = 2
+	pkgver = 0.11.6
+	pkgrel = 1
 	url = https://boostnote.io/
 	arch = any
 	license = GPL3
@@ -10,18 +10,18 @@ pkgbase = boostnote
 	makedepends = git
 	depends = electron
 	depends = nodejs
-	source = boostnote-0.11.4.tar.gz::https://github.com/BoostIO/Boostnote/archive/v0.11.4.tar.gz
+	source = boostnote-0.11.6.tar.gz::https://github.com/BoostIO/Boostnote/archive/v0.11.6.tar.gz
 	source = boostnote.js
 	source = boostnote.desktop
 	source = warning-fix.patch
 	source = remove-analytics.patch
 	source = electron-v2-compatibility.patch
-	sha512sums = 218fd8d362053b26a01fd92cd6b115211f3809c00342dafbd6bc4f3f9c6d0e95aaeb367b7d3474857fb4e714b5e8a556d85feeb3bea648a785084a13d5b4ccde
+	sha512sums = 2e516d8fa64c35fe1c092ffeb616f5d3acb0c870efcc7c64de6124e18deddc3720bc45f39f2de9fb50d35aa73f8cf77bdf2700dd5e79d195e95424ee12a18fc5
 	sha512sums = 1f0ccd2a3632a12c4714d97b9f909ddc94b53d6f86a9e4bdcab31abd55a93071a2c35c6e1e9527b747de6dd74b8a5276414980c11e174085f28b8f2d2721230a
 	sha512sums = 18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40
-	sha512sums = 415eb95c889eee8076cc92ea30058505f9f3c1b73b0bc9712b92ffc65ddb5be250e962b20449946be2fffccaf31153b9923fa63e11412525db33dbf1c3215974
-	sha512sums = d6ff77413aa606c38db9a38cde0f38b2818194649cf0def93d003b52f90825c2f095ab82d98bb8200080546fe96f0d9c356eec32e21a9fb2bf46831699af550e
-	sha512sums = 21d97cb7a877333dd6c3d980a6ab0a606b53d88b5234648d07e7b4435330e3e16727afc8beded158e14f6397713cdb00d655b131021bc191ca116567ef92d068
+	sha512sums = ccd0b8903f9a755f733df13fdd2049ca06c4e85f27c56dcae101ad9610799a83a74e9050aa881c1f656880d3720137a64a39b299d392dbf724c10c74018f2889
+	sha512sums = 5cf9835598bb4f81ce8075a578f92c6d5068a02d0a09edce376c6929bcb081bbe7b776ef89b20d9ef295d3d3753c82eab07ff7f0f78230980d8273ab56f45a9b
+	sha512sums = 64e305386ed95df7bf580f1a46fe724de93a567dd272995fa3072d3c028bb5a09889123f1c44dd4066c5181471de55563120be4bc98ebe742eabdfb5587420f7
 
 pkgname = boostnote
 
diff --git a/PKGBUILD b/PKGBUILD
index 0640dda81545..1320898ca277 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: Romain Bazile <gromain {dot} baz {at} gmail {dot} com>
 pkgname=boostnote
 _pkgname=Boostnote
-pkgver=0.11.4
-pkgrel=2
+pkgver=0.11.6
+pkgrel=1
 pkgdesc="Open source note-taking app for programmers"
 arch=('any')
 url="https://boostnote.io/"
@@ -23,12 +23,12 @@ source=(
   "electron-v2-compatibility.patch"
   )
 
-sha512sums=('218fd8d362053b26a01fd92cd6b115211f3809c00342dafbd6bc4f3f9c6d0e95aaeb367b7d3474857fb4e714b5e8a556d85feeb3bea648a785084a13d5b4ccde'
+sha512sums=('2e516d8fa64c35fe1c092ffeb616f5d3acb0c870efcc7c64de6124e18deddc3720bc45f39f2de9fb50d35aa73f8cf77bdf2700dd5e79d195e95424ee12a18fc5'
             '1f0ccd2a3632a12c4714d97b9f909ddc94b53d6f86a9e4bdcab31abd55a93071a2c35c6e1e9527b747de6dd74b8a5276414980c11e174085f28b8f2d2721230a'
             '18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40'
-            '415eb95c889eee8076cc92ea30058505f9f3c1b73b0bc9712b92ffc65ddb5be250e962b20449946be2fffccaf31153b9923fa63e11412525db33dbf1c3215974'
-            'd6ff77413aa606c38db9a38cde0f38b2818194649cf0def93d003b52f90825c2f095ab82d98bb8200080546fe96f0d9c356eec32e21a9fb2bf46831699af550e'
-            '21d97cb7a877333dd6c3d980a6ab0a606b53d88b5234648d07e7b4435330e3e16727afc8beded158e14f6397713cdb00d655b131021bc191ca116567ef92d068')
+            'ccd0b8903f9a755f733df13fdd2049ca06c4e85f27c56dcae101ad9610799a83a74e9050aa881c1f656880d3720137a64a39b299d392dbf724c10c74018f2889'
+            '5cf9835598bb4f81ce8075a578f92c6d5068a02d0a09edce376c6929bcb081bbe7b776ef89b20d9ef295d3d3753c82eab07ff7f0f78230980d8273ab56f45a9b'
+            '64e305386ed95df7bf580f1a46fe724de93a567dd272995fa3072d3c028bb5a09889123f1c44dd4066c5181471de55563120be4bc98ebe742eabdfb5587420f7')
 
 prepare() {
   cd "${_pkgname}-${pkgver}"
@@ -41,10 +41,10 @@ prepare() {
 build() {
   cd "${_pkgname}-${pkgver}"
 
-  npm install --no-optional
+  npm install --no-optional --no-shrinkwrap
   grunt compile
   rm -r node_modules/
-  npm install --production --no-optional
+  npm install --production --no-optional --no-shrinkwrap
 }
 
 package() {
diff --git a/electron-v2-compatibility.patch b/electron-v2-compatibility.patch
index b24f5191c141..bd3fdab89a12 100644
--- a/electron-v2-compatibility.patch
+++ b/electron-v2-compatibility.patch
@@ -1,7 +1,7 @@
 diff -ura a/lib/main.html b/lib/main.html
---- a/lib/main.html	2018-04-11 01:16:20.000000000 +0200
-+++ b/lib/main.html	2018-06-13 07:35:01.495445739 +0200
-@@ -114,7 +114,7 @@
+--- a/lib/main.html	2018-06-14 04:02:20.000000000 +0200
++++ b/lib/main.html	2018-06-14 08:50:26.059077938 +0200
+@@ -115,7 +115,7 @@
    <script src="../node_modules/react-redux/dist/react-redux.min.js"></script>
    <script type='text/javascript'>
      const electron = require('electron')
@@ -11,8 +11,8 @@ diff -ura a/lib/main.html b/lib/main.html
        ? 'http://localhost:8080/assets/main.js'
        : '../compiled/main.js'
 diff -ura a/lib/main-window.js b/lib/main-window.js
---- a/lib/main-window.js	2018-04-11 01:16:20.000000000 +0200
-+++ b/lib/main-window.js	2018-06-13 07:34:34.968829173 +0200
+--- a/lib/main-window.js	2018-06-14 04:02:20.000000000 +0200
++++ b/lib/main-window.js	2018-06-14 08:50:48.442815904 +0200
 @@ -17,7 +17,7 @@
    autoHideMenuBar: showMenu,
    webPreferences: {
@@ -22,15 +22,3 @@ diff -ura a/lib/main-window.js b/lib/main-window.js
    },
    icon: path.resolve(__dirname, '../resources/app.png')
  })
-diff -ura a/package.json b/package.json
---- a/package.json	2018-06-13 07:45:37.000000000 +0200
-+++ b/package.json	2018-06-13 07:46:48.993660686 +0200
-@@ -110,7 +110,7 @@
-     "css-loader": "^0.19.0",
-     "devtron": "^1.1.0",
-     "dom-storage": "^2.0.2",
--    "electron": "1.7.11",
-+    "electron": "2.0.2",
-     "electron-packager": "^8.6.0",
-     "eslint": "^3.13.1",
-     "eslint-config-standard": "^6.2.1",
diff --git a/remove-analytics.patch b/remove-analytics.patch
index 4cf49bca39fb..af25f9f153bf 100644
--- a/remove-analytics.patch
+++ b/remove-analytics.patch
@@ -1,6 +1,6 @@
 diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
---- a/browser/main/Detail/MarkdownNoteDetail.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/Detail/MarkdownNoteDetail.js	2018-03-22 16:05:48.568143378 +0100
+--- a/browser/main/Detail/MarkdownNoteDetail.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/Detail/MarkdownNoteDetail.js	2018-06-14 08:42:29.609020608 +0200
 @@ -15,7 +15,6 @@
  import StatusBar from '../StatusBar'
  import _ from 'lodash'
@@ -9,7 +9,7 @@ diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/Mark
  import ConfigManager from 'browser/main/lib/ConfigManager'
  import TrashButton from './TrashButton'
  import FullscreenButton from './FullscreenButton'
-@@ -112,7 +111,6 @@
+@@ -117,7 +116,6 @@
            type: 'UPDATE_NOTE',
            note: note
          })
@@ -17,7 +17,7 @@ diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/Mark
        })
    }
  
-@@ -151,7 +149,6 @@
+@@ -156,7 +154,6 @@
  
    handleStarButtonClick (e) {
      const { note } = this.state
@@ -26,17 +26,17 @@ diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/Mark
      note.isStarred = !note.isStarred
  
 diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
---- a/browser/main/Detail/SnippetNoteDetail.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/Detail/SnippetNoteDetail.js	2018-03-22 16:06:37.140689593 +0100
-@@ -18,7 +18,6 @@
- import ConfigManager from 'browser/main/lib/ConfigManager'
+--- a/browser/main/Detail/SnippetNoteDetail.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/Detail/SnippetNoteDetail.js	2018-06-14 08:43:32.060939891 +0200
+@@ -19,7 +19,6 @@
  import _ from 'lodash'
  import {findNoteTitle} from 'browser/lib/findNoteTitle'
+ import convertModeName from 'browser/lib/convertModeName'
 -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
  import TrashButton from './TrashButton'
  import RestoreButton from './RestoreButton'
  import PermanentDeleteButton from './PermanentDeleteButton'
-@@ -140,7 +139,6 @@
+@@ -127,7 +126,6 @@
            type: 'UPDATE_NOTE',
            note: note
          })
@@ -44,7 +44,7 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp
        })
    }
  
-@@ -179,7 +177,6 @@
+@@ -166,7 +164,6 @@
  
    handleStarButtonClick (e) {
      const { note } = this.state
@@ -52,7 +52,7 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp
  
      note.isStarred = !note.isStarred
  
-@@ -377,9 +374,6 @@
+@@ -364,9 +361,6 @@
      const mode = syntax != null ? syntax.name : null
      if (mode != null) {
        snippets[index].mode = mode
@@ -60,10 +60,10 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp
 -        name: mode
 -      })
      }
-     this.setState({note: Object.assign(this.state.note, {snippets: snippets})})
+     this.setState(state => ({note: Object.assign(state.note, {snippets: snippets})}))
  
-@@ -401,10 +395,6 @@
-       }, () => {
+@@ -388,10 +382,6 @@
+       }), () => {
          this.save()
        })
 -
@@ -74,8 +74,8 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp
    }
  
 diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
---- a/browser/main/Detail/TagSelect.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/Detail/TagSelect.js	2018-03-22 16:06:54.073880422 +0100
+--- a/browser/main/Detail/TagSelect.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/Detail/TagSelect.js	2018-06-14 08:43:53.187726280 +0200
 @@ -3,7 +3,6 @@
  import CSSModules from 'browser/lib/CSSModules'
  import styles from './TagSelect.styl'
@@ -84,7 +84,7 @@ diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
  import i18n from 'browser/lib/i18n'
  
  class TagSelect extends React.Component {
-@@ -63,7 +62,6 @@
+@@ -56,7 +55,6 @@
    }
  
    submitTag () {
@@ -93,8 +93,8 @@ diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
      let newTag = this.refs.newTag.value.trim().replace(/ +/g, '_')
      newTag = newTag.charAt(0) === '#' ? newTag.substring(1) : newTag
 diff -ura a/browser/main/Main.js b/browser/main/Main.js
---- a/browser/main/Main.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/Main.js	2018-03-22 16:07:08.159039305 +0100
+--- a/browser/main/Main.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/Main.js	2018-06-14 08:44:12.834832465 +0200
 @@ -10,7 +10,6 @@
  import dataApi from 'browser/main/lib/dataApi'
  import _ from 'lodash'
@@ -103,7 +103,7 @@ diff -ura a/browser/main/Main.js b/browser/main/Main.js
  import eventEmitter from 'browser/main/lib/eventEmitter'
  import { hashHistory } from 'react-router'
  import store from 'browser/main/store'
-@@ -24,10 +23,6 @@
+@@ -26,10 +25,6 @@
    constructor (props) {
      super(props)
  
@@ -115,8 +115,8 @@ diff -ura a/browser/main/Main.js b/browser/main/Main.js
  
      this.state = {
 diff -ura a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/CreateFolderModal.js
---- a/browser/main/modals/CreateFolderModal.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/modals/CreateFolderModal.js	2018-03-22 16:07:22.927206041 +0100
+--- a/browser/main/modals/CreateFolderModal.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/modals/CreateFolderModal.js	2018-06-14 08:44:28.685129396 +0200
 @@ -6,7 +6,6 @@
  import store from 'browser/main/store'
  import consts from 'browser/lib/consts'
@@ -134,8 +134,8 @@ diff -ura a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/Creat
        const { storage } = this.props
        const input = {
 diff -ura a/browser/main/modals/NewNoteModal.js b/browser/main/modals/NewNoteModal.js
---- a/browser/main/modals/NewNoteModal.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/modals/NewNoteModal.js	2018-03-22 16:07:43.452438010 +0100
+--- a/browser/main/modals/NewNoteModal.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/modals/NewNoteModal.js	2018-06-14 08:44:53.051207268 +0200
 @@ -5,7 +5,6 @@
  import { hashHistory } from 'react-router'
  import ee from 'browser/main/lib/eventEmitter'
@@ -163,8 +163,8 @@ diff -ura a/browser/main/modals/NewNoteModal.js b/browser/main/modals/NewNoteMod
  
      dataApi
 diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js
---- a/browser/main/modals/PreferencesModal/InfoTab.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/modals/PreferencesModal/InfoTab.js	2018-03-22 16:08:39.671074712 +0100
+--- a/browser/main/modals/PreferencesModal/InfoTab.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/modals/PreferencesModal/InfoTab.js	2018-06-14 08:45:38.558084370 +0200
 @@ -3,7 +3,6 @@
  import styles from './InfoTab.styl'
  import ConfigManager from 'browser/main/lib/ConfigManager'
@@ -221,12 +221,10 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal
    render () {
      return (
        <div styleName='root'>
-@@ -135,23 +93,6 @@
-             {i18n.__('License: GPL v3')}
-           </li>
+@@ -137,21 +95,6 @@
          </ul>
--
--        <hr styleName='separate-line' />
+ 
+         <hr styleName='separate-line' />
 -
 -        <div styleName='policy'>{i18n.__('Analytics')}</div>
 -        <div>{i18n.__('Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.')}</div>
@@ -246,17 +244,17 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal
      )
    }
 diff -ura a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
---- a/browser/main/NoteList/index.js	2018-03-22 15:07:28.000000000 +0100
-+++ b/browser/main/NoteList/index.js	2018-03-22 16:09:20.152534305 +0100
-@@ -15,7 +15,6 @@
+--- a/browser/main/NoteList/index.js	2018-06-14 04:02:20.000000000 +0200
++++ b/browser/main/NoteList/index.js	2018-06-14 08:46:04.138478625 +0200
+@@ -17,7 +17,6 @@
  import path from 'path'
  import { hashHistory } from 'react-router'
  import copy from 'copy-to-clipboard'
 -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
  import Markdown from '../../lib/markdown'
  import i18n from 'browser/lib/i18n'
- 
-@@ -625,7 +624,6 @@
+ import { confirmDeleteNote } from 'browser/lib/confirmDeleteNote'
+@@ -636,7 +635,6 @@
              note: newNote
            })
          })
@@ -264,7 +262,7 @@ diff -ura a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
          console.log('Notes went to trash')
        })
        .catch((err) => {
-@@ -644,8 +642,6 @@
+@@ -655,8 +653,6 @@
      const firstNote = selectedNotes[0]
      const eventName = firstNote.type === 'MARKDOWN_NOTE' ? 'ADD_MARKDOWN' : 'ADD_SNIPPET'
  
@@ -274,14 +272,14 @@ diff -ura a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
        .createNote(storage.key, {
          type: firstNote.type,
 diff -ura a/package.json b/package.json
---- a/package.json	2018-03-22 15:07:28.000000000 +0100
-+++ b/package.json	2018-03-22 16:09:42.000000000 +0100
-@@ -50,8 +50,6 @@
+--- a/package.json	2018-06-14 04:02:20.000000000 +0200
++++ b/package.json	2018-06-14 08:46:17.872054533 +0200
+@@ -51,8 +51,6 @@
    "dependencies": {
      "@rokt33r/markdown-it-math": "^4.0.1",
      "@rokt33r/season": "^5.3.0",
 -    "aws-sdk": "^2.48.0",
 -    "aws-sdk-mobile-analytics": "^0.9.2",
-     "codemirror": "^5.19.0",
+     "codemirror": "^5.37.0",
      "codemirror-mode-elixir": "^1.1.1",
      "electron-config": "^0.2.1",
diff --git a/warning-fix.patch b/warning-fix.patch
index 6f9de6e6a07c..e13c91ed49a4 100644
--- a/warning-fix.patch
+++ b/warning-fix.patch
@@ -1,6 +1,6 @@
 diff -ura a/gruntfile.js b/gruntfile.js
---- a/gruntfile.js	2018-02-03 15:50:49.000000000 +0100
-+++ b/gruntfile.js	2018-02-03 20:06:27.823432173 +0100
+--- a/gruntfile.js	2018-06-14 04:02:20.000000000 +0200
++++ b/gruntfile.js	2018-06-14 08:38:45.786543071 +0200
 @@ -6,6 +6,7 @@
  
  module.exports = function (grunt) {
@@ -31,27 +31,27 @@ diff -ura a/gruntfile.js b/gruntfile.js
    grunt.registerTask('compile', function () {
      var done = this.async()
 diff -ura a/package.json b/package.json
---- a/package.json	2018-02-03 15:50:49.000000000 +0100
-+++ b/package.json	2018-02-03 20:06:05.383251764 +0100
-@@ -104,14 +104,14 @@
+--- a/package.json	2018-06-14 04:02:20.000000000 +0200
++++ b/package.json	2018-06-14 08:38:07.322269574 +0200
+@@ -121,14 +121,14 @@
      "devtron": "^1.1.0",
      "dom-storage": "^2.0.2",
-     "electron": "1.7.11",
+     "electron": "1.8.7",
 -    "electron-packager": "^6.0.0",
 +    "electron-packager": "^8.6.0",
      "eslint": "^3.13.1",
      "eslint-config-standard": "^6.2.1",
      "eslint-config-standard-jsx": "^3.2.0",
-     "eslint-plugin-react": "^7.2.0",
+     "eslint-plugin-react": "^7.8.2",
      "eslint-plugin-standard": "^3.0.1",
      "faker": "^3.1.0",
 -    "grunt": "^0.4.5",
 +    "grunt": "^1.0.1",
      "grunt-electron-installer": "2.1.0",
      "history": "^1.17.0",
-     "jsdom": "^9.4.2",
-@@ -125,15 +125,11 @@
-     "react-router-redux": "^4.0.4",
+     "identity-obj-proxy": "^3.0.0",
+@@ -147,15 +147,11 @@
+     "react-test-renderer": "^15.6.2",
      "standard": "^8.4.0",
      "style-loader": "^0.12.4",
 -    "stylus": "^0.52.4",