diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a1bcd202..66a630dc 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -8,25 +8,21 @@ Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues. -[template]: https://github.com/saenzramiro/rambox/blob/master/.github/ISSUE_TEMPLATE.md +[template]: https://github.com/TheGoddessInari/rambox/blob/master/.github/ISSUE_TEMPLATE.md ## Share your Custom Services If you consider there are other users that can use your Custom Service, we have a repo for this: [Rambox Services Contrib][rambox-services-contrib]. -[rambox-services-contrib]: https://github.com/saenzramiro/rambox-services-contrib +[rambox-services-contrib]: https://github.com/TheGoddessInari/rambox-services-contrib ## Ask for help We have a great community in [Gitter][gitter] that can help you with any doubt or problem. -[gitter]: https://gitter.im/saenzramiro/rambox +[gitter]: https://gitter.im/TheGoddessInari/rambox ## Contributing to Source Code Feel free to create pull requests to help us offer a great and complete software. :wink: -## Translations -Please submit translations via [Transifex][transifex]. - -[transifex]: https://www.transifex.com/rambox/rambox-app/ diff --git a/.sencha/app/sencha.cfg b/.sencha/app/sencha.cfg index e0715c80..053cef27 100644 --- a/.sencha/app/sencha.cfg +++ b/.sencha/app/sencha.cfg @@ -43,4 +43,4 @@ app.resource.paths=${app.dir}/resources app.framework.version=5.1.1.451 -app.cmd.version=6.5.3.6 +app.cmd.version=6.6.0.13 diff --git a/.sencha/workspace/sencha.cfg b/.sencha/workspace/sencha.cfg index df9bb04b..85c322c2 100644 --- a/.sencha/workspace/sencha.cfg +++ b/.sencha/workspace/sencha.cfg @@ -1,4 +1,3 @@ -#Sat, 09 Jun 2018 02:04:36 -0700 # ----------------------------------------------------------------------------- # This file contains configuration options that apply to all applications in # the workspace. By convention, these options start with "workspace." but any diff --git a/.travis.yml b/.travis.yml index 555edc21..1e34062b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,12 @@ node_js: branches: only: - master + - testing + except: + - snapshot-master + - snapshot-testing os: - - linux - osx cache: @@ -17,70 +20,107 @@ cache: - node_modules - $HOME/.electron +env: + global: + - SENCHA_VER=6.6.0.13 + - secure: "sEoA+xvrsfYuxGOlrcdHudu0nYjlV47wwyMMgurSi+Em4izYgXoe5JLYDZ5nniO2iDAmD1IqjwbxhBrbRyue2b0gyyuz4PbPfsR5sSbegZ3xum8nzn7Jg5NydllLQbJmPKSsOGOhiOYdprUvMsbmvTWVOwSAs6fH/PorJlqegODpsa8GeuNTXPsI5pT2j98F+DJaF+wAKdkhpgpX3ggdCCdY4pb7SdLk+2Q51IPZhgEPG1AXv2kfXFXHQIwZp76+5hva0aKZEjXipgkPeOr/tLgsIdrSCHAPigxcZyb8SvJzNMIniHfNmdzWr8q2tJuh2W9zCuYhghJQ4pkGUc3OFR0xaLU9aP17u9P/7AB+Zv/PaO5ta5Ay49/2K38hrfAjgBioUCrICH4jXTZenmg8X6q5ksx6R3wBMLP0qv1wyvGEakzIhqBjTwBnZyGE7aLpyGyi4qP0TcBQ7APVaAa1HYsd8uz4GTm67SCqEELzGJlt14dkep9FLIPBFVMo1kzHK45ltLPSawUsJ4Z5Ds8nAdJi1ZEik2IWh6++XVn65fGe0qOdZ1T0AvOgln7RVv4WtznEBcjK0vwP68++XQditB6oGRnMitnVyudQfoSI6j5q0KPrTDRENRN+yh0ofqO/YhkNu1BxCzLLoHQ4Rb5DdX8kALNWupqbCnw1Ce4KJw0=" + addons: apt: sources: - ubuntu-toolchain-r-test packages: - g++-4.8 + - rpm -before_install: - # native dependencies - - if [ $TRAVIS_OS_NAME == "linux" ]; then - sudo apt-add-repository -y ppa:snappy-dev/tools; - sudo apt-get update -qq; - sudo apt-get install -qq libxml2-dev; - sudo apt-get install -qq libappindicator1; - sudo apt-get install -qq rpm; - sudo apt-get install -y -qq snappy-tools; - sudo apt-get install -y -qq snapcraft; - fi install: - git config --global core.autocrlf input - git reset --hard HEAD - - npm run sencha:clean - - git clone https://github.com/saenzramiro/rambox-build.git $TRAVIS_BUILD_DIR/build/production/Rambox/ - npm install - npm uninstall electron-prebuilt - - npm i electron@$ELECTRON - - npm --prefix $TRAVIS_BUILD_DIR/build/production/Rambox/ install $TRAVIS_BUILD_DIR/build/production/Rambox/ + - npm i electron@${ELECTRON} + - if [ $TRAVIS_OS_NAME == "linux" ]; then + curl -o SenchaCmd-${SENCHA_VER}-linux-amd64.sh.zip http://cdn.sencha.com/cmd/${SENCHA_VER}/no-jre/SenchaCmd-${SENCHA_VER}-linux-amd64.sh.zip; + unzip SenchaCmd-${SENCHA_VER}-linux-amd64.sh.zip; + chmod +x SenchaCmd-${SENCHA_VER}-linux-amd64.sh; + ./SenchaCmd-${SENCHA_VER}-linux-amd64.sh -q -Dall=true; + else + curl -o SenchaCmd-${SENCHA_VER}-osx-no_jre.app.zip http://cdn.sencha.com/cmd/${SENCHA_VER}/no-jre/SenchaCmd-${SENCHA_VER}-osx-no_jre.app.zip; + unzip SenchaCmd-${SENCHA_VER}-osx-no_jre.app.zip; + SenchaCmd-${SENCHA_VER}-osx-no_jre.app/Contents/MacOS/JavaApplicationStub -q -Dall=true; + fi + - cp env-sample.js env.js +before_script: + - export PATH=~/bin/Sencha/Cmd/${SENCHA_VER}:${PATH} + - export CURRENT_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} + script: - - echo $TRAVIS_OS_NAME + - echo ${TRAVIS_OS_NAME} - node --version - npm --version - - npm run build:$TRAVIS_OS_NAME + - sencha audit + - npm run setup:${TRAVIS_OS_NAME} + +# after_success: + # - git config --global user.email "travis@travis-ci.org" + # - git config --global user.name "Travis" + # - if [ ${CURRENT_BRANCH} == "testing" ]; then + # export TRAVIS_TAG="snapshot-testing"; + # git tag -f ${TRAVIS_TAG} -a -m "Automatic snapshot for testing [skip ci]"; + # (git push -q https://${TAGPERM}@github.com/TheGoddessInari/rambox --tags -f) > /dev/null 2>&1; + # elif [ ${CURRENT_BRANCH} == "master" ]; then + # export TRAVIS_TAG="snapshot-master"; + # git tag -f ${TRAVIS_TAG} -a -m "Automatic snapshot for master [skip ci]"; + # (git push -q https://${TAGPERM}@github.com/TheGoddessInari/rambox --tags -f) > /dev/null 2>&1; + # fi + +# deploy: +# - provider: releases # Snapshot tags +# on: +# repo: TheGoddessInari/rambox +# all_branches: true +# condition: ${TRAVIS_TAG} == snapshot-master || ${TRAVIS_TAG} == snapshot-testing +# api_key: +# secure: bYto8VS+zEFqKRjgBga69DgbjVPtHi4vRM+EGsNURe1b4ILRlwS8lJb5RbM+8w2UEPr8P9l959dC1pKYKjlJqEHwvDdTLFsDESO5uEUOtoEWUOnsNEwvvoNY1tFfPoFr1qhWjPWh4UGZzf/sfgXvSdoEg8cbmgbjkbEgGpKPri6Gigvosu/HT1ZCXVoud32uJ2ydfoWMfERXeQYk8u9x52Qx3XS7OMmUR1BvqifaSMt6K5oPFS1lOAXkxyCu1Sczg119+6MEWixImFcXYmPaAoHqLfPNICnhG3egiddq24f1ZGsGmfHgpliM4MNl74t99kPX6lcoQchTlhz4lVVI0lpHBymZwhIf4JjLSuZt81zW5cvJmu0CT22o/thnRFTY1MkaBDmdweaPtdYiMmAJuhwSQEeP6Mt4lqQNgtsNsBqkT6+n4T2l5RHagc/iC4TC58/4QZErKcVkaZnjy78trrQCKD9E1wLpm5hV84fF0FJLrEIhNYcSAJ6u1OJa2CaJ3u5OXFIuu01E+6CWu64pXgpIjkCRQU/JPSQVxdmwWqx4o4948NddBEx7Z3EsPkKU+5ccQr6dz7qESa8xnuERILclWO/LvdauYLhxtMVD2/fc/aKeP+6QxvNBClZT/eeO7bJDdCx/uWzm3Qo4k5+nyTl9bPUKLDzb5MuMh2x7flc= +# file_glob: true +# file: +# - "dist/*.deb" +# - "dist/*.tar.gz" +# - "dist/*.AppImage" +# - "dist/*.rpm" +# - "dist/*.zip" +# - "dist/*.dmg" +# skip_cleanup: true +# overwrite: true +# draft: false +# prerelease: true +# tag_name: $TRAVIS_TAG +# - provider: releases # Regular tags +# on: +# repo: TheGoddessInari/rambox +# all_branches: true +# condition: x${TRAVIS_TAG} != "x" && ${TRAVIS_TAG} != snapshot-master && ${TRAVIS_TAG} != snapshot-testing +# api_key: +# secure: bYto8VS+zEFqKRjgBga69DgbjVPtHi4vRM+EGsNURe1b4ILRlwS8lJb5RbM+8w2UEPr8P9l959dC1pKYKjlJqEHwvDdTLFsDESO5uEUOtoEWUOnsNEwvvoNY1tFfPoFr1qhWjPWh4UGZzf/sfgXvSdoEg8cbmgbjkbEgGpKPri6Gigvosu/HT1ZCXVoud32uJ2ydfoWMfERXeQYk8u9x52Qx3XS7OMmUR1BvqifaSMt6K5oPFS1lOAXkxyCu1Sczg119+6MEWixImFcXYmPaAoHqLfPNICnhG3egiddq24f1ZGsGmfHgpliM4MNl74t99kPX6lcoQchTlhz4lVVI0lpHBymZwhIf4JjLSuZt81zW5cvJmu0CT22o/thnRFTY1MkaBDmdweaPtdYiMmAJuhwSQEeP6Mt4lqQNgtsNsBqkT6+n4T2l5RHagc/iC4TC58/4QZErKcVkaZnjy78trrQCKD9E1wLpm5hV84fF0FJLrEIhNYcSAJ6u1OJa2CaJ3u5OXFIuu01E+6CWu64pXgpIjkCRQU/JPSQVxdmwWqx4o4948NddBEx7Z3EsPkKU+5ccQr6dz7qESa8xnuERILclWO/LvdauYLhxtMVD2/fc/aKeP+6QxvNBClZT/eeO7bJDdCx/uWzm3Qo4k5+nyTl9bPUKLDzb5MuMh2x7flc= +# file_glob: true +# file: +# - "dist/*.deb" +# - "dist/*.tar.gz" +# - "dist/*.AppImage" +# - "dist/*.rpm" +# - "dist/*.zip" +# - "dist/*.dmg" +# skip_cleanup: true +# overwrite: false +# draft: true +# prerelease: false +# tag_name: $TRAVIS_TAG -deploy: - provider: releases - api_key: - secure: F7z4j9xzhpVyfovrf33jbVdW9dwgpIgbn85dxe8y/kZbQ9sAVU8LzoBZ3PlfeXmoV5CnSUa5j/fe8BmPKiG31kgAH7cktsCOgyOLggO1Sy+vnx7RQwwE/jzb7PzEqI2BP6TG/eOfylBxGBInWeaoSRfK3IRAvLHvvxY1eL4Wq/KRaanzMvh+JdCaStIKJSnI/rc9noI7vtOtgHot+F162s1G1k5/UcdbsfXWzotMVsonhlGgB/Jz9srnJpMpxYxaknR8UFPVRzOM5UzzMo64hXRUDnCFlYcTHcSAkvgKHI0SIPIS3kOdvgrYGavPLK2CAteQk7Dy1lHnEixmKPxG7eVAFwleUo8ePR82WXFkv5gacCvcrGrRLQ9nC/ygeMVgC5XxcHq3ykkcrstu5yjC1yEYFs23gA1Z4DIctwq1diyO72/FNxghV5ckN5WtJQs1QTT+Ec2NjLrWgFYuaEHYgAGopzTPN8gT9fyIv/lAq1S/l4P/z3EDS42UL+UTM77gyXSYShCKneDnFC34ATlYNDhJFRzLZ6qJG5UlOwrfXxUYeGUpQZlV41jg+VFWmPDAeQTMjGP5fRA3w1hFobBotBVyrtbcovTb4TFVTKJWOC/0wyiwku7YTY/nqMU/hR4IluTyRh9Z4NMn5xT5UW63OZd4DJvE573JxmJmnPc0fbo= - file_glob: true - file: - - "dist/*.zip" - - "dist/*.snap" - - "dist/*.deb" - - "dist/*.tar.gz" - - "dist/*.AppImage" - - "dist/*.rpm" - - "dist/mac/*.zip" - - "dist/mac/*.dmg" - skip_cleanup: true - overwrite: true - prerelease: true - on: - repo: saenzramiro/rambox - tags: true - all_branches: true notifications: - email: - recipients: - - rambox@protonmail.com - on_success: always - on_failure: always webhooks: urls: - - https://webhooks.gitter.im/e/0f214eb0d0017d3c5561 + - https://webhooks.gitter.im/e/a6584eccd211f35ecab6 on_success: always # options: [always|never|change] default: always on_failure: always # options: [always|never|change] default: always on_start: never # options: [always|never|change] default: always diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 08506148..4df52efa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ We welcome pull requests! Follow these steps to contribute: -1. Find an [issue](https://github.com/saenzramiro/rambox/issues) that needs assistance. +1. Find an [issue](https://github.com/TheGoddessInari/rambox/issues) that needs assistance. 2. Let us know you are working on it by posting a comment on the issue. @@ -45,7 +45,7 @@ Working on your first Pull Request? You can learn how from this *free* series [H | ------------------------------------------------------------- | ------- | | [Sencha](https://www.sencha.com/products/extjs/cmd-download/) | `=6.1.2.15` | | [Ruby](https://www.ruby-lang.org/en/downloads/) | `=2.3` | -| [Node.js](http://nodejs.org) | `~ ^4.0.0` | +| [Node.js](https://nodejs.org) | `~ ^4.0.0` | | npm (comes with Node) | `~ ^3.8.7` | > _Updating to the latest releases is recommended_. @@ -69,7 +69,7 @@ If your versions are lower than the prerequisite versions, you should update. #### Forking rambox -1. Go to the top level rambox repository: +1. Go to the top level rambox repository: 2. Click the "Fork" Button in the upper right hand corner of the interface ([More Details Here](https://help.github.com/articles/fork-a-repo/)) 3. After the repository (repo) has been forked, you will be taken to your copy of the rambox repo at @@ -92,7 +92,7 @@ This will download the entire rambox repo to your projects directory. 2. Add a remote to the official rambox repo: ```shell -$ git remote add upstream https://github.com/saenzramiro/rambox.git +$ git remote add upstream https://github.com/TheGoddessInari/rambox.git ``` Congratulations, you now have a local copy of the rambox repo! @@ -198,7 +198,7 @@ fork and re-fork. 2. By default, all pull requests should be against the rambox main repo, `staging` branch. - **Make sure that your Base Fork is set to saenzramiro/rambox when raising a Pull Request.** + **Make sure that your Base Fork is set to TheGoddessInari/rambox when raising a Pull Request.** 3. Submit a pull request. diff --git a/README.md b/README.md index 90bbcef5..7f548490 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@


