Chore/prettier 2.x (conventional-changelog#2025)

* chore: update dependency prettier to v2

* chore: update prettier to v2.x

* chore: apply prettier v2.x format fixes

* chore: only run all circle-ci tasks on node LTS

* fix: run prettier fixes from docker (conventional-changelog#2027)

Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Cedric van Putten <[email protected]>

Author: 3 people

.circleci/config.yml

@@ -90,7 +90,7 @@ jobs:
     docker:
       - image: node:14
     steps:
-      - run-all
+      - run-tests
   windows-v12:
     executor: win/default
     steps:

.eslintrc.js

@@ -3,14 +3,14 @@ module.exports = {
 	plugins: ['@typescript-eslint', 'jest', 'import'],
 	env: {
 		es6: true,
-		node: true
+		node: true,
 	},
 	parserOptions: {
 		sourceType: 'module',
 		ecmaVersion: 11,
 		ecmaFeatures: {
-			jsx: false
-		}
+			jsx: false,
+		},
 	},
 	extends: ['eslint:recommended', 'prettier'],
 	rules: {
@@ -25,7 +25,7 @@ module.exports = {
 		// Prevent importing the default as if it were named
 		'import/no-named-default': 'error',
 		// Forbid a module from importing itself
-		'import/no-self-import': 'error'
+		'import/no-self-import': 'error',
 
 		// Enable after https://github.com/benmosher/eslint-plugin-import/issues/1650 is fixed
 		// Forbid the use of extraneous packages
@@ -41,7 +41,7 @@ module.exports = {
 			extends: [
 				'plugin:@typescript-eslint/eslint-recommended',
 				'plugin:@typescript-eslint/recommended',
-				'prettier/@typescript-eslint'
+				'prettier/@typescript-eslint',
 			],
 			rules: {
 				'@typescript-eslint/no-unused-vars': 'off',
@@ -54,21 +54,21 @@ module.exports = {
 
 				// TODO: enable those rules?
 				'no-empty': 'off',
-				'no-var': 'off'
-			}
+				'no-var': 'off',
+			},
 		},
 		{
 			files: ['*.test.ts', '*.test.js'],
 			env: {
-				jest: true
+				jest: true,
 			},
 			extends: ['plugin:jest/recommended'],
 			rules: {
 				'@typescript-eslint/no-explicit-any': 'off',
 				'@typescript-eslint/no-var-requires': 'off',
 				// disallow non-import statements appearing before import statements
-				'import/first': 'off'
-			}
-		}
-	]
+				'import/first': 'off',
+			},
+		},
+	],
 };

@alias/commitlint/cli.test.js

@@ -7,12 +7,12 @@ function cli(args, options, input) {
 	const c = execa(bin, args, {
 		cwd: options.cwd,
 		env: options.env,
-		input: input
+		input: input,
 	});
-	return c.catch(err => err);
+	return c.catch((err) => err);
 }
 
-const fixBootstrap = fixture => fix.bootstrap(fixture, __dirname);
+const fixBootstrap = (fixture) => fix.bootstrap(fixture, __dirname);
 
 test('should reprint input from stdin', async () => {
 	const cwd = await fixBootstrap('fixtures/default');

@commitlint/cli/src/cli.test.ts

@@ -17,7 +17,7 @@ const cli = (args: string[], options: TestOptions) => {
 			cwd: options.cwd,
 			env: options.env,
 			input: input,
-			reject: false
+			reject: false,
 		});
 	};
 };
@@ -239,7 +239,7 @@ test('should allow reading of environment variables for edit file, succeeding if
 	await fs.writeFile(path.join(cwd, 'commit-msg-file'), 'foo');
 	const actual = await cli(['--env', 'variable'], {
 		cwd,
-		env: {variable: 'commit-msg-file'}
+		env: {variable: 'commit-msg-file'},
 	})();
 	expect(actual.exitCode).toBe(0);
 });
@@ -252,7 +252,7 @@ test('should allow reading of environment variables for edit file, failing if in
 	);
 	const actual = await cli(['--env', 'variable'], {
 		cwd,
-		env: {variable: 'commit-msg-file'}
+		env: {variable: 'commit-msg-file'},
 	})();
 	expect(actual.exitCode).toBe(1);
 });

