From 9f995f24dbdd968e82d3b057d0744dd3f0c348f2 Mon Sep 17 00:00:00 2001 From: Jonathan Bendes Date: Sun, 16 Aug 2020 00:01:59 -0400 Subject: [PATCH 1/3] Upgraded node to work only after v10 --- examples/node-client/package.json | 4 ++-- gen/emit/EmitNode.cpp | 2 +- zcm/js/node/index.js | 8 ++++---- zcm/js/node/package.json | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/node-client/package.json b/examples/node-client/package.json index 0ff4e875..d92acb5b 100644 --- a/examples/node-client/package.json +++ b/examples/node-client/package.json @@ -13,7 +13,7 @@ "dependencies": { "big-integer": "^1.6.27", "express": "^4.14.0", - "ref": "^1.3.3", - "zerocm": "file:/usr/local/share/node/zerocm-1.0.0.tgz" + "ref-napi": "^3.0.0", + "zerocm": "file:../../../../../../usr/local/share/node/zerocm-1.0.0.tgz" } } diff --git a/gen/emit/EmitNode.cpp b/gen/emit/EmitNode.cpp index 145f6473..19435664 100644 --- a/gen/emit/EmitNode.cpp +++ b/gen/emit/EmitNode.cpp @@ -87,7 +87,7 @@ struct EmitModule : public Emitter { emitAutoGeneratedWarning(); - emit(0, "var ref = require('ref');"); + emit(0, "var ref = require('ref-napi');"); emit(0, "var bigint = require('big-integer');"); emit(0, ""); emit(0, "var UINT64_MAX = bigint('ffffffffffffffff', 16);"); diff --git a/zcm/js/node/index.js b/zcm/js/node/index.js index f7bc3793..417f5bbc 100644 --- a/zcm/js/node/index.js +++ b/zcm/js/node/index.js @@ -4,10 +4,10 @@ * Could/Should be more efficent, but it should * suffice in the short-term ******************************************************/ -var ffi = require('ffi'); -var ref = require('ref'); -var StructType = require('ref-struct'); -var ArrayType = require('ref-array'); +var ffi = require('ffi-napi'); +var ref = require('ref-napi'); +var StructType = require('ref-struct-napi'); +var ArrayType = require('ref-array-napi'); var bigint = require('big-integer'); var assert = require('assert'); diff --git a/zcm/js/node/package.json b/zcm/js/node/package.json index a69d12af..5fba7954 100644 --- a/zcm/js/node/package.json +++ b/zcm/js/node/package.json @@ -4,10 +4,10 @@ "description": "Bindings to Zero Communications and Marshalling", "dependencies": { "big-integer": "^1.6.25", - "ffi": "^2.2.0", - "ref": "^1.3.3", - "ref-array": "^1.2.0", - "ref-struct": "^1.1.0", + "ffi-napi": "^3.0.1", + "ref-array-napi": "^1.2.1", + "ref-napi": "^3.0.0", + "ref-struct-napi": "^1.1.1", "socket.io": "^1.5.1" } } From a0430af0b792af5dc9ec1227a9ed3eb62efef496 Mon Sep 17 00:00:00 2001 From: Jonathan Bendes Date: Sun, 16 Aug 2020 12:24:00 -0400 Subject: [PATCH 2/3] Changed version to 1.0.2 --- examples/node-client/package.json | 2 +- gen/version.h | 2 +- zcm/js/node/package.json | 2 +- zcm/zcm.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/node-client/package.json b/examples/node-client/package.json index d92acb5b..e199a1f7 100644 --- a/examples/node-client/package.json +++ b/examples/node-client/package.json @@ -1,6 +1,6 @@ { "name": "zcm-example", - "version": "1.0.0", + "version": "1.0.2", "description": "", "scripts": { "//": [ diff --git a/gen/version.h b/gen/version.h index 1a5534d9..dbd0c245 100644 --- a/gen/version.h +++ b/gen/version.h @@ -3,6 +3,6 @@ #define ZCM_MAJOR_VERSION 1 #define ZCM_MINOR_VERSION 0 -#define ZCM_MICRO_VERSION 0 +#define ZCM_MICRO_VERSION 2 #endif diff --git a/zcm/js/node/package.json b/zcm/js/node/package.json index 5fba7954..7db65141 100644 --- a/zcm/js/node/package.json +++ b/zcm/js/node/package.json @@ -1,6 +1,6 @@ { "name": "zerocm", - "version": "1.0.0", + "version": "1.0.2", "description": "Bindings to Zero Communications and Marshalling", "dependencies": { "big-integer": "^1.6.25", diff --git a/zcm/zcm.h b/zcm/zcm.h index dd010850..bb151ddb 100644 --- a/zcm/zcm.h +++ b/zcm/zcm.h @@ -13,7 +13,7 @@ extern "C" { */ #define ZCM_MAJOR_VERSION 1 #define ZCM_MINOR_VERSION 0 -#define ZCM_MICRO_VERSION 0 +#define ZCM_MICRO_VERSION 2 #include From 0adb987251178d691962fecddb8ae1dc7b1cdb6f Mon Sep 17 00:00:00 2001 From: Jonathan Bendes Date: Sun, 16 Aug 2020 13:22:11 -0400 Subject: [PATCH 3/3] Added npm publish and updated changelog --- .github/workflows/release.yml | 18 ++++++++++++++++++ docs/changelog.md | 1 + 2 files changed, 19 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6acb2fe8..481630a2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,3 +54,21 @@ jobs: asset_path: ${{ steps.builddeb.outputs.pkgpath }} asset_name: ${{ steps.builddeb.outputs.pkgname }} asset_content_type: application/octet-stream + npm: + name: Npm Publish + runs-on: ubuntu-16.04 + defaults: + run: + shell: bash -l {0} + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Setup node + uses: actions/setup-node@v1 + with: + node-version: '12.x' + registry-url: 'https://registry.npmjs.org' + - name: Publish Npm Package + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + run: cd zcm/js/node && npm publish diff --git a/docs/changelog.md b/docs/changelog.md index 3cbdca54..81b39fa1 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -6,3 +6,4 @@ Improved documentation Added can transport based on socketcan New zcm-logplayer-gui based on gtk3 Fixed lockfiles to unlock on all program exits +Node version upgrade to support new node versions