Update to node 18 and 20 with package upgrades (#59)

* Update to node 18 with package upgrades

* Use the node-based image, since circle doesn't have 18

* Add submodule update command for new node-pre-gyp

* Use correct git submodule incantation

* Fix up manual ./test.sh run

* Update s2 code and prepare for 0.0.5

* Revert submodule updates for this version

* Support node 20

* Use the node 20 image

* Bump README

* Add DLC

Author: jkao

.circleci/config.yml

@@ -3,44 +3,43 @@ version: 2
 dockerbuild: &dockerbuild
   steps:
     - checkout
+    - setup_remote_docker:
+        docker_layer_caching: true
     - run:
         name: "Pull submodules"
         command: |
           git submodule init
-          git submodule update --remote
+          git submodule sync
+          git submodule update
     - run:
         name: Install dependencies
-        command: npm install
+        command: |
+          npm install
         when: on_success
     - run:
         name: Test
         command: npm run test
         when: on_success
 
 jobs:
-  "node-10":
-    <<: *dockerbuild
-    docker:
-      - image: circleci/node:10.16.2
-  "node-12":
+  "node-16":
     <<: *dockerbuild
     docker:
-      - image: circleci/node:12.8.0
-  "node-14":
+      - image: circleci/node:16.5.0
+  "node-18":
     <<: *dockerbuild
     docker:
-      - image: circleci/node:14.15.4
-  "node-16":
+      - image: node:18.12.1
+  "node-20":
     <<: *dockerbuild
     docker:
-      - image: circleci/node:16.5.0
+      - image: node:20.0.0
 
 workflows:
   version: 2
   build:
     jobs:
-      - "node-10"
-      - "node-12"
-      - "node-14"
       - "node-16"
+      - "node-18"
+      - "node-20"
 

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Version 0.0.5
 
+- Support Node 18 & 20, minimum tested version is now 16
+- Update node-pre-gyp, node-addon-api, and node-gyp
+
 ## Version 0.0.4
 
 - Added CellId.rangeMin & CellId.rangeMax (thanks to @mast)

README.md

@@ -17,7 +17,7 @@ Other JavaScript projects available on GitHub appear unmaintained.
 The project has been built against Node's N-API, meaning that it's compatible across Node.js versions that support BigInt.
 This means that Node.js version 9 and below are unsupported.
 
-As of today, the library is built and tested against Node.js 10-12. The library has been in production use at [Radar](https://radar.io) and has been built against OS X and Linux. Feel free to open an issue or PR if you'd like other platform support.
+As of today, the library is built and tested against Node.js 16, 18 and 20. The library has been in production use at [Radar](https://radar.io) and has been built against OS X and Linux. Feel free to open an issue or PR if you'd like other platform support.
 
 See [test.sh](https://github.com/radarlabs/s2/blob/master/test.sh) for more details.
 

docker/Dockerfile.node10.test

@@ -0,0 +1,8 @@
+FROM node:18.12.1
+
+WORKDIR /app
+COPY . /app
+
+RUN npm install
+RUN JOBS=max PATH=$(npm bin):$PATH node-pre-gyp rebuild
+CMD npm run test

docker/Dockerfile.node12.test

@@ -1,4 +1,4 @@
-FROM node:14.15.0
+FROM node:20.0.0
 
 WORKDIR /app
 COPY . /app

docker/Dockerfile.node18.test

@@ -1,5 +1,5 @@
 // magic incantation from step 3 @ https://github.com/mapbox/node-pre-gyp#readme
-const binary = require('node-pre-gyp');
+const binary = require('@mapbox/node-pre-gyp');
 const path = require('path');
 var binding_path = binary.find(path.resolve(path.join(__dirname,'./package.json')));
 const s2 = require(binding_path);

docker/Dockerfile.node14.test docker/Dockerfile.node20.testdocker/Dockerfile.node14.test renamed to docker/Dockerfile.node20.test

@@ -1,43 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # this script is mainly for running on macs to publish binaries
 # for linux, we use a circleci/docker build
 #
 # per the node-gyp-pre docs, you can use any of the standard ways
-# to specify AWS keys from the javascript aws-sdk, or the env vars 
+# to specify AWS keys from the javascript aws-sdk, or the env vars
 # node_pre_gyp_accessKeyId and node_pre_gyp_secretAccessKey
 
 set -e
 
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-
-nvm install v10
-nvm use v10
-rm -rf node_modules
-npm install
-JOBS=max npx node-pre-gyp rebuild package unpublish publish
-
-nvm install v11
-nvm use v11
-rm -rf node_modules
-npm install
-JOBS=max npx node-pre-gyp rebuild package unpublish publish
-
-nvm install v12
-nvm use v12
-rm -rf node_modules
-npm install
-JOBS=max npx node-pre-gyp rebuild package unpublish publish
-
-nvm install v13
-nvm use v13
-rm -rf node_modules
-npm install
-JOBS=max npx node-pre-gyp rebuild package unpublish publish
-
-nvm install v14
-nvm use v14
-rm -rf node_modules
-npm install
-JOBS=max npx node-pre-gyp rebuild package unpublish publish
+# loop through node LTS versions 16 - 20, unpublish and publish them
+for node in v16 v18 v20
+do
+  nvm install $node
+  nvm use $node
+  rm -rf node_modules
+  npm install
+  JOBS=max npx node-pre-gyp rebuild package unpublish publish
+done