diff --git a/gpii-service/package.json b/gpii-service/package.json index 55d524cec..297c95518 100644 --- a/gpii-service/package.json +++ b/gpii-service/package.json @@ -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", "ref-array-di": "1.2.1", "ref-napi": "1.4.0", "ref-struct-di": "1.1.0", diff --git a/gpii/node_modules/WindowsUtilities/WindowsUtilities.js b/gpii/node_modules/WindowsUtilities/WindowsUtilities.js index 1e320006b..5f1671985 100644 --- a/gpii/node_modules/WindowsUtilities/WindowsUtilities.js +++ b/gpii/node_modules/WindowsUtilities/WindowsUtilities.js @@ -39,9 +39,9 @@ var ffi = require("ffi-napi"), var gpii = fluid.registerNamespace("gpii"); var windows = fluid.registerNamespace("gpii.windows"); -var ref = require("ref"); -var Struct = require("ref-struct"); -var arrayType = require("ref-array"); +var ref = require("ref-napi"); +var Struct = require("ref-struct-di")(ref); +var arrayType = require("ref-array-di")(ref); var NULL = ref.NULL; var os = require("os"); diff --git a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js index ba861c68f..814b4ea8f 100644 --- a/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js +++ b/gpii/node_modules/displaySettingsHandler/src/displaySettingsHandler.js @@ -12,9 +12,9 @@ "use strict"; -var ref = require("ref"); -var Struct = require("ref-struct"); -var arrayType = require("ref-array"); +var ref = require("ref-napi"); +var Struct = require("ref-struct-di")(ref); +var arrayType = require("ref-array-di")(ref); var ffi = require("ffi-napi"); var fluid = require("gpii-universal"); var os = require("os"); diff --git a/gpii/node_modules/displaySettingsHandler/src/dpiWindows10.js b/gpii/node_modules/displaySettingsHandler/src/dpiWindows10.js index 266a02ca0..93b1c52cf 100644 --- a/gpii/node_modules/displaySettingsHandler/src/dpiWindows10.js +++ b/gpii/node_modules/displaySettingsHandler/src/dpiWindows10.js @@ -42,9 +42,9 @@ * For example, if the recommended DPI is 175%, then a dpiOffset of 0 is 175, 2 is 225, and -1 is 150. */ -var ref = require("ref"); -var Struct = require("ref-struct"); -var arrayType = require("ref-array"); +var ref = require("ref-napi"); +var Struct = require("ref-struct-di")(ref); +var arrayType = require("ref-array-di")(ref); var ffi = require("ffi-napi"); var fluid = require("gpii-universal"); diff --git a/gpii/node_modules/gpii-localisation/src/languageNames.js b/gpii/node_modules/gpii-localisation/src/languageNames.js index 83f229ce5..fa16950c9 100644 --- a/gpii/node_modules/gpii-localisation/src/languageNames.js +++ b/gpii/node_modules/gpii-localisation/src/languageNames.js @@ -24,7 +24,7 @@ "use strict"; var ffi = require("ffi-napi"), - ref = require("ref"); + ref = require("ref-napi"); /** * winlangdb.dll is used by control panel to perform language-related things. The first parameter of these functions diff --git a/gpii/node_modules/nativeSettingsHandler/src/nativeSettingsHandler.js b/gpii/node_modules/nativeSettingsHandler/src/nativeSettingsHandler.js index 088dd3e75..3dbd23507 100644 --- a/gpii/node_modules/nativeSettingsHandler/src/nativeSettingsHandler.js +++ b/gpii/node_modules/nativeSettingsHandler/src/nativeSettingsHandler.js @@ -22,7 +22,7 @@ var fluid = require("gpii-universal"), gpii = fluid.registerNamespace("gpii"), windows = fluid.registerNamespace("gpii.windows"), - ref = require("ref"), + ref = require("ref-napi"), child_process = require("child_process"), path = require("path"); diff --git a/gpii/node_modules/processHandling/processHandling.js b/gpii/node_modules/processHandling/processHandling.js index a51c5b68b..c38b700bd 100644 --- a/gpii/node_modules/processHandling/processHandling.js +++ b/gpii/node_modules/processHandling/processHandling.js @@ -18,7 +18,7 @@ "use strict"; var fluid = require("gpii-universal"); -var ref = require("ref"), +var ref = require("ref-napi"), child_process = require("child_process"), path = require("path"); diff --git a/gpii/node_modules/registrySettingsHandler/src/RegistrySettingsHandler.js b/gpii/node_modules/registrySettingsHandler/src/RegistrySettingsHandler.js index 920b22480..e70456b62 100644 --- a/gpii/node_modules/registrySettingsHandler/src/RegistrySettingsHandler.js +++ b/gpii/node_modules/registrySettingsHandler/src/RegistrySettingsHandler.js @@ -19,8 +19,8 @@ "use strict"; var ffi = require("ffi-napi"), - ref = require("ref"), - Struct = require("ref-struct"), + ref = require("ref-napi"), + Struct = require("ref-struct-di")(ref), fluid = require("gpii-universal"); require("../../WindowsUtilities/WindowsUtilities.js"); diff --git a/gpii/node_modules/registrySettingsHandler/test/testRegistrySettingsHandler.js b/gpii/node_modules/registrySettingsHandler/test/testRegistrySettingsHandler.js index af62c997e..f9891e997 100644 --- a/gpii/node_modules/registrySettingsHandler/test/testRegistrySettingsHandler.js +++ b/gpii/node_modules/registrySettingsHandler/test/testRegistrySettingsHandler.js @@ -480,7 +480,7 @@ jqUnit.test("Testing 32/64 bit views", function () { var windows = fluid.registerNamespace("gpii.windows"); var ffi = require("ffi-napi"), - ref = require("ref"); + ref = require("ref-napi"); var advapi32 = new ffi.Library("advapi32", { GetExplicitEntriesFromAclW: [ diff --git a/gpii/node_modules/spiSettingsHandler/src/GetHighContrastSchemeName.js b/gpii/node_modules/spiSettingsHandler/src/GetHighContrastSchemeName.js index 688b73b74..ec1755374 100644 --- a/gpii/node_modules/spiSettingsHandler/src/GetHighContrastSchemeName.js +++ b/gpii/node_modules/spiSettingsHandler/src/GetHighContrastSchemeName.js @@ -18,7 +18,7 @@ "use strict"; var ffi = require("ffi-napi"); -var ref = require("ref"); +var ref = require("ref-napi"); var shlwapi = new ffi.Library("shlwapi", { // https://docs.microsoft.com/en-us/windows/desktop/api/shlwapi/nf-shlwapi-shloadindirectstring diff --git a/gpii/node_modules/spiSettingsHandler/src/SpiSettingsHandler.js b/gpii/node_modules/spiSettingsHandler/src/SpiSettingsHandler.js index 9a64dfc21..7988f5fa5 100644 --- a/gpii/node_modules/spiSettingsHandler/src/SpiSettingsHandler.js +++ b/gpii/node_modules/spiSettingsHandler/src/SpiSettingsHandler.js @@ -18,7 +18,7 @@ https://github.com/GPII/universal/blob/master/LICENSE.txt "use strict"; -var ref = require("ref"), +var ref = require("ref-napi"), ffi = require("ffi-napi"), fs = require("fs"), path = require("path"), diff --git a/gpii/node_modules/windowsMetrics/src/windowsMetrics.js b/gpii/node_modules/windowsMetrics/src/windowsMetrics.js index f5df71dc7..5ec4faffc 100644 --- a/gpii/node_modules/windowsMetrics/src/windowsMetrics.js +++ b/gpii/node_modules/windowsMetrics/src/windowsMetrics.js @@ -19,7 +19,7 @@ "use strict"; -var ref = require("ref"); +var ref = require("ref-napi"); var fluid = require("gpii-universal"), path = require("path"); diff --git a/gpii/node_modules/windowsMetrics/test/WindowsMetricsTests.js b/gpii/node_modules/windowsMetrics/test/WindowsMetricsTests.js index 1902c515f..30f1641b8 100644 --- a/gpii/node_modules/windowsMetrics/test/WindowsMetricsTests.js +++ b/gpii/node_modules/windowsMetrics/test/WindowsMetricsTests.js @@ -29,7 +29,7 @@ require("../../processHandling/processHandling.js"); var jqUnit = fluid.require("node-jqunit"); var gpii = fluid.registerNamespace("gpii"); -var ref = require("ref"); +var ref = require("ref-napi"); fluid.registerNamespace("gpii.tests.metrics"); require("../index.js"); diff --git a/package.json b/package.json index b7c01df3d..7f690e178 100644 --- a/package.json +++ b/package.json @@ -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" diff --git a/provisioning/Chocolatey.ps1 b/provisioning/Chocolatey.ps1 index 828280dad..9b1397290 100644 --- a/provisioning/Chocolatey.ps1 +++ b/provisioning/Chocolatey.ps1 @@ -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.