From 8a4a74406beafad4523bc650fc1bbbf1e2f193e8 Mon Sep 17 00:00:00 2001
From: Rob Brackett <rob@robbrackett.com>
Date: Wed, 17 Jan 2024 11:42:26 -0800
Subject: [PATCH 01/11] Upgrade grunt-contrib-jasmine to v1.2

This is the latest v1.x release, and allows Jasmine browser tests to work in modern Node.js releases (Node.js v12+). The latest version is actually v4, but we can't upgrade to v2+ because there is no compatible version of grunt-template-jasmine-istanbul (top-of-tree there is compatible, but was never released and apparently has unaddressed test failures; developed appears to be stopped, so we also can't expect a future release).
---
 .editorconfig                                       |  3 +++
 package.json                                        |  2 +-
 test/console-fallback-test.js                       |  6 ++++++
 test/global-integration-with-new-context.js         | 13 +++++++++++++
 test/global-integration.js                          | 13 +++++++++++++
 test/integration-smoke-test.js                      |  6 ++++++
 test/test-helpers.js                                | 11 +++++++++++
 .../src/template-jasmine-requirejs.js               | 11 ++++++++---
 8 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index f5d573b..4403be2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -22,3 +22,6 @@ indent_size = 2
 
 [*.{yaml,yml}]
 indent_size = 2
+
+[vendor/grunt-template-jasmine-requirejs/**/*]
+indent_size = 2
diff --git a/package.json b/package.json
index 6cdf894..eb75240 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-concat": "~0.5.0",
     "grunt-contrib-connect": "^1.0.2",
-    "grunt-contrib-jasmine": "~1.0.3",
+    "grunt-contrib-jasmine": "^1.2.0",
     "grunt-contrib-jshint": "^1.1.0",
     "grunt-contrib-uglify": "^3.4.0",
     "grunt-contrib-watch": "^1.1.0",
