Merge pull request #699 from bryceosterhaus/311

Author: bryceosterhaus

.prettierrc.js

@@ -5,6 +5,7 @@
 
 module.exports = {
 	bracketSpacing: false,
+	quoteProps: 'consistent',
 	singleQuote: true,
 	tabWidth: 4,
 	trailingComma: 'es5',

guidelines/support/checkLinks.js

@@ -24,11 +24,11 @@ const FILTER_PATTERN = /\.md$/;
  * See: https://github.com/liferay/liferay-frontend-guidelines/issues/133
  */
 const HEADERS = {
-	Accept:
+	'Accept':
 		'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
 	'Accept-Encoding': 'gzip, deflate, br',
 	'Accept-Language': 'en-US,en;q=0.8,es-ES;q=0.5,es;q=0.3',
-	DNT: '1',
+	'DNT': '1',
 	'User-Agent':
 		'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:74.0) Gecko/20100101 Firefox/74.0',
 };

maintenance/projects/js-themes-toolkit-v8-x/.eslintrc.js

@@ -14,5 +14,6 @@ module.exports = {
 				templateFile: path.join(__dirname, 'copyright.js'),
 			},
 		],
+		'promise/catch-or-return': 'off',
 	},
 };

maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/lib/doctor.js

@@ -9,27 +9,23 @@ const _ = require('lodash');
 
 const lfrThemeConfig = require('./liferay_theme_config');
 
-/* eslint-disable quote-props */
-
 const SUPPORTED_TASKS = {
 	default: {
-		6.2: ' - please run "gulp upgrade" first',
+		'6.2': ' - please run "gulp upgrade" first',
 		'7.0': true,
-		7.1: true,
+		'7.1': true,
 	},
 
 	upgrade: {
-		6.2: true,
+		'6.2': true,
 		'7.0': true,
-		7.1:
+		'7.1':
 			' - please run ' +
 			'"npm install --save-dev liferay-theme-tasks@9.0.0-alpha.1" ' +
 			'and then "gulp upgrade" again',
 	},
 };
 
-/* eslint-enable quote-props */
-
 function getSupportedTasks(task) {
 	return SUPPORTED_TASKS[task] || SUPPORTED_TASKS.default;
 }

maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/lib/look_and_feel_util.js

@@ -18,7 +18,7 @@ const QUERY_ELEMENTS = {
 	'layout-templates.0.custom.0.layout-template': 'id',
 	'layout-templates.0.standard.0.layout-template': 'id',
 	'portlet-decorator': 'id',
-	roles: 'single',
+	'roles': 'single',
 	'settings.0.setting': 'key',
 };
 

maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/lib/lookup.js

@@ -22,9 +22,10 @@ function lookup(key, version = null) {
 	}
 
 	return {
-		baseThemeDependencies: () =>
+		'baseThemeDependencies': () =>
 			require('./lookup/base').getBaseDependencies,
-		devDependencies: () => require('./lookup/dependencies').devDependencies,
+		'devDependencies': () =>
+			require('./lookup/dependencies').devDependencies,
 		'kickstart:afterPromptThemeSource': () =>
 			require('./lookup/kickstart').afterPromptThemeSource,
 		'kickstart:choices': () => require('./lookup/kickstart').choices,

maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/lib/lookup/dependencies.js

@@ -5,7 +5,7 @@
 
 function devDependencies(version) {
 	const dependencies = {
-		gulp: '3.9.1',
+		'gulp': '3.9.1',
 		'liferay-theme-tasks': '8.2.4',
 	};
 

maintenance/projects/js-themes-toolkit-v9-x/.eslintrc.js

@@ -14,5 +14,6 @@ module.exports = {
 				templateFile: path.join(__dirname, 'copyright.js'),
 			},
 		],
+		'promise/catch-or-return': 'off',
 	},
 };

maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/devDependencies.js

@@ -23,18 +23,18 @@ const gulpVersion = '3.9.1';
 const themeTasksVersion = `^${pkgJson.version}`;
 
 // Define dependencies for each Liferay DXP version and project type
-/* eslint-disable quote-props */
+
 module.exports = {
 	layout: {
 		7.2: {
 			default: {
-				gulp: gulpVersion,
+				'gulp': gulpVersion,
 				'liferay-theme-tasks': themeTasksVersion,
 			},
 		},
 		7.3: {
 			default: {
-				gulp: gulpVersion,
+				'gulp': gulpVersion,
 				'liferay-theme-tasks': themeTasksVersion,
 			},
 		},
@@ -43,7 +43,7 @@ module.exports = {
 		7.2: {
 			default: {
 				'compass-mixins': strict('0.12.10'),
-				gulp: gulpVersion,
+				'gulp': gulpVersion,
 				'liferay-frontend-common-css': strict('1.0.4'),
 				'liferay-frontend-theme-styled': strict('4.0.21'),
 				'liferay-frontend-theme-unstyled': strict('4.0.17'),
@@ -56,7 +56,7 @@ module.exports = {
 		7.3: {
 			default: {
 				'compass-mixins': strict('0.12.10'),
-				gulp: gulpVersion,
+				'gulp': gulpVersion,
 				'liferay-frontend-common-css': strict('1.0.4'),
 				'liferay-frontend-theme-styled': strict('5.0.15'),
 				'liferay-frontend-theme-unstyled': strict('5.0.20'),
@@ -68,4 +68,3 @@ module.exports = {
 		},
 	},
 };
-/* eslint-enable quote-props */

maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/look_and_feel_util.js

@@ -18,7 +18,7 @@ const QUERY_ELEMENTS = {
 	'layout-templates.0.custom.0.layout-template': 'id',
 	'layout-templates.0.standard.0.layout-template': 'id',
 	'portlet-decorator': 'id',
-	roles: 'single',
+	'roles': 'single',
 	'settings.0.setting': 'key',
 };