This commit is contained in:
Eugene Pankov 2017-06-24 14:14:57 +02:00
parent b5486b2ac9
commit fa6f968e87
8 changed files with 22 additions and 14 deletions

1
.npmrc
View File

@ -1 +0,0 @@
package-lock = false

View File

@ -22,7 +22,10 @@ sudo: false
deploy:
provider: releases
api_key: $GITHUB_TOKEN
file: dist/*.AppImage
file_glob: true
file:
- dist/*.deb
- dist/*.rpm
skip_cleanup: true
on:
tags: true

View File

@ -4,7 +4,7 @@ const vars = require('./vars')
builder({
dir: true,
linux: ['deb'],
linux: ['deb', 'rpm', 'tar.gz'],
extraMetadata: {
version: vars.version,
},

View File

@ -6,17 +6,17 @@ const log = require('npmlog')
log.info('deps', 'app')
sh.exec('npm prune')
sh.exec('npm install')
sh.exec('npm update --dev')
sh.cd('app')
sh.exec('npm prune')
sh.exec('npm install')
sh.exec('npm update --dev')
sh.cd('..')
vars.builtinPlugins.forEach(plugin => {
log.info('deps', plugin)
sh.cd(plugin)
sh.exec('npm prune')
sh.exec('npm install')
sh.exec('npm update --dev')
sh.cd('..')
})

View File

@ -15,14 +15,13 @@
"license": "MIT",
"devDependencies": {
"@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
"@types/electron": "^1.4.35",
"@types/js-yaml": "^3.5.29",
"@types/node": "^7.0.12",
"@types/webpack-env": "^1.13.0",
"bootstrap": "4.0.0-alpha.6",
"core-js": "^2.4.1",
"ngx-perfect-scrollbar": "4.0.0",
"typescript": "^2.2.2"
"typescript": "^2.4.0"
},
"peerDependencies": {
"@angular/animations": "4.0.1",
@ -35,8 +34,8 @@
"zone.js": "0.8.4"
},
"dependencies": {
"deepmerge": "^1.3.2",
"js-yaml": "^3.8.3"
"deepmerge": "^1.4.4",
"js-yaml": "^3.8.4"
},
"false": {}
}

View File

@ -1,7 +1,7 @@
import { Injectable } from '@angular/core'
import { ConfigService } from '../services/config.service'
import { ElectronService } from '../services/electron.service'
import { HostAppService } from '../services/hostApp.service'
import { HostAppService, Bounds } from '../services/hostApp.service'
export interface IScreen {
id: string
@ -24,7 +24,7 @@ export class DockingService {
}
let dockSide = this.config.store.appearance.dock
let newBounds: Electron.Rectangle = { x: 0, y: 0, width: 0, height: 0 }
let newBounds: Bounds = { x: 0, y: 0, width: 0, height: 0 }
let fill = this.config.store.appearance.dockFill
if (dockSide === 'off') {

View File

@ -6,6 +6,13 @@ export enum Platform {
Linux, macOS, Windows,
}
export interface Bounds {
x: number
y: number
width: number
height: number
}
@Injectable()
export class HostAppService {
platform: Platform
@ -97,7 +104,7 @@ export class HostAppService {
this.electron.ipcRenderer.send('window-toggle-maximize')
}
setBounds (bounds: Electron.Rectangle) {
setBounds (bounds: Bounds) {
this.electron.ipcRenderer.send('window-set-bounds', bounds)
}

View File

@ -33,7 +33,7 @@
"rxjs": "5.3.0"
},
"dependencies": {
"axios": "^0.16.1"
"axios": "^0.16.2"
},
"false": {}
}