diff --git a/test/console-fallback-test.js b/test/console-fallback-test.js
index 16fbb46..6bb5138 100644
--- a/test/console-fallback-test.js
+++ b/test/console-fallback-test.js
@@ -16,6 +16,12 @@ define(['../lib/loglevel', 'test/test-helpers'], function(log, testHelpers) {
     var originalConsole = window.console;
 
     describe("Fallback functionality:", function() {
+        beforeEach(function() {
+            jasmine.addMatchers({
+                nothing: testHelpers.nothing
+            });
+        });
+
         describe("with no console present", function() {
             beforeEach(function() {
                 window.console = undefined;
diff --git a/test/global-integration-with-new-context.js b/test/global-integration-with-new-context.js
index 95cea84..cc530b6 100644
--- a/test/global-integration-with-new-context.js
+++ b/test/global-integration-with-new-context.js
@@ -2,6 +2,19 @@
 "use strict";
 
 describe("loglevel from a global <script> tag with a custom context", function () {
+    beforeEach(function () {
+        jasmine.addMatchers({
+            // Polyfill for expect().nothing() in Jasmine 2.8+.
+            nothing: function nothing() {
+                return {
+                    compare: function() {
+                        return { pass: true };
+                    }
+                };
+            }
+        });
+    });
+
     it("is available globally", function () {
         expect(MyCustomLogger).not.toBeUndefined();
     });
diff --git a/test/global-integration.js b/test/global-integration.js
index 2f624d8..f026e37 100644
--- a/test/global-integration.js
+++ b/test/global-integration.js
@@ -2,6 +2,19 @@
 "use strict";
 
 describe("loglevel from a global <script> tag", function () {
+    beforeEach(function () {
+        jasmine.addMatchers({
+            // Polyfill for expect().nothing() in Jasmine 2.8+.
+            nothing: function nothing() {
+                return {
+                    compare: function() {
+                        return { pass: true };
+                    }
+                };
+            }
+        });
+    });
+
     it("is available globally", function () {
         expect(log).not.toBeUndefined();
     });
diff --git a/test/integration-smoke-test.js b/test/integration-smoke-test.js
index f46b46a..2f7426b 100644
--- a/test/integration-smoke-test.js
+++ b/test/integration-smoke-test.js
@@ -5,6 +5,12 @@ define(['../lib/loglevel', 'test/test-helpers'], function(log, testHelpers) {
     var itIf = testHelpers.itIf;
 
     describe("Integration smoke tests:", function() {
+        beforeEach(function() {
+            jasmine.addMatchers({
+                "nothing": testHelpers.nothing
+            });
+        });
+
         describe("log methods", function() {
             it("can all be disabled", function() {
                 log.setLevel(log.levels.SILENT);
diff --git a/test/test-helpers.js b/test/test-helpers.js
index 42b57e4..d5e7907 100644
--- a/test/test-helpers.js
+++ b/test/test-helpers.js
@@ -174,6 +174,17 @@ define(function () {
         }
     };
 
+    // Jasmine matcher for tests that otherwise have no expectations. This is
+    // a built in feature in Jasmine 2.8+ and is polyfilled here to support
+    // older versions.
+    self.nothing = function nothing() {
+        return {
+            compare: function() {
+                return { pass: true };
+            }
+        };
+    };
+
     self.describeIf = function describeIf(condition, name, test) {
         var env = jasmine.getEnv();
         var implementation = condition ? env.describe : env.xdescribe;
diff --git a/vendor/grunt-template-jasmine-requirejs/src/template-jasmine-requirejs.js b/vendor/grunt-template-jasmine-requirejs/src/template-jasmine-requirejs.js
index 93f803f..5e67ea7 100644
--- a/vendor/grunt-template-jasmine-requirejs/src/template-jasmine-requirejs.js
+++ b/vendor/grunt-template-jasmine-requirejs/src/template-jasmine-requirejs.js
@@ -58,7 +58,8 @@ function resolvePath(filepath) {
   return path.resolve(filepath);
 }
 
-function moveRequireJs(grunt, task, versionOrPath) {
+// LOGLEVEL-FORK: copying tempfiles now requires info from the `context` object.
+function moveRequireJs(grunt, task, context, versionOrPath) {
   var pathToRequireJS,
       versionReg = /^(\d\.?)*$/;
 
@@ -74,8 +75,10 @@ function moveRequireJs(grunt, task, versionOrPath) {
         throw new Error('local file path of requirejs [' + versionOrPath + '] was not found');
       }
   }
-  task.copyTempFile(pathToRequireJS,'require.js');
+  task.copyTempFile(pathToRequireJS, path.join(context.temp, 'require.js'));
 }
+// END LOGLEVEL-FORK
+
 
 exports.process = function(grunt, task, context) {
 
@@ -149,7 +152,9 @@ exports.process = function(grunt, task, context) {
     });
   }
 
-  moveRequireJs(grunt, task, version);
+  // LOGLEVEL-FORK: this function now requires context info
+  moveRequireJs(grunt, task, context, version);
+  // END LOGLEVEL-FORK
 
   context.serializeRequireConfig = function(requireConfig) {
     var funcCounter = 0;

From 94acb4ec900aa4ae3ea85485bacb5e88c2a886f4 Mon Sep 17 00:00:00 2001
From: Rob Brackett <rob@robbrackett.com>
Date: Wed, 17 Jan 2024 11:56:05 -0800
Subject: [PATCH 02/11] Upgrade grunt-jasmine-node to v0.3.1

This is the latest version and allows grunt-jasmine-node to function in modern versions of Node.js. Unfortunately, it contains a *huge* regression in configuration and requires this super-wonky hack. Some folks in grunt-jasmine-node's issues have proposed other ways to work around this in how you structure your config, but none of those actually work correctly (I did a lot of testing here!).
---
 Gruntfile.js | 34 ++++++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 5b3234b..4a28991 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -179,4 +179,38 @@ module.exports = function (grunt) {
     // Default task.
     grunt.registerTask('default', 'test');
 
+    // HACK: grunt-jasmine-node v0.3.x is fundamentally broken with respect to
+    // configuration, but contains other fixes required to function in modern
+    // Node.js versions. This hack works around the broken-ness:
+    //
+    // Instead of loading options from `this.options()`, grunt-jasmine-node
+    // loads them via `grunt.config()`, which is not meant to for this purpose
+    // and doesn't give multitasks (which grunt-jasmine-node is) a way to read
+    // the options that they are being run with.
+    // To fix it, we patch `grunt.config()` so that it passes back the options
+    // for the "test" subtask (our only subtask; this wouldn't work if we had
+    // more) when asked for "jasmine_node"-related options.
+    //
+    // It appears that this was an accidental regression due to a bad manual
+    // merge of https://github.com/jasmine-contrib/grunt-jasmine-node/pull/36,
+    // which was based on very out-of-date code.
+    // (actual commit: https://github.com/jasmine-contrib/grunt-jasmine-node/commit/3c8012e5632fa265dd229e3a04fbcc6eb80a7730).
+    //
+    // Someone posted a PR to fix it, but it appears the project is dead:
+    // https://github.com/jasmine-contrib/grunt-jasmine-node/pull/70
+    var _gruntConfig = grunt.config;
+    grunt.config = function (property) {
+        if (arguments.length === 1 && property.indexOf('jasmine_node.') === 0) {
+            var propertyPath = property.split('.');
+            propertyPath.splice(1, 0, 'test.options');
+            var newProperty = propertyPath.join('.');
+            return _gruntConfig.call(this, newProperty);
+        }
+        return _gruntConfig.apply(this, arguments);
+    };
+    for (var key in _gruntConfig) {
+        if (_gruntConfig.hasOwnProperty(key)) {
+            grunt.config[key] = _gruntConfig[key];
+        }
+    }
 };
diff --git a/package.json b/package.json
index eb75240..6e7ea2d 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "grunt-contrib-jshint": "^1.1.0",
     "grunt-contrib-uglify": "^3.4.0",
     "grunt-contrib-watch": "^1.1.0",
-    "grunt-jasmine-node": "~0.2.1",
+    "grunt-jasmine-node": "^0.3.1",
     "grunt-open": "~0.2.3",
     "grunt-preprocess": "^5.1.0",
     "grunt-template-jasmine-istanbul": "~0.4.0",

From 7b77ecf80d5196f6cc0dd23d98e6d81d75cbd613 Mon Sep 17 00:00:00 2001
From: Rob Brackett <rob@robbrackett.com>
Date: Wed, 17 Jan 2024 11:58:01 -0800
Subject: [PATCH 03/11] Update CI workflow to test in new Node.js versions

---
 .github/workflows/ci.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f0e22e..7afdae0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 10
+          node-version: 20
           cache: npm
           cache-dependency-path: 'package.json'
 
@@ -37,7 +37,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 10
+          node-version: 20
           cache: npm
           cache-dependency-path: 'package.json'
 
@@ -51,9 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # Ideally we'd also test on [12, 14, 16, 18, 20], but the current
-        # tooling does not support them.
-        node_version: [6, 8, 10]
+        node_version: [6, 8, 10, 12, 14, 16, 18, 20]
 
     steps:
       - uses: actions/checkout@v4
@@ -80,7 +78,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 8
+          node-version: 20
           cache: npm
           cache-dependency-path: 'package.json'
 
@@ -99,7 +97,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 10
+          node-version: 20
           cache: npm
           cache-dependency-path: 'package.json'
 

From 1e6bdba31c46f1c54b3c7e593336ae1ab37ffa0c Mon Sep 17 00:00:00 2001
From: Rob Brackett <rob@robbrackett.com>
Date: Wed, 17 Jan 2024 13:57:10 -0800
Subject: [PATCH 04/11] Just drop grunt-jasmine-node

Using Jasmine directly is pretty simple (moreso than the previous hacks to use grunt-jasmine-node!) and reduces a bunch of compatibility and security issues. It also lets us use the same version of Jasmine for Node.js and browser tests.
---
 Gruntfile.js | 65 +++++++++++++++++-----------------------------------
 package.json |  2 +-
 2 files changed, 22 insertions(+), 45 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 4a28991..30154aa 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,5 +1,7 @@
 'use strict';
 
+var Jasmine = require('jasmine');
+
 module.exports = function (grunt) {
     var jasmineRequireJsOptions = {
         specs: 'test/*-test.js',
@@ -85,14 +87,9 @@ module.exports = function (grunt) {
                 }
             }
         },
-        "jasmine_node": {
-            test: {
-                options: {
-                    match: "node-integration.",
-                    matchall: true,
-                    projectRoot: "./test",
-                    useHelpers: false
-                }
+        jasmine_node: {
+            options: {
+                specs: ['test/node-integration.js']
             }
         },
         open: {
@@ -155,7 +152,6 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-jasmine');
-    grunt.loadNpmTasks('grunt-jasmine-node');
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-watch');
 
@@ -164,6 +160,22 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-preprocess');
     grunt.loadNpmTasks('grunt-contrib-clean');
 
+    // A simple version of `grunt-jasmine-node` that works in modern engines.
+    //
+    // NOTE: This is designed for Jasmine 2.4, which matches the version used
+    // in `grunt-contrib-jasmine`. If that package is updated, this should also
+    // be updated to match.
+    grunt.registerTask('jasmine_node', 'Run Jasmine in Node.js', function() {
+        var done = this.async();
+
+        var jasmine = new Jasmine({ projectBaseDir: __dirname });
+        jasmine.onComplete(function(success) {
+            done(success);
+        });
+
+        jasmine.execute(this.options().specs);
+    });
+
     // Build a distributable release
     grunt.registerTask('dist', ['test', 'dist-build']);
     grunt.registerTask('dist-build', ['concat', 'uglify']);
@@ -178,39 +190,4 @@ module.exports = function (grunt) {
 
     // Default task.
     grunt.registerTask('default', 'test');
-
-    // HACK: grunt-jasmine-node v0.3.x is fundamentally broken with respect to
-    // configuration, but contains other fixes required to function in modern
-    // Node.js versions. This hack works around the broken-ness:
-    //
-    // Instead of loading options from `this.options()`, grunt-jasmine-node
-    // loads them via `grunt.config()`, which is not meant to for this purpose
-    // and doesn't give multitasks (which grunt-jasmine-node is) a way to read
-    // the options that they are being run with.
-    // To fix it, we patch `grunt.config()` so that it passes back the options
-    // for the "test" subtask (our only subtask; this wouldn't work if we had
-    // more) when asked for "jasmine_node"-related options.
-    //
-    // It appears that this was an accidental regression due to a bad manual
-    // merge of https://github.com/jasmine-contrib/grunt-jasmine-node/pull/36,
-    // which was based on very out-of-date code.
-    // (actual commit: https://github.com/jasmine-contrib/grunt-jasmine-node/commit/3c8012e5632fa265dd229e3a04fbcc6eb80a7730).
-    //
-    // Someone posted a PR to fix it, but it appears the project is dead:
-    // https://github.com/jasmine-contrib/grunt-jasmine-node/pull/70
-    var _gruntConfig = grunt.config;
-    grunt.config = function (property) {
-        if (arguments.length === 1 && property.indexOf('jasmine_node.') === 0) {
-            var propertyPath = property.split('.');
-            propertyPath.splice(1, 0, 'test.options');
-            var newProperty = propertyPath.join('.');
-            return _gruntConfig.call(this, newProperty);
-        }
-        return _gruntConfig.apply(this, arguments);
-    };
-    for (var key in _gruntConfig) {
-        if (_gruntConfig.hasOwnProperty(key)) {
-            grunt.config[key] = _gruntConfig[key];
-        }
-    }
 };
diff --git a/package.json b/package.json
index 6e7ea2d..041154f 100644
--- a/package.json
+++ b/package.json
@@ -48,10 +48,10 @@
     "grunt-contrib-jshint": "^1.1.0",
     "grunt-contrib-uglify": "^3.4.0",
     "grunt-contrib-watch": "^1.1.0",
-    "grunt-jasmine-node": "^0.3.1",
     "grunt-open": "~0.2.3",
     "grunt-preprocess": "^5.1.0",
     "grunt-template-jasmine-istanbul": "~0.4.0",
+    "jasmine": "^2.4.1",
     "typescript": "^3.5.1"
   },
   "keywords": [

From 72182e5e5deb7a8540c7e02f168ee4cbc4669d62 Mon Sep 17 00:00:00 2001
From: Rob Brackett <rob@robbrackett.com>
Date: Wed, 17 Jan 2024 14:16:24 -0800
Subject: [PATCH 05/11] Upgrade grunt-contrib-jasmine to v4,
 grunt-template-jasmine-istanbul to v0.6

In order to a) remove a critical code injection vulnerability and b) upgrade browser tests to a recent version of Headless Chrome (instead of PhantomJS), this upgrades grunt-contrib-jasmine to v4.0.0 and grunt-template-jasmine-istanbul to v0.6.0 (via git; this version was never published on NPM). Upgrading the former requires upgrading the latter.

Important notes:

1. This is a little iffy, in that this version of grunt-template-jasmine-istanbul was never published to NPM, supposedly on account of it causing some test failures (unclear whether those failures are problems with the code or with the tests): https://github.com/maenu/grunt-template-jasmine-istanbul/pull/64#issuecomment-547359194

2. This requires installation via `npm install --legacy-peer-deps` because this version of grunt-template-jasmine-istanbul has a peer dependency on grunt-contrib-jasmine v2.x, but we are now on v4.x. It still works fine, but is a little messy to require this extra flag (this should only affect installs that include dev dependencies, not people who are installing loglevel as a dependency of their project).

The best solution to these is probably to drop grunt-template-jasmine-istanbul altogether -- we aren't really using the coverage information it gathers right now. The next alternative is to fork and vendor it like we did for grunt-template-jasmine-requirejs.
---
 .github/workflows/ci.yml                            | 10 +++++-----
 package.json                                        |  4 ++--
 test/console-fallback-test.js                       |  6 ------
 test/global-integration-with-new-context.js         | 13 -------------
 test/global-integration.js                          | 13 -------------
 test/integration-smoke-test.js                      |  6 ------
 test/test-helpers.js                                | 11 -----------
 .../src/templates/jasmine-requirejs.html            |  4 +++-
 8 files changed, 10 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7afdae0..74ec099 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
           cache-dependency-path: 'package.json'
 
       - name: Install dependencies
-        run: npm install
+        run: npm install --legacy-peer-deps
 
       - name: JSHint
         run: npm run lint
@@ -42,7 +42,7 @@ jobs:
           cache-dependency-path: 'package.json'
 
       - name: Install dependencies
-        run: npm install
+        run: npm install --legacy-peer-deps
 
       - name: Build
         run: npm run dist-build
@@ -64,7 +64,7 @@ jobs:
           cache-dependency-path: 'package.json'
 
       - name: Install dependencies
-        run: npm install
+        run: npm install --legacy-peer-deps
 
       - name: Unit Tests
         run: npm run test-node
@@ -83,7 +83,7 @@ jobs:
           cache-dependency-path: 'package.json'
 
       - name: Install dependencies
-        run: npm install
+        run: npm install --legacy-peer-deps
 
       - name: Unit Tests
         run: npm run test-browser
@@ -102,7 +102,7 @@ jobs:
           cache-dependency-path: 'package.json'
 
       - name: Install dependencies
-        run: npm install
+        run: npm install --legacy-peer-deps
 
       - name: Typescript Tests
         run: npm run test-types
diff --git a/package.json b/package.json
index 041154f..8909be8 100644
--- a/package.json
+++ b/package.json
@@ -44,13 +44,13 @@
     "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-concat": "~0.5.0",
     "grunt-contrib-connect": "^1.0.2",
-    "grunt-contrib-jasmine": "^1.2.0",
+    "grunt-contrib-jasmine": "^4.0.0",
     "grunt-contrib-jshint": "^1.1.0",
     "grunt-contrib-uglify": "^3.4.0",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-open": "~0.2.3",
     "grunt-preprocess": "^5.1.0",
-    "grunt-template-jasmine-istanbul": "~0.4.0",
+    "grunt-template-jasmine-istanbul": "https://github.com/maenu/grunt-template-jasmine-istanbul.git#caedc636b9f9c11217a32d586717e3153edf9ba3",
     "jasmine": "^2.4.1",
     "typescript": "^3.5.1"
   },
diff --git a/test/console-fallback-test.js b/test/console-fallback-test.js
index 6bb5138..16fbb46 100644
--- a/test/console-fallback-test.js
+++ b/test/console-fallback-test.js
@@ -16,12 +16,6 @@ define(['../lib/loglevel', 'test/test-helpers'], function(log, testHelpers) {
     var originalConsole = window.console;
 
     describe("Fallback functionality:", function() {
-        beforeEach(function() {
-            jasmine.addMatchers({
-                nothing: testHelpers.nothing
-            });
-        });
-
         describe("with no console present", function() {
             beforeEach(function() {
                 window.console = undefined;
diff --git a/test/global-integration-with-new-context.js b/test/global-integration-with-new-context.js
index cc530b6..95cea84 100644
--- a/test/global-integration-with-new-context.js
+++ b/test/global-integration-with-new-context.js
@@ -2,19 +2,6 @@
 "use strict";
 
 describe("loglevel from a global <script> tag with a custom context", function () {
-    beforeEach(function () {
-        jasmine.addMatchers({
-            // Polyfill for expect().nothing() in Jasmine 2.8+.
-            nothing: function nothing() {
-                return {
-                    compare: function() {
-                        return { pass: true };
-                    }
-                };
-            }
-        });
-    });
-
     it("is available globally", function () {
         expect(MyCustomLogger).not.toBeUndefined();
     });
diff --git a/test/global-integration.js b/test/global-integration.js
index f026e37..2f624d8 100644
--- a/test/global-integration.js
+++ b/test/global-integration.js
@@ -2,19 +2,6 @@
 "use strict";
 
 describe("loglevel from a global <script> tag", function () {
-    beforeEach(function () {
-        jasmine.addMatchers({
-            // Polyfill for expect().nothing() in Jasmine 2.8+.
-            nothing: function nothing() {
-                return {
-                    compare: function() {
-                        return { pass: true };
-                    }
-                };
-            }
-        });
-    });
-
     it("is available globally", function () {
         expect(log).not.toBeUndefined();
     });
diff --git a/test/integration-smoke-test.js b/test/integration-smoke-test.js
index 2f7426b..f46b46a 100644
--- a/test/integration-smoke-test.js
+++ b/test/integration-smoke-test.js
@@ -5,12 +5,6 @@ define(['../lib/loglevel', 'test/test-helpers'], function(log, testHelpers) {
     var itIf = testHelpers.itIf;
 
     describe("Integration smoke tests:", function() {
-        beforeEach(function() {
-            jasmine.addMatchers({
-                "nothing": testHelpers.nothing
-            });
-        });
-
         describe("log methods", function() {
             it("can all be disabled", function() {
                 log.setLevel(log.levels.SILENT);
diff --git a/test/test-helpers.js b/test/test-helpers.js
index d5e7907..42b57e4 100644
--- a/test/test-helpers.js
+++ b/test/test-helpers.js
@@ -174,17 +174,6 @@ define(function () {
         }
     };
 
-    // Jasmine matcher for tests that otherwise have no expectations. This is
-    // a built in feature in Jasmine 2.8+ and is polyfilled here to support
-    // older versions.
-    self.nothing = function nothing() {
-        return {
-            compare: function() {
-                return { pass: true };
-            }
-        };
-    };
-
     self.describeIf = function describeIf(condition, name, test) {
         var env = jasmine.getEnv();
         var implementation = condition ? env.describe : env.xdescribe;
diff --git a/vendor/grunt-template-jasmine-requirejs/src/templates/jasmine-requirejs.html b/vendor/grunt-template-jasmine-requirejs/src/templates/jasmine-requirejs.html
index 2f6e9f0..991d58b 100644
--- a/vendor/grunt-template-jasmine-requirejs/src/templates/jasmine-requirejs.html
+++ b/vendor/grunt-template-jasmine-requirejs/src/templates/jasmine-requirejs.html
@@ -17,9 +17,11 @@
   <script src="<%= temp ? temp + "/" : temp %>require.js"></script>
 
   <% with (scripts) { %>
-  <% [].concat(jasmine, boot, helpers).forEach(function(script){ %>
+  <% /* LOGLEVEL-FORK: Include new script types used by grunt-contrib-jasmine v4 */ %>
+  <% [].concat(polyfills, jasmine, boot, boot2, helpers).forEach(function(script){ %>
   <script src="<%= script %>"></script>
   <% }) %>
+  <% /* END LOGLEVEL-FORK */ %>
   <% }; %>
 
   <script>

From a16ed9c066e275d3b11790ccf5beed980113f908 Mon Sep 17 00:00:00 2001
From: Rob Brackett <rob@robbrackett.com>
Date: Wed, 17 Jan 2024 16:09:44 -0800
Subject: [PATCH 06/11] Turns out this does not in fact work on Node v6

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74ec099..6440468 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node_version: [6, 8, 10, 12, 14, 16, 18, 20]
+        node_version: [8, 10, 12, 14, 16, 18, 20]
 
     steps:
       - uses: actions/checkout@v4

From 53afb5ede323943ec4d0392a855f94200f3f25dd Mon Sep 17 00:00:00 2001
From: Rob Brackett <rob@robbrackett.com>
Date: Thu, 18 Jan 2024 11:04:59 -0800
Subject: [PATCH 07/11] Update Node tests to Jasmine 5.1

In 72182e5e5deb7a8540c7e02f168ee4cbc4669d62, I upgraded grunt-contrib-jasmine to v4, and forgot this upgraded Jasmine (for browser tests) to v5.1. This upgrades the Jasmine version used for Node.js tests to match.
---
 Gruntfile.js | 9 ++++-----
 package.json | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 30154aa..3929500 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -169,11 +169,10 @@ module.exports = function (grunt) {
         var done = this.async();
 
         var jasmine = new Jasmine({ projectBaseDir: __dirname });
-        jasmine.onComplete(function(success) {
-            done(success);
-        });
-
-        jasmine.execute(this.options().specs);
+        jasmine.exitOnCompletion = false;
+        jasmine.execute(this.options().specs)
+            .then(function(info) { done(info.overallStatus === 'passed'); })
+            .catch(function(error) { done(error); });
     });
 
     // Build a distributable release
diff --git a/package.json b/package.json
index 8909be8..d2eb229 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "grunt-open": "~0.2.3",
     "grunt-preprocess": "^5.1.0",
     "grunt-template-jasmine-istanbul": "https://github.com/maenu/grunt-template-jasmine-istanbul.git#caedc636b9f9c11217a32d586717e3153edf9ba3",
-    "jasmine": "^2.4.1",
+    "jasmine": "^5.1.0",
     "typescript": "^3.5.1"
   },
   "keywords": [

From 160fc4cce49e9607148d23fc6e5c9b17099c0553 Mon Sep 17 00:00:00 2001
From: Rob Brackett <rob@robbrackett.com>
Date: Thu, 18 Jan 2024 11:09:14 -0800
Subject: [PATCH 08/11] Fix issue with cookie support testing

I noticed this while checking the Jasmine version, now that I'm running in a local browser. If testing in an environment where no cookies are set *yet*, the tests assume cookies aren't supported, which is not correct. This fixes the issue.
---
 test/test-helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test-helpers.js b/test/test-helpers.js
index 42b57e4..f517d01 100644
--- a/test/test-helpers.js
+++ b/test/test-helpers.js
@@ -48,7 +48,7 @@ define(function () {
     };
 
     self.isCookieStorageAvailable = function isCookieStorageAvailable() {
-        if (window && window.document && window.document.cookie) {
+        if (window && window.document && window.document.cookie != null) {
             // We need to check not just that the cookie objects are available, but that they work, because
             // if we run from file:// URLs they appear present but are non-functional
             window.document.cookie = "test=hi;";

From bb00d4193688255c39544cabf493e4bad461651e Mon Sep 17 00:00:00 2001
From: Rob Brackett <rob@robbrackett.com>
Date: Thu, 18 Jan 2024 11:17:42 -0800
Subject: [PATCH 09/11] Revert "Update Node tests to Jasmine 5.1"

Forgot to check Node.js support here. Jasmine 5.1 requires Node.js 18+. Even though we've decided we aren't worrying about requiring newer versions now, this seems a bit too big of a jump. Setting aside for now, but we can easily bring this back if we want.
---
 Gruntfile.js | 9 +++++----
 package.json | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 3929500..30154aa 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -169,10 +169,11 @@ module.exports = function (grunt) {
         var done = this.async();
 
         var jasmine = new Jasmine({ projectBaseDir: __dirname });
-        jasmine.exitOnCompletion = false;
-        jasmine.execute(this.options().specs)
-            .then(function(info) { done(info.overallStatus === 'passed'); })
-            .catch(function(error) { done(error); });
+        jasmine.onComplete(function(success) {
+            done(success);
+        });
+
+        jasmine.execute(this.options().specs);
     });
 
     // Build a distributable release
diff --git a/package.json b/package.json
index d2eb229..8909be8 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "grunt-open": "~0.2.3",
     "grunt-preprocess": "^5.1.0",
     "grunt-template-jasmine-istanbul": "https://github.com/maenu/grunt-template-jasmine-istanbul.git#caedc636b9f9c11217a32d586717e3153edf9ba3",
-    "jasmine": "^5.1.0",
+    "jasmine": "^2.4.1",
     "typescript": "^3.5.1"
   },
   "keywords": [

From f2bf952fee2a259dff75a61555a50d57ea54dd6c Mon Sep 17 00:00:00 2001
From: Rob Brackett <rob@robbrackett.com>
Date: Sun, 21 Jan 2024 11:54:08 -0800
Subject: [PATCH 10/11] Remove grunt-template-jasmine-istanbul

---
 .github/workflows/ci.yml | 10 +++++-----
 Gruntfile.js             | 31 +------------------------------
 package.json             |  1 -
 3 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6440468..927e8f8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
           cache-dependency-path: 'package.json'
 
       - name: Install dependencies
-        run: npm install --legacy-peer-deps
+        run: npm install
 
       - name: JSHint
         run: npm run lint
@@ -42,7 +42,7 @@ jobs:
           cache-dependency-path: 'package.json'
 
       - name: Install dependencies
-        run: npm install --legacy-peer-deps
+        run: npm install
 
       - name: Build
         run: npm run dist-build
@@ -64,7 +64,7 @@ jobs:
           cache-dependency-path: 'package.json'
 
       - name: Install dependencies
-        run: npm install --legacy-peer-deps
+        run: npm install
 
       - name: Unit Tests
         run: npm run test-node
@@ -83,7 +83,7 @@ jobs:
           cache-dependency-path: 'package.json'
 
       - name: Install dependencies
-        run: npm install --legacy-peer-deps
+        run: npm install
 
       - name: Unit Tests
         run: npm run test-browser
@@ -102,7 +102,7 @@ jobs:
           cache-dependency-path: 'package.json'
 
       - name: Install dependencies
-        run: npm install --legacy-peer-deps
+        run: npm install
 
       - name: Typescript Tests
         run: npm run test-types
diff --git a/Gruntfile.js b/Gruntfile.js
index 30154aa..e04736e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -56,35 +56,6 @@ module.exports = function (grunt) {
                 options: {
                     specs: 'test/global-integration-with-new-context.js',
                 }
-            },
-            // Wraps the `requirejs` configuration above with Instanbul code
-            // coverage tracking.
-            withCoverage: {
-                src: 'lib/**/*.js',
-                options: {
-                    specs: jasmineRequireJsOptions.specs,
-                    helpers: jasmineRequireJsOptions.helpers,
-                    template: require('grunt-template-jasmine-istanbul'),
-                    templateOptions: {
-                        coverage: 'coverage/coverage.json',
-                        report: [
-                            {
-                                type: 'html',
-                                options: {
-                                    dir: 'coverage'
-                                }
-                            },
-                            {
-                                type: 'lcov',
-                                options: {
-                                    dir: 'coverage'
-                                }
-                            }
-                        ],
-
-                        template: require('./vendor/grunt-template-jasmine-requirejs')
-                    }
-                }
             }
         },
         jasmine_node: {
@@ -182,7 +153,7 @@ module.exports = function (grunt) {
 
     // Check everything is good
     grunt.registerTask('test', ['jshint', 'test-browser', 'test-node']);
-    grunt.registerTask('test-browser', ['jasmine:global', 'preprocess', 'jasmine:context', 'clean:test', 'jasmine:withCoverage']);
+    grunt.registerTask('test-browser', ['jasmine:global', 'preprocess', 'jasmine:context', 'clean:test', 'jasmine:requirejs']);
     grunt.registerTask('test-node', ['jasmine_node']);
 
     // Test with a live server and an actual browser
diff --git a/package.json b/package.json
index 8909be8..aa4308e 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,6 @@
     "grunt-contrib-watch": "^1.1.0",
     "grunt-open": "~0.2.3",
     "grunt-preprocess": "^5.1.0",
-    "grunt-template-jasmine-istanbul": "https://github.com/maenu/grunt-template-jasmine-istanbul.git#caedc636b9f9c11217a32d586717e3153edf9ba3",
     "jasmine": "^2.4.1",
     "typescript": "^3.5.1"
   },

From 03cffedf3be8cbe8b065a8995aedaf61ffae972e Mon Sep 17 00:00:00 2001
From: Rob Brackett <rob@robbrackett.com>
Date: Sun, 21 Jan 2024 11:59:11 -0800
Subject: [PATCH 11/11] Reword comments not to reference somethign we no longer
 use and that is not supported

---
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index e04736e..21c44a7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -131,7 +131,7 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-preprocess');
     grunt.loadNpmTasks('grunt-contrib-clean');
 
-    // A simple version of `grunt-jasmine-node` that works in modern engines.
+    // Run Jasmine with Node.js tests (as opposed to browser tests).
     //
     // NOTE: This is designed for Jasmine 2.4, which matches the version used
     // in `grunt-contrib-jasmine`. If that package is updated, this should also