Skip to content

node12: Updated to node 12/electron 7 #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

node12: Updated to node 12/electron 7 #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab2e4e0
node12: Updated to node 12/electron 6
javihernandez Oct 10, 2019
4ef9ea4
node12: Updated Build.ps1 to fetch the scripts from the node12 branch
javihernandez Oct 11, 2019
bd86b30
node12: Updated references to gpii-windows and electron-edge-js
javihernandez May 11, 2020
49e7387
Merge branch 'upstream/master' into node12
javihernandez May 11, 2020
e6ac4b0
node12: Moved gpii-windows dep into the optionalDepencencies block
javihernandez May 12, 2020
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
2 changes: 1 addition & 1 deletion .npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
target=3.0.2
target=7.2.4
arch=ia32
disturl=https://atom.io/download/atom-shell
runtime=electron
Expand Down
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
},
"license": "BSD-3-Clause",
"dependencies": {
"electron": "3.0.2",
"electron-edge-js": "8.3.8",
"electron": "7.2.4",
"electron-edge-js": "12.13.0",
"electron-localshortcut": "3.1.0",
"gpii-express": "1.0.15",
"infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab",
"nan": "2.10.0",
"nan": "2.14.0",
"node-jqunit": "1.1.8",
"request": "2.88.0",
"winstrap": "0.5.12",
"ws": "6.1.2",
"gpii-express": "1.0.15"
"ws": "6.1.2"
},
"devDependencies": {
"electron-packager": "8.5.1",
"electron-packager": "10.1.1",
"eslint-config-fluid": "1.3.0",
"gpii-express": "1.0.15",
"gpii-grunt-lint-all": "1.0.5",
Expand All @@ -35,7 +35,7 @@
"shelljs": "0.8.2"
},
"optionalDependencies": {
"gpii-windows": "0.3.0-dev.20200427T102955Z.2e04c69"
"gpii-windows": "javihernandez/windows#c95b5e03b8addafa8d6ff0d2e3ba2c3bb92131d0"
},
"scripts": {
"start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .",
Expand Down
2 changes: 1 addition & 1 deletion provisioning/Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Import-Module $bootstrapModule -Verbose -Force
# # Run all the windows provisioning scripts
# ############
# TODO: Create function for downloading scripts and executing them.
$windowsBootstrapURL = "https://raw.githubusercontent.com/GPII/windows/master/provisioning"
$windowsBootstrapURL = "https://raw.githubusercontent.com/javihernandez/windows/node12/provisioning"
try {
$choco = Join-Path $originalBuildScriptPath "Chocolatey.ps1"
Write-OutPut "Running windows script: $choco"
Expand Down
5 changes: 4 additions & 1 deletion src/main/dialogs/basic/dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@ fluid.defaults("gpii.app.dialog", {
alwaysOnTop: true,
skipTaskbar: true,
type: "toolbar",
resizable: false
resizable: false,
webPreferences: {
nodeIntegration: true
}
},
filePrefixPath: "src/renderer",
fileSuffixPath: null, // e.g. "waitDialog/index.html"
Expand Down