From 9262cfc57f334314cabc461ba437cf2aa0b0c78f Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 14 Aug 2023 14:53:13 +0200
Subject: [PATCH] Fix `lint:json` not processing `json5` extension (#26481)

---
 .github/renovate.json5 | 14 +++++++-------
 package.json           |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 3131083ca1..879a564e1c 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -5,9 +5,9 @@
     ':labels(dependencies)',
     ':maintainLockFilesMonthly', // update non-direct dependencies monthly
     ':prConcurrentLimitNone', // Remove limit for open PRs at any time.
-    ':prHourlyLimit2' // Rate limit PR creation to a maximum of two per hour.
+    ':prHourlyLimit2', // Rate limit PR creation to a maximum of two per hour.
   ],
-  minimumReleaseAge: "3", // Wait 3 days after the package has been published before upgrading it
+  minimumReleaseAge: '3', // Wait 3 days after the package has been published before upgrading it
   // packageRules order is important, they are applied from top to bottom and are merged,
   // meaning the most important ones must be at the bottom, for example grouping rules
   // If we do not want a package to be grouped with others, we need to set its groupName
@@ -42,7 +42,7 @@
         'react-router-dom',
       ],
       matchUpdateTypes: ['major'],
-      "dependencyDashboardApproval": true
+      dependencyDashboardApproval: true,
     },
     {
       // Require Dependency Dashboard Approval for major version bumps of these Ruby packages
@@ -56,7 +56,7 @@
         'redis', // Requires manual upgrade and sync with Sidekiq version
       ],
       matchUpdateTypes: ['major'],
-      "dependencyDashboardApproval": true
+      dependencyDashboardApproval: true,
     },
     {
       // Update Github Actions and Docker images weekly
@@ -68,21 +68,21 @@
       matchManagers: ['dockerfile'],
       matchPackageNames: ['moritzheiber/ruby-jemalloc'],
       matchUpdateTypes: ['minor', 'major'],
-      "dependencyDashboardApproval": true
+      dependencyDashboardApproval: true,
     },
     {
       // Require Dependency Dashboard Approval for major bumps for the node image, this needs to be synced with .nvmrc
       matchManagers: ['dockerfile'],
       matchPackageNames: ['node'],
       matchUpdateTypes: ['major'],
-      "dependencyDashboardApproval": true
+      dependencyDashboardApproval: true,
     },
     {
       // Require Dependency Dashboard Approval for major postgres bumps in the docker-compose file, as those break dev environments
       matchManagers: ['docker-compose'],
       matchPackageNames: ['postgres'],
       matchUpdateTypes: ['major'],
-      "dependencyDashboardApproval": true
+      dependencyDashboardApproval: true,
     },
     {
       // Update devDependencies every week, with one grouped PR
diff --git a/package.json b/package.json
index 5c109c2588..0dbd84ee85 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack",
     "build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
     "fix:js": "yarn lint:js --fix",
-    "fix:json": "prettier --write \"**/*.json\"",
+    "fix:json": "prettier --write \"**/*.{json,json5}\"",
     "fix:md": "prettier --write \"**/*.md\"",
     "fix:sass": "stylelint --fix \"**/*.{css,scss}\" && prettier --write \"**/*.{css,scss}\"",
     "fix:yml": "prettier --write \"**/*.{yaml,yml}\"",
@@ -16,7 +16,7 @@
     "i18n:extract": "formatjs extract 'app/javascript/**/*.{js,jsx,ts,tsx}' '--ignore=**/*.d.ts' --out-file app/javascript/mastodon/locales/en.json --format config/formatjs-formatter.js",
     "jest": "cross-env NODE_ENV=test jest",
     "lint:js": "eslint . --ext=.js,.jsx,.ts,.tsx --cache --report-unused-disable-directives",
-    "lint:json": "prettier --check \"**/*.json\"",
+    "lint:json": "prettier --check \"**/*.{json,json5}\"",
     "lint:md": "prettier --check \"**/*.md\"",
     "lint:sass": "stylelint \"**/*.{css,scss}\" && prettier --check \"**/*.{css,scss}\"",
     "lint:yml": "prettier --check \"**/*.{yaml,yml}\"",