Fix, update, and sort _rc_ hasProjectFile filenames (#19994)

* Update and fix `hasProjectFile` filenames * Sort `hasProjectFile` filenames * Update CHANGELOG.md
WordPress · Feb 2, 2020 · 80c5239 · 80c5239
1 parent d362cb1
commit 80c5239
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 11 deletions.
diff --git a/packages/scripts/CHANGELOG.md b/packages/scripts/CHANGELOG.md
@@ -14,6 +14,9 @@
 - Add `lint-md-docs` script to lint the markup of markdown files, uses the `markdownlint` module ([#19855](https://github.com/WordPress/gutenberg/pull/19855)).
 - Add `packages-update` script to update WordPress packages to the latest version automatically ([#19448](https://github.com/WordPress/gutenberg/pull/19448)).
 
+### Bug Fixes
+- Fixes and updates valid _rc_ configuration filenames for Babel, ESLint, markdownlint, npmpackagejsonlint, stylelint, and Prettier ([#19994](https://github.com/WordPress/gutenberg/pull/19994)).
+
 ## 6.1.1 (2020-01-01)
 
 ### Bug Fixes

diff --git a/packages/scripts/scripts/format-js.js b/packages/scripts/scripts/format-js.js
@@ -61,13 +61,13 @@ function checkPrettier() {
 
 	// See: https://prettier.io/docs/en/configuration.html
 	const hasProjectPrettierConfig =
-		hasProjectFile( '.prettierrc' ) ||
+		hasProjectFile( '.prettierrc.js' ) ||
 		hasProjectFile( '.prettierrc.json' ) ||
+		hasProjectFile( '.prettierrc.toml' ) ||
 		hasProjectFile( '.prettierrc.yaml' ) ||
 		hasProjectFile( '.prettierrc.yml' ) ||
-		hasProjectFile( '.prettierrc.js' ) ||
-		hasProjectFile( '.prettierrc.config.js' ) ||
-		hasProjectFile( '.prettierrc.toml' ) ||
+		hasProjectFile( 'prettier.config.js' ) ||
+		hasProjectFile( '.prettierrc' ) ||
 		hasPackageProp( 'prettier' );
 
 	if ( ! hasProjectPrettierConfig ) {

diff --git a/packages/scripts/scripts/lint-js.js b/packages/scripts/scripts/lint-js.js
@@ -25,9 +25,10 @@ const hasLintConfig =
 	hasArgInCLI( '-c' ) ||
 	hasArgInCLI( '--config' ) ||
 	hasProjectFile( '.eslintrc.js' ) ||
+	hasProjectFile( '.eslintrc.json' ) ||
 	hasProjectFile( '.eslintrc.yaml' ) ||
 	hasProjectFile( '.eslintrc.yml' ) ||
-	hasProjectFile( '.eslintrc.json' ) ||
+	hasProjectFile( 'eslintrc.config.js' ) ||
 	hasProjectFile( '.eslintrc' ) ||
 	hasPackageProp( 'eslintConfig' );
 

diff --git a/packages/scripts/scripts/lint-md-docs.js b/packages/scripts/scripts/lint-md-docs.js
@@ -26,7 +26,8 @@ const hasLintConfig =
 	hasArgInCLI( '--config' ) ||
 	hasProjectFile( '.markdownlint.json' ) ||
 	hasProjectFile( '.markdownlint.yaml' ) ||
-	hasProjectFile( '.markdownlint.yml' );
+	hasProjectFile( '.markdownlint.yml' ) ||
+	hasProjectFile( '.markdownlintrc' );
 
 // When a configuration is not provided by the project, use from the default
 // provided with the scripts module.

diff --git a/packages/scripts/scripts/lint-pkg-json.js b/packages/scripts/scripts/lint-pkg-json.js
@@ -20,12 +20,16 @@ const args = getArgsFromCLI();
 
 const defaultFilesArgs = hasFileArgInCLI() ? [] : [ '.' ];
 
-// See: https://github.com/tclindner/npm-package-json-lint/wiki/configuration#configuration.
+// See: https://npmpackagejsonlint.org/docs/en/configuration
 const hasLintConfig =
 	hasArgInCLI( '-c' ) ||
 	hasArgInCLI( '--configFile' ) ||
+	hasProjectFile( '.npmpackagejsonlintrc.js' ) ||
 	hasProjectFile( '.npmpackagejsonlintrc.json' ) ||
+	hasProjectFile( '.npmpackagejsonlintrc.yaml' ) ||
+	hasProjectFile( '.npmpackagejsonlintrc.yml' ) ||
 	hasProjectFile( 'npmpackagejsonlint.config.js' ) ||
+	hasProjectFile( '.npmpackagejsonlintrc' ) ||
 	hasPackageProp( 'npmpackagejsonlint' ) ||
 	// npm-package-json-lint v3.x used a different prop name.
 	hasPackageProp( 'npmPackageJsonLintConfig' );

diff --git a/packages/scripts/scripts/lint-style.js b/packages/scripts/scripts/lint-style.js
@@ -20,15 +20,15 @@ const args = getArgsFromCLI();
 
 const defaultFilesArgs = hasFileArgInCLI() ? [] : [ '**/*.{css,scss}' ];
 
-// See: https://github.com/stylelint/stylelint/blob/master/docs/user-guide/configuration.md#loading-the-configuration-object.
+// See: https://stylelint.io/user-guide/configuration
 const hasLintConfig =
 	hasArgInCLI( '--config' ) ||
-	hasProjectFile( '.stylelintrc' ) ||
 	hasProjectFile( '.stylelintrc.js' ) ||
 	hasProjectFile( '.stylelintrc.json' ) ||
 	hasProjectFile( '.stylelintrc.yaml' ) ||
 	hasProjectFile( '.stylelintrc.yml' ) ||
-	hasProjectFile( '.stylelint.config.js' ) ||
+	hasProjectFile( 'stylelint.config.js' ) ||
+	hasProjectFile( '.stylelintrc' ) ||
 	hasPackageProp( 'stylelint' );
 
 const defaultConfigArgs = ! hasLintConfig

diff --git a/packages/scripts/utils/config.js b/packages/scripts/utils/config.js
@@ -15,10 +15,13 @@ const {
 const { fromConfigRoot, hasProjectFile } = require( './file' );
 const { hasPackageProp } = require( './package' );
 
+// See https://babeljs.io/docs/en/config-files#configuration-file-types
 const hasBabelConfig = () =>
-	hasProjectFile( '.babelrc' ) ||
 	hasProjectFile( '.babelrc.js' ) ||
+	hasProjectFile( '.babelrc.json' ) ||
 	hasProjectFile( 'babel.config.js' ) ||
+	hasProjectFile( 'babel.config.json' ) ||
+	hasProjectFile( '.babelrc' ) ||
 	hasPackageProp( 'babel' );
 
 const hasJestConfig = () =>