From 58e65cb881d2d584bfba612faf0d7235a73374e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Wed, 9 Oct 2019 14:19:32 +0200 Subject: [PATCH 01/13] node12: Testing updates --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 4206dde9a..fbf88a475 100644 --- a/package.json +++ b/package.json @@ -15,13 +15,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.20190917T115342Z.cb3500e10", - "@pokusew/pcsclite": "0.4.18", - "ref": "1.3.4", - "ref-struct": "1.1.0", - "ref-array": "1.1.2", + "@pokusew/pcsclite": "pokusew/node-pcsclite#pull/26/head", + "ref": "lxe/ref#node-12", + "ref-struct": "lxe/ref-struct#node-12", + "ref-array": "lxe/ref-array#node-12", "string-argv": "0.0.2", "rimraf": "2.6.2" }, From 5d071466225d7d76f2d46ac104b21881a9cec05c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 10 Oct 2019 02:35:21 +0200 Subject: [PATCH 02/13] node12: Use javihernandez/ref to fix the build on electron 6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fbf88a475..94a49d9c6 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "ffi-napi": "2.4.5", "gpii-universal": "0.3.0-dev.20190917T115342Z.cb3500e10", "@pokusew/pcsclite": "pokusew/node-pcsclite#pull/26/head", - "ref": "lxe/ref#node-12", + "ref": "javihernandez/ref#node-12", "ref-struct": "lxe/ref-struct#node-12", "ref-array": "lxe/ref-array#node-12", "string-argv": "0.0.2", From 0dc8f6012606bc34482e4cecac2e26ed579ee7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 10 Oct 2019 02:57:39 +0200 Subject: [PATCH 03/13] node12: Use javihernandez/ref-array and javihernandez/ref-struct --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 94a49d9c6..105a8c1fe 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "gpii-universal": "0.3.0-dev.20190917T115342Z.cb3500e10", "@pokusew/pcsclite": "pokusew/node-pcsclite#pull/26/head", "ref": "javihernandez/ref#node-12", - "ref-struct": "lxe/ref-struct#node-12", - "ref-array": "lxe/ref-array#node-12", + "ref-struct": "javihernandez/ref-struct#node-12", + "ref-array": "javihernandez/ref-array#node-12", "string-argv": "0.0.2", "rimraf": "2.6.2" }, From 56b1e7f91a9414d431c5d9c86e6d0cfc770ff9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 10 Oct 2019 13:41:00 +0200 Subject: [PATCH 04/13] node12: Updated to node 12.10.0 --- provisioning/Chocolatey.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/Chocolatey.ps1 b/provisioning/Chocolatey.ps1 index b01ac70c7..8b638de81 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.10.0" 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. From 8bc362299fef3f15eadc29fa4eac826dae6aeb6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Sun, 10 May 2020 01:00:03 +0200 Subject: [PATCH 05/13] node12: Updated reference to pcsclite --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 105a8c1fe..29b8d7070 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "edge-js": "12.3.1", "ffi-napi": "2.4.5", "gpii-universal": "0.3.0-dev.20190917T115342Z.cb3500e10", - "@pokusew/pcsclite": "pokusew/node-pcsclite#pull/26/head", + "@pokusew/pcsclite": "0.6.0", "ref": "javihernandez/ref#node-12", "ref-struct": "javihernandez/ref-struct#node-12", "ref-array": "javihernandez/ref-array#node-12", From 02c29ab84ab17437194cb074706f63cb9d5a0753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Sun, 10 May 2020 01:43:58 +0200 Subject: [PATCH 06/13] node12: Updated ref reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 29b8d7070..3abc67c8b 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "ffi-napi": "2.4.5", "gpii-universal": "0.3.0-dev.20190917T115342Z.cb3500e10", "@pokusew/pcsclite": "0.6.0", - "ref": "javihernandez/ref#node-12", + "ref": "bruceauyeung/ref#20b24fe3d1bda78088736ea9b09a6e15943bbb65", "ref-struct": "javihernandez/ref-struct#node-12", "ref-array": "javihernandez/ref-array#node-12", "string-argv": "0.0.2", From c76103d6b5b95e3cf70d19f6708089907efbc1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Sun, 10 May 2020 01:58:32 +0200 Subject: [PATCH 07/13] node12: Updated ref reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3abc67c8b..6e87cc670 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "ffi-napi": "2.4.5", "gpii-universal": "0.3.0-dev.20190917T115342Z.cb3500e10", "@pokusew/pcsclite": "0.6.0", - "ref": "bruceauyeung/ref#20b24fe3d1bda78088736ea9b09a6e15943bbb65", + "ref": "javihernandez/ref#b8fc6884ad5184f71743aa7434475be4837f4c17", "ref-struct": "javihernandez/ref-struct#node-12", "ref-array": "javihernandez/ref-array#node-12", "string-argv": "0.0.2", From 7358ec315d39e70588e97d717a8832fd410c3974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Mon, 11 May 2020 11:48:39 +0200 Subject: [PATCH 08/13] node12: Updated ref reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e87cc670..8fe579b75 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "ffi-napi": "2.4.5", "gpii-universal": "0.3.0-dev.20190917T115342Z.cb3500e10", "@pokusew/pcsclite": "0.6.0", - "ref": "javihernandez/ref#b8fc6884ad5184f71743aa7434475be4837f4c17", + "ref": "javihernandez/ref#8e793d551617e126c42f744cc55682dfee268281", "ref-struct": "javihernandez/ref-struct#node-12", "ref-array": "javihernandez/ref-array#node-12", "string-argv": "0.0.2", From 75e2679b8e1a5ed9670c5af5e3fd6a29835b35bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Mon, 11 May 2020 12:03:41 +0200 Subject: [PATCH 09/13] node12: Updated references to ref-array and ref-struct --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8fe579b75..e88f7287a 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "gpii-universal": "0.3.0-dev.20190917T115342Z.cb3500e10", "@pokusew/pcsclite": "0.6.0", "ref": "javihernandez/ref#8e793d551617e126c42f744cc55682dfee268281", - "ref-struct": "javihernandez/ref-struct#node-12", - "ref-array": "javihernandez/ref-array#node-12", + "ref-struct": "javihernandez/ref-struct#GPII-4140", + "ref-array": "javihernandez/ref-array#GPII-4140", "string-argv": "0.0.2", "rimraf": "2.6.2" }, From 6d986d3fc1412be42fbe71868cb401041e32304c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Mon, 11 May 2020 18:03:16 +0200 Subject: [PATCH 10/13] node12: Updated ref reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e88f7287a..dd4b7c5e7 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "ffi-napi": "2.4.5", "gpii-universal": "0.3.0-dev.20190917T115342Z.cb3500e10", "@pokusew/pcsclite": "0.6.0", - "ref": "javihernandez/ref#8e793d551617e126c42f744cc55682dfee268281", + "ref": "javihernandez/ref#64b0509c2340d2151e261e20decfd1a8502fabe2", "ref-struct": "javihernandez/ref-struct#GPII-4140", "ref-array": "javihernandez/ref-array#GPII-4140", "string-argv": "0.0.2", From 7b949054d3daa720475154165bb040f2e82c7ac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Mon, 11 May 2020 18:39:29 +0200 Subject: [PATCH 11/13] node12: Updated to node 12.16.3 --- provisioning/Chocolatey.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/Chocolatey.ps1 b/provisioning/Chocolatey.ps1 index bc7404be9..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 = "12.10.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. From c95b5e03b8addafa8d6ff0d2e3ba2c3bb92131d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Mon, 11 May 2020 19:49:42 +0200 Subject: [PATCH 12/13] node12: Updated to a version of the os-service with support for node 12 --- gpii-service/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpii-service/package.json b/gpii-service/package.json index 1e2f153e4..6ee1b3772 100644 --- a/gpii-service/package.json +++ b/gpii-service/package.json @@ -20,7 +20,7 @@ "ffi-napi": "2.4.4", "json5": "2.1.0", "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" From dec7fda80c88999db79417539be6dca8bb227233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Tue, 16 Jun 2020 18:48:15 +0200 Subject: [PATCH 13/13] node12+refNapi: Replaced ref with reg-napi --- gpii/node_modules/WindowsUtilities/WindowsUtilities.js | 6 +++--- .../displaySettingsHandler/src/displaySettingsHandler.js | 6 +++--- .../node_modules/displaySettingsHandler/src/dpiWindows10.js | 6 +++--- gpii/node_modules/gpii-localisation/src/languageNames.js | 2 +- .../nativeSettingsHandler/src/nativeSettingsHandler.js | 2 +- gpii/node_modules/processHandling/processHandling.js | 2 +- .../registrySettingsHandler/src/RegistrySettingsHandler.js | 4 ++-- .../test/testRegistrySettingsHandler.js | 2 +- .../spiSettingsHandler/src/GetHighContrastSchemeName.js | 2 +- .../spiSettingsHandler/src/SpiSettingsHandler.js | 2 +- gpii/node_modules/windowsMetrics/src/windowsMetrics.js | 2 +- .../node_modules/windowsMetrics/test/WindowsMetricsTests.js | 2 +- package.json | 6 +++--- 13 files changed, 22 insertions(+), 22 deletions(-) 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 c15028622..7f690e178 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,9 @@ "ffi-napi": "2.4.5", "gpii-universal": "0.3.0-dev.20200604T131823Z.d6fed9a", "@pokusew/pcsclite": "0.6.0", - "ref": "javihernandez/ref#64b0509c2340d2151e261e20decfd1a8502fabe2", - "ref-struct": "javihernandez/ref-struct#GPII-4140", - "ref-array": "javihernandez/ref-array#GPII-4140", + "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"