Skip to content

Commit

Permalink
v10.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sidneys committed Nov 14, 2019
1 parent 3b92d4a commit db1a7a8
Show file tree
Hide file tree
Showing 23 changed files with 7,686 additions and 3,652 deletions.
23 changes: 12 additions & 11 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
os: Visual Studio 2017
os: Visual Studio 2019

platform:
- x64
Expand All @@ -13,14 +13,17 @@ cache:
- "node_modules"
- "%LOCALAPPDATA%\\Yarn"

test: off

init:
- cmd: echo 🚦 Authorizing Build
- cmd: echo 🚦 Verifying Build
- ps: if ($env:OS -eq "Windows_NT" -And $env:DEPLOY_WINDOWS -eq "0") { $host.SetShouldExit(0) }
- cmd: git config --global core.autocrlf input

install:
- cmd: echo 🔧 Setting up Node
- ps: Update-NodeJsInstallation 12.7.0
- cmd: echo 🔧 Preparing Build Environment (Git)
- cmd: git config --global core.autocrlf input
- cmd: echo 🔧 Preparing Build Environment (Node.js)
- ps: Update-NodeJsInstallation 13.1.0
- cmd: npm --global update npm
- cmd: npm --global install yarn

Expand All @@ -29,22 +32,20 @@ before_build:
- cmd: yarn install

build_script:
- cmd: echo 📦 Building
- cmd: npm run build --metadata
- cmd: echo 📦 Building Project
- cmd: npm run build

deploy_script:
- cmd: echo 📮 Deploying to GitHub
- cmd: echo 📮 Deploying Project
- cmd: npm run deploy

artifacts:
- path: build\output\*.exe

notifications:
- provider: Webhook
url: https://webhooks.gitter.im/e/f29f98b58ec67b5f0f59
url: https://webhooks.gitter.im/e/65966d679f4ebeae4b3b
method: GET
on_build_success: true
on_build_failure: true
on_build_status_changed: true

test: off
4 changes: 2 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"root": true,
"env": {
"browser": true,
"es6": true,
Expand All @@ -12,7 +13,6 @@
"jsx": true
}
},
"root": true,
"rules": {
"array-bracket-spacing": [
"error",
Expand Down Expand Up @@ -135,4 +135,4 @@
],
"wrap-iife": "off"
}
}
}
33 changes: 21 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
matrix:
include:
- os: linux
dist: xenial
sudo: required
dist: bionic
group: edge
compiler: clang

Expand All @@ -12,10 +11,17 @@ branches:
only:
- master

env:
global:
- LC_ALL: "C.UTF-8"
- LANG: "C.UTF-8"
- PATH: "/snap/bin:${PATH}"

cache:
directories:
- "./node_modules"
- "${HOME}/.yarn-cache"
- ${TRAVIS_BUILD_DIR}/snaps-cache

addons:
apt:
Expand All @@ -25,33 +31,36 @@ addons:
- gcc-multilib
- graphicsmagick
- icnsutils
- libopenjp2-tools
- libxss-dev:i386
- rpm
- snapd
- xz-utils

env:
- PATH=/snap/bin:$PATH
snaps:
- name: multipass
confinement: classic
channel: edge
- name: snapcraft
confinement: classic
channel: edge

before_install:
- echo "🔧 Setting up Node"
- echo "🔧 Preparing Build Environment (Node.js)"
- curl -o- https://raw.githubusercontent.com/creationix/nvm/master/install.sh | NVM_DIR="${HOME}"/.nvm sh
- source "${HOME}"/.nvm/nvm.sh && nvm install 12.8.0 && nvm use 12.8.0
- source "${HOME}"/.nvm/nvm.sh && nvm install 13.1.0 && nvm use 13.1.0
- npm --global update npm
- npm --global install yarn

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

script:
- echo "📦 Building"
- npm run build --metadata
- echo "📦 Building Project"
- npm run build

after_success:
- echo "📮 Deploying to Github"
- echo "📮 Deploying Project"
- npm run deploy

