Update deps, Node 12+ (hence major version bump)

davedoesdev · Nov 16, 2021 · bcfee62 · bcfee62
1 parent 9368afb
commit bcfee62
Show file tree

Hide file tree

Showing 24 changed files with 9,060 additions and 8,020 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 node_modules
-/.nyc_output
+/coverage/tmp
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,6 +1,8 @@
 /*jslint node: true */
 "use strict";
 
+const c8 = "npx c8 -x Gruntfile.js -x 'test/**'";
+
 module.exports = function (grunt)
 {
     grunt.initConfig(
@@ -13,60 +15,54 @@ module.exports = function (grunt)
             }
         },
 
-        mochaTest: {
-            src: 'test/*.js'
-        },
-
         apidox: {
             input: 'lib/qlobber.js',
             output: 'README.md',
             fullSourceDescription: true,
             extraHeadingLevels: 1
         },
 
-        exec: {
+        exec: Object.fromEntries(Object.entries({
+            test: {
+                cmd: 'node --expose-gc ./node_modules/.bin/mocha test/*.js'
+            },
+
             cover: {
-                cmd: "./node_modules/.bin/nyc -x Gruntfile.js -x 'test/**' node --expose-gc ./node_modules/.bin/grunt test"
+                cmd: `${c8} npx grunt test`
             },
 
             cover_report: {
-                cmd: './node_modules/.bin/nyc report -r lcov'
+                cmd: `${c8} report -r lcov`
             },
 
             cover_check: {
-                cmd: './node_modules/.bin/nyc check-coverage --statements 100 --branches 100 --functions 100 --lines 100'
-            },
-
-            coveralls: {
-                cmd: 'cat coverage/lcov.info | coveralls'
+                cmd: `${c8} check-coverage --statements 100 --branches 100 --functions 100 --lines 100`
             },
 
             bench: {
-                cmd: './node_modules/.bin/bench -c 20000 -i bench/options/default.js,bench/options/dedup.js,bench/options/mapval.js,bench/options/default-native.js,bench/options/dedup-native.js,bench/options/default-cache-splits.js -k options bench/add bench/add_match_remove bench/match bench/match_search bench/test'
+                cmd: 'npx bench -c 20000 -i bench/options/default.js,bench/options/dedup.js,bench/options/mapval.js,bench/options/default-native.js,bench/options/dedup-native.js,bench/options/default-cache-splits.js -k options bench/add bench/add_match_remove bench/match bench/match_search bench/test'
             },
 
             'bench-check': {
-                cmd: './node_modules/.bin/bench -c 20000 -i bench/options/check-default.js,bench/options/check-dedup.js,bench/options/check-mapval.js,bench/options/check-default-native.js,bench/options/check-dedup-native.js -k options bench/add bench/add_match_remove bench/match bench/match_search bench/test'
+                cmd: 'npx bench -c 20000 -i bench/options/check-default.js,bench/options/check-dedup.js,bench/options/check-mapval.js,bench/options/check-default-native.js,bench/options/check-dedup-native.js -k options bench/add bench/add_match_remove bench/match bench/match_search bench/test'
             },
 
             'bench-many': {
-                cmd: './node_modules/.bin/bench -c 1 -i bench/options/default.js,bench/options/dedup.js,bench/options/mapval.js,bench/options/default-native.js,bench/options/dedup-native.js,bench/options/default-cache-splits.js -k options bench/add_many bench/add_shortcut_many bench/match_many bench/match_search_many bench/test_many'
+                cmd: 'npx bench -c 1 -i bench/options/default.js,bench/options/dedup.js,bench/options/mapval.js,bench/options/default-native.js,bench/options/dedup-native.js,bench/options/default-cache-splits.js -k options bench/add_many bench/add_shortcut_many bench/match_many bench/match_search_many bench/test_many'
             }
-        }
+        }).map(([k, v]) => [k, { stdio: 'inherit', ...v }]))
     });
 
     grunt.loadNpmTasks('grunt-contrib-jshint');
-    grunt.loadNpmTasks('grunt-mocha-test');
     grunt.loadNpmTasks('grunt-apidox');
     grunt.loadNpmTasks('grunt-exec');
 
     grunt.registerTask('lint', 'jshint');
-    grunt.registerTask('test', 'mochaTest');
+    grunt.registerTask('test', 'exec:test');
     grunt.registerTask('docs', 'apidox');
     grunt.registerTask('coverage', ['exec:cover',
                                     'exec:cover_report',
                                     'exec:cover_check']);
-    grunt.registerTask('coveralls', 'exec:coveralls');
     grunt.registerTask('bench', ['exec:bench',
                                  'exec:bench-many']);
     grunt.registerTask('bench-check', 'exec:bench-check');

