Merge branch 'master' into spec-reporter-retries

mochajs · Mar 1, 2024 · b5d4d68 · b5d4d68
2 parents 00b710c + b88978d
commit b5d4d68
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 129 deletions.
diff --git a/eslint.config.js b/eslint.config.js
@@ -12,7 +12,7 @@ module.exports = [
   {
     ...js.configs.recommended,
     languageOptions: {
-      ecmaVersion: 2018,
+      ecmaVersion: 2020,
       globals: {
         ...globals.browser,
         ...globals.node

diff --git a/package-scripts.js b/package-scripts.js
@@ -259,7 +259,7 @@ module.exports = {
     docs: {
       default: {
         script:
-          'nps docs.clean && nps docs.api && eleventy && nps docs.linkcheck && node scripts/netlify-headers.js docs/_site >> docs/_site/_headers',
+          'nps docs.clean && nps docs.api && eleventy && nps docs.linkcheck',
         description: 'Build documentation'
       },
       production: {
@@ -277,7 +277,7 @@ module.exports = {
       },
       postbuild: {
         script:
-          'buildProduction docs/_site/index.html --outroot docs/_dist --canonicalroot https://mochajs.org/ --optimizeimages --svgo --inlinehtmlimage 9400 --inlinehtmlscript 0 --asyncscripts && cp docs/_headers docs/_dist/_headers && node scripts/netlify-headers.js docs/_dist >> docs/_dist/_headers',
+          'node node_modules/assetgraph-builder/bin/buildProduction docs/_site/index.html --outroot docs/_dist --canonicalroot https://mochajs.org/ --optimizeimages --svgo --inlinehtmlimage 9400 --inlinehtmlscript 0 --asyncscripts && cp docs/_headers docs/_dist/_headers',
         description: 'Post-process docs after build',
         hiddenFromHelp: true
       },

diff --git a/scripts/netlify-headers.js b/scripts/netlify-headers.js