- Rambox + Rambox
Rambox
@@ -10,24 +10,33 @@

Free, Open Source and Cross Platform messaging and emailing app that combines common web applications into one.

- Donate with PayPal - GNU GPL v3 - Gitter - Release - + GNU GPL v3 + Gitter + Release

- Travis CI - AppVeyor CI - - + Travis CI + AppVeyor CI + + +

- -
Available for Windows, Mac and Linux.
- -
DOWNLOAD HERE
+
Latest unstable build artifacts are available in Windows + ( + Win64 / + Win32 ), Mac (DMG) and Linux ( + AppImage64 / + AppImage32 / + RPM64 / + RPM32 / + DEB64 / + DEB32 / + Tarball64 / + Tarball32 ) packaging flavors.
Logo designed by Andriy Yurchenko
+
Original rambox by Ramiro Saenz
+ ---------- @@ -39,9 +48,10 @@ - [Privacy](#privacy) - [Donations](#donations) - [Translations](#translations) -- [Install on Linux - Steps](#install-on-linux---steps) +- [Compiling](#compiling) - [To Do](#to-do) - [Contributing](#contributing) +- [Quickstart](#quickstart) - [Disclosure](#disclosure) - [Licence](#licence) @@ -49,113 +59,113 @@ ## Screenshot -![Rambox](https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/screenshots/mac.png) +![Rambox](https://raw.githubusercontent.com/TheGoddessInari/rambox/master/resources/screenshots/mac.png) ## Services available - 98 -WhatsApp -Messenger -Skype -Slack -Hangouts -Telegram -WeChat -Gmail -Inbox -HipChat -Allo - -ChatWork -GroupMe -Grape -Gitter -Steam -Discord -Noysi -Outlook -Outlook 365 -TutaNota - -Hushmail -BearyChat -Aol -Sync -Wire -Rocket Chat -Missive -Yahoo! Mail -Ryver - -Yandex Mail -Dasher -DingTalk -FlowDock -Mattermost -Voxer -Glip -Yahoo! Messenger -mysms -ICQ - -TweetDeck -Zinc -FreeNode -MightyText -Zoho Email -Zoho Chat -Roundcube -Horde -SquirrelMail -Zimbra - -Hootsuite -Amium -RainLoop -iCloud Mail -IRC Cloud -Kiwi IRC -Smooch -Crisp -Flock -Openmailbox - -Typetalk -Drift -Cisco Spark -Fleep -Socialcast -Riot -Pushbullet -Movim - -Kaiwa -Zyptonite -LinkedIn -The Lounge -Kezmo -Teams -Xing -Workplace -FastMail -Hibox -Jandi -Threema -Messenger for Pages -VK Messenger -Mastodon -Teamwork Chat -ClockTweets -Intercom -Voice -Sandstorm -Gadu-Gadu -Mail.Ru -Kune -Zulip -Stride -Hangouts Chat -Messenger for Business +WhatsApp +Messenger +Skype +Slack +Hangouts +Telegram +WeChat +Gmail +Inbox +HipChat +Allo + +ChatWork +GroupMe +Grape +Gitter +Steam +Discord +Noysi +Outlook +Outlook 365 +TutaNota + +Hushmail +BearyChat +Aol +Sync +Wire +Rocket Chat +Missive +Yahoo! Mail +Ryver + +Yandex Mail +Dasher +DingTalk +FlowDock +Mattermost +Voxer +Glip +Yahoo! Messenger +mysms +ICQ + +TweetDeck +Zinc +FreeNode +MightyText +Zoho Email +Zoho Chat +Roundcube +Horde +SquirrelMail +Zimbra + +Hootsuite +Amium +RainLoop +iCloud Mail +IRC Cloud +Kiwi IRC +Smooch +Crisp +Flock +Openmailbox + +Typetalk +Drift +Cisco Spark +Fleep +Socialcast +Riot +Pushbullet +Movim + +Kaiwa +Zyptonite +LinkedIn +The Lounge +Kezmo +Teams +Xing +Workplace +FastMail +Hibox +Jandi +Threema +Messenger for Pages +VK Messenger +Mastodon +Teamwork Chat +ClockTweets +Intercom +Voice +Sandstorm +Gadu-Gadu +Mail.Ru +Kune +Zulip +Stride +Hangouts Chat +Messenger for Business











































@@ -179,24 +189,37 @@ ## Privacy -No personal information will be saved +No personal information will be saved or tracked. Sessions will persist using the [partition:persist](https://electronjs.org/docs/api/webview-tag#partition) attribute for Webviews. So every time you open Rambox, your sessions will keep alive until you remove the service. -Sync feature use Auth0 for Single Sign On & Token Based Authentication and to store the services that user is using (and the configuration for each service). You are always welcome to check the code! ;) +Sync feature use [Auth0](https://auth0.com/) for Single Sign On & Token Based Authentication and to store the services that user is using (and the configuration for each service). You are always welcome to check the code! ;) ## Donations | Type | URL/Wallet | |--------------------|:------------------------------------------------------------------------------------------:| -| PayPal | [HERE](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WU75QWS7LH2CA) | -| Cryptocurrencies | [HERE](https://www.vaulty.io/v/b6480279-af28-4855-868c-17e5cb0ae7fa) | +I'll think about it later. -## Translations +## Compiling -Help us translate Rambox on https://crowdin.com/project/rambox/invite. +To build your own copy, you need: +- A recent version of the [Java SE Development Kit](http://www.oracle.com/technetwork/java/javase/downloads/index.html). 8.0 may be needed on some platform configurations. +- A recent version of [Ruby](https://www.ruby-lang.org/en/downloads/). +- A recent version of [Sencha CMD](https://www.sencha.com/products/extjs/cmd-download/), and to install it with the Compass extension. +- A recent version of [NodeJS](https://nodejs.org/en/download/) with npm. +These **need** to be added to your PATH. -## [Install on Linux - Steps](https://github.com/saenzramiro/rambox/wiki/Install-on-Linux) +```shell +git clone https://github.com/TheGoddessInari/rambox.git +cd rambox +cp env-sample.js env.js +# update env.js with your auth0 details. +npm install +npm run setup:win64 +``` +You can substitute win64 for linux32, linux64, win32, or osx as desired. This will create installers appropriate to your platform in dist. +Win32 builds are **deprecated** by electron-builder and is likely to be removed at some point in the future. ## Contributing @@ -205,7 +228,7 @@ Want to report a bug, request a feature, contribute to or translate Rambox? We n ### Quickstart: ```shell -git clone https://github.com/saenzramiro/rambox.git +git clone https://github.com/TheGoddessInari/rambox.git cd rambox cp env-sample.js env.js # update env.js with your auth0 details. @@ -214,7 +237,7 @@ sencha app watch npm start ``` -See [Contributing.md](https://github.com/saenzramiro/rambox/blob/master/CONTRIBUTING.md) for more detailed information about getting set up. +See [Contributing.md](https://github.com/TheGoddessInari/rambox/blob/master/CONTRIBUTING.md) for more detailed information about getting set up. ------------------- @@ -226,4 +249,4 @@ Rambox is not affiliated with any of the messaging apps offered. Licence ------------------- -[GNU GPL v3](https://github.com/saenzramiro/rambox/LICENSE) +[GNU GPL v3](https://github.com/TheGoddessInari/rambox/LICENSE) diff --git a/app.js b/app.js index 920844bd..6e267aa2 100644 --- a/app.js +++ b/app.js @@ -1,7 +1,7 @@ var auth0, lock; // Auth0 vars // Enable Cookies var ElectronCookies = require('@exponent/electron-cookies'); -ElectronCookies.enable({ origin: 'http://rambox.pro' }); +ElectronCookies.enable({ origin: 'https://rambox.pro' }); // Sencha App Ext.setGlyphFontFamily('FontAwesome'); @@ -63,7 +63,7 @@ ipc.on('autoUpdater:update-downloaded', function(e, releaseNotes, releaseName, r xtype: 'button' ,text: 'Changelog' ,ui: 'decline' - ,href: 'https://github.com/saenzramiro/rambox/releases/tag/'+releaseName + ,href: 'https://github.com/TheGoddessInari/rambox/releases/tag/'+releaseName } ,'->' ,{ diff --git a/app/Application.js b/app/Application.js index ae96d970..345ce104 100644 --- a/app/Application.js +++ b/app/Application.js @@ -224,7 +224,7 @@ Ext.define('Rambox.Application', { ,checkUpdate: function(silence) { console.info('Checking for updates...'); Ext.Ajax.request({ - url: 'http://rambox.pro/api/latestversion.json' + url: 'https://rambox.pro/api/latestversion.json' ,method: 'GET' ,success: function(response) { var json = Ext.decode(response.responseText); @@ -244,7 +244,7 @@ Ext.define('Rambox.Application', { ,{ xtype: 'button' ,text: locale['app.update[1]'] - ,href: process.platform === 'darwin' ? 'https://getrambox.herokuapp.com/download/'+process.platform+'_'+process.arch : 'https://github.com/saenzramiro/rambox/releases/latest' + ,href: process.platform === 'darwin' ? 'https://getrambox.herokuapp.com/download/'+process.platform+'_'+process.arch : 'https://github.com/TheGoddessInari/rambox/releases/latest' ,hidden: process.platform === 'win32' } ,{ @@ -252,7 +252,7 @@ Ext.define('Rambox.Application', { ,text: locale['app.update[2]'] ,ui: 'decline' ,tooltip: 'Click here to see more information about the new version.' - ,href: 'https://github.com/saenzramiro/rambox/releases/tag/'+json.version + ,href: 'https://github.com/TheGoddessInari/rambox/releases/tag/'+json.version } ,'->' ,{ diff --git a/app/package.json b/app/package.json index a073bf58..26665f1d 100644 --- a/app/package.json +++ b/app/package.json @@ -1,18 +1,18 @@ { "name": "Rambox", "productName": "Rambox", - "version": "0.5.17", + "version": "0.5.18", "description": "Rambox", "main": "electron/main.js", "private": true, "repository": { "type": "git", - "url": "https://github.com/saenzramiro/rambox.git" + "url": "https://github.com/TheGoddessInari/rambox.git" }, "bugs": { - "url": "https://github.com/saenzramiro/rambox/issues" + "url": "https://github.com/TheGoddessInari/rambox/issues" }, - "homepage": "http://rambox.pro", + "homepage": "https://rambox.pro", "keywords": [ "Rambox", "messaging", @@ -26,7 +26,7 @@ "hangouts", "skype" ], - "author": "Ramiro Saenz ", + "author": "TheGoddessInari ", "license": "GPL-3.0", "dependencies": { "@exponent/electron-cookies": "2.0.0", diff --git a/app/store/ServicesList.js b/app/store/ServicesList.js index 9b1ad565..d612ac81 100644 --- a/app/store/ServicesList.js +++ b/app/store/ServicesList.js @@ -66,7 +66,7 @@ Ext.define('Rambox.store.ServicesList', { ,url: 'https://web.skype.com/' ,type: 'messaging' ,userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Safari/537.36 Edge/13.10586' - ,note: 'Text and Audio calls are supported only. Read more...' + ,note: 'Text and Audio calls are supported only. Read more...' }, { id: 'hangouts' @@ -125,11 +125,11 @@ Ext.define('Rambox.store.ServicesList', { ,logo: 'inbox.png' ,name: 'Inbox' ,description: locale['services[10]'] - ,url: 'http://inbox.google.com/?cid=imp' + ,url: 'https://inbox.google.com/?cid=imp' ,type: 'email' ,manual_notifications: true ,js_unread: 'function checkUnread(){updateBadge(document.getElementsByClassName("ss").length)}function updateBadge(a){a>=1?document.title="("+a+") "+originalTitle:document.title=originalTitle}var originalTitle=document.title;setInterval(checkUnread,3e3);' - ,note: 'Please be sure to sign out of Hangouts inside Inbox, as it causes problems. Read more...' + ,note: 'Please be sure to sign out of Hangouts inside Inbox, as it causes problems. Read more...' }, { id: 'chatwork' @@ -877,7 +877,7 @@ Ext.define('Rambox.store.ServicesList', { ,logo: 'mailru.png' ,name: 'Mail.Ru' ,description: 'Free voice and video calls, ICQ support, Odnoklassniki, VKontakte, Facebook, online games, free SMS.' - ,url: 'http://webagent.mail.ru/webim/agent/popup.html' + ,url: 'https://webagent.mail.ru/webim/agent/popup.html' ,type: 'email' }, { diff --git a/app/view/add/Add.js b/app/view/add/Add.js index acd29b6b..d96806fd 100644 --- a/app/view/add/Add.js +++ b/app/view/add/Add.js @@ -65,7 +65,7 @@ Ext.define('Rambox.view.add.Add',{ ,readOnly: me.edit ? (me.service.get('custom_domain') && me.service.get('url') === me.record.get('url') ? true : me.service.get('url').indexOf('___') === -1 && !me.service.get('custom_domain')) : me.record.get('url').indexOf('___') === -1 && me.record.get('custom_domain') ,allowBlank: false ,submitEmptyText: false - ,emptyText: me.record.get('url') === '___' ? 'http://' : '' + ,emptyText: me.record.get('url') === '___' ? 'https://' : '' ,vtype: me.record.get('url') === '___' ? 'url' : '' ,listeners: { specialkey: 'onEnter' } ,flex: 1 @@ -97,7 +97,7 @@ Ext.define('Rambox.view.add.Add',{ } ,changeHandler: function(cycleBtn, activeItem) { Ext.apply(cycleBtn.previousSibling(), { - emptyText: activeItem.custom ? 'http://' : ' ' + emptyText: activeItem.custom ? 'https://' : ' ' ,vtype: activeItem.custom ? 'url' : '' }); cycleBtn.previousSibling().applyEmptyText(); @@ -127,7 +127,7 @@ Ext.define('Rambox.view.add.Add',{ ,{ xtype: 'textfield' ,fieldLabel: locale['app.window[18]'] - ,emptyText: 'http://url.com/image.png' + ,emptyText: 'https://url.com/image.png' ,name: 'logo' ,vtype: me.record.get('type') === 'custom' ? 'url' : '' ,value: me.record.get('type') === 'custom' ? (me.edit ? me.record.get('logo') : '') : me.record.get('logo') @@ -237,7 +237,7 @@ Ext.define('Rambox.view.add.Add',{ ,items: [ { xtype: 'textarea' - ,fieldLabel: locale['app.window[8]']+' ('+locale['app.window[9]']+')' + ,fieldLabel: locale['app.window[8]']+' ('+locale['app.window[9]']+')' ,allowBlank: true ,name: 'js_unread' ,value: me.edit ? me.record.get('js_unread') : '' diff --git a/app/view/main/About.js b/app/view/main/About.js index 24e3c856..ae0674a3 100644 --- a/app/view/main/About.js +++ b/app/view/main/About.js @@ -26,8 +26,8 @@ Ext.define('Rambox.view.main.About', { ,'
Chromium: {chromium}
' ,'
Node: {node}
' ,'
' - ,'' + ,'' ,'
' - ,'
'+locale['app.about[4]']+' Ramiro Saenz
' + ,'
'+locale['app.about[4]']+' Ramiro Saenz, maintained and newly developed by TheGoddessInari
' ] }); diff --git a/app/view/main/Main.js b/app/view/main/Main.js index cb6e10e4..dcad2f8b 100644 --- a/app/view/main/Main.js +++ b/app/view/main/Main.js @@ -26,6 +26,7 @@ Ext.define('Rambox.view.main.Main', { ,autoShow: true ,deferredRender: false ,tabBar: { + /* TODO: Donation items: [{ xtype: 'button' ,html: '' @@ -33,6 +34,7 @@ Ext.define('Rambox.view.main.Main', { ,tooltip: locale['app.main[25]'] ,href: 'https://fundraiseup.com/widget/FUNSGXPIJWQ/donate?key=KPCFEZKZ' }] + */ } ,items: [ { @@ -313,7 +315,7 @@ Ext.define('Rambox.view.main.Main', { text: locale['app.main[22]'] ,icon: 'resources/auth0.png' ,id: 'loginBtn' - ,tooltip: locale['app.main[23]']+'

'+locale['app.main[24]']+' Auth0 (http://auth0.com)' + ,tooltip: locale['app.main[23]']+'

'+locale['app.main[24]']+' Auth0 (https://auth0.com)' ,bind: { hidden: '{username}' } @@ -330,6 +332,7 @@ Ext.define('Rambox.view.main.Main', { { xtype: 'segmentedbutton' ,allowToggle: false + /* TODO: Donation, Translation. ,items: [ { text: 'Help us with' @@ -345,13 +348,14 @@ Ext.define('Rambox.view.main.Main', { ,glyph: 'xf0ac@FontAwesome' ,href: 'https://crowdin.com/project/rambox/invite' } - ] + ]*/ } + /* TODO: Flag ,'->' ,{ xtype: 'label' ,html: ' '+locale['app.main[26]']+' '+locale['app.main[27]'].replace('Argentina', 'Argentina') - } + }*/ ,'->' ,{ xtype: 'segmentedbutton' @@ -363,15 +367,15 @@ Ext.define('Rambox.view.main.Main', { } ,{ glyph: 'xf082@FontAwesome' - ,href: 'https://www.facebook.com/ramboxapp' + ,href: 'https://www.facebook.com/TheGoddessInari' } ,{ glyph: 'xf099@FontAwesome' - ,href: 'https://www.twitter.com/ramboxapp' + ,href: 'https://www.twitter.com/TheGoddessInari' } ,{ glyph: 'xf09b@FontAwesome' - ,href: 'https://www.github.com/saenzramiro/rambox' + ,href: 'https://www.github.com/TheGoddessInari/rambox' } ] } diff --git a/app/view/preferences/Preferences.js b/app/view/preferences/Preferences.js index 2cf19579..07bad412 100644 --- a/app/view/preferences/Preferences.js +++ b/app/view/preferences/Preferences.js @@ -298,7 +298,7 @@ Ext.define('Rambox.view.preferences.Preferences',{ } ,{ xtype: 'fieldset' - ,title: 'Proxy (needs to relaunch) - Free Proxy Servers' + ,title: 'Proxy (needs to relaunch) - Free Proxy Servers' ,collapsed: !config.proxy ,checkboxToggle: true ,checkboxName: 'proxy' diff --git a/appveyor.yml b/appveyor.yml index ff0297c2..7ff3a7e5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,55 +1,142 @@ -version: 0.5.17 +version: 0.5.18-{build} +image: + - Visual Studio 2017 + - Ubuntu environment: - matrix: - - nodejs_version: '8' + nodejs_version: '10' + JAVA_HOME: C:\Program Files\Java\jdk1.8.0 + npm_config_loglevel: 'error' + SENCHA_VER: '6.6.0.13' + TAGPERM: + secure: FKiBHTmmImO3M5FhK2TMrnpojiT6ITuJ/LvrdLjj2xD0VkcYtXuvQr5nqoxouvph +stack: node 10, jdk 8 pull_requests: do_not_increment_build_number: true branches: only: - master -skip_non_tags: true + - testing + except: + - snapshot-master + - snapshot-testing + init: - - cmd: git config --global core.autocrlf input + - ps: git config --global core.autocrlf input install: - - ps: Install-Product node $env:nodejs_version - - cmd: >- - git reset --hard HEAD - - npm run sencha:clean - - git clone https://github.com/saenzramiro/rambox-build.git %APPVEYOR_BUILD_FOLDER%\build\production\Rambox\ - - npm install npm@5.7.1 -g - - npm install - - npm --prefix %APPVEYOR_BUILD_FOLDER%\build\production\Rambox\ install %APPVEYOR_BUILD_FOLDER%\build\production\Rambox\ - - npm prune + - ps: >- + + If ($isWindows) { + Install-Product node ${env:nodejs_version} + Invoke-WebRequest -Uri http://cdn.sencha.com/cmd/${env:SENCHA_VER}/no-jre/SenchaCmd-${env:SENCHA_VER}-windows-no_jre.zip -OutFile .\Sencha.zip + } ElseIf ($isLinux) { + Invoke-WebRequest -Uri http://cdn.sencha.com/cmd/${env:SENCHA_VER}/no-jre/SenchaCmd-${env:SENCHA_VER}-linux-amd64.sh.zip -OutFile .\Sencha.zip + } + + Expand-Archive -Path .\Sencha.zip -DestinationPath .\SenchaCmd + + If ($isWindows) { + Invoke-Expression ".\SenchaCmd\SenchaCmd-${env:SENCHA_VER}-windows-no_jre.exe -q -Dall=true" + $env:PATH = "${env:USERPROFILE}\bin\Sencha\Cmd;${env:PATH}" + } ElseIf ($isLinux) { + Invoke-Expression "chmod +x ./SenchaCmd/SenchaCmd-${env:SENCHA_VER}-linux-amd64.sh" + Invoke-Expression "./SenchaCmd/SenchaCmd-${env:SENCHA_VER}-linux-amd64.sh -q -Dall=true" + $env:PATH = "${env:HOME}/bin/Sencha/Cmd:${env:PATH}" + } + + Copy-Item env-sample.js env.js + + git reset --hard HEAD + + npm i npm@latest -g + + npm install + + npm prune + + - sh: >- + + sudo apt-get update -qq; + + sudo apt-get install -qq -y libxml2-dev libappindicator1 rpm; + cache: - '%APPDATA%\npm-cache' - '%USERPROFILE%\.electron' - - node_modules - - build\production\Rambox\node_modules + - node_modules -> package-lock.json + +before_build: + - ps: >- + ${env:CURRENT_BRANCH} = If (${env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH}) { + ${env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH} + } Else { + ${env:APPVEYOR_REPO_BRANCH} + } + build_script: - - cmd: >- - node --version - - npm --version - - node_modules/.bin/build --win --ia32 --x64 + - ps: >- + node --version + + npm --version + + If ($isWindows) { + npm run setup:win + } ElseIf ($isLinux) { + npm run setup:linux + } + + + test: off artifacts: - - path: dist\win\*.exe - - path: dist\win\*.nupkg - - path: dist\win\RELEASES - - path: dist\win-ia32\*.exe - - path: dist\*.zip -deploy: - - provider: GitHub - tag: $(appveyor_build_version) - release: $(appveyor_build_version) - auth_token: - secure: RKFkz2S89dkYXdW+k47Wv42yrUeE1bDDMkM1PNuxrb0ZOcVVXPO88+t5dUllyvOG - draft: true - prerelease: false + - path: dist\squirrel-windows\*.exe + - path: dist\squirrel-windows-ia32\*.exe + - path: dist/*.AppImage + - path: dist/*.rpm + - path: dist/*.deb + - path: dist/*.tar.gz + +# after_build: +# - ps: >- +# git config --global user.email "travis@travis-ci.org" + +# git config --global user.name "Travis" + +# If (${env:CURRENT_BRANCH} -eq "testing") { +# ${env:APPVEYOR_REPO_TAG_NAME}="snapshot-testing" +# ${env:APPVEYOR_REPO_TAG}="true" +# ${env:SNAPSHOT}="true" +# git tag -f ${env:APPVEYOR_REPO_TAG_NAME} -a -m "Automatic snapshot for testing [skip ci]" +# (git push -q https://${env:TAGPERM}@github.com/TheGoddessInari/rambox --tags -f 2>&1) | Out-Null +# } ElseIf (${env:CURRENT_BRANCH} -eq "master") { +# ${env:APPVEYOR_REPO_TAG_NAME}="snapshot-master" +# ${env:APPVEYOR_REPO_TAG}="true" +# ${env:SNAPSHOT}="true" +# git tag -f ${env:APPVEYOR_REPO_TAG_NAME} -a -m "Automatic snapshot for master [skip ci]" +# (git push -q https://${env:TAGPERM}@github.com/TheGoddessInari/rambox --tags -f 2>&1) | Out-Null +# } Else { +# ${env:SNAPSHOT}="false" +# } + +# deploy: +# - provider: GitHub +# on: +# appveyor_repo_tag: true +# snapshot: false +# auth_token: +# secure: G9kcUc6R6xSYIP/mhFWZkuub5EE4b0ws9l3IQtFBz52yTsONp6GiQlFdtsnZWYjW +# draft: true +# prerelease: false +# force_update: false +# tag: $(APPVEYOR_REPO_TAG_NAME) +# release: $(APPVEYOR_REPO_TAG_NAME) +# - provider: GitHub +# on: +# appveyor_repo_tag: true +# snapshot: true +# auth_token: +# secure: G9kcUc6R6xSYIP/mhFWZkuub5EE4b0ws9l3IQtFBz52yTsONp6GiQlFdtsnZWYjW +# draft: false +# prerelease: true +# force_update: true +# tag: $(APPVEYOR_REPO_TAG_NAME) +# release: $(APPVEYOR_REPO_TAG_NAME) diff --git a/electron/menu.js b/electron/menu.js index 7b485e91..f5de3827 100644 --- a/electron/menu.js +++ b/electron/menu.js @@ -22,25 +22,25 @@ module.exports = function(config) { { label: `&`+locale['menu.help[0]'], click() { - shell.openExternal('http://rambox.pro'); + shell.openExternal('https://rambox.pro'); } }, { label: `&Facebook`, click() { - shell.openExternal('https://www.facebook.com/ramboxapp'); + shell.openExternal('https://www.facebook.com/TheGoddessInari'); } }, { label: `&Twitter`, click() { - shell.openExternal('https://www.twitter.com/ramboxapp'); + shell.openExternal('https://www.twitter.com/TheGoddessInari'); } }, { label: `&GitHub`, click() { - shell.openExternal('https://www.github.com/saenzramiro/rambox'); + shell.openExternal('https://www.github.com/TheGoddessInari/rambox'); } }, { @@ -60,13 +60,13 @@ module.exports = function(config) { > Electron ${process.versions.electron} > ${process.platform} ${process.arch} ${os.release()}`; - shell.openExternal(`https://github.com/saenzramiro/rambox/issues/new?body=${encodeURIComponent(body)}`); + shell.openExternal(`https://github.com/TheGoddessInari/rambox/issues/new?body=${encodeURIComponent(body)}`); } }, { label: `&`+locale['menu.help[2]'], click() { - shell.openExternal('https://rambox.typeform.com/to/t7jc4C'); + shell.openExternal('https://gitter.im/TheGoddessInari/rambox'); } }, { @@ -95,12 +95,13 @@ module.exports = function(config) { { type: 'separator' }, - { + /*{ label: `&`+locale['menu.help[3]'], click() { shell.openExternal('https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WU75QWS7LH2CA'); } } + */ ]; let tpl = [ diff --git a/package-lock.json b/package-lock.json index 79c91438..cc70c678 100644 --- a/package-lock.json +++ b/package-lock.json @@ -76,6 +76,26 @@ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=" }, + "ajv": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", + "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", + "dev": true, + "requires": { + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.1" + }, + "dependencies": { + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + } + } + }, "ajv-keywords": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", @@ -151,9 +171,9 @@ } }, "app-builder-bin": { - "version": "1.9.11", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-1.9.11.tgz", - "integrity": "sha512-GeB00tbuMeRa5NfYpKAnE3m2Ztj5QKa8pdrYKkg2CxZgyQn3iqJEUzy1EWMS6O1a1pX8wJxPLkEzUghg43bXWQ==", + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-1.11.2.tgz", + "integrity": "sha512-PwgZljspDcFbms3yWc/u7VwqZKHxLUoWNJ+7q376L4BRE7YchS3j2DHypC9yDGzsno4ExarDZ3SyEImh8sTSzA==", "dev": true }, "archiver": { @@ -678,25 +698,25 @@ "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=" }, "builder-util": { - "version": "5.11.4", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.11.4.tgz", - "integrity": "sha512-H6KnYwoeA9tEDz0EQNqridZ5YuJiyCX61TyhOMZmLiMnfJCuVfpyXbfYKUDMTAP8vmvjiAYJhbU8THkiHpKljA==", + "version": "5.16.2", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.16.2.tgz", + "integrity": "sha512-kyw6VrpUucv4/Sw0I9SgNiMpi5+HfoihDI0P4bW+JW00kiUNs6RjNXiUxLU96XqcoU4nMD7jphEKarFX1uULDA==", "dev": true, "requires": { "7zip-bin": "~4.0.2", - "app-builder-bin": "1.9.11", + "app-builder-bin": "1.11.2", "bluebird-lst": "^1.0.5", - "builder-util-runtime": "^4.2.1", + "builder-util-runtime": "^4.4.1", "chalk": "^2.4.1", "debug": "^3.1.0", - "fs-extra-p": "^4.6.0", + "fs-extra-p": "^4.6.1", "is-ci": "^1.1.0", - "js-yaml": "^3.11.0", + "js-yaml": "^3.12.0", "lazy-val": "^1.0.3", "semver": "^5.5.0", "source-map-support": "^0.5.6", "stat-mode": "^0.2.2", - "temp-file": "^3.1.2" + "temp-file": "^3.1.3" }, "dependencies": { "debug": { @@ -707,24 +727,18 @@ "requires": { "ms": "2.0.0" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true } } }, "builder-util-runtime": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.2.1.tgz", - "integrity": "sha512-6Ufp6ExT40RDYNXQgD4xG0fgtpUHyc8XIld6lptKr0re1DNnUrQP4sSV/lJOajpzyercMP/YIzO60/mNuAFiWg==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.4.1.tgz", + "integrity": "sha512-8L2pbL6D3VdI1f8OMknlZJpw0c7KK15BRz3cY77AOUElc4XlCv2UhVV01jJM7+6Lx7henaQh80ALULp64eFYAQ==", "dev": true, "requires": { "bluebird-lst": "^1.0.5", "debug": "^3.1.0", - "fs-extra-p": "^4.6.0", + "fs-extra-p": "^4.6.1", "sax": "^1.2.4" }, "dependencies": { @@ -736,12 +750,6 @@ "requires": { "ms": "2.0.0" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true } } }, @@ -1621,27 +1629,61 @@ "dev": true }, "dmg-builder": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-4.10.1.tgz", - "integrity": "sha512-+NqdmZb5uhPV1exzeH+hD+WLtr79qRjfA38S7DckOIMQW0C5Vykvp4dqCypnupfEnEOVZMcaNCCKK639h/uS/g==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-4.14.1.tgz", + "integrity": "sha512-/+SL4e1oyLUJjqTVQ4y54rFJoAFDnq5s2uuh6G9rL00GuUHLeX4K2p50B00Ry5XWuklMJ1nsbO2xdlSlNeEYFg==", "dev": true, "requires": { "bluebird-lst": "^1.0.5", - "builder-util": "^5.11.0", - "electron-builder-lib": "~20.14.6", - "fs-extra-p": "^4.6.0", + "builder-util": "~5.16.2", + "electron-builder-lib": "~20.22.0", + "fs-extra-p": "^4.6.1", "iconv-lite": "^0.4.23", - "js-yaml": "^3.11.0", + "js-yaml": "^3.12.0", "parse-color": "^1.0.0", "sanitize-filename": "^1.6.1" }, "dependencies": { "app-builder-bin": { - "version": "1.9.5", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-1.9.5.tgz", - "integrity": "sha512-Uw8jhfww5gYcAvMVgeRZ9cdlXOv+Ivqy4LSbALPMrQrCHHTmfVXETthkhW3cQKdvDo9pRuYn+Q5egSSn04F+Wg==", + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-1.11.2.tgz", + "integrity": "sha512-PwgZljspDcFbms3yWc/u7VwqZKHxLUoWNJ+7q376L4BRE7YchS3j2DHypC9yDGzsno4ExarDZ3SyEImh8sTSzA==", "dev": true }, + "builder-util": { + "version": "5.16.2", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.16.2.tgz", + "integrity": "sha512-kyw6VrpUucv4/Sw0I9SgNiMpi5+HfoihDI0P4bW+JW00kiUNs6RjNXiUxLU96XqcoU4nMD7jphEKarFX1uULDA==", + "dev": true, + "requires": { + "7zip-bin": "~4.0.2", + "app-builder-bin": "1.11.2", + "bluebird-lst": "^1.0.5", + "builder-util-runtime": "^4.4.1", + "chalk": "^2.4.1", + "debug": "^3.1.0", + "fs-extra-p": "^4.6.1", + "is-ci": "^1.1.0", + "js-yaml": "^3.12.0", + "lazy-val": "^1.0.3", + "semver": "^5.5.0", + "source-map-support": "^0.5.6", + "stat-mode": "^0.2.2", + "temp-file": "^3.1.3" + } + }, + "builder-util-runtime": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.4.1.tgz", + "integrity": "sha512-8L2pbL6D3VdI1f8OMknlZJpw0c7KK15BRz3cY77AOUElc4XlCv2UhVV01jJM7+6Lx7henaQh80ALULp64eFYAQ==", + "dev": true, + "requires": { + "bluebird-lst": "^1.0.5", + "debug": "^3.1.0", + "fs-extra-p": "^4.6.1", + "sax": "^1.2.4" + } + }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -1651,61 +1693,25 @@ "ms": "2.0.0" } }, - "electron-builder-lib": { - "version": "20.14.7", - "resolved": "https://registry.npmjs.org/electron-builder-lib/-/electron-builder-lib-20.14.7.tgz", - "integrity": "sha512-sPlpRN5Nea9ZK+nwZcD5ZuGoK2uCj2muQ7enc+9BeXPAxnEu4yYmYanICAi4BQqUdusm4yjjnN9uPowlbvCNzA==", + "fs-extra": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz", + "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "fs-extra-p": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.6.1.tgz", + "integrity": "sha512-IsTMbUS0svZKZTvqF4vDS9c/L7Mw9n8nZQWWeSzAGacOSe+8CzowhUN0tdZEZFIJNP5HC7L9j3MMikz/G4hDeQ==", "dev": true, "requires": { - "7zip-bin": "~4.0.2", - "app-builder-bin": "1.9.5", - "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.5", - "builder-util": "5.11.1", - "builder-util-runtime": "4.2.1", - "chromium-pickle-js": "^0.2.0", - "debug": "^3.1.0", - "ejs": "^2.6.1", - "electron-osx-sign": "0.4.10", - "electron-publish": "20.14.6", - "fs-extra-p": "^4.6.0", - "hosted-git-info": "^2.6.0", - "is-ci": "^1.1.0", - "isbinaryfile": "^3.0.2", - "js-yaml": "^3.11.0", - "lazy-val": "^1.0.3", - "minimatch": "^3.0.4", - "normalize-package-data": "^2.4.0", - "plist": "^3.0.1", - "read-config-file": "3.0.1", - "sanitize-filename": "^1.6.1", - "semver": "^5.5.0", - "stream-json": "^0.6.1", - "temp-file": "^3.1.2" - }, - "dependencies": { - "builder-util": { - "version": "5.11.1", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.11.1.tgz", - "integrity": "sha512-fZu9j33B4VMeUJaeb1q2TubKWrk9tAg2Jwpgjstxk7Mu7sNw7v/XB87/EbpNBlE3RPMrXblG6f8asfCRC8IiNQ==", - "dev": true, - "requires": { - "7zip-bin": "~4.0.2", - "app-builder-bin": "1.9.5", - "bluebird-lst": "^1.0.5", - "builder-util-runtime": "^4.2.1", - "chalk": "^2.4.1", - "debug": "^3.1.0", - "fs-extra-p": "^4.6.0", - "is-ci": "^1.1.0", - "js-yaml": "^3.11.0", - "lazy-val": "^1.0.3", - "semver": "^5.5.0", - "source-map-support": "^0.5.6", - "stat-mode": "^0.2.2", - "temp-file": "^3.1.2" - } - } + "fs-extra": "^6.0.1" } }, "iconv-lite": { @@ -1717,11 +1723,26 @@ "safer-buffer": ">= 2.1.2 < 3" } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "temp-file": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.1.3.tgz", + "integrity": "sha512-oz2J77loDE9sGrlRTqBzwbsUvoBD2BpyXeaRPKyGwBIwaamSs2jdqAfhutw7Tch9llr1u8E2ruoug09rNPa3PA==", + "dev": true, + "requires": { + "async-exit-hook": "^2.0.1", + "bluebird-lst": "^1.0.5", + "fs-extra-p": "^4.6.1", + "lazy-val": "^1.0.3" + } } } }, @@ -1739,9 +1760,9 @@ } }, "dotenv": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz", - "integrity": "sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.0.0.tgz", + "integrity": "sha512-FlWbnhgjtwD+uNLUGHbMykMOYQaTivdHEmYwAKFjn6GKe/CqY0fNae93ZHTd20snh9ZLr8mTzIL9m0APQ1pjQg==", "dev": true }, "dotenv-expand": { @@ -1782,60 +1803,193 @@ } }, "electron-builder": { - "version": "20.15.3", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.15.3.tgz", - "integrity": "sha512-hoZN5+2aFSMH60otpzxYqJAOCxWXdYpLm5c/pMSSyK91LACd0UyLx9IMpFXZadavmHTgf5z/94Blf3/+/2LRgw==", + "version": "20.22.0", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.22.0.tgz", + "integrity": "sha512-xf2qjOEvEROrlsH8Ct5B1PqKqosiVb3t3O9QMLwhZr1PPLHwAJMiG1NaZkXw2U0o3czG/9Bbwy4quiEkuAp1cA==", "dev": true, "requires": { "bluebird-lst": "^1.0.5", - "builder-util": "5.11.4", - "builder-util-runtime": "4.2.1", + "builder-util": "5.16.2", + "builder-util-runtime": "4.4.1", "chalk": "^2.4.1", - "dmg-builder": "4.10.1", - "electron-builder-lib": "20.15.3", - "electron-download-tf": "4.3.4", - "fs-extra-p": "^4.6.0", + "dmg-builder": "4.14.1", + "electron-builder-lib": "20.22.0", + "fs-extra-p": "^4.6.1", "is-ci": "^1.1.0", "lazy-val": "^1.0.3", - "read-config-file": "3.0.1", + "read-config-file": "3.1.0", "sanitize-filename": "^1.6.1", "update-notifier": "^2.5.0", - "yargs": "^11.0.0" + "yargs": "^12.0.1" + }, + "dependencies": { + "app-builder-bin": { + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-1.11.2.tgz", + "integrity": "sha512-PwgZljspDcFbms3yWc/u7VwqZKHxLUoWNJ+7q376L4BRE7YchS3j2DHypC9yDGzsno4ExarDZ3SyEImh8sTSzA==", + "dev": true + }, + "builder-util": { + "version": "5.16.2", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.16.2.tgz", + "integrity": "sha512-kyw6VrpUucv4/Sw0I9SgNiMpi5+HfoihDI0P4bW+JW00kiUNs6RjNXiUxLU96XqcoU4nMD7jphEKarFX1uULDA==", + "dev": true, + "requires": { + "7zip-bin": "~4.0.2", + "app-builder-bin": "1.11.2", + "bluebird-lst": "^1.0.5", + "builder-util-runtime": "^4.4.1", + "chalk": "^2.4.1", + "debug": "^3.1.0", + "fs-extra-p": "^4.6.1", + "is-ci": "^1.1.0", + "js-yaml": "^3.12.0", + "lazy-val": "^1.0.3", + "semver": "^5.5.0", + "source-map-support": "^0.5.6", + "stat-mode": "^0.2.2", + "temp-file": "^3.1.3" + } + }, + "builder-util-runtime": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.4.1.tgz", + "integrity": "sha512-8L2pbL6D3VdI1f8OMknlZJpw0c7KK15BRz3cY77AOUElc4XlCv2UhVV01jJM7+6Lx7henaQh80ALULp64eFYAQ==", + "dev": true, + "requires": { + "bluebird-lst": "^1.0.5", + "debug": "^3.1.0", + "fs-extra-p": "^4.6.1", + "sax": "^1.2.4" + } + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "fs-extra": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz", + "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "fs-extra-p": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.6.1.tgz", + "integrity": "sha512-IsTMbUS0svZKZTvqF4vDS9c/L7Mw9n8nZQWWeSzAGacOSe+8CzowhUN0tdZEZFIJNP5HC7L9j3MMikz/G4hDeQ==", + "dev": true, + "requires": { + "bluebird-lst": "^1.0.5", + "fs-extra": "^6.0.1" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "temp-file": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.1.3.tgz", + "integrity": "sha512-oz2J77loDE9sGrlRTqBzwbsUvoBD2BpyXeaRPKyGwBIwaamSs2jdqAfhutw7Tch9llr1u8E2ruoug09rNPa3PA==", + "dev": true, + "requires": { + "async-exit-hook": "^2.0.1", + "bluebird-lst": "^1.0.5", + "fs-extra-p": "^4.6.1", + "lazy-val": "^1.0.3" + } + } } }, "electron-builder-lib": { - "version": "20.15.3", - "resolved": "https://registry.npmjs.org/electron-builder-lib/-/electron-builder-lib-20.15.3.tgz", - "integrity": "sha512-qOp0zwXCNICEk9IrRR8Q0sTTPvwjQDO2nWzJ/7lMYg7b71GVfF1I3d2IjMgEmrhPzWsF9XAFIWyPduN1aRLYgA==", + "version": "20.22.0", + "resolved": "https://registry.npmjs.org/electron-builder-lib/-/electron-builder-lib-20.22.0.tgz", + "integrity": "sha512-pMSJ6YEmwhwnfq6v4XE7xT07eKGZIRVaM0yN86VBP0I3GBaUZHr02+G/+QBZxjr/sInnkkWvjLSwLoo/WRanjQ==", "dev": true, "requires": { "7zip-bin": "~4.0.2", - "app-builder-bin": "1.9.11", + "app-builder-bin": "1.11.2", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.5", - "builder-util": "5.11.4", - "builder-util-runtime": "4.2.1", + "builder-util": "5.16.2", + "builder-util-runtime": "4.4.1", "chromium-pickle-js": "^0.2.0", "debug": "^3.1.0", "ejs": "^2.6.1", "electron-osx-sign": "0.4.10", - "electron-publish": "20.15.0", - "fs-extra-p": "^4.6.0", - "hosted-git-info": "^2.6.0", + "electron-publish": "20.22.2", + "env-paths": "^1.0.0", + "fs-extra-p": "^4.6.1", + "hosted-git-info": "^2.7.1", "is-ci": "^1.1.0", "isbinaryfile": "^3.0.2", - "js-yaml": "^3.11.0", + "js-yaml": "^3.12.0", "lazy-val": "^1.0.3", "minimatch": "^3.0.4", "normalize-package-data": "^2.4.0", "plist": "^3.0.1", - "read-config-file": "3.0.1", + "read-config-file": "3.1.0", "sanitize-filename": "^1.6.1", "semver": "^5.5.0", - "stream-json": "^0.6.1", - "temp-file": "^3.1.2" + "sumchecker": "^2.0.2", + "temp-file": "^3.1.3" }, "dependencies": { + "app-builder-bin": { + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-1.11.2.tgz", + "integrity": "sha512-PwgZljspDcFbms3yWc/u7VwqZKHxLUoWNJ+7q376L4BRE7YchS3j2DHypC9yDGzsno4ExarDZ3SyEImh8sTSzA==", + "dev": true + }, + "builder-util": { + "version": "5.16.2", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.16.2.tgz", + "integrity": "sha512-kyw6VrpUucv4/Sw0I9SgNiMpi5+HfoihDI0P4bW+JW00kiUNs6RjNXiUxLU96XqcoU4nMD7jphEKarFX1uULDA==", + "dev": true, + "requires": { + "7zip-bin": "~4.0.2", + "app-builder-bin": "1.11.2", + "bluebird-lst": "^1.0.5", + "builder-util-runtime": "^4.4.1", + "chalk": "^2.4.1", + "debug": "^3.1.0", + "fs-extra-p": "^4.6.1", + "is-ci": "^1.1.0", + "js-yaml": "^3.12.0", + "lazy-val": "^1.0.3", + "semver": "^5.5.0", + "source-map-support": "^0.5.6", + "stat-mode": "^0.2.2", + "temp-file": "^3.1.3" + } + }, + "builder-util-runtime": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.4.1.tgz", + "integrity": "sha512-8L2pbL6D3VdI1f8OMknlZJpw0c7KK15BRz3cY77AOUElc4XlCv2UhVV01jJM7+6Lx7henaQh80ALULp64eFYAQ==", + "dev": true, + "requires": { + "bluebird-lst": "^1.0.5", + "debug": "^3.1.0", + "fs-extra-p": "^4.6.1", + "sax": "^1.2.4" + } + }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -1845,40 +1999,67 @@ "ms": "2.0.0" } }, - "electron-publish": { - "version": "20.15.0", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.15.0.tgz", - "integrity": "sha512-0v1jXvbRDlPK5S+LzEZqcvuFHLCSWPKmMYmbDwVheeNRjbJjQLlZyQAINVlV+Ky+yhawChEaAF+dyGLvXEyONg==", + "fs-extra": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz", + "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "fs-extra-p": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.6.1.tgz", + "integrity": "sha512-IsTMbUS0svZKZTvqF4vDS9c/L7Mw9n8nZQWWeSzAGacOSe+8CzowhUN0tdZEZFIJNP5HC7L9j3MMikz/G4hDeQ==", "dev": true, "requires": { "bluebird-lst": "^1.0.5", - "builder-util": "^5.11.2", - "builder-util-runtime": "^4.2.1", - "chalk": "^2.4.1", - "fs-extra-p": "^4.6.0", - "lazy-val": "^1.0.3", - "mime": "^2.3.1" + "fs-extra": "^6.0.1" } }, - "mime": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", - "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", + "hosted-git-info": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", + "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", "dev": true + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "temp-file": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.1.3.tgz", + "integrity": "sha512-oz2J77loDE9sGrlRTqBzwbsUvoBD2BpyXeaRPKyGwBIwaamSs2jdqAfhutw7Tch9llr1u8E2ruoug09rNPa3PA==", + "dev": true, + "requires": { + "async-exit-hook": "^2.0.1", + "bluebird-lst": "^1.0.5", + "fs-extra-p": "^4.6.1", + "lazy-val": "^1.0.3" + } } } }, "electron-builder-squirrel-windows": { - "version": "20.15.0", - "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-20.15.0.tgz", - "integrity": "sha512-bsf9kNhqPqhUj0rA6AfMu5oYyRMZBimBORjIFggApX9saOfjQBlE2mw55tgm0TNdPpHKH5DXiQoJmfT9lhLF/A==", + "version": "20.22.0", + "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-20.22.0.tgz", + "integrity": "sha512-bvc4VnQjGXqt9VksAEePnD9w0QK0KJxuMmovafBxOrRBT9Kgyf9jBvLK+tp5CPBi9Qvu28qfEwca8kSeweUg8g==", "dev": true, "requires": { "7zip-bin": "~3.1.0", "archiver": "^2.1.1", "bluebird-lst": "^1.0.5", - "builder-util": "^5.11.2", - "fs-extra-p": "^4.6.0", + "builder-util": "~5.16.2", + "fs-extra-p": "^4.6.1", "sanitize-filename": "^1.6.1" }, "dependencies": { @@ -2019,60 +2200,6 @@ } } }, - "electron-download-tf": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/electron-download-tf/-/electron-download-tf-4.3.4.tgz", - "integrity": "sha512-SQYDGMLpTgty1bx3NycuDb7dNPzktVSdK2sqPZjyRocauq/uN/V4S2lcpFVLupaHhKlD8zozm9fTpm5UdohvTg==", - "dev": true, - "requires": { - "debug": "^3.0.0", - "env-paths": "^1.0.0", - "fs-extra": "^4.0.1", - "minimist": "^1.2.0", - "nugget": "^2.0.1", - "path-exists": "^3.0.0", - "rc": "^1.2.1", - "semver": "^5.4.1", - "sumchecker": "^2.0.2" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, "electron-is-dev": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.3.0.tgz", @@ -2246,25 +2373,116 @@ } }, "electron-publish": { - "version": "20.14.6", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.14.6.tgz", - "integrity": "sha512-14u2eT8qTNKD1ek20UK5AbjDn6qmdhAOEiTcgmjmrMoRJFQIhGwV3emFmfaY1S6uFnFdY/4MyMcU92AXD1oRsw==", + "version": "20.22.2", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.22.2.tgz", + "integrity": "sha512-8C2/imQHsMZ2HKzidGrhFgSyHGXgZKXEILrjX9k2DqDl4oBmPoydklGhZn8QoLwx2VNucG45Me9owULG4PWvyA==", "dev": true, "requires": { "bluebird-lst": "^1.0.5", - "builder-util": "^5.11.0", - "builder-util-runtime": "^4.2.1", + "builder-util": "~5.16.2", + "builder-util-runtime": "^4.4.1", "chalk": "^2.4.1", - "fs-extra-p": "^4.6.0", + "fs-extra-p": "^4.6.1", "lazy-val": "^1.0.3", "mime": "^2.3.1" }, "dependencies": { + "app-builder-bin": { + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-1.11.2.tgz", + "integrity": "sha512-PwgZljspDcFbms3yWc/u7VwqZKHxLUoWNJ+7q376L4BRE7YchS3j2DHypC9yDGzsno4ExarDZ3SyEImh8sTSzA==", + "dev": true + }, + "builder-util": { + "version": "5.16.2", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.16.2.tgz", + "integrity": "sha512-kyw6VrpUucv4/Sw0I9SgNiMpi5+HfoihDI0P4bW+JW00kiUNs6RjNXiUxLU96XqcoU4nMD7jphEKarFX1uULDA==", + "dev": true, + "requires": { + "7zip-bin": "~4.0.2", + "app-builder-bin": "1.11.2", + "bluebird-lst": "^1.0.5", + "builder-util-runtime": "^4.4.1", + "chalk": "^2.4.1", + "debug": "^3.1.0", + "fs-extra-p": "^4.6.1", + "is-ci": "^1.1.0", + "js-yaml": "^3.12.0", + "lazy-val": "^1.0.3", + "semver": "^5.5.0", + "source-map-support": "^0.5.6", + "stat-mode": "^0.2.2", + "temp-file": "^3.1.3" + } + }, + "builder-util-runtime": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.4.1.tgz", + "integrity": "sha512-8L2pbL6D3VdI1f8OMknlZJpw0c7KK15BRz3cY77AOUElc4XlCv2UhVV01jJM7+6Lx7henaQh80ALULp64eFYAQ==", + "dev": true, + "requires": { + "bluebird-lst": "^1.0.5", + "debug": "^3.1.0", + "fs-extra-p": "^4.6.1", + "sax": "^1.2.4" + } + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "fs-extra": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz", + "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "fs-extra-p": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.6.1.tgz", + "integrity": "sha512-IsTMbUS0svZKZTvqF4vDS9c/L7Mw9n8nZQWWeSzAGacOSe+8CzowhUN0tdZEZFIJNP5HC7L9j3MMikz/G4hDeQ==", + "dev": true, + "requires": { + "bluebird-lst": "^1.0.5", + "fs-extra": "^6.0.1" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, "mime": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", "dev": true + }, + "temp-file": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.1.3.tgz", + "integrity": "sha512-oz2J77loDE9sGrlRTqBzwbsUvoBD2BpyXeaRPKyGwBIwaamSs2jdqAfhutw7Tch9llr1u8E2ruoug09rNPa3PA==", + "dev": true, + "requires": { + "async-exit-hook": "^2.0.1", + "bluebird-lst": "^1.0.5", + "fs-extra-p": "^4.6.1", + "lazy-val": "^1.0.3" + } } } }, @@ -2573,13 +2791,13 @@ } }, "fs-extra-p": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.6.0.tgz", - "integrity": "sha512-nSVqB5UfWZQdU6pzBwcFh+7lJpBynnTsVtNJTBhAnAppUQRut0W7WeM271iS0TqQ9FoCqDXqyL0+h+h8DQUCpg==", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.6.1.tgz", + "integrity": "sha512-IsTMbUS0svZKZTvqF4vDS9c/L7Mw9n8nZQWWeSzAGacOSe+8CzowhUN0tdZEZFIJNP5HC7L9j3MMikz/G4hDeQ==", "dev": true, "requires": { "bluebird-lst": "^1.0.5", - "fs-extra": "^6.0.0" + "fs-extra": "^6.0.1" }, "dependencies": { "fs-extra": { @@ -2658,9 +2876,9 @@ } }, "get-caller-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "dev": true }, "get-package-info": { @@ -3906,12 +4124,6 @@ "error-ex": "^1.2.0" } }, - "parser-toolkit": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/parser-toolkit/-/parser-toolkit-0.0.5.tgz", - "integrity": "sha1-7EthcpyGMYtW6pcb+6azxnLWLAE=", - "dev": true - }, "password-sheriff": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/password-sheriff/-/password-sheriff-1.1.0.tgz", @@ -4199,32 +4411,50 @@ } }, "read-config-file": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.0.1.tgz", - "integrity": "sha512-xMKmxBYENBqcTMc7r/VteufWgqI9c7oASnOxFa6Crlk4d/nVTOTOJKDhAHJCiGpD8cWzUY9t7K1+M3d75w4f9A==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.1.0.tgz", + "integrity": "sha512-z3VTrR9fgFu+Ll6MhTdtxbPFBKNGKgzYYnRjOcZvQeE/zwJTjPYVrps0ATgaSWU2/BnucUg3knP+Oz4zo9vEoA==", "dev": true, "requires": { - "ajv": "^6.4.0", + "ajv": "^6.5.2", "ajv-keywords": "^3.2.0", "bluebird-lst": "^1.0.5", - "dotenv": "^5.0.1", + "dotenv": "^6.0.0", "dotenv-expand": "^4.2.0", - "fs-extra-p": "^4.6.0", - "js-yaml": "^3.11.0", + "fs-extra-p": "^4.6.1", + "js-yaml": "^3.12.0", "json5": "^1.0.1", "lazy-val": "^1.0.3" }, "dependencies": { - "ajv": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.0.tgz", - "integrity": "sha512-VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA==", + "fs-extra": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz", + "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0", - "uri-js": "^4.2.1" + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "fs-extra-p": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.6.1.tgz", + "integrity": "sha512-IsTMbUS0svZKZTvqF4vDS9c/L7Mw9n8nZQWWeSzAGacOSe+8CzowhUN0tdZEZFIJNP5HC7L9j3MMikz/G4hDeQ==", + "dev": true, + "requires": { + "bluebird-lst": "^1.0.5", + "fs-extra": "^6.0.1" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" } } } @@ -4718,15 +4948,6 @@ "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=", "dev": true }, - "stream-json": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/stream-json/-/stream-json-0.6.1.tgz", - "integrity": "sha512-Tmhl5yUVusgkgCiWnoHD1BA8/LqFX5/OlYj+YMCgUuUMjbacQvSWV8p1grbKvzP6s4EBS4nK5WNsMHX7kugzyg==", - "dev": true, - "requires": { - "parser-toolkit": ">=0.0.3" - } - }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -4929,14 +5150,14 @@ } }, "temp-file": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.1.2.tgz", - "integrity": "sha512-s5JJnUbvV6QaKBxBJm6wDpKIVVvr/ssrb8Cdaz2iaXcjFMtWX+OGBwY+UTvARoWYI5HlKaoD7xFJSpo0jJUlbA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.1.3.tgz", + "integrity": "sha512-oz2J77loDE9sGrlRTqBzwbsUvoBD2BpyXeaRPKyGwBIwaamSs2jdqAfhutw7Tch9llr1u8E2ruoug09rNPa3PA==", "dev": true, "requires": { "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.5", - "fs-extra-p": "^4.6.0", + "fs-extra-p": "^4.6.1", "lazy-val": "^1.0.3" } }, @@ -5440,6 +5661,12 @@ "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=" }, + "xregexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz", + "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==", + "dev": true + }, "xtend": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", @@ -5449,9 +5676,9 @@ } }, "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", "dev": true }, "yallist": { @@ -5461,14 +5688,14 @@ "dev": true }, "yargs": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", - "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.1.tgz", + "integrity": "sha512-B0vRAp1hRX4jgIOWFtjfNjd9OA9RWYZ6tqGA9/I/IrTMsxmKvtWy+ersM+jzpQqbC3YfLzeABPdeTgcJ9eu1qQ==", "dev": true, "requires": { "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", + "decamelize": "^2.0.0", + "find-up": "^3.0.0", "get-caller-file": "^1.0.1", "os-locale": "^2.0.0", "require-directory": "^2.1.1", @@ -5476,8 +5703,8 @@ "set-blocking": "^2.0.0", "string-width": "^2.0.0", "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^10.1.0" }, "dependencies": { "ansi-regex": { @@ -5486,13 +5713,22 @@ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, + "decamelize": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz", + "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==", + "dev": true, + "requires": { + "xregexp": "4.0.0" + } + }, "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "^3.0.0" } }, "is-fullwidth-code-point": { @@ -5501,6 +5737,40 @@ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz", + "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "p-try": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", + "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", + "dev": true + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -5523,9 +5793,9 @@ } }, "yargs-parser": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", - "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", + "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", "dev": true, "requires": { "camelcase": "^4.1.0" diff --git a/package.json b/package.json index 239daf5d..0de4569b 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "clean": "rm -rf ./dist", "clean:osx": "rm -rf ./dist/Rambox-darwin-*", "clean:win": "rm -rf ./dist/Rambox-win32-*", - "pack": "npm run pack:osx && npm run pack:win", + "pack": "npm run pack:osx && npm run pack:win && npm run pack:linux", "pack:osx": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=darwin --arch=x64 --electron-version=2.0.5 --icon=resources/installer/Icon.icns --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite", "pack:win": "npm run pack:win32 && npm run pack:win64", "pack:win32": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=win32 --arch=ia32 --electron-version=2.0.5 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=32-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite", @@ -19,21 +19,28 @@ "pack:linux32": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=linux --arch=ia32 --electron-version=2.0.5 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite", "pack:linux64": "electron-packager \"./build/production/Rambox/\" \"Rambox\" --out=dist --platform=linux --arch=x64 --electron-version=2.0.5 --icon=resources/installer/Icon.ico --app-version=0.2.0 --build-version=64-bit --version-string.CompanyName=\"Rambox\" --version-string.ProductName=\"Rambox\" --asar --prune --overwrite", "build": "npm run build:linux && npm run build:osx && npm run build:win", - "build:osx": "build --macos", + "build:osx": "electron-builder --macos", "build:linux": "npm run build:linux32 && npm run build:linux64", - "build:linux32": "build --linux --ia32", - "build:linux64": "build --linux --x64", - "build:win32": "build --win --ia32", - "build:win64": "build --win --x64", - "setup:osx": "npm run sencha:clean && npm run sencha:compile && npm run clean:osx && npm run pack:osx && npm run build:osx", - "setup:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run build:win", + "build:linux32": "electron-builder --linux --ia32", + "build:linux64": "electron-builder --linux --x64", + "build:win": "electron-builder --win --ia32 --x64", + "build:win32": "electron-builder --win --ia32", + "build:win64": "electron-builder --win --x64", + "setup:osx": "npm run sencha:clean && npm run sencha:compile && npm run build:osx", + "setup:win": "npm run sencha:clean && npm run sencha:compile && npm run build:win", + "setup:win32": "npm run sencha:clean && npm run sencha:compile && npm run build:win32", + "setup:win64": "npm run sencha:clean && npm run sencha:compile && npm run build:win64", + "setup:linux": "npm run sencha:clean && npm run sencha:compile && npm run build:linux", + "setup:linux32": "npm run sencha:clean && npm run sencha:compile && npm run build:linux32", + "setup:linux64": "npm run sencha:clean && npm run sencha:compile && npm run build:linux64", "all:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win && npm run zip:win32 && npm run zip:win64 && npm run build:win", "all:linux": "npm run sencha:clean && npm run sencha:compile && npm run build:linux" }, "build": { "productName": "Rambox", - "appId": "com.saenzramiro.rambox", + "appId": "com.thegoddessinari.rambox", "asar": true, + "publish": null, "mac": { "category": "public.app-category.productivity", "target": [ @@ -58,13 +65,11 @@ ] }, "squirrelWindows": { - "iconUrl": "https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/Icon.ico" + "iconUrl": "https://raw.githubusercontent.com/TheGoddessInari/rambox/master/resources/Icon.ico" }, "win": { "target": [ - "squirrel", - "nsis", - "zip" + "squirrel" ] }, "linux": { @@ -75,18 +80,12 @@ "Categories": "GTK;GNOME;Utility;Office;Email;Chat;InstantMessaging;" }, "target": [ - "snap", "AppImage", "deb", "rpm", - "zip", "tar.gz" ] }, - "snap": { - "confinement": "strict", - "grade": "stable" - }, "directories": { "buildResources": "resources/installer/", "output": "dist/", @@ -98,8 +97,8 @@ "chai": "3.5.0", "crowdin": "1.0.0", "csvjson": "4.3.3", - "electron-builder": "^20.15.3", - "electron-builder-squirrel-windows": "^20.15.0", + "electron-builder": "^20.22.0", + "electron-builder-squirrel-windows": "^20.22.0", "electron-squirrel-startup": "^1.0.0", "mocha": "^5.2.0", "spectron": "^3.8.0"