Skip to content

Commit

Permalink
v8.18.2
Browse files Browse the repository at this point in the history
  • Loading branch information
sidneys committed Apr 19, 2019
1 parent 08d6d2d commit b93802e
Show file tree
Hide file tree
Showing 7 changed files with 868 additions and 814 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ init:

install:
- cmd: echo 🔧 Setting up Node
- ps: Install-Product node 11.9.0
- ps: Install-Product node Current
- cmd: npm --global update npm
- cmd: npm --global install yarn

Expand Down
10 changes: 8 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,24 @@ addons:
- gcc-multilib
- graphicsmagick
- icnsutils
- libxss-dev:i386
- rpm
- snapd
- xz-utils

env:
- PATH=/snap/bin:$PATH

before_install:
- echo "🚦 Authorizing Build"
- echo "🔧 Setting up Node"
- curl -o- https://raw.githubusercontent.com/creationix/nvm/master/install.sh | NVM_DIR="${HOME}"/.nvm sh
- source "${HOME}"/.nvm/nvm.sh && nvm install 11.9.0 && nvm use 11.9.0
- source "${HOME}"/.nvm/nvm.sh && nvm install 11.14.0 && nvm use 11.14.0
- npm --global update npm
- npm --global install yarn

install:
- echo "🚦 Preparing Environment"
- sudo snap install snapcraft --classic
- echo "📥 Installing Dependencies"
- yarn install

Expand Down
10 changes: 8 additions & 2 deletions RELEASENOTES.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
{
"8.16.0": {
"8.18.2": {
"🍾 features": [
"contributed by @LyzardKing: [Add snap package](https://github.com/sidneys/pb-for-desktop/pull/93) (Linux)"
],
"🚨 fixes": [
"adds fix for [A JavaScript error occurred in the main process Uncaught Exception.](https://github.com/sidneys/pb-for-desktop/issues/102) (Windows)"
],
"💎 improvements": [
"various stability and performance improvements"
],
"👷 internals": [
"upgrades `electron` to `v4.1.3`",
"upgrades `electron` to `v4.1.4`",
"upgrades external `node_modules`"
]
},
Expand Down
31 changes: 15 additions & 16 deletions app/scripts/main/components/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,21 @@ const path = require('path')
const electron = require('electron')
const { app, BrowserWindow, systemPreferences } = electron

/**
* Modules
* External
* @constant
*/
const appRootPath = require('app-root-path')
appRootPath.setPath(path.join(__dirname, '..', '..', '..', '..'))

/**
* Modules
* Internal
* @constant
*/
require(path.join(appRootPath['path'], 'app', 'scripts', 'main', 'components', 'globals'))


/**
* HOTFIX
Expand Down Expand Up @@ -77,29 +92,13 @@ if (process.platform === 'linux') {
* External
* @constant
*/
const appRootPath = require('app-root-path')
const logger = require('@sidneys/logger')({ write: true })
/* eslint-disable no-unused-vars */
const debugService = require('@sidneys/electron-debug-service')
const updaterService = require('@sidneys/electron-updater-service')
const powerService = require('@sidneys/electron-power-service')
/* eslint-enable */

/**
* Modules
* Configuration
*/
appRootPath.setPath(path.join(__dirname, '..', '..', '..', '..'))

/**
* Modules
* Internal
* @constant
*/
/* eslint-disable no-unused-vars */
const globals = require(path.join(appRootPath['path'], 'app', 'scripts', 'main', 'components', 'globals'))
/* eslint-enable */

/**
* Modules
* Internal
Expand Down
Loading

0 comments on commit b93802e

Please sign in to comment.