chore(deps): upgrade puppeteer to 25 and grunt-contrib-qunit to 11

.changeset/new-chrome-tests.md

@@ -0,0 +1,2 @@
+---
+---

package.json

@@ -31,7 +31,6 @@
     "./examples/*"
   ],
   "resolutions": {
-    "grunt-contrib-qunit/puppeteer": "24.22.0",
     "eslint-plugin-sonarjs/typescript": "5.8.2"
   },
   "volta": {

packages/joint-core/Gruntfile.js

@@ -31,6 +31,17 @@ module.exports = function(grunt) {
         if (name.indexOf('grunt-') === 0) grunt.loadNpmTasks(name);
     });
 
+    // Karma's ChromeHeadless launcher starts the browser at `CHROME_BIN`, and
+    // Puppeteer only resolves the path of the browser it installs asynchronously,
+    // so this task sets it before the karma tasks run
+    grunt.registerTask('chrome-bin', 'Point CHROME_BIN at the browser Puppeteer installs', function() {
+        var done = this.async();
+        require('puppeteer').executablePath().then(function(executablePath) {
+            process.env.CHROME_BIN = executablePath;
+            done();
+        }, done);
+    });
+
     Object.keys(aliases).forEach(function(name) {
         grunt.registerTask(name, aliases[name]);
     });

packages/joint-core/grunt/config/aliases.js

@@ -51,6 +51,7 @@ module.exports = function(grunt) {
             'test:bundles'
         ],
         'test:src': [
+            'chrome-bin',
             'karma:geometry',
             'karma:vectorizer',
             'karma:joint'

packages/joint-core/grunt/config/karma.js

@@ -1,11 +1,7 @@
-const puppeteer = require('puppeteer');
 const dependencies = require('../resources/dependencies');
 const modules = require('../resources/esm');
 const coverageThresholds = require('../../coverage.json');
 
-// Used for starting Chrome if using ChromeHeadless in Jenkins
-process.env.CHROME_BIN = puppeteer.executablePath();
-
 // Which path should .lcov files record as root they are relative to?
 // - SonarQube (`.github/workflows/sonar.yml`) needs this to be the repo root
 const REPOSITORY_ROOT = '../..';
@@ -57,7 +53,9 @@ module.exports = function(grunt) {
                         '--no-sandbox',
                         '--headless',
                         '--disable-gpu',
-                        '--disable-dev-shm-usage'
+                        '--disable-dev-shm-usage',
+                        // Keep macOS from asking for the keychain password on launch
+                        '--use-mock-keychain'
                     ]
                 }
             },

packages/joint-core/package.json

@@ -103,7 +103,7 @@
     "grunt-contrib-clean": "2.0.0",
     "grunt-contrib-concat": "1.0.1",
     "grunt-contrib-copy": "1.0.0",
-    "grunt-contrib-qunit": "7.0.1",
+    "grunt-contrib-qunit": "11.0.0",
     "grunt-contrib-uglify": "4.0.1",
     "grunt-karma": "4.0.2",
     "grunt-newer": "1.3.0",
@@ -117,7 +117,7 @@
     "karma-sourcemap-loader": "^0.4.0",
     "lodash": "^4.18.1",
     "mocha": "12.0.3",
-    "puppeteer": "24.22.0",
+    "puppeteer": "25.16.0",
     "qunit": "2.24.1",
     "requirejs": "2.3.8",
     "rollup": "4.64.12",

packages/joint-core/test/geometry/require.js