@commitlint/cli/src/cli.ts

@@ -14,7 +14,7 @@ import {
 	ParserOptions,
 	ParserPreset,
 	QualifiedConfig,
-	Formatter
+	Formatter,
 } from '@commitlint/types';
 import {CliError} from './cli-error';
 
@@ -26,77 +26,77 @@ const cli = yargs
 			alias: 'c',
 			default: true,
 			description: 'toggle colored output',
-			type: 'boolean'
+			type: 'boolean',
 		},
 		config: {
 			alias: 'g',
 			description: 'path to the config file',
-			type: 'string'
+			type: 'string',
 		},
 		cwd: {
 			alias: 'd',
 			default: process.cwd(),
 			defaultDescription: '(Working Directory)',
 			description: 'directory to execute in',
-			type: 'string'
+			type: 'string',
 		},
 		edit: {
 			alias: 'e',
 			default: false,
 			description:
 				'read last commit message from the specified file or fallbacks to ./.git/COMMIT_EDITMSG',
-			type: 'string'
+			type: 'string',
 		},
 		env: {
 			alias: 'E',
 			description:
 				'check message in the file at path given by environment variable value',
-			type: 'string'
+			type: 'string',
 		},
 		extends: {
 			alias: 'x',
 			description: 'array of shareable configurations to extend',
-			type: 'array'
+			type: 'array',
 		},
 		'help-url': {
 			alias: 'H',
 			type: 'string',
-			description: 'help url in error message'
+			description: 'help url in error message',
 		},
 		from: {
 			alias: 'f',
 			description:
 				'lower end of the commit range to lint; applies if edit=false',
-			type: 'string'
+			type: 'string',
 		},
 		format: {
 			alias: 'o',
 			description: 'output format of the results',
-			type: 'string'
+			type: 'string',
 		},
 		'parser-preset': {
 			alias: 'p',
 			description:
 				'configuration preset to use for conventional-commits-parser',
-			type: 'string'
+			type: 'string',
 		},
 		quiet: {
 			alias: 'q',
 			default: false,
 			description: 'toggle console output',
-			type: 'boolean'
+			type: 'boolean',
 		},
 		to: {
 			alias: 't',
 			description:
 				'upper end of the commit range to lint; applies if edit=false',
-			type: 'string'
+			type: 'string',
 		},
 		verbose: {
 			alias: 'V',
 			type: 'boolean',
-			description: 'enable verbose output for reports without problems'
-		}
+			description: 'enable verbose output for reports without problems',
+		},
 	})
 	.version(
 		'version',
@@ -112,7 +112,7 @@ const cli = yargs
 	)
 	.strict();
 