notifications:
Expand Down
25 changes: 25 additions & 0 deletions RELEASENOTES.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,29 @@
{
"10.0.1": {
"🍾 features": [
"adds native blurred translucent `NSVisualEffectView` menu sidebar (macOS)"
],
"💎 improvements": [
"various stability and performance improvements"
],
"🚨 fixes": [
"fixes injection of local stylesheet into webview",
"fixes bootstrapping of application bundle",
"adds fix by [btaens](https://github.com/sidneys/pb-for-desktop/pull/107): [Not getting any pushes on my Mac desktop anymore](https://github.com/sidneys/pb-for-desktop/issues/100)",
"adds fix by [btaens](https://github.com/sidneys/pb-for-desktop/pull/106): [Login stays on Connecting](https://github.com/sidneys/pb-for-desktop/issues/105)"
],
"📒 documentation": [
"updates `jsdoc` documentation coverage"
],
"👷 internals": [
"upgrades `electron` to `v7.1.1`",
"migrates `electron` APIs to v7",
"upgrades internal `node_modules`",
"upgrades external `node_modules`",
"upgrades `babel` and `nodejs`",
"refactors application file structure"
]
},
"9.5.0": {
"🍾 features": [
"add new application icons"
Expand Down
4 changes: 2 additions & 2 deletions app/html/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
<webview id="webview"
disablewebsecurity="true"
partition="persist:app"
preload="../scripts/renderer/webviews/pushbullet-webview.js"
preload="../scripts/renderer-process/webviews/pushbullet-webview.js"
src="https://www.pushbullet.com">
</webview>
<!-- webview-->

<script src="../scripts/renderer/main.js"></script>
<script src="../scripts/renderer-process/index.js"></script>

</body>
</html>
27 changes: 27 additions & 0 deletions app/scripts/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
'use strict'


/**
* Modules (Node.js)
* @constant
*/
const path = require('path')

/**
* Modules (Node.js)
* @constant
*/
const appRootPath = require('app-root-path')
const appModulePath = require('app-module-path')

/**
* Module Configuration
*/
appRootPath.setPath(path.resolve(path.join(__dirname), '..', '..'))
appModulePath.addPath(appRootPath.path)


/**
* Initialize Main Process
*/
require('app/scripts/main-process')
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,22 @@


/**
* Modules
* Node
* Modules (Node.js)
* @constant
*/
const path = require('path')

/**
* Modules
* External
* Modules (Third party)
* @constant
*/
const appRootPath = require('app-root-path')
const appRootPathDirectory = require('app-root-path').path

/**
* Modules
* Internal
* Modules (Local)
* @constant
*/
const packageJson = require(path.join(appRootPath['path'], 'package.json'))
const packageJson = require(path.join(appRootPathDirectory, 'package.json'))


/**
Expand All @@ -44,7 +41,7 @@ global.manifest = {
global.filesystem = {
directories: {
resources: process.resourcesPath,
sounds: path.join(appRootPath['path'], 'sounds').replace('app.asar', 'app.asar.unpacked')
sounds: path.join(appRootPathDirectory, 'sounds').replace('app.asar', 'app.asar.unpacked')
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,24 @@


/**
* Modules
* Node
* Modules (Node.js)
* @constant
*/
const events = require('events')
const path = require('path')

/**
* Modules
* Electron
* Modules (Electron)
* @constant
*/
const electron = require('electron')
const { app, BrowserWindow, systemPreferences } = electron
const { app, BrowserWindow, dialog, systemPreferences } = electron

/**
* Modules
* External
* Modules (Local)
* @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'))
require('app/scripts/main-process/components/globals')


/**
Expand Down Expand Up @@ -88,8 +77,7 @@ if (process.platform === 'linux') {


/**
* Modules
* External
* Modules (Third party)
* @constant
*/
const logger = require('@sidneys/logger')({ write: true })
Expand All @@ -100,21 +88,28 @@ const powerService = require('@sidneys/electron-power-service')
/* eslint-enable */

/**
* Modules
* Internal
* Modules (Local)
* @constant
*/
/* eslint-disable no-unused-vars */
const appMenu = require(path.join(appRootPath.path, 'app', 'scripts', 'main', 'menus', 'app-menu'))
const mainWindow = require(path.join(appRootPath.path, 'app', 'scripts', 'main', 'windows', 'main-window'))
const configurationManager = require(path.join(appRootPath.path, 'app', 'scripts', 'main', 'managers', 'configuration-manager'))
const trayMenu = require(path.join(appRootPath.path, 'app', 'scripts', 'main', 'menus', 'tray-menu'))
const snoozerService = require(path.join(appRootPath.path, 'app', 'scripts', 'main', 'services', 'snoozer-service'))
const appMenu = require('app/scripts/main-process/menus/app-menu')
const dialogProvider = require('@sidneys/electron-dialog-provider')
const mainWindow = require('app/scripts/main-process/windows/main-window')
const configurationManager = require('app/scripts/main-process/managers/configuration-manager')
const trayMenu = require('app/scripts/main-process/menus/tray-menu')
const snoozerService = require('app/scripts/main-process/services/snoozer-service')
/* eslint-enable */

/**
* Application
* @constant
* @default
*/
const appProductName = global.manifest.productName


/**
* Ensure single instance
* Force Singular Instance
*/
if (!app.requestSingleInstanceLock()) {
logger.warn('Additional application instance detected:', app.getPath('exe'))
Expand Down Expand Up @@ -157,16 +152,20 @@ app.on('before-quit-for-update', () => {
})

/**
* @listens Electron.App:ready
* @listens Electron.systemPreferences:appearance-changed
*/
app.once('ready', () => {
logger.debug('app#ready')
systemPreferences.on('appearance-changed', (newAppearance) => {
logger.debug('systemPreferences#appearance-changed', 'newAppearance:', newAppearance)
})


/**
* @listens Electron.systemPreferences:appearance-changed
* @listens Electron.App:ready
*/
systemPreferences.on('appearance-changed', (newAppearance) => {
logger.debug('systemPreferences#appearance-changed', 'newAppearance:', newAppearance)
app.once('ready', () => {
logger.debug('app#ready')

if (!process.defaultApp && app.isInApplicationsFolder()) {
return
}
})
Loading

0 comments on commit db1a7a8

Please sign in to comment.