Skip to content

Commit

Permalink
Merge pull request #137 from Blakenator/update-packages
Browse files Browse the repository at this point in the history
v0.9.0
  • Loading branch information
Blakenator authored Feb 27, 2021
2 parents 6fa4002 + 09f0bed commit 3d2dc8f
Show file tree
Hide file tree
Showing 207 changed files with 28,343 additions and 24,013 deletions.
12 changes: 12 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# You can see what browsers were selected by your queries by running:
# npx browserslist

#> 0.5%
last 2 versions
#Firefox ESR
#not dead
#not IE 9-11 # For IE 9-11 support, remove 'not'.
4 changes: 4 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"singleQuote": true,
"trailingComma": "all"
}
62 changes: 36 additions & 26 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,59 +1,69 @@
language: node_js

cache:
directories:
- $HOME/.cache/electron
- $HOME/.cache/electron-builder
cache: npm

env:
- ELECTRON_CACHE=$HOME/.cache/electron ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder

jobs:
include:
- stage: Run Tests
os: osx
osx_image: xcode10.2
node_js: "8"
script:
- npm i &> /dev/null
- npm run test-node || travis_terminate 1
# - stage: Run Tests
# os: osx
# osx_image: xcode10.2
# node_js: "12"
# script:
# - npm i &> /dev/null
# - npm run test-node || travis_terminate 1
- stage: Release
os: osx
osx_image: xcode10.2
node_js: "8"
osx_image: xcode12.2
node_js: "14"
if: (branch = testing/build) OR (branch = master)
script:
- npm run release:mac
- stage: Build
os: osx
osx_image: xcode10.2
node_js: "8"
osx_image: xcode12.2
node_js: "14"
if: branch = staging
script:
- git lfs pull
- npm run electron:mac

- stage: Run Tests
os: linux
node_js: "10"
script:
- nvm install 10
- nvm use 10
- git lfs pull
- npm i &> /dev/null
- npm run test-node || travis_terminate 1
# - stage: Run Tests
# os: linux
# node_js: "12"
# script:
# - nvm install 12
# - nvm use 12
# - git lfs pull
# - npm i &> /dev/null
# - npm run test-node || travis_terminate 1
- stage: Release
os: linux
node_js: "10"
node_js: "14"
if: (branch = testing/build) OR (branch = master)
script:
- npm run release:linux
- stage: Build
os: linux
node_js: "10"
node_js: "14"
if: branch = staging
script:
- npm run electron:linux
# WINDOWS
- stage: Release
os: windows
node_js: "14"
if: (branch = testing/build) OR (branch = master)
script:
- npm run release:windows
- stage: Build
os: windows
node_js: "14"
if: branch = staging
script:
- npm run electron:windows

branches:
only:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Light Git Client
A light, elegant git client

[![Build Status](https://travis-ci.org/Blakenator/light-git-client.png?branch=master)](https://travis-ci.org/Blakenator/light-git-client) [![Build status](https://ci.appveyor.com/api/projects/status/896vfu1sr2m5mbk2/branch/master?svg=true)](https://ci.appveyor.com/project/Blakenator/light-git-client/branch/master)
[![Build Status](https://travis-ci.com/Blakenator/light-git-client.svg?branch=master)](https://travis-ci.com/Blakenator/light-git-client)


## Installation
Expand Down
20 changes: 17 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
Expand All @@ -31,10 +32,15 @@
},
"configurations": {
"dev": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
"extractCss": true,
"namedChunks": false,
"aot": false,
"extractLicenses": true,
Expand All @@ -48,10 +54,15 @@
]
},
"production": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand Down Expand Up @@ -150,10 +161,13 @@
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "scss"
"style": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
}
},
"cli": {
"analytics": false
}
}
29 changes: 0 additions & 29 deletions appveyor.yml

This file was deleted.

22 changes: 6 additions & 16 deletions electron-builder.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"productName": "Light Git",
"productName": "Light-Git",
"appId": "com.blakestacks.light-git-client",
"directories": {
"output": "app-builds"
},
"artifactName": "light-git-${version}.${ext}",
"files": [
"**/*",
"!*.ts",
Expand All @@ -21,9 +22,7 @@
"!tsconfig.json",
"!tslint.json"
],
"extraFiles": [
"extra/**/*"
],
"extraFiles": ["extra/**/*"],
"win": {
"icon": "dist",
"publish": [
Expand All @@ -33,19 +32,12 @@
"repo": "light-git-client"
}
],
"target": [
"nsis",
"portable",
"7z",
"zip"
],
"target": ["nsis", "portable", "7z", "zip"],
"publisherName": "Blake Stacks"
},
"mac": {
"icon": "dist",
"target": [
"dmg"
]
"target": ["dmg"]
},
"linux": {
"icon": "dist",
Expand All @@ -57,8 +49,6 @@
"repo": "light-git-client"
}
],
"target": [
"AppImage"
]
"target": ["AppImage", "deb"]
}
}
1 change: 1 addition & 0 deletions genericApplication.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export abstract class GenericApplication {
y: 0,
width: this.windowWidth || screen.getPrimaryDisplay().workAreaSize.width * .6,
height: this.windowHeight || screen.getPrimaryDisplay().workAreaSize.height * .8,
webPreferences: {nodeIntegration: true},
});

if (this.startMaximized) {
Expand Down
Loading

0 comments on commit 3d2dc8f

Please sign in to comment.