mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-22 18:45:41 +01:00
Fix lint:json
not processing json5
extension (#26481)
This commit is contained in:
parent
07f43daadc
commit
9262cfc57f
2 changed files with 9 additions and 9 deletions
14
.github/renovate.json5
vendored
14
.github/renovate.json5
vendored
|
@ -5,9 +5,9 @@
|
||||||
':labels(dependencies)',
|
':labels(dependencies)',
|
||||||
':maintainLockFilesMonthly', // update non-direct dependencies monthly
|
':maintainLockFilesMonthly', // update non-direct dependencies monthly
|
||||||
':prConcurrentLimitNone', // Remove limit for open PRs at any time.
|
':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,
|
// 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
|
// 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
|
// 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',
|
'react-router-dom',
|
||||||
],
|
],
|
||||||
matchUpdateTypes: ['major'],
|
matchUpdateTypes: ['major'],
|
||||||
"dependencyDashboardApproval": true
|
dependencyDashboardApproval: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// Require Dependency Dashboard Approval for major version bumps of these Ruby packages
|
// 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
|
'redis', // Requires manual upgrade and sync with Sidekiq version
|
||||||
],
|
],
|
||||||
matchUpdateTypes: ['major'],
|
matchUpdateTypes: ['major'],
|
||||||
"dependencyDashboardApproval": true
|
dependencyDashboardApproval: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// Update Github Actions and Docker images weekly
|
// Update Github Actions and Docker images weekly
|
||||||
|
@ -68,21 +68,21 @@
|
||||||
matchManagers: ['dockerfile'],
|
matchManagers: ['dockerfile'],
|
||||||
matchPackageNames: ['moritzheiber/ruby-jemalloc'],
|
matchPackageNames: ['moritzheiber/ruby-jemalloc'],
|
||||||
matchUpdateTypes: ['minor', 'major'],
|
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
|
// Require Dependency Dashboard Approval for major bumps for the node image, this needs to be synced with .nvmrc
|
||||||
matchManagers: ['dockerfile'],
|
matchManagers: ['dockerfile'],
|
||||||
matchPackageNames: ['node'],
|
matchPackageNames: ['node'],
|
||||||
matchUpdateTypes: ['major'],
|
matchUpdateTypes: ['major'],
|
||||||
"dependencyDashboardApproval": true
|
dependencyDashboardApproval: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// Require Dependency Dashboard Approval for major postgres bumps in the docker-compose file, as those break dev environments
|
// Require Dependency Dashboard Approval for major postgres bumps in the docker-compose file, as those break dev environments
|
||||||
matchManagers: ['docker-compose'],
|
matchManagers: ['docker-compose'],
|
||||||
matchPackageNames: ['postgres'],
|
matchPackageNames: ['postgres'],
|
||||||
matchUpdateTypes: ['major'],
|
matchUpdateTypes: ['major'],
|
||||||
"dependencyDashboardApproval": true
|
dependencyDashboardApproval: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// Update devDependencies every week, with one grouped PR
|
// Update devDependencies every week, with one grouped PR
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
"build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack",
|
"build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack",
|
||||||
"build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
|
"build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
|
||||||
"fix:js": "yarn lint:js --fix",
|
"fix:js": "yarn lint:js --fix",
|
||||||
"fix:json": "prettier --write \"**/*.json\"",
|
"fix:json": "prettier --write \"**/*.{json,json5}\"",
|
||||||
"fix:md": "prettier --write \"**/*.md\"",
|
"fix:md": "prettier --write \"**/*.md\"",
|
||||||
"fix:sass": "stylelint --fix \"**/*.{css,scss}\" && prettier --write \"**/*.{css,scss}\"",
|
"fix:sass": "stylelint --fix \"**/*.{css,scss}\" && prettier --write \"**/*.{css,scss}\"",
|
||||||
"fix:yml": "prettier --write \"**/*.{yaml,yml}\"",
|
"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",
|
"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",
|
"jest": "cross-env NODE_ENV=test jest",
|
||||||
"lint:js": "eslint . --ext=.js,.jsx,.ts,.tsx --cache --report-unused-disable-directives",
|
"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:md": "prettier --check \"**/*.md\"",
|
||||||
"lint:sass": "stylelint \"**/*.{css,scss}\" && prettier --check \"**/*.{css,scss}\"",
|
"lint:sass": "stylelint \"**/*.{css,scss}\" && prettier --check \"**/*.{css,scss}\"",
|
||||||
"lint:yml": "prettier --check \"**/*.{yaml,yml}\"",
|
"lint:yml": "prettier --check \"**/*.{yaml,yml}\"",
|
||||||
|
|
Loading…
Reference in a new issue