Skip to content

Commit

Permalink
Merge dev into master
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverschwendener committed Aug 13, 2019
2 parents 994ebc2 + cae187c commit 406a15d
Show file tree
Hide file tree
Showing 525 changed files with 16,595 additions and 12,877 deletions.
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ os:

language: node_js
node_js:
"8"
"12"

install:
- yarn install

before_script:
- export NODE_ENV=production

script:
- yarn tsc:validate
- yarn lint
- yarn test --coverage
- yarn coverage
- yarn bundle
- yarn package:publish
- yarn test
6 changes: 0 additions & 6 deletions .vscode/extensions.json

This file was deleted.

29 changes: 10 additions & 19 deletions .vscode/launch.example.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,33 @@
"request": "launch",
"name": "Electron Main",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
"program": "${workspaceRoot}/src/ts/main.ts",
"program": "${workspaceRoot}/src/main/main.ts",
"protocol": "inspector",
"sourceMaps": true,
"cwd": "${workspaceRoot}",
"outFiles": [
"${workspaceRoot}/bundle/main.js"
]
},
{
"name": "Electron Renderer",
"type": "chrome",
"request": "launch",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
"windows": {
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd"
},
"runtimeArgs": [
"${workspaceRoot}/bundle/main.js",
"--remote-debugging-port=9222"
],
"port": 9222,
"webRoot": "${workspaceRoot}"
},
{
"type": "node",
"request": "launch",
"name": "Jest Tests",
"program": "${workspaceRoot}/node_modules/jest/bin/jest",
"args": [
"--runInBand",
"--config",
"jest.json",
"src/tests"
"jest.json"
],
"console": "internalConsole",
"internalConsoleOptions": "neverOpen"
},
{
"type": "chrome",
"request": "attach",
"name": "Electron Renderer",
"port": 9223,
"webRoot": "${workspaceFolder}",
"timeout": 10000
}
]
}
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Oliver Schwendener
Copyright (c) 2019 Oliver Schwendener

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
9 changes: 0 additions & 9 deletions PULL_REQUEST_TEMPLATE.md

This file was deleted.

Loading

0 comments on commit 406a15d

Please sign in to comment.