Skip to content
This repository has been archived by the owner on Jun 7, 2021. It is now read-only.

[WIP] Ava 1.0 #12

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

[WIP] Ava 1.0 #12

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
62623a8
fix: try 1.0
bokuweb Jan 23, 2019
dfad8c6
fix renderer test
bokuweb Jan 24, 2019
044fa94
fix: use hook
bokuweb Jan 24, 2019
83b0af4
fix fixture option
bokuweb Jan 24, 2019
21936af
fix: async
bokuweb Jan 24, 2019
4a68957
fix: use @2
bokuweb Jan 24, 2019
f431160
use v5
bokuweb Feb 5, 2019
95d55d2
fix: libdbus
bokuweb Jun 9, 2019
a0330c1
chore: use: node-ho-with-b
bokuweb Jun 9, 2019
c54b32f
chore: update electron
bokuweb Jun 9, 2019
879705f
update
bokuweb Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update
  • Loading branch information
@bokuweb
bokuweb committed Jul 25, 2019
commit 879705f542a8f0851bf4b64eaf2f4efcae18bdc8
7 changes: 2 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@


defaults: &defaults
working_directory: ~/avaron
docker:
- image: bokuweb/node-xcb-xvfb
- image: bokuweb/node-go-with-browser:latest
environment:
DISPLAY: ":99"

Expand All @@ -28,5 +26,4 @@ jobs:
xvfbd start
yarn run test:main
yarn run test:renderer
xvfbd stop

xvfbd stop
3 changes: 2 additions & 1 deletion main/create-window.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ module.exports = (options = {}, argv) => {
width: 800,
height: 600,
webPreferences: {
nodeIntegration: true
nodeIntegration: true,
sandbox: false
}
},
options.windowOptions
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,15 @@
"title": "avaron",
"show": false,
"webPreferences": {
"sandbox": true,
"nodeIntegration": true
}
},
"fixture": "./fixture.html"
},
"dependencies": {
"ava": "1.1",
"electron": "6.0.0-beta.6",
"electron": "6.0.0-beta.15",
"make-dir": "^1.3.0",
"require-hacker": "^3.0.1"
},
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,10 +1667,10 @@ electron-download@^4.1.0:
semver "^5.4.1"
sumchecker "^2.0.2"

electron@6.0.0-beta.6:
version "6.0.0-beta.6"
resolved "https://registry.yarnpkg.com/electron/-/electron-6.0.0-beta.6.tgz#11b8395b9dd25f9ecf79beaac726e18031b71c0d"
integrity sha512-w09md+UPBd7p20divMi91cOYYvIYtfOYFjc4Gm+ki8HVRTQlHpnhq752Suzie2NyGKIJYoK5MZbF06HIyPxO4g==
electron@6.0.0-beta.15:
version "6.0.0-beta.15"
resolved "https://registry.yarnpkg.com/electron/-/electron-6.0.0-beta.15.tgz#c4825ceee46086ecdf3b12c19d660abb13f06ebe"
integrity sha512-msdO180UWIvvbYOnKP2pvVFMEtmMcHn3N2KjU+N+Pjqi1GzYUMHGC8JyIIIKQoT00cfKw2xwlQWjEOksTtlh8g==
dependencies:
"@types/node" "^10.12.18"
electron-download "^4.1.0"
Expand Down