@@ -1,8 +1,11 @@
 require.config({
-    baseUrl: '../../',
-    paths: {
-        'qunit': 'node_modules/qunit/qunit/qunit'
-    }
+    baseUrl: '../../'
+});
+
+// The global QUnit (see `requirejs.html`), as a module.
+// eslint-disable-next-line no-undef
+define('qunit', [], function() {
+    return window.QUnit;
 });
 
 require(['qunit'], function(QUnit) {

packages/joint-core/test/geometry/requirejs.html

@@ -6,6 +6,10 @@
     </head>
     <body>
         <div id="qunit"></div>
+        <!-- QUnit is loaded as a global (the grunt-contrib-qunit bridge expects one),
+             only the code under test is loaded through RequireJS -->
+        <script src="../../node_modules/qunit/qunit/qunit.js"></script>
+        <script>QUnit.config.autostart = false;</script>
         <script src="../../node_modules/requirejs/require.js"></script>
         <script src="require.js"></script>
     </body>

packages/joint-core/test/jointjs/require.js

@@ -1,15 +1,19 @@
 require.config({
     baseUrl: '../../',
     paths: {
-        'qunit': 'node_modules/qunit/qunit/qunit',
-
         // Dependencies for Joint:
         'jquery': 'node_modules/jquery/dist/jquery',
         'lodash': 'node_modules/lodash/lodash',
         'dagre': 'node_modules/dagre/dist/dagre'
     }
 });
 
+// The global QUnit (see `requirejs.html`), as a module.
+// eslint-disable-next-line no-undef
+define('qunit', [], function() {
+    return window.QUnit;
+});
+
 require(['qunit'], function(QUnit) {
 
     QUnit.start();

packages/joint-core/test/jointjs/requirejs.html

@@ -6,6 +6,10 @@
     </head>
     <body>
         <div id="qunit"></div>
+        <!-- QUnit is loaded as a global (the grunt-contrib-qunit bridge expects one),
+             only the code under test is loaded through RequireJS -->
+        <script src="../../node_modules/qunit/qunit/qunit.js"></script>
+        <script>QUnit.config.autostart = false;</script>
         <script src="../../node_modules/requirejs/require.js"></script>
         <script src="./require.js"></script>
     </body>

packages/joint-core/test/vectorizer/require.js

@@ -1,8 +1,11 @@
 require.config({
-    baseUrl: '../../',
-    paths: {
-        'qunit': 'node_modules/qunit/qunit/qunit',
-    }
+    baseUrl: '../../'
+});
+
+// The global QUnit (see `requirejs.html`), as a module.
+// eslint-disable-next-line no-undef
+define('qunit', [], function() {
+    return window.QUnit;
 });
 
 require(['qunit'], function(QUnit) {

packages/joint-core/test/vectorizer/requirejs.html

@@ -6,6 +6,10 @@
     </head>
     <body>
         <div id="qunit"></div>
+        <!-- QUnit is loaded as a global (the grunt-contrib-qunit bridge expects one),
+             only the code under test is loaded through RequireJS -->
+        <script src="../../node_modules/qunit/qunit/qunit.js"></script>
+        <script>QUnit.config.autostart = false;</script>
         <script src="../../node_modules/requirejs/require.js"></script>
         <script src="./require.js"></script>
     </body>

packages/joint-layout-directed-graph/karma.conf.js

@@ -1,17 +1,18 @@
 const puppeteer = require('puppeteer');
 const coverageThresholds = require('./coverage.json');
 
-// Used for starting Chrome if using ChromeHeadless in Jenkins
-process.env.CHROME_BIN = puppeteer.executablePath();
-
 // Coverage is collected for this and source-mapped to `DirectedGraph.mjs`
 const TEST_BUNDLE = './build/test/DirectedGraph.js';
 
 // Which path should .lcov files record as root they are relative to?
 // - SonarQube (`.github/workflows/sonar.yml`) needs this to be the repo root
 const REPOSITORY_ROOT = '../..';
 
-module.exports = function(config) {
+module.exports = async function(config) {
+    // Karma's ChromeHeadless launcher starts the browser at `CHROME_BIN` - the one
+    // Puppeteer installs, whose path it only resolves asynchronously
+    process.env.CHROME_BIN = await puppeteer.executablePath();
+
     config.set({
         basePath: '.',
         files: [
@@ -41,7 +42,9 @@ module.exports = function(config) {
                     '--no-sandbox',
                     '--headless',
                     '--disable-gpu',
-                    '--disable-dev-shm-usage'
+                    '--disable-dev-shm-usage',
+                    // Keep macOS from asking for the keychain password on launch
+                    '--use-mock-keychain'
                 ]
             }
         },

packages/joint-layout-directed-graph/package.json

@@ -67,7 +67,7 @@
     "karma-qunit": "4.2.1",
     "karma-sourcemap-loader": "^0.4.0",
     "mocha": "12.0.3",
-    "puppeteer": "24.22.0",
+    "puppeteer": "25.16.0",
     "qunit": "2.24.1",
     "requirejs": "2.3.8",
     "rollup": "4.64.12",

packages/joint-layout-elk/karma.conf.js

@@ -1,17 +1,18 @@
 const puppeteer = require('puppeteer');
 const coverageThresholds = require('./coverage.json');
 
-// Used for starting Chrome if using ChromeHeadless in Jenkins
-process.env.CHROME_BIN = puppeteer.executablePath();
-
 // Coverage is collected for this and source-mapped to `src/*.mts`
 const TEST_BUNDLE = './build/test/index.js';
 
 // Which path should .lcov files record as root they are relative to?
 // - SonarQube (`.github/workflows/sonar.yml`) needs this to be the repo root
 const REPOSITORY_ROOT = '../..';
 
-module.exports = function(config) {
+module.exports = async function(config) {
+    // Karma's ChromeHeadless launcher starts the browser at `CHROME_BIN` - the one
+    // Puppeteer installs, whose path it only resolves asynchronously
+    process.env.CHROME_BIN = await puppeteer.executablePath();
+
     config.set({
         basePath: '.',
         files: [
@@ -42,7 +43,9 @@ module.exports = function(config) {
                     '--no-sandbox',
                     '--headless',
                     '--disable-gpu',
-                    '--disable-dev-shm-usage'
+                    '--disable-dev-shm-usage',
+                    // Keep macOS from asking for the keychain password on launch
+                    '--use-mock-keychain'
                 ]
             }
         },

packages/joint-layout-elk/package.json

@@ -74,7 +74,7 @@
     "karma-coverage": "^2.2.1",
     "karma-qunit": "^4.1.2",
     "karma-sourcemap-loader": "^0.4.0",
-    "puppeteer": "24.22.0",
+    "puppeteer": "25.16.0",
     "qunit": "^2.24.1",
     "rollup": "4.64.12",
     "rollup-plugin-banner2": "^1.2.2",

packages/joint-layout-msagl/karma.conf.js

@@ -1,17 +1,18 @@
 const puppeteer = require('puppeteer');
 const coverageThresholds = require('./coverage.json');
 
-// Used for starting Chrome if using ChromeHeadless in Jenkins
-process.env.CHROME_BIN = puppeteer.executablePath();
-
 // Coverage is collected for this and source-mapped to `src/*.mts`
 const TEST_BUNDLE = './build/test/index.js';
 
 // Which path should .lcov files record as root they are relative to?
 // - SonarQube (`.github/workflows/sonar.yml`) needs this to be the repo root
 const REPOSITORY_ROOT = '../..';
 
-module.exports = function(config) {
+module.exports = async function(config) {
+    // Karma's ChromeHeadless launcher starts the browser at `CHROME_BIN` - the one
+    // Puppeteer installs, whose path it only resolves asynchronously
+    process.env.CHROME_BIN = await puppeteer.executablePath();
+
     config.set({
         basePath: '.',
         files: [
@@ -40,7 +41,9 @@ module.exports = function(config) {
                     '--no-sandbox',
                     '--headless',
                     '--disable-gpu',
-                    '--disable-dev-shm-usage'
+                    '--disable-dev-shm-usage',
+                    // Keep macOS from asking for the keychain password on launch
+                    '--use-mock-keychain'
                 ]
             }
         },

packages/joint-layout-msagl/package.json

@@ -76,7 +76,7 @@
     "karma-coverage": "^2.2.1",
     "karma-qunit": "^4.1.2",
     "karma-sourcemap-loader": "^0.4.0",
-    "puppeteer": "24.22.0",
+    "puppeteer": "25.16.0",
     "qunit": "^2.24.1",
     "rollup": "4.64.12",
     "rollup-plugin-banner2": "^1.2.2",

packages/joint-router-avoid/karma.conf.js

@@ -1,7 +1,10 @@
-// Used for starting Chrome if using ChromeHeadless in Jenkins
-process.env.CHROME_BIN = require('puppeteer').executablePath();
+const puppeteer = require('puppeteer');
+
+module.exports = async function(config) {
+    // Karma's ChromeHeadless launcher starts the browser at `CHROME_BIN` - the one
+    // Puppeteer installs, whose path it only resolves asynchronously
+    process.env.CHROME_BIN = await puppeteer.executablePath();
 
-module.exports = function(config) {
     config.set({
         basePath: '.',
         files: [
@@ -38,7 +41,9 @@ module.exports = function(config) {
                     '--no-sandbox',
                     '--headless',
                     '--disable-gpu',
-                    '--disable-dev-shm-usage'
+                    '--disable-dev-shm-usage',
+                    // Keep macOS from asking for the keychain password on launch
+                    '--use-mock-keychain'
                 ]
             }
         },

packages/joint-router-avoid/package.json

@@ -68,7 +68,7 @@
     "karma-chrome-launcher": "^3.2.0",
     "karma-coverage": "^2.2.1",
     "karma-qunit": "^4.1.2",
-    "puppeteer": "24.22.0",
+    "puppeteer": "25.16.0",
     "qunit": "^2.24.1",
     "rollup": "4.64.12",
     "rollup-plugin-banner2": "^1.2.2",

packages/joint-sanitize/karma.conf.js

@@ -2,9 +2,6 @@ const path = require('path');
 const puppeteer = require('puppeteer');
 const coverageThresholds = require('./coverage.json');
 
-// Used for starting Chrome if using ChromeHeadless in Jenkins
-process.env.CHROME_BIN = puppeteer.executablePath();
-
 // Coverage is collected for this and source-mapped to `src/`
 const TEST_BUNDLE = './build/test/sanitize.js';
 
@@ -15,7 +12,11 @@ const JOINT_CORE = path.resolve(path.dirname(require.resolve('@joint/core')), '.
 // - SonarQube (`.github/workflows/sonar.yml`) needs this to be the repo root
 const REPOSITORY_ROOT = '../..';
 
-module.exports = function(config) {
+module.exports = async function(config) {
+    // Karma's ChromeHeadless launcher starts the browser at `CHROME_BIN` - the one
+    // Puppeteer installs, whose path it only resolves asynchronously
+    process.env.CHROME_BIN = await puppeteer.executablePath();
+
     config.set({
         basePath: '.',
         files: [
@@ -43,7 +44,9 @@ module.exports = function(config) {
                     '--no-sandbox',
                     '--headless',
                     '--disable-gpu',
-                    '--disable-dev-shm-usage'
+                    '--disable-dev-shm-usage',
+                    // Keep macOS from asking for the keychain password on launch
+                    '--use-mock-keychain'
                 ]
             }
         },

packages/joint-sanitize/package.json

@@ -67,7 +67,7 @@
     "karma-qunit": "4.2.1",
     "karma-sourcemap-loader": "^0.4.0",
     "mocha": "11.1.0",
-    "puppeteer": "24.22.0",
+    "puppeteer": "25.16.0",
     "qunit": "2.24.1",
     "rollup": "4.36.0",
     "rollup-plugin-banner2": "^1.2.2"