-main(cli.argv).catch(err => {
+main(cli.argv).catch((err) => {
 	setTimeout(() => {
 		if (err.type === pkg.name) {
 			process.exit(1);
@@ -132,12 +132,12 @@ async function main(options: CliFlags) {
 				to: flags.to,
 				from: flags.from,
 				edit: flags.edit,
-				cwd: flags.cwd
+				cwd: flags.cwd,
 		  }));
 
 	const messages = (Array.isArray(input) ? input : [input])
-		.filter(message => typeof message === 'string')
-		.filter(message => message.trim() !== '')
+		.filter((message) => typeof message === 'string')
+		.filter((message) => message.trim() !== '')
 		.filter(Boolean);
 
 	if (messages.length === 0 && !checkFromRepository(flags)) {
@@ -157,7 +157,7 @@ async function main(options: CliFlags) {
 		parserOpts: {},
 		plugins: {},
 		ignores: [],
-		defaultIgnores: true
+		defaultIgnores: true,
 	};
 	if (parserOpts) {
 		opts.parserOpts = parserOpts;
@@ -179,7 +179,7 @@ async function main(options: CliFlags) {
 	}
 
 	const results = await Promise.all(
-		messages.map(message => lint(message, loaded.rules, opts))
+		messages.map((message) => lint(message, loaded.rules, opts))
 	);
 
 	if (Object.keys(loaded.rules).length === 0) {
@@ -199,12 +199,12 @@ async function main(options: CliFlags) {
 					message: [
 						'Please add rules to your `commitlint.config.js`',
 						'    - Getting started guide: https://git.io/fhHij',
-						'    - Example config: https://git.io/fhHip'
-					].join('\n')
-				}
+						'    - Example config: https://git.io/fhHip',
+					].join('\n'),
+				},
 			],
 			warnings: [],
-			input
+			input,
 		});
 	}
 
@@ -226,7 +226,7 @@ async function main(options: CliFlags) {
 			valid: true,
 			errorCount: 0,
 			warningCount: 0,
-			results: []
+			results: [],
 		}
 	);
 
@@ -235,7 +235,7 @@ async function main(options: CliFlags) {
 		verbose: flags.verbose,
 		helpUrl: flags['help-url']
 			? flags['help-url'].trim()
-			: 'https://github.com/conventional-changelog/commitlint/#what-is-commitlint'
+			: 'https://github.com/conventional-changelog/commitlint/#what-is-commitlint',
 	});
 
 	if (!flags.quiet && output !== '') {
@@ -267,19 +267,15 @@ function normalizeFlags(flags: CliFlags): CliFlags {
 	const edit = getEditValue(flags);
 	return {
 		...flags,
-		edit
+		edit,
 	};
 }
 
 function getEditValue(flags: CliFlags) {
 	if (flags.env) {
 		if (!(flags.env in process.env)) {
 			throw new Error(
-				`Recieved '${
-					flags.env
-				}' as value for -E | --env, but environment variable '${
-					flags.env
-				}' is not available globally`
+				`Recieved '${flags.env}' as value for -E | --env, but environment variable '${flags.env}' is not available globally`
 			);
 		}
 		return process.env[flags.env];

@commitlint/config-angular-type-enum/README.md

@@ -28,14 +28,14 @@ const types = require('@commitlint/config-angular-type-enum');
 // Use as rule creating errors for non-allowed types
 module.exports = {
   rules: {
-    ...types.rules
-  }
+    ...types.rules,
+  },
 };
 
 // Warn for non-allowed types
 module.exports = {
   rules: {
-    'type-enum': [1, 'always', types.values()]
-  }
+    'type-enum': [1, 'always', types.values()],
+  },
 };
 ```

@commitlint/config-angular-type-enum/index.js

@@ -8,11 +8,11 @@ const types = [
 	'refactor',
 	'revert',
 	'style',
-	'test'
+	'test',
 ];
 
 module.exports.rules = {
-	'type-enum': [2, 'always', types]
+	'type-enum': [2, 'always', types],
 };
 
 module.exports.value = () => types;

@commitlint/config-angular/index.js

@@ -9,12 +9,12 @@ module.exports = {
 		'subject-case': [
 			2,
 			'never',
-			['sentence-case', 'start-case', 'pascal-case', 'upper-case']
+			['sentence-case', 'start-case', 'pascal-case', 'upper-case'],
 		],
 		'subject-empty': [2, 'never'],
 		'subject-full-stop': [2, 'never', '.'],
 		'type-case': [2, 'always', 'lower-case'],
 		'type-empty': [2, 'never'],
-		'type-enum': typeEnum.rules['type-enum']
-	}
+		'type-enum': typeEnum.rules['type-enum'],
+	},
 };

@commitlint/config-conventional/index.js

@@ -10,7 +10,7 @@ module.exports = {
 		'subject-case': [
 			2,
 			'never',
-			['sentence-case', 'start-case', 'pascal-case', 'upper-case']
+			['sentence-case', 'start-case', 'pascal-case', 'upper-case'],
 		],
 		'subject-empty': [2, 'never'],
 		'subject-full-stop': [2, 'never', '.'],
@@ -30,8 +30,8 @@ module.exports = {
 				'refactor',
 				'revert',
 				'style',
-				'test'
-			]
-		]
-	}
+				'test',
+			],
+		],
+	},
 };