diff --git a/README.md b/README.md
@@ -121,7 +121,7 @@ npm test
 ## Lint
 
 ```shell
-npm run lint
+grunt lint
 ```
 
 ## Code Coverage
@@ -130,7 +130,7 @@ npm run lint
 npm run coverage
 ```
 
-[Istanbul](http://gotwarlost.github.io/istanbul/) results are available [here](http://rawgit.davedoesdev.com/davedoesdev/qlobber/master/coverage/lcov-report/index.html).
+[c8](https://github.com/bcoe/c8) results are available [here](http://rawgit.davedoesdev.com/davedoesdev/qlobber/master/coverage/lcov-report/index.html).
 
 Coveralls page is [here](https://coveralls.io/r/davedoesdev/qlobber).
 
@@ -165,7 +165,8 @@ this:
 const { Qlobber } = require('qlobber').set_native(require('qlobber-native'));
 ```
 
-Note that qlobber-native requires Gnu C++ version 9+ and Boost 1.70+.
+Note that qlobber-native requires Gnu C++ version 9+ and Boost 1.70+,
+including the `boost_context` runtime library.
 
 Once's you've added it to qlobber, the following classes will be available
 alongside the Javascript classes:

diff --git a/aedes/qlobber-sub.js b/aedes/qlobber-sub.js
@@ -124,16 +124,8 @@ QlobberSub.prototype.clear = function ()
 
 QlobberSub.set_native = function (qlobber_native)
 {
-    // wrap_native.js uses 'async *' which isn't available on Node 8
-    try
-    {
-        const wrap_native = require('../lib/wrap_native.js');
-        QlobberSub.native = wrap_native(qlobber_native.QlobberSub, QlobberSub);
-    }
-    catch (ex)
-    {
-    }
-
+    const wrap_native = require('../lib/wrap_native.js');
+    QlobberSub.native = wrap_native(qlobber_native.QlobberSub, QlobberSub);
     return module.exports;
 };
 

diff --git a/coverage/coverage.json b/coverage/coverage.json
diff --git a/coverage/lcov-report/index.html b/coverage/lcov-report/index.html
@@ -25,28 +25,28 @@ <h1>All files</h1>
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>433/433</span>
+                <span class='fraction'>1378/1378</span>
             </div>
 
 
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>210/210</span>
+                <span class='fraction'>241/241</span>
             </div>
 
 
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>70/70</span>
+                <span class='fraction'>65/65</span>
             </div>
 
 
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>432/432</span>
+                <span class='fraction'>1378/1378</span>
             </div>
 
 
@@ -78,13 +78,13 @@ <h1>All files</h1>
 	<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
 	</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="1" class="abs high">1/1</td>
+	<td data-value="3" class="abs high">3/3</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="0" class="abs high">0/0</td>
+	<td data-value="1" class="abs high">1/1</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="0" class="abs high">0/0</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="1" class="abs high">1/1</td>
+	<td data-value="3" class="abs high">3/3</td>
 	</tr>
 
 <tr>
@@ -93,13 +93,13 @@ <h1>All files</h1>
 	<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
 	</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="52" class="abs high">52/52</td>
+	<td data-value="132" class="abs high">132/132</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="15" class="abs high">15/15</td>
+	<td data-value="24" class="abs high">24/24</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="10" class="abs high">10/10</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="52" class="abs high">52/52</td>
+	<td data-value="132" class="abs high">132/132</td>
 	</tr>
 
 <tr>
@@ -108,13 +108,13 @@ <h1>All files</h1>
 	<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
 	</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="379" class="abs high">379/379</td>
+	<td data-value="1242" class="abs high">1242/1242</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="195" class="abs high">195/195</td>
+	<td data-value="215" class="abs high">215/215</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="60" class="abs high">60/60</td>
+	<td data-value="55" class="abs high">55/55</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="378" class="abs high">378/378</td>
+	<td data-value="1242" class="abs high">1242/1242</td>
 	</tr>
 
 <tr>
@@ -125,7 +125,7 @@ <h1>All files</h1>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="1" class="abs high">1/1</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="0" class="abs high">0/0</td>
+	<td data-value="1" class="abs high">1/1</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="0" class="abs high">0/0</td>
 	<td data-value="100" class="pct high">100%</td>
@@ -140,7 +140,7 @@ <h1>All files</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Sep 01 2020 16:15:38 GMT+0100 (British Summer Time)
+                at Tue Nov 16 2021 07:43:03 GMT+0000 (Greenwich Mean Time)
             </div>
         </div>
         <script src="prettify.js"></script>