Merge pull request #180 from mapbox/v0.8.0

Adds support for node16

Author: rafaykh90

.travis.yml

@@ -1,12 +1,15 @@
+dist: focal
 language: node_js
 
 sudo: false
 
 # enable c++11/14 builds
 addons:
   apt:
-    sources: [ 'ubuntu-toolchain-r-test' ]
-    packages: [ 'libstdc++-4.9-dev' ]
+    sources:
+      - sourceline: "ppa:ubuntu-toolchain-r/test"
+    packages:
+      - "libstdc++-9-dev"
 
 install:
   # set up the environment by installing mason and clang++
@@ -27,70 +30,39 @@ install:
 # For this reason, we disable the 'script' section below, since we prefer using 'before_script'.
 before_script:
   - npm test
-  # after successful tests, publish binaries if specified in commit message
-  - ./scripts/publish.sh --toolset=${TOOLSET:-} --debug=$([ "${BUILDTYPE}" == 'debug' ] && echo "true" || echo "false")
 
 # We set 'script' here to an empty array to prevent this section from automatically running 'npm test'
 # The reason we do this is mentioned above in the comment about the 'before_script' stage.
 # For reference, the default travis behavior which we override comes from https://github.com/travis-ci/travis-build/blob/e5a45cbf49e0d9e27398e76e5f25dd7706feb6aa/lib/travis/build/script/node_js.rb#L62-L69.
 script:
 
-# the matrix allows you to specify different operating systems and environments to
-# run your tests and build binaries
-matrix:
-  include:
-    # linux publishable node v8
-    - os: linux
-      env: BUILDTYPE=release
-      node_js: 8
-    # linux publishable node v8/debug
-    - os: linux
-      env: BUILDTYPE=debug
-      node_js: 8
-    # linux publishable node v10
-    - os: linux
-      env: BUILDTYPE=release
-      node_js: 10
-    # linux publishable node v10/debug
-    - os: linux
-      env: BUILDTYPE=debug
-      node_js: 10
-    # linux publishable node v12
-    - os: linux
-      env: BUILDTYPE=release
-      node_js: 12
-    # linux publishable node v10/debug
-    - os: linux
-      env: BUILDTYPE=debug
-      node_js: 14
-    # linux publishable node v14
-    - os: linux
-      env: BUILDTYPE=release
-      node_js: 14
-    # linux publishable node v10/debug
-    - os: linux
-      env: BUILDTYPE=debug
-      node_js: 12
-    # osx publishable node v8
-    - os: osx
-      osx_image: xcode11
-      env: BUILDTYPE=release
-      node_js: 8
-    # osx publishable node v10
-    - os: osx
-      osx_image: xcode11
-      env: BUILDTYPE=release
-      node_js: 10
-    # osx publishable node v12
-    - os: osx
-      osx_image: xcode11
-      env: BUILDTYPE=release
-      node_js: 12
-    # osx publishable node v12
+# Node versions for the job matrix
+node_js:
+  - 8
+  - 10
+  - 12
+  - 14
+  - 16
+
+# Env variables for the job matrix
+env:
+  - BUILDTYPE=debug
+  - BUILDTYPE=release
+
+# OS for build
+os:
+  - linux
+  - osx
+
+osx_image:
+  - xcode11
+
+# Build all binaries and if all succeed then publish based on the commit message
+jobs:
+  exclude:
     - os: osx
-      osx_image: xcode11
-      env: BUILDTYPE=release
-      node_js: 14
+      env: BUILDTYPE=debug
+  include:
     # Sanitizer build node v10/Debug
     - os: linux
       env: BUILDTYPE=debug TOOLSET=asan
@@ -120,15 +92,15 @@ matrix:
     - os: linux
       # Note: -fext-numeric-literals is needed to workaround gcc bug:
       # boost/math/constants/constants.hpp:269:3: error: unable to find numeric literal operator 'operatorQ'
-      env: BUILDTYPE=debug CXX="g++-6" CC="gcc-6" CXXFLAGS="-fext-numeric-literals"
+      env: BUILDTYPE=debug CXX="g++-9" CC="gcc-9" CXXFLAGS="-fext-numeric-literals"
       node_js: 10
       addons:
         apt:
           sources:
-            - ubuntu-toolchain-r-test
+            - sourceline: "ppa:ubuntu-toolchain-r/test"
           packages:
-            - libstdc++-6-dev
-            - g++-6
+            - libstdc++-9-dev
+            - g++-9
       # Overrides `install` to avoid initializing clang toolchain
       install:
         - make ${BUILDTYPE}
@@ -176,3 +148,19 @@ matrix:
     #     - make tidy
     #   # Overrides `script`, no need to run tests
     #   before_script:
+    - stage: publish
+      name: "Publish Darwin Release"
+      script: ./scripts/publish.sh --debug=false
+      env: BUILDTYPE=release
+      node_js: 16
+      os: osx
+    - name: "Publish Linux Release"
+      script: ./scripts/publish.sh --debug=false
+      env: BUILDTYPE=release
+      node_js: 16
+      os: linux
+    - name: "Publish Debug"
+      script: ./scripts/publish.sh --debug=true
+      env: BUILDTYPE=debug
+      node_js: 16
+      os: linux

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.7.0
+
+- Adds node v16 support
+- Updates vulnerable dependencies
+
 # 0.6.0
 
 - Adds node v12 and v14 support

README.md

