[pull] main from qunitjs:main

.eslintrc.json

@@ -42,7 +42,7 @@
         "no-console": "error",
         "compat/compat": [
           "error",
-          "android >= 4.3, firefox >= 45, ie >= 11, safari >= 9.1, ios_saf >= 7, chrome >= 58"
+          "android >= 4.3, firefox >= 45, ie >= 9, safari >= 9.1, ios_saf >= 7, chrome >= 58"
         ]
       }
     },
@@ -61,7 +61,7 @@
       "rules": {
         "compat/compat": [
           "error",
-          "android >= 4.3, firefox >= 45, ie >= 11, safari >= 9.1, chrome >= 58"
+          "android >= 4.3, firefox >= 45, ie >= 9, safari >= 9.1, chrome >= 58"
         ],
         "max-len": "off",
         "no-throw-literal": "off",
@@ -81,7 +81,7 @@
     {
       "files": [
         "bin/**",
-        "build/**",
+        "build/**/*.js",
         "src/cli/**",
         "Gruntfile.js",
         "rollup.config.js"
@@ -99,6 +99,7 @@
         "node": true
       },
       "rules": {
+        "strict": "error",
         "compat/compat": "off",
         "no-console": "off",
         "no-process-exit": "off",

.github/workflows/CI.yaml

@@ -39,19 +39,15 @@ jobs:
             node: 18.x
             script: npm run test-nolint
 
-          # use macos-12 instead of macos-latest
-          # as proxy for Intel instead of ARM
-          # because the older Puppeteer/Chrome for Node 10 compat
-          # didn't support ARM yet.
           - name: "macOS: Node 18"
-            os: macos-12
+            os: macos-13
             node: 18.x
             script: npm run test-nolint
 
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
       FORCE_COLOR: "1"
     steps:
       - uses: actions/checkout@v4
@@ -62,14 +58,14 @@ jobs:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
 
       - name: Use Node.js ${{ matrix.node }}
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
 
-      - run: npm ci
+      - run: npm install
 
       - name: Tests
         run: ${{ matrix.script }}
@@ -89,23 +85,23 @@ jobs:
     name: SpiderMonkey 68
     runs-on: ubuntu-20.04
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
         with:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
       - name: Use Node.js 18
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
       - name: Install mozjs
         run: |
           sudo apt-fast install -y libmozjs-68-dev
-      - run: npm ci
+      - run: npm install
       - run: npm run build
       - name: Test mozjs.js
         run: js68 test/mozjs.js
@@ -127,23 +123,23 @@ jobs:
     name: SpiderMonkey 102
     runs-on: ubuntu-24.04
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
         with:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
       - name: Use Node.js 18
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
       - name: Install mozjs
         run: |
           sudo apt-get install -y libmozjs-102-dev
-      - run: npm ci
+      - run: npm install
       - run: npm run build
       - name: Test mozjs.js
         run: js102 test/mozjs.js
@@ -165,23 +161,23 @@ jobs:
     name: SpiderMonkey 115
     runs-on: ubuntu-24.04
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
         with:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
       - name: Use Node.js 18
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
       - name: Install mozjs
         run: |
           sudo apt-get install -y libmozjs-115-dev
-      - run: npm ci
+      - run: npm install
       - run: npm run build
       - name: Test mozjs.js
         run: js115 test/mozjs.js

.github/workflows/browsers-full.yaml

@@ -17,7 +17,7 @@ jobs:
     if: ${{ github.repository == 'qunitjs/qunit' }} # skip on forks, needs secret
     runs-on: ubuntu-latest
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
     steps:
       - uses: actions/checkout@v4
 
@@ -26,7 +26,7 @@ jobs:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
 
       - name: Use Node.js 18
         uses: actions/setup-node@v4
@@ -35,7 +35,7 @@ jobs:
 
       - name: Prepare
         run: |
-          npm ci
+          npm install
           npm run build
 
       - name: Tests

.github/workflows/browsers-quick.yaml

@@ -8,7 +8,7 @@ jobs:
     if: ${{ github.repository == 'qunitjs/qunit' }} # skip on forks, needs secret
     runs-on: ubuntu-latest
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
     steps:
       - uses: actions/checkout@v4
 
@@ -17,7 +17,7 @@ jobs:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
 
       - name: Use Node.js 18
         uses: actions/setup-node@v4
@@ -26,7 +26,7 @@ jobs:
 
       - name: Prepare
         run: |
-          npm ci
+          npm install
           npm run build
 
       # To debug locally:

.github/workflows/coverage.yaml

@@ -8,7 +8,8 @@ jobs:
     if: ${{ github.repository == 'qunitjs/qunit' }} # skip on forks, needs secret
     runs-on: ubuntu-20.04
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
+      FORCE_COLOR: "1"
     steps:
       - uses: actions/checkout@v4
 
@@ -17,14 +18,14 @@ jobs:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
 
       - name: Use Node.js 18
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
 
-      - run: npm ci
+      - run: npm install
 
       - name: Tests
         run: npm run coverage

.github/workflows/github-pages.yaml

@@ -32,6 +32,8 @@ jobs:
       - name: Jekyll build
         # If your site is in a subdirectory
         working-directory: ./docs/
+        env:
+          JEKYLL_ENV: production
         run: bundle exec jekyll build
 
       - name: Push to branch

.github/workflows/reproducible.yaml

@@ -5,10 +5,6 @@ on:
     - cron: '30 0 * * 1'
   # Or manually
   workflow_dispatch:
-  # Or when developing this workflow
-  push:
-    paths:
-      - .github/workflows/reproducible.yaml
 
 jobs:
   run:

.github/workflows/spider-check.yaml

@@ -5,13 +5,6 @@ on:
     - cron: '0 0 * * 5'
   # Or manually
   workflow_dispatch:
-  # Or when developing this workflow
-  push:
-    paths:
-      - .github/workflows/spider-check.yaml
-  pull_request:
-    paths:
-      - .github/workflows/spider-check.yaml
 
 jobs:
   spider-check:

.gitignore

@@ -13,3 +13,4 @@
 /qunit/
 /temp/
 /.eslintcache
+/package-lock.json

.mailmap

@@ -99,7 +99,7 @@ Dave K. Smith <[email protected]>
 David Vollbracht <[email protected]>
 Jochen Ulrich <[email protected]>
 Michał Gołębiowski-Owczarek <[email protected]>
-Leonardo Balter <[email protected]>
+Leo Balter <[email protected]> <[email protected]>
 Kevin Partington <[email protected]>
 Kevin Partington <[email protected]> <[email protected]>
 Manoj Kumar <[email protected]> <[email protected]>

CONTRIBUTING.md

@@ -2,14 +2,11 @@
 
 # Contributing
 
-Welcome! Thanks for your interest in contributing to QUnit. This document is
-intended to help make your experience smooth and enjoyable. If you feel
-anything should be added or clarified, definitely let us know.
+Welcome! Thanks for your interest in contributing to QUnit. This document is intended to help make your experience smooth and enjoyable. If you feel anything should be added or clarified, definitely let us know.
 
-If this is your first time contributing to open-source software, you might want
-to take a look at the [GitHub Guides](https://guides.github.com/).
+If this is your first time contributing to open-source software, you might want to take a look at the [GitHub Guides](https://guides.github.com/).
 
-If you get stuck or need help, you can always [chat with us](https://gitter.im/qunitjs/qunit).
+If you get stuck or need help, you can always [chat with us](https://qunitjs.com/intro/#support).
 
 ## Where to begin
 
@@ -23,22 +20,13 @@ good ways to gain familiarity with just one or two areas of the code.
 You're also welcome to start on any other [open issue](https://github.com/qunitjs/qunit/issues).
 Feel free to comment in that case to ask for directions.
 
-## Contributor License Agreement
-
-As a first step, in order to contribute to QUnit, you will need to sign the JS
-Foundation's [CLA for QUnit](https://cla.js.foundation/qunitjs/qunit).
-
 ## Code
 
-For code changes, you'll need to have [Node.js](https://nodejs.org/en/) installed.
+For code changes, you'll need to have [Node.js](https://nodejs.org/) installed.
 
-Install dependencies in the repository via `npm ci`. Make your code
-changes and run `npm test` which will validate the syntax and coding style,
-and run unit and integration tests.
+Install dependencies in the repository via `npm install`. Make your code changes and run `npm test` which will validate the syntax and coding style, and run unit and integration tests.
 
-In general, code changes should be accompanied by a unit test to verify the
-change in functionality. Once the new tests are passing, make a commit, push it
-to your GitHub fork, and create the pull request.
+In general, code changes should be accompanied by a unit test to verify the change in functionality. Once the new tests are passing, make a commit, push it to your GitHub fork, and create the pull request.
 
 ## Documentation
 
@@ -48,11 +36,9 @@ Check [docs/README.md](docs/README.md) for how to locally preview the API docume
 
 ## Commit messages
 
-If you're a new contributor, don't worry if you're unsure about
-the commit message. The team will edit or write it for you as part
-of their code review and merge activities. If you're a regular
-contributor, do try to follow this structure as it helps others to
-more quickly find, understand, and merge your changes. Thanks!
+If you're a new contributor, don't worry if you're unsure about the commit message.
+
+The team will improve it for you as part of their code review and merge activities. If you're a regular contributor, we appreciate you following this structure as it helps everyone to more quickly understand and review your changes, and to summarise them for the changelog. Thanks!
 
 Structure:
 
@@ -62,11 +48,10 @@ Component: Short subject line about what is changing
 Additional details about the commit are placed after a new line
 in the commit message body. That's this paragraph here.
 
-As well as any additional paragraphs. The last block is the footer,
-which is reserved for any "Ref", "Fixes" or "Closes" instructions
-(one per line).
+The last lines are the footer, which is reserved for any "Ref", "Fixes"
+or "Closes" commands (one per line).
 
-Fixes #1.
+Fixes https://github.com/qunitjs/qunit/issues/1000.
 ```
 
 The subject line should use the [imperative mood](https://en.wikipedia.org/wiki/Imperative_mood),
@@ -82,3 +67,7 @@ and start with one of the following components:
 * `Test`
 
 See also [Commit message guidelines](https://www.mediawiki.org/wiki/Gerrit/Commit_message_guidelines).
+
+## Contributor License Agreement
+
+After creating your first pull request, a bot will ask you to sign the JS Foundation's [CLA for QUnit](https://cla.js.foundation/qunitjs/qunit).

Gruntfile.js

@@ -1,4 +1,5 @@
 /* eslint-env node */
+'use strict';
 
 const fs = require('fs');
 const path = require('path');
@@ -27,6 +28,18 @@ module.exports = function (grunt) {
       'src-css': {
         src: 'src/core/qunit.css',
         dest: 'qunit/qunit.css'
+      },
+      'src-export-cjs-wrappers': {
+        src: 'src/core/qunit-wrapper-bundler-require.js',
+        expand: true,
+        flatten: true,
+        dest: 'qunit/'
+      },
+      'src-export-esm-wrappers': {
+        src: 'src/core/qunit-wrapper-nodejs-module.js',
+        expand: true,
+        flatten: true,
+        dest: 'qunit/esm/'
       }
     },
     search: {