diff options
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | PKGBUILD | 28 | ||||
-rw-r--r-- | boostnote.js | 2 | ||||
-rw-r--r-- | electron_5_fix.patch | 15 | ||||
-rw-r--r-- | latest_electron_compatibility.patch | 29 | ||||
-rw-r--r-- | remove-analytics.patch | 276 |
6 files changed, 240 insertions, 130 deletions
@@ -1,29 +1,25 @@ pkgbase = boostnote pkgdesc = Open source note-taking app for programmers - pkgver = 0.11.15 - pkgrel = 2 + pkgver = 0.16.1 + pkgrel = 4 url = https://boostnote.io/ arch = any license = GPL3 - makedepends = npm + makedepends = yarn makedepends = grunt-cli makedepends = git - depends = electron + depends = electron4-bin depends = nodejs - source = boostnote-0.11.15.tar.gz::https://github.com/BoostIO/Boostnote/archive/v0.11.15.tar.gz + source = boostnote-0.16.1.tar.gz::https://github.com/BoostIO/Boostnote/archive/0.16.1.tar.gz source = boostnote.js source = boostnote.desktop source = warning-fix.patch source = remove-analytics.patch - source = fix-js-sequence-diagrams.patch - source = electron_4.patch - sha512sums = 531e58d0e8620d745dab1245b036cf39a88e8951d2b1d11dabb4ce6c52cce97c2a961bbc25516cbb2b5b543d359bff66aa2f4f5f6894eb39392630ee1699d69e - sha512sums = 1f0ccd2a3632a12c4714d97b9f909ddc94b53d6f86a9e4bdcab31abd55a93071a2c35c6e1e9527b747de6dd74b8a5276414980c11e174085f28b8f2d2721230a + sha512sums = eeb37f835bc74f7022f5f7cdf55513541f1aafd9b0d055ce84072b05d35645d8de544349e52a6243a0ff739de6e565aeec04bd9306584da9aa5f1bbc0a8755f2 + sha512sums = dc52526014a84f3048fdd835fb5433026da28c393f3559c0a4c4095ca2f927e1111d144b09178c1bce3fa36e8271f419cfd0575e68f5c094b2b175cefa6461c6 sha512sums = 18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40 sha512sums = a52e5631867e2c5f18465dee6a3201b9b5c546bda373205c4891c9f7b6114599e0854e2b49defb55ee7bea0778a7fde9c9d9f7271dceeeece743a2d72e2fd0c6 - sha512sums = 65280bb7e30e07746a63b93be0e32299424683ade760d52031765099048761c863bd2905fbe98a808d85b991777734c6645e887d51493db063984ff236c4fae8 - sha512sums = c39485dadfaa4c8769e7a1eb4cda637563d95dc3cbd8d391c133dd0cdf7d46ecda1c7a11d46a94ba5de5207dc407c3f07c0f617a81aaab8acd05813f30c9f0cc - sha512sums = b6e704343c4bdf48273ea680761ccae38cd87a3ea8f87db3b5cf18c99921351b4519c6a4b2cf20417d58a02a4a20e59f354ff96b1cdbc6328e83bff527654647 + sha512sums = aa25e326f7bddb0855f4d38c3105a6347e69b780ab86e18612c80fe4b004a7adb83aee8daf7f75f4806411164676235b83968037f017ae6def6b7d8183984674 pkgname = boostnote @@ -5,49 +5,43 @@ # Contributor: Romain Bazile <gromain {dot} baz {at} gmail {dot} com> pkgname=boostnote _pkgname=Boostnote -pkgver=0.11.15 -pkgrel=2 +pkgver=0.16.1 +pkgrel=4 pkgdesc="Open source note-taking app for programmers" arch=('any') url="https://boostnote.io/" license=('GPL3') -depends=('electron' 'nodejs') -makedepends=('npm' 'grunt-cli' 'git') +depends=('electron4-bin' 'nodejs') +makedepends=('yarn' 'grunt-cli' 'git') source=( - "${pkgname}-${pkgver}.tar.gz::https://github.com/BoostIO/"${_pkgname}"/archive/v"${pkgver}".tar.gz" + "${pkgname}-${pkgver}.tar.gz::https://github.com/BoostIO/"${_pkgname}"/archive/"${pkgver}".tar.gz" "${pkgname}.js" "${pkgname}.desktop" "warning-fix.patch" "remove-analytics.patch" - "fix-js-sequence-diagrams.patch" - "electron_4.patch" ) -sha512sums=('531e58d0e8620d745dab1245b036cf39a88e8951d2b1d11dabb4ce6c52cce97c2a961bbc25516cbb2b5b543d359bff66aa2f4f5f6894eb39392630ee1699d69e' - '1f0ccd2a3632a12c4714d97b9f909ddc94b53d6f86a9e4bdcab31abd55a93071a2c35c6e1e9527b747de6dd74b8a5276414980c11e174085f28b8f2d2721230a' +sha512sums=('eeb37f835bc74f7022f5f7cdf55513541f1aafd9b0d055ce84072b05d35645d8de544349e52a6243a0ff739de6e565aeec04bd9306584da9aa5f1bbc0a8755f2' + 'dc52526014a84f3048fdd835fb5433026da28c393f3559c0a4c4095ca2f927e1111d144b09178c1bce3fa36e8271f419cfd0575e68f5c094b2b175cefa6461c6' '18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40' 'a52e5631867e2c5f18465dee6a3201b9b5c546bda373205c4891c9f7b6114599e0854e2b49defb55ee7bea0778a7fde9c9d9f7271dceeeece743a2d72e2fd0c6' - '65280bb7e30e07746a63b93be0e32299424683ade760d52031765099048761c863bd2905fbe98a808d85b991777734c6645e887d51493db063984ff236c4fae8' - 'c39485dadfaa4c8769e7a1eb4cda637563d95dc3cbd8d391c133dd0cdf7d46ecda1c7a11d46a94ba5de5207dc407c3f07c0f617a81aaab8acd05813f30c9f0cc' - 'b6e704343c4bdf48273ea680761ccae38cd87a3ea8f87db3b5cf18c99921351b4519c6a4b2cf20417d58a02a4a20e59f354ff96b1cdbc6328e83bff527654647') + 'aa25e326f7bddb0855f4d38c3105a6347e69b780ab86e18612c80fe4b004a7adb83aee8daf7f75f4806411164676235b83968037f017ae6def6b7d8183984674') prepare() { cd "${_pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/warning-fix.patch" patch -Np1 -i "${srcdir}/remove-analytics.patch" - patch -Np1 -i "${srcdir}/fix-js-sequence-diagrams.patch" - patch -Np1 -i "${srcdir}/electron_4.patch" } build() { cd "${_pkgname}-${pkgver}" - npm install --no-optional --no-shrinkwrap - grunt compile + yarn install --ignore-optional + yarn run compile rm -r node_modules/ - npm install --production --no-optional --no-shrinkwrap + yarn install --production --ignore-optional } package() { diff --git a/boostnote.js b/boostnote.js index 02d2bef6d68f..da295810745d 100644 --- a/boostnote.js +++ b/boostnote.js @@ -1,4 +1,4 @@ -#!/usr/bin/env electron +#!/usr/bin/env electron4 const name = 'boostnote'; diff --git a/electron_5_fix.patch b/electron_5_fix.patch new file mode 100644 index 000000000000..ce115bc680a8 --- /dev/null +++ b/electron_5_fix.patch @@ -0,0 +1,15 @@ +diff -ura a/lib/main-window.js b/lib/main-window.js +--- a/lib/main-window.js 2019-05-22 08:20:34.000000000 +0200 ++++ b/lib/main-window.js 2019-07-03 15:16:52.013748142 +0200 +@@ -23,7 +23,10 @@ + minHeight: 320, + webPreferences: { + zoomFactor: 1.0, +- enableBlinkFeatures: 'OverlayScrollbars' ++ enableBlinkFeatures: 'OverlayScrollbars', ++ contextIsolation: false, ++ nodeIntegration: true, ++ webviewTag: true + }, + icon: path.resolve(__dirname, '../resources/app.png') + }) diff --git a/latest_electron_compatibility.patch b/latest_electron_compatibility.patch new file mode 100644 index 000000000000..3fb3aac13e76 --- /dev/null +++ b/latest_electron_compatibility.patch @@ -0,0 +1,29 @@ +diff --color -ura a/browser/main/lib/dataApi/formatPDF.js b/browser/main/lib/dataApi/formatPDF.js +--- a/browser/main/lib/dataApi/formatPDF.js 2020-09-04 16:47:01.000000000 +0200 ++++ b/browser/main/lib/dataApi/formatPDF.js 2020-10-25 10:29:34.265677941 +0100 +@@ -5,7 +5,7 @@ + return function(note, targetPath, exportTasks) { + const printout = new remote.BrowserWindow({ + show: false, +- webPreferences: { webSecurity: false, javascript: false } ++ webPreferences: { webSecurity: false, javascript: false, enableRemoteModule: true } + }) + + printout.loadURL( +Alleen in b: compiled +diff --color -ura a/lib/main-window.js b/lib/main-window.js +--- a/lib/main-window.js 2020-09-04 16:47:01.000000000 +0200 ++++ b/lib/main-window.js 2020-10-25 10:40:39.929617534 +0100 +@@ -50,7 +50,11 @@ + minHeight: 320, + webPreferences: { + zoomFactor: 1.0, +- enableBlinkFeatures: 'OverlayScrollbars' ++ enableBlinkFeatures: 'OverlayScrollbars', ++ contextIsolation: false, ++ nodeIntegration: true, ++ webviewTag: true, ++ enableRemoteModule: true + }, + icon: path.resolve(__dirname, '../resources/app.png') + }) diff --git a/remove-analytics.patch b/remove-analytics.patch index c6824422c495..b89ad5eef8fe 100644 --- a/remove-analytics.patch +++ b/remove-analytics.patch @@ -1,30 +1,34 @@ -diff -ura a/browser/lib/newNote.js b/browser/lib/newNote.js ---- a/browser/lib/newNote.js 2019-01-26 04:30:22.000000000 +0100 -+++ b/browser/lib/newNote.js 2019-01-27 12:57:41.390750827 +0100 -@@ -1,11 +1,8 @@ - import { hashHistory } from 'react-router' +diff --color -ura a/browser/lib/newNote.js b/browser/lib/newNote.js +--- a/browser/lib/newNote.js 2020-09-04 16:47:01.000000000 +0200 ++++ b/browser/lib/newNote.js 2020-09-12 09:52:20.544253351 +0200 +@@ -1,6 +1,5 @@ import dataApi from 'browser/main/lib/dataApi' import ee from 'browser/main/lib/eventEmitter' -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' + import queryString from 'query-string' + import { push } from 'connected-react-router' - export function createMarkdownNote (storage, folder, dispatch, location, params, config) { +@@ -12,8 +11,6 @@ + params, + config + ) { - AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_MARKDOWN') - AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE') let tags = [] - if (config.ui.tagNewNoteWithFilteringTags && location.pathname.match(/\/tags/)) { -@@ -38,8 +35,6 @@ - } - - export function createSnippetNote (storage, folder, dispatch, location, params, config) { + if ( +@@ -58,8 +55,6 @@ + params, + config + ) { - AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_SNIPPET') - AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE') let tags = [] - if (config.ui.tagNewNoteWithFilteringTags && location.pathname.match(/\/tags/)) { -diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js ---- a/browser/main/Detail/MarkdownNoteDetail.js 2019-01-26 04:30:22.000000000 +0100 -+++ b/browser/main/Detail/MarkdownNoteDetail.js 2019-01-27 12:58:03.457745347 +0100 + if ( +diff --color -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js +--- a/browser/main/Detail/MarkdownNoteDetail.js 2020-09-04 16:47:01.000000000 +0200 ++++ b/browser/main/Detail/MarkdownNoteDetail.js 2020-09-12 09:53:15.814946778 +0200 @@ -15,7 +15,6 @@ import StatusBar from '../StatusBar' import _ from 'lodash' @@ -33,50 +37,52 @@ 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' -@@ -130,7 +129,6 @@ - type: 'UPDATE_NOTE', - note: note - }) -- AwsMobileAnalyticsConfig.recordDynamicCustomEvent('EDIT_NOTE') +@@ -166,7 +165,6 @@ + type: 'UPDATE_NOTE', + note: note }) +- AwsMobileAnalyticsConfig.recordDynamicCustomEvent('EDIT_NOTE') + }) } -@@ -169,7 +167,6 @@ +@@ -210,8 +208,6 @@ - handleStarButtonClick (e) { + handleStarButtonClick(e) { const { note } = this.state -- if (!note.isStarred) AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_STAR') +- if (!note.isStarred) +- AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_STAR') note.isStarred = !note.isStarred -diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js ---- a/browser/main/Detail/SnippetNoteDetail.js 2019-01-26 04:30:22.000000000 +0100 -+++ b/browser/main/Detail/SnippetNoteDetail.js 2019-01-27 12:58:42.858366888 +0100 -@@ -19,7 +19,6 @@ +diff --color -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js +--- a/browser/main/Detail/SnippetNoteDetail.js 2020-09-04 16:47:01.000000000 +0200 ++++ b/browser/main/Detail/SnippetNoteDetail.js 2020-09-12 09:54:03.845549553 +0200 +@@ -17,7 +17,6 @@ + import ConfigManager from 'browser/main/lib/ConfigManager' import _ from 'lodash' - import {findNoteTitle} from 'browser/lib/findNoteTitle' - import convertModeName from 'browser/lib/convertModeName' + import { findNoteTitle } from 'browser/lib/findNoteTitle' -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' import FullscreenButton from './FullscreenButton' import TrashButton from './TrashButton' import RestoreButton from './RestoreButton' -@@ -142,7 +141,6 @@ - type: 'UPDATE_NOTE', - note: note - }) -- AwsMobileAnalyticsConfig.recordDynamicCustomEvent('EDIT_NOTE') +@@ -162,7 +161,6 @@ + type: 'UPDATE_NOTE', + note: note }) +- AwsMobileAnalyticsConfig.recordDynamicCustomEvent('EDIT_NOTE') + }) } -@@ -181,7 +179,6 @@ +@@ -206,8 +204,6 @@ - handleStarButtonClick (e) { + handleStarButtonClick(e) { const { note } = this.state -- if (!note.isStarred) AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_STAR') +- if (!note.isStarred) +- AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_STAR') note.isStarred = !note.isStarred -@@ -377,9 +374,6 @@ +@@ -420,9 +416,6 @@ const mode = syntax != null ? syntax.name : null if (mode != null) { snippets[index].mode = mode @@ -84,12 +90,12 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp - name: mode - }) } - this.setState(state => ({note: Object.assign(state.note, {snippets: snippets})})) - -@@ -401,10 +395,6 @@ - }), () => { - this.save() - }) + this.setState(state => ({ + note: Object.assign(state.note, { snippets: snippets }) +@@ -454,10 +447,6 @@ + this.save() + } + ) - - AwsMobileAnalyticsConfig.recordDynamicCustomEvent('SELECT_LANG', { - name @@ -97,9 +103,9 @@ 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 2019-01-26 04:30:22.000000000 +0100 -+++ b/browser/main/Detail/TagSelect.js 2019-01-27 12:58:58.171953113 +0100 +diff --color -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js +--- a/browser/main/Detail/TagSelect.js 2020-09-04 16:47:01.000000000 +0200 ++++ b/browser/main/Detail/TagSelect.js 2020-09-12 09:54:23.255793194 +0200 @@ -4,7 +4,6 @@ import CSSModules from 'browser/lib/CSSModules' import styles from './TagSelect.styl' @@ -108,28 +114,28 @@ diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js import i18n from 'browser/lib/i18n' import ee from 'browser/main/lib/eventEmitter' import Autosuggest from 'react-autosuggest' -@@ -28,8 +27,6 @@ +@@ -34,8 +33,6 @@ } - addNewTag (newTag) { + addNewTag(newTag) { - AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_TAG') - newTag = newTag.trim().replace(/ +/g, '_') if (newTag.charAt(0) === '#') { newTag.substring(1) -diff -ura a/browser/main/Main.js b/browser/main/Main.js ---- a/browser/main/Main.js 2019-01-26 04:30:22.000000000 +0100 -+++ b/browser/main/Main.js 2019-01-27 12:59:10.998836056 +0100 +diff --color -ura a/browser/main/Main.js b/browser/main/Main.js +--- a/browser/main/Main.js 2020-09-04 16:47:01.000000000 +0200 ++++ b/browser/main/Main.js 2020-09-12 09:52:38.484478405 +0200 @@ -10,7 +10,6 @@ import dataApi from 'browser/main/lib/dataApi' import _ from 'lodash' import ConfigManager from 'browser/main/lib/ConfigManager' -import mobileAnalytics from 'browser/main/lib/AwsMobileAnalyticsConfig' import eventEmitter from 'browser/main/lib/eventEmitter' - import { hashHistory } from 'react-router' - import store from 'browser/main/store' -@@ -25,10 +24,6 @@ - constructor (props) { + import { store } from 'browser/main/store' + import i18n from 'browser/lib/i18n' +@@ -27,10 +26,6 @@ + constructor(props) { super(props) - if (process.env.NODE_ENV === 'production') { @@ -139,11 +145,11 @@ diff -ura a/browser/main/Main.js b/browser/main/Main.js const { config } = props this.state = { -diff -ura a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/CreateFolderModal.js ---- a/browser/main/modals/CreateFolderModal.js 2019-01-26 04:30:22.000000000 +0100 -+++ b/browser/main/modals/CreateFolderModal.js 2019-01-27 12:59:25.195746589 +0100 +diff --color -ura a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/CreateFolderModal.js +--- a/browser/main/modals/CreateFolderModal.js 2020-09-04 16:47:01.000000000 +0200 ++++ b/browser/main/modals/CreateFolderModal.js 2020-09-12 09:54:41.586023299 +0200 @@ -6,7 +6,6 @@ - import store from 'browser/main/store' + import { store } from 'browser/main/store' import consts from 'browser/lib/consts' import ModalEscButton from 'browser/components/ModalEscButton' -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' @@ -153,33 +159,40 @@ diff -ura a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/Creat @@ -51,7 +50,6 @@ } - confirm () { + confirm() { - AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_FOLDER') if (this.state.name.trim().length > 0) { const { storage } = this.props const input = { -diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js ---- a/browser/main/modals/PreferencesModal/InfoTab.js 2019-01-26 04:30:22.000000000 +0100 -+++ b/browser/main/modals/PreferencesModal/InfoTab.js 2019-01-27 12:59:53.699582791 +0100 +diff --color -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js +--- a/browser/main/modals/PreferencesModal/InfoTab.js 2020-09-04 16:47:01.000000000 +0200 ++++ b/browser/main/modals/PreferencesModal/InfoTab.js 2020-09-12 09:57:44.078315155 +0200 @@ -3,7 +3,6 @@ import styles from './InfoTab.styl' import ConfigManager from 'browser/main/lib/ConfigManager' - import store from 'browser/main/store' + import { store } from 'browser/main/store' -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' import _ from 'lodash' import i18n from 'browser/lib/i18n' -@@ -25,47 +24,6 @@ +@@ -28,12 +27,6 @@ e.preventDefault() } -- handleConfigChange (e) { +- handleConfigChange(e) { - const newConfig = { amaEnabled: this.refs.amaEnabled.checked } - - this.setState({ config: newConfig }) - } - -- handleSaveButtonClick (e) { + handleSubscriptionFormSubmit(e) { + e.preventDefault() + this.setState({ +@@ -76,36 +69,6 @@ + }) + } + +- handleSaveButtonClick(e) { - const newConfig = { - amaEnabled: this.state.config.amaEnabled - } @@ -191,7 +204,7 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal - }) - } else { - this.setState({ -- amaMessage: i18n.__('Thank\'s for trusting us') +- amaMessage: i18n.__("Thank's for trusting us") - }) - } - @@ -209,70 +222,95 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal - }) - } - -- infoMessage () { + toggleAutoUpdate() { + const newConfig = { + autoUpdateEnabled: !this.state.config.autoUpdateEnabled +@@ -115,11 +78,6 @@ + ConfigManager.set(newConfig) + } + +- infoMessage() { - const { amaMessage } = this.state - return amaMessage ? <p styleName='policy-confirm'>{amaMessage}</p> : null - } - - render () { + render() { return ( <div styleName='root'> -@@ -140,23 +98,6 @@ - {i18n.__('License: GPL v3')} - </li> - </ul> -- -- <hr styleName='separate-line' /> +@@ -268,41 +226,6 @@ + </div> + + <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> -- <div>{i18n.__('You can see how it works on ')}<a href='https://github.com/BoostIO/Boostnote' onClick={(e) => this.handleLinkClick(e)}>GitHub</a>.</div> +- <div styleName='group-header2--sub'>{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> +- <div> +- {i18n.__('You can see how it works on ')} +- <a +- href='https://github.com/BoostIO/Boostnote' +- onClick={e => this.handleLinkClick(e)} +- > +- GitHub +- </a> +- . +- </div> - <br /> - <div>{i18n.__('You can choose to enable or disable this option.')}</div> -- <input onChange={(e) => this.handleConfigChange(e)} +- <input +- onChange={e => this.handleConfigChange(e)} - checked={this.state.config.amaEnabled} - ref='amaEnabled' - type='checkbox' - /> -- {i18n.__('Enable analytics to help improve Boostnote')}<br /> -- <button styleName='policy-submit' onClick={(e) => this.handleSaveButtonClick(e)}>{i18n.__('Save')}</button> +- {i18n.__('Enable analytics to help improve Boostnote')} +- <br /> +- <button +- styleName='policy-submit' +- onClick={e => this.handleSaveButtonClick(e)} +- > +- {i18n.__('Save')} +- </button> - <br /> - {this.infoMessage()} </div> ) } -diff -ura a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js ---- a/browser/main/NoteList/index.js 2019-01-26 04:30:22.000000000 +0100 -+++ b/browser/main/NoteList/index.js 2019-01-27 13:00:18.606702121 +0100 +diff --color -ura a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js +--- a/browser/main/NoteList/index.js 2020-09-04 16:47:01.000000000 +0200 ++++ b/browser/main/NoteList/index.js 2020-09-12 09:58:32.588924649 +0200 @@ -16,7 +16,6 @@ import path from 'path' - import { hashHistory } from 'react-router' + import { push, replace } from 'connected-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' import { confirmDeleteNote } from 'browser/lib/confirmDeleteNote' -@@ -689,7 +688,6 @@ - note: newNote +@@ -876,7 +875,6 @@ + note: newNote + }) }) +- AwsMobileAnalyticsConfig.recordDynamicCustomEvent('EDIT_NOTE') }) -- AwsMobileAnalyticsConfig.recordDynamicCustomEvent('EDIT_NOTE') - }) - .then(() => ee.emit('list:next')) - .catch((err) => { -@@ -708,8 +706,6 @@ - const firstNote = selectedNotes[0] - const eventName = firstNote.type === 'MARKDOWN_NOTE' ? 'ADD_MARKDOWN' : 'ADD_SNIPPET' + .then(() => ee.emit('list:next')) + .catch(err => { +@@ -896,8 +894,6 @@ + const eventName = + firstNote.type === 'MARKDOWN_NOTE' ? 'ADD_MARKDOWN' : 'ADD_SNIPPET' - AwsMobileAnalyticsConfig.recordDynamicCustomEvent(eventName) - AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE') dataApi .createNote(storage.key, { type: firstNote.type, -diff -ura a/package.json b/package.json ---- a/package.json 2019-01-26 04:30:22.000000000 +0100 -+++ b/package.json 2019-01-27 13:00:34.563664724 +0100 -@@ -53,8 +53,6 @@ +diff --color -ura a/package.json b/package.json +--- a/package.json 2020-09-04 16:47:01.000000000 +0200 ++++ b/package.json 2020-09-12 09:51:30.223622230 +0200 +@@ -56,8 +56,6 @@ "@rokt33r/markdown-it-math": "^4.0.1", "@rokt33r/season": "^5.3.0", "@susisu/mte-kernel": "^2.0.0", @@ -281,3 +319,41 @@ diff -ura a/package.json b/package.json "chart.js": "^2.7.2", "codemirror": "^5.40.2", "codemirror-mode-elixir": "^1.1.1", +diff --color -ura a/yarn.lock b/yarn.lock +--- a/yarn.lock 2020-09-04 16:47:01.000000000 +0200 ++++ b/yarn.lock 2020-09-12 09:52:01.884019291 +0200 +@@ -632,34 +632,6 @@ + unique-temp-dir "^1.0.0" + update-notifier "^2.3.0" + +-aws-sdk-mobile-analytics@^0.9.2: +- version "0.9.2" +- resolved "https://registry.yarnpkg.com/aws-sdk-mobile-analytics/-/aws-sdk-mobile-analytics-0.9.2.tgz#b56a6e5206fc8c3975a19170b41536c53f6d5d91" +- dependencies: +- aws-sdk ">=2.2.37" +- +-aws-sdk@>=2.2.37, aws-sdk@^2.48.0: +- version "2.247.1" +- resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.247.1.tgz#be5f220d40665ac91d3a84a51f029fa05560c4ee" +- dependencies: +- buffer "4.9.1" +- events "1.1.1" +- ieee754 "1.1.8" +- jmespath "0.15.0" +- querystring "0.2.0" +- sax "1.2.1" +- url "0.10.3" +- uuid "3.1.0" +- xml2js "0.4.17" +- +-aws-sign2@~0.7.0: +- version "0.7.0" +- resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" +- +-aws4@^1.6.0: +- version "1.7.0" +- resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289" +- + babel-code-frame@^6.16.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" |