@@ -17,7 +17,7 @@ See also [TinySDF](https://github.com/mapbox/tiny-sdf), which is a faster but le
 By default, installs binaries. On these platforms no external dependencies are needed.
 
 - 64 bit OS X or 64 bit Linux
-- Node.js v8-v14
+- Node.js v8-v16
 
 Just run:
 

bench/bench.js

@@ -2,7 +2,7 @@
 
 var path = require('path');
 var fontnik = require('../');
-var queue = require('queue-async');
+var { queue } = require('d3-queue');
 var fs = require('fs');
 
 // https://gist.github.com/mourner/96b1335c6a43e68af252
@@ -12,15 +12,15 @@ function now() {
     return hr[0] + hr[1] / 1e9;
 }
 
-function bench(opts,cb) {
+function bench(opts, cb) {
     var q = queue(opts.concurrency);
     var start = now();
     for (var i = 1; i <= opts.iterations; i++) {
-        q.defer.apply({},opts.args);
+        q.defer.apply({}, opts.args);
     }
-    q.awaitAll(function(error, results) {
+    q.awaitAll(function (error, results) {
         var seconds = now() - start;
-        console.log(opts.name, Math.round(opts.iterations / (seconds)),'ops/sec',opts.iterations,opts.concurrency);
+        console.log(opts.name, Math.round(opts.iterations / (seconds)), 'ops/sec', opts.iterations, opts.concurrency);
         return cb();
     });
 }
@@ -30,18 +30,18 @@ function main() {
 
     var suite = queue(1);
     suite.defer(bench, {
-        name:"fontnik.load",
-        args:[fontnik.load,opensans],
+        name: "fontnik.load",
+        args: [fontnik.load, opensans],
         iterations: 10,
         concurrency: 10
     });
     suite.defer(bench, {
-        name:"fontnik.range",
-        args:[fontnik.range,{font:opensans,start:0,end:256}],
+        name: "fontnik.range",
+        args: [fontnik.range, { font: opensans, start: 0, end: 256 }],
         iterations: 1000,
         concurrency: 100
     });
-    suite.awaitAll(function(err) {
+    suite.awaitAll(function (err) {
         if (err) throw err;
     })
 }

bin/build-glyphs

@@ -3,7 +3,7 @@
 var fontnik = require('../index.js');
 var path = require('path');
 var fs = require('fs');
-var queue = require('queue-async');
+var { queue } = require('d3-queue');
 
 if (process.argv.length !== 4) {
     console.log('Usage:');
@@ -33,7 +33,7 @@ for (var i = 0; i < 65536; (i = i + 256)) {
 }
 
 function writeGlyphs(opts, done) {
-    fontnik.range(opts, function(err, zdata) {
+    fontnik.range(opts, function (err, zdata) {
         if (err) {
             console.warn(err.toString());
             process.exit(1);

bin/font-inspect

@@ -2,7 +2,7 @@
 
 var path = require('path');
 var fs = require('fs');
-var queue = require('queue-async');
+var { queue } = require('d3-queue');
 var glob = require('glob');
 var argv = require('minimist')(process.argv.slice(2), {
     boolean: ['verbose', 'help']
@@ -28,9 +28,9 @@ if (argv.face) {
 } else {
     var register = path.resolve(argv.register);
     var pattern = '+(*ttf|*otf)';
-    faces = glob.sync(pattern,{nodir:true, cwd:register, matchBase:true});
-    faces = faces.map(function(f) {
-        return path.join(register,f);
+    faces = glob.sync(pattern, { nodir: true, cwd: register, matchBase: true });
+    faces = faces.map(function (f) {
+        return path.join(register, f);
     })
 }
 
@@ -42,9 +42,9 @@ if (argv.verbose) {
 var q = queue();
 
 function getCoverage(face, cb) {
-    fs.readFile(face, function(err, res) {
+    fs.readFile(face, function (err, res) {
         if (err) return cb(err);
-        fontnik.load(res, function(err, faces) {
+        fontnik.load(res, function (err, faces) {
             if (err) return cb(err);
             return cb(null, {
                 face: [faces[0].family_name, faces[0].style_name].join(' '),
@@ -54,9 +54,9 @@ function getCoverage(face, cb) {
     });
 }
 
-faces.forEach(function(f) { q.defer(getCoverage, f) });
+faces.forEach(function (f) { q.defer(getCoverage, f) });
 
-q.awaitAll(function(err, res) {
+q.awaitAll(function (err, res) {
     if (err) throw err;
     process.stdout.write(JSON.stringify(res, null, 2));
 });

binding.gyp

@@ -16,7 +16,6 @@
       'compiler_checks': [
         '-Wall',
         '-Wextra',
-        '-Weffc++',
         '-Wconversion',
         '-pedantic-errors',
         '-Wconversion',

common.gypi

@@ -2,15 +2,7 @@
   'target_defaults': {
     'default_configuration': 'Release',
     'cflags_cc' : [
-      '-std=c++14',
-      # The assumption is that projects based on node-cpp-skel will also
-      # depend on mason packages. Currently (this will change in future mason versions)
-      # mason packages default to being built/linked with the CXX11_ABI=0.
-      # So we need to link this way too. This allows source
-      # compiling your module on any ubuntu version, even the latest
-      # where the CXX11_ABI default has flipped to 1
-      # More details at https://github.com/mapbox/mason/issues/319
-      '-D_GLIBCXX_USE_CXX11_ABI=0'
+      '-std=c++14'
     ],
     'cflags_cc!': ['-std=gnu++0x','-fno-rtti', '-fno-exceptions'],
     'configurations': {