Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 gpii-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"json5": "2.1.0",
"mkdirp": "0.5.1",
"minimist": "1.2.0",
"@gpii/os-service": "2.2.0",
"@gpii/os-service": "javihernandez/node-os-service#GPII-4140",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's in this one?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an update with upstream/master, which adds support for node12, see: GPII/node-os-service#2

"ref-array-di": "1.2.1",
"ref-napi": "1.4.0",
"ref-struct-di": "1.1.0",
Expand Down
6 changes: 3 additions & 3 deletions gpii/node_modules/WindowsUtilities/WindowsUtilities.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions gpii/node_modules/displaySettingsHandler/src/dpiWindows10.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gpii/node_modules/gpii-localisation/src/languageNames.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gpii/node_modules/processHandling/processHandling.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gpii/node_modules/windowsMetrics/src/windowsMetrics.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
"install": "powershell -ExecutionPolicy Bypass provisioning/NpmInstall.ps1"
},
"dependencies": {
"edge-js": "10.3.1",
"ffi-napi": "2.4.3",
"edge-js": "12.3.1",
"ffi-napi": "2.4.5",
"gpii-universal": "0.3.0-dev.20200604T131823Z.d6fed9a",
"@pokusew/pcsclite": "0.4.18",
"ref": "1.3.4",
"ref-struct": "1.1.0",
"ref-array": "1.1.2",
"@pokusew/pcsclite": "0.6.0",
"ref-napi": "2.0.2",
"ref-struct-di": "1.1.0",
"ref-array-di": "1.2.1",
"string-argv": "0.0.2",
"rimraf": "2.6.2",
"win-ca": "3.1.1"
Expand Down
2 changes: 1 addition & 1 deletion provisioning/Chocolatey.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Import-Module "$($originalBuildScriptPath)/Provisioning.psm1" -Force
$chocolatey = "$env:ChocolateyInstall\bin\choco.exe" -f $env:SystemDrive

$nodePath = "C:\Program Files (x86)\nodejs"
$nodeVersion = "10.11.0"
$nodeVersion = "12.16.3"
Invoke-Command $chocolatey "install nodejs.install --version $($nodeVersion) --forcex86 -y"
# TODO: Correct path and automatically added is this one
# C:\Users\vagrant\AppData\Roaming\npm review it.
Expand Down