Bump prettier from 1.19.1 to 2.0.2 (#4669)

* Bump prettier from 1.19.1 to 2.0.2 Bumps [prettier](https://github.com/prettier/prettier) from 1.19.1 to 2.0.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md) - [Commits](prettier/prettier@1.19.1...2.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Prettier 2.0 fixes (#4679) * Bump prettier from 1.19.1 to 2.0.2 Bumps [prettier](https://github.com/prettier/prettier) from 1.19.1 to 2.0.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md) - [Commits](prettier/prettier@1.19.1...2.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Add `endOfLine: "lf"` Prettier option * Prettier 2.0 fixes Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Stephen Edgar <stephen@netweb.com.au>
stylelint · Apr 2, 2020 · 551dcb5 · 551dcb5
1 parent 5c6f489
commit 551dcb5
Show file tree

Hide file tree

Showing 125 changed files with 188 additions and 214 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -3,6 +3,7 @@
 // https://prettier.io/docs/en/options.html
 module.exports = {
 	arrowParens: 'always',
+	endOfLine: 'lf',
 	printWidth: 100,
 	singleQuote: true,
 	trailingComma: 'all',

diff --git a/docs/developer-guide/plugins.md b/docs/developer-guide/plugins.md
@@ -21,11 +21,11 @@ const messages = stylelint.utils.ruleMessages(ruleName, {
   expected: "Expected ..."
 });
 
-module.exports = stylelint.createPlugin(ruleName, function(
+module.exports = stylelint.createPlugin(ruleName, function (
   primaryOption,
   secondaryOptionObject
 ) {
-  return function(postcssRoot, postcssResult) {
+  return function (postcssRoot, postcssResult) {
     const validOptions = stylelint.utils.validateOptions(
       postcssResult,
       ruleName,
@@ -80,11 +80,11 @@ const messages = stylelint.utils.ruleMessages(ruleName, {
   expected: "Expected ..."
 });
 
-module.exports = stylelint.createPlugin(ruleName, function(
+module.exports = stylelint.createPlugin(ruleName, function (
   primaryOption,
   secondaryOptionObject
 ) {
-  return function(postcssRoot, postcssResult) {
+  return function (postcssRoot, postcssResult) {
     const validOptions = stylelint.utils.validateOptions(
       postcssResult,
       ruleName,
@@ -97,9 +97,9 @@ module.exports = stylelint.createPlugin(ruleName, function(
       return;
     }
 
-    return new Promise(function(resolve) {
+    return new Promise(function (resolve) {
       // some async operation
-      setTimeout(function() {
+      setTimeout(function () {
         // ... some logic ...
         stylelint.utils.report({
           /* .. */
@@ -152,7 +152,7 @@ const allowableAtRules = [
 ];
 
 function myPluginRule(primaryOption, secondaryOptionObject) {
-  return function(postcssRoot, postcssResult) {
+  return function (postcssRoot, postcssResult) {
     const defaultedOptions = Object.assign({}, secondaryOptionObject, {
       ignoreAtRules: allowableAtRules.concat(options.ignoreAtRules || [])
     });
@@ -189,7 +189,7 @@ All rules share a common signature. They are a function that accepts two argumen
 Here's an example of a plugin that runs `color-hex-case` only if there is a special directive `@@check-color-hex-case` somewhere in the stylesheet:
 
 ```js
-module.exports = stylelint.createPlugin(ruleName, function(expectation) {
+module.exports = stylelint.createPlugin(ruleName, function (expectation) {
   const runColorHexCase = stylelint.rules["color-hex-case"](expectation);
 
   return (root, result) => {

diff --git a/docs/developer-guide/processors.md b/docs/developer-guide/processors.md
@@ -11,13 +11,13 @@ Processor modules are functions that accept an options object and return an obje
 
 ```js
 // my-processor.js
-module.exports = function(options) {
+module.exports = function (options) {
   return {
-    code: function(input, filepath) {
+    code: function (input, filepath) {
       // ...
       return transformedCode;
     },
-    result: function(stylelintResult, filepath) {
+    result: function (stylelintResult, filepath) {
       // ...
       return transformedResult;
     }

diff --git a/docs/user-guide/usage/node-api.md b/docs/user-guide/usage/node-api.md
@@ -3,7 +3,7 @@
 The stylelint module includes a `lint()` function that provides the Node.js API.
 
 ```js
-stylelint.lint(options).then(function(resultObject) {
+stylelint.lint(options).then(function (resultObject) {
   /* .. */
 });
 ```
@@ -91,11 +91,11 @@ stylelint
     config: { rules: "color-no-invalid-hex" },
     files: "all/my/stylesheets/*.css"
   })
-  .then(function(data) {
+  .then(function (data) {
     // do things with data.output, data.errored,
     // and data.results
   })
-  .catch(function(err) {
+  .catch(function (err) {
     // do things with err e.g.
     console.error(err.stack);
   });
@@ -112,7 +112,7 @@ stylelint
     configBasedir: path.join(__dirname, "configs"),
     files: "all/my/stylesheets/*.css"
   })
-  .then(function() {
+  .then(function () {
     /* .. */
   });
 ```
@@ -128,7 +128,7 @@ stylelint
     config: myConfig,
     formatter: "verbose"
   })
-  .then(function() {
+  .then(function () {
     /* .. */
   });
 ```
@@ -142,11 +142,11 @@ stylelint
   .lint({
     config: myConfig,
     files: "all/my/stylesheets/*.scss",
-    formatter: function(stylelintResults) {
+    formatter: function (stylelintResults) {
       /* .. */
     }
   })
-  .then(function() {
+  .then(function () {
     /* .. */
   });
 ```
diff --git a/lib/__tests__/disableRanges.test.js b/lib/__tests__/disableRanges.test.js
@@ -645,8 +645,5 @@ it('enable rule without disabling rule', () => {
 });
 
 function testDisableRanges(source, cb) {
-	return postcss()
-		.use(assignDisabledRanges)
-		.process(source, { from: undefined })
-		.then(cb);
+	return postcss().use(assignDisabledRanges).process(source, { from: undefined }).then(cb);
 }
diff --git a/lib/__tests__/fixtures/processor-fenced-blocks.js b/lib/__tests__/fixtures/processor-fenced-blocks.js
@@ -2,7 +2,7 @@
 
 const execall = require('execall');
 
-module.exports = function(options = {}) {
+module.exports = function (options = {}) {
 	const specialMessage = options.specialMessage || 'was processed';
 
 	return {

diff --git a/lib/__tests__/fixtures/processor-triple-question-marks.js b/lib/__tests__/fixtures/processor-triple-question-marks.js
@@ -2,7 +2,7 @@
 
 const execall = require('execall');
 
-module.exports = function() {
+module.exports = function () {
 	let found = false;
 
 	return {

diff --git a/lib/assignDisabledRanges.js b/lib/assignDisabledRanges.js
@@ -37,7 +37,7 @@ function createDisableRange(start, strictStart, end, strictEnd) {
  * @param {PostcssResult} result
  * @returns {PostcssResult}
  */
-module.exports = function(root, result) {
+module.exports = function (root, result) {
 	result.stylelint = result.stylelint || {
 		disabledRanges: {},
 		ruleSeverities: {},
@@ -155,8 +155,9 @@ module.exports = function(root, result) {
 		getCommandRules(enableCommand, comment.text).forEach((ruleToEnable) => {
 			// TODO TYPES
 			// need fallback if endLine will be undefined
-			const endLine =
-				/** @type {number} */ (comment.source && comment.source.end && comment.source.end.line);
+			const endLine = /** @type {number} */ (comment.source &&
+				comment.source.end &&
+				comment.source.end.line);
 
 			if (ruleToEnable === ALL_RULES) {
 				if (

diff --git a/lib/augmentConfig.js b/lib/augmentConfig.js
@@ -256,42 +256,39 @@ function addPluginFunctions(config) {
 
 	const normalizedPlugins = Array.isArray(config.plugins) ? config.plugins : [config.plugins];
 
-	const pluginFunctions = normalizedPlugins.reduce(
-		(result, pluginLookup) => {
-			let pluginImport = dynamicRequire(pluginLookup);
-
-			// Handle either ES6 or CommonJS modules
-			pluginImport = pluginImport.default || pluginImport;
-
-			// A plugin can export either a single rule definition
-			// or an array of them
-			const normalizedPluginImport = Array.isArray(pluginImport) ? pluginImport : [pluginImport];
-
-			normalizedPluginImport.forEach((pluginRuleDefinition) => {
-				if (!pluginRuleDefinition.ruleName) {
-					throw configurationError(
-						'stylelint v3+ requires plugins to expose a ruleName. ' +
-							`The plugin "${pluginLookup}" is not doing this, so will not work ` +
-							'with stylelint v3+. Please file an issue with the plugin.',
-					);
-				}
-
-				if (!pluginRuleDefinition.ruleName.includes('/')) {
-					throw configurationError(
-						'stylelint v7+ requires plugin rules to be namespaced, ' +
-							'i.e. only `plugin-namespace/plugin-rule-name` plugin rule names are supported. ' +
-							`The plugin rule "${pluginRuleDefinition.ruleName}" does not do this, so will not work. ` +
-							'Please file an issue with the plugin.',
-					);
-				}
-
-				result[pluginRuleDefinition.ruleName] = pluginRuleDefinition.rule;
-			});
-
-			return result;
-		},
-		/** @type {{[k: string]: Function}} */ ({}),
-	);
+	const pluginFunctions = normalizedPlugins.reduce((result, pluginLookup) => {
+		let pluginImport = dynamicRequire(pluginLookup);
+
+		// Handle either ES6 or CommonJS modules
+		pluginImport = pluginImport.default || pluginImport;
+
+		// A plugin can export either a single rule definition
+		// or an array of them
+		const normalizedPluginImport = Array.isArray(pluginImport) ? pluginImport : [pluginImport];
+
+		normalizedPluginImport.forEach((pluginRuleDefinition) => {
+			if (!pluginRuleDefinition.ruleName) {
+				throw configurationError(
+					'stylelint v3+ requires plugins to expose a ruleName. ' +
+						`The plugin "${pluginLookup}" is not doing this, so will not work ` +
+						'with stylelint v3+. Please file an issue with the plugin.',
+				);
+			}
+
+			if (!pluginRuleDefinition.ruleName.includes('/')) {
+				throw configurationError(
+					'stylelint v7+ requires plugin rules to be namespaced, ' +
+						'i.e. only `plugin-namespace/plugin-rule-name` plugin rule names are supported. ' +
+						`The plugin rule "${pluginRuleDefinition.ruleName}" does not do this, so will not work. ` +
+						'Please file an issue with the plugin.',
+				);
+			}
+
+			result[pluginRuleDefinition.ruleName] = pluginRuleDefinition.rule;
+		});
+
+		return result;
+	}, /** @type {{[k: string]: Function}} */ ({}));
 
 	config.pluginFunctions = pluginFunctions;
 

diff --git a/lib/createPlugin.js b/lib/createPlugin.js
@@ -5,7 +5,7 @@
  * @param {Function} rule
  * @returns {{ruleName: string, rule: Function}}
  */
-module.exports = function(ruleName, rule) {
+module.exports = function (ruleName, rule) {
 	return {
 		ruleName,
 		rule,

diff --git a/lib/createStylelint.js b/lib/createStylelint.js
@@ -22,7 +22,7 @@ const STOP_DIR = IS_TEST ? path.resolve(__dirname, '..') : undefined;
  * @param {import('stylelint').StylelintStandaloneOptions} options
  * @returns {StylelintInternalApi}
  */
-module.exports = function(options = {}) {
+module.exports = function (options = {}) {
 	/** @type {Partial<StylelintInternalApi>} */
 	const stylelint = { _options: options };
 

diff --git a/lib/createStylelintResult.js b/lib/createStylelintResult.js
@@ -13,7 +13,7 @@ const _ = require('lodash');
  * @param {import('stylelint').StylelintCssSyntaxError} [cssSyntaxError]
  * @return {Promise<StylelintResult>}
  */
-module.exports = function(stylelint, postcssResult, filePath, cssSyntaxError) {
+module.exports = function (stylelint, postcssResult, filePath, cssSyntaxError) {
 	/** @type {StylelintResult} */
 	let stylelintResult;
 	/** @type {string | undefined} */
@@ -103,8 +103,8 @@ module.exports = function(stylelint, postcssResult, filePath, cssSyntaxError) {
 
 	return stylelint.getConfigForFile(filePath).then((configForFile) => {
 		// TODO TYPES handle possible null here
-		const config =
-			/** @type {{ config: import('stylelint').StylelintConfig, filepath: string }} */ (configForFile).config;
+		const config = /** @type {{ config: import('stylelint').StylelintConfig, filepath: string }} */ (configForFile)
+			.config;
 		const file = source || (cssSyntaxError && cssSyntaxError.file);
 
 		if (config.resultProcessors) {

diff --git a/lib/dynamicRequire.js b/lib/dynamicRequire.js
@@ -5,6 +5,6 @@
  * @param {string} name
  * @return {any} any module
  */
-module.exports = function(name) {
+module.exports = function (name) {
 	return require(name);
 };
diff --git a/lib/formatters/__tests__/prepareFormatterOutput.js b/lib/formatters/__tests__/prepareFormatterOutput.js
@@ -9,7 +9,7 @@ symbolConversions.set('✔', '√');
 symbolConversions.set('⚠', '‼');
 symbolConversions.set('✖', '×');
 
-module.exports = function(results, formatter) {
+module.exports = function (results, formatter) {
 	let output = stripAnsi(formatter(results)).trim();
 
 	symbolConversions.forEach((win, nix) => {

diff --git a/lib/formatters/disableOptionsReportStringFormatter.js b/lib/formatters/disableOptionsReportStringFormatter.js
@@ -10,17 +10,14 @@ const path = require('path');
 function logFrom(fromValue) {
 	if (fromValue.startsWith('<')) return fromValue;
 
-	return path
-		.relative(process.cwd(), fromValue)
-		.split(path.sep)
-		.join('/');
+	return path.relative(process.cwd(), fromValue).split(path.sep).join('/');
 }
 
 /**
  * @param {import('stylelint').StylelintDisableOptionsReport} report
  * @returns {string}
  */
-module.exports = function(report) {
+module.exports = function (report) {
 	if (!report) return '';
 
 	let output = '';

diff --git a/lib/formatters/stringFormatter.js b/lib/formatters/stringFormatter.js
@@ -68,10 +68,7 @@ function invalidOptionsFormatter(results) {
 function logFrom(fromValue) {
 	if (fromValue.startsWith('<')) return fromValue;
 
-	return path
-		.relative(process.cwd(), fromValue)
-		.split(path.sep)
-		.join('/');
+	return path.relative(process.cwd(), fromValue).split(path.sep).join('/');
 }
 
 /**
@@ -200,7 +197,7 @@ function formatter(messages, source) {
  * @param {import('stylelint').StylelintResult[]} results
  * @returns {string}
  */
-module.exports = function(results) {
+module.exports = function (results) {
 	let output = invalidOptionsFormatter(results);
 
 	output += deprecationsFormatter(results);

diff --git a/lib/formatters/verboseFormatter.js b/lib/formatters/verboseFormatter.js
@@ -8,7 +8,7 @@ const stringFormatter = require('./stringFormatter');
  * @param {import('stylelint').StylelintResult[]} results
  * @returns {string}
  */
-module.exports = function(results) {
+module.exports = function (results) {
 	let output = stringFormatter(results);
 
 	if (output === '') {

diff --git a/lib/getConfigForFile.js b/lib/getConfigForFile.js
@@ -13,7 +13,7 @@ const path = require('path');
  * @param {string} [searchPath]
  * @returns {ConfigPromise}
  */
-module.exports = function(stylelint, searchPath = process.cwd()) {
+module.exports = function (stylelint, searchPath = process.cwd()) {
 	const optionsConfig = stylelint._options.config;
 
 	if (optionsConfig !== undefined) {

diff --git a/lib/getPostcssResult.js b/lib/getPostcssResult.js
@@ -18,7 +18,7 @@ const postcssProcessor = postcss();
  *
  * @returns {Promise<import('postcss').Result>}
  */
-module.exports = function(stylelint, options = {}) {
+module.exports = function (stylelint, options = {}) {
 	const cached = options.filePath ? stylelint._postcssResultCache.get(options.filePath) : undefined;
 
 	if (cached) return Promise.resolve(cached);

diff --git a/lib/invalidScopeDisables.js b/lib/invalidScopeDisables.js
@@ -9,7 +9,7 @@
  * @param {import('stylelint').StylelintConfig|undefined} config
  * @returns {StylelintDisableOptionsReport}
  */
-module.exports = function(results, config = {}) {
+module.exports = function (results, config = {}) {
 	/** @type {StylelintDisableOptionsReport} */
 	const report = [];
 	const usedRules = new Set(Object.keys(config.rules || {}));