Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

module.exports = {
bracketSpacing: false,
quoteProps: 'consistent',
singleQuote: true,
tabWidth: 4,
trailingComma: 'es5',
Expand Down
4 changes: 2 additions & 2 deletions guidelines/support/checkLinks.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
};
Expand Down
1 change: 1 addition & 0 deletions maintenance/projects/js-themes-toolkit-v8-x/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ module.exports = {
templateFile: path.join(__dirname, 'copyright.js'),
},
],
'promise/catch-or-return': 'off',
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

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

Expand Down
1 change: 1 addition & 0 deletions maintenance/projects/js-themes-toolkit-v9-x/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ module.exports = {
templateFile: path.join(__dirname, 'copyright.js'),
},
],
'promise/catch-or-return': 'off',
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
},
Expand All @@ -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'),
Expand All @@ -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'),
Expand All @@ -68,4 +68,3 @@ module.exports = {
},
},
};
/* eslint-enable quote-props */
Original file line number Diff line number Diff line change
Expand Up @@ -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',
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ var propertyMap = {
'border-top-left-radius': 'border-top-right-radius',
'border-top-right-radius': 'border-top-left-radius',

left: 'right',
'left': 'right',

'margin-left': 'margin-right',
'margin-right': 'margin-left',

'padding-left': 'padding-right',
'padding-right': 'padding-left',

right: 'left',
'right': 'left',
};

var valueMap = {
Expand All @@ -129,11 +129,11 @@ var valueMap = {
'border-radius': quad_radius,
'border-style': quad,
'border-width': quad,
clear: rtltr,
'clear': rtltr,
direction,
float: rtltr,
margin: quad,
padding: quad,
'float': rtltr,
'margin': quad,
'padding': quad,
'text-align': rtltr,
};

Expand Down
1 change: 1 addition & 0 deletions maintenance/projects/js-toolkit/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ module.exports = {
templateFile: path.join(__dirname, 'copyright.js'),
},
],
'promise/catch-or-return': 'off',
'sort-keys': 'off',
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ const prjDirPath = path.join(__dirname, '__fixtures__', 'a-project');
const filename = path.join(prjDirPath, 'path', 'to', 'module.js');

const imports = {
provider: {
'provider': {
'imp-package': '^1.0.0',
},
shims: {
'shims': {
fs: '^1.0.0',
},
'': {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@ export default class {
// Add configuration localization

new LanguagePropertiesModifier(this._generator).addProperties({
fruit: 'Favorite fruit',
'fruit': 'Favorite fruit',
'fruit-help': 'Choose the fruit you like the most',
'an-orange': 'An orange',
'a-pear': 'A pear',
'an-apple': 'An apple',
drink: 'Favorite drink',
'drink': 'Favorite drink',
'drink-help': 'Choose the drink you like the most',
water: 'Water',
wine: 'Wine',
beer: 'Beer',
'water': 'Water',
'wine': 'Wine',
'beer': 'Beer',
});
}
else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ function translate(subscriptionKey, locales, texts) {
url: 'translate',
qs: {
'api-version': '3.0',
to: targetLocales,
'to': targetLocales,
},
headers: {
'Ocp-Apim-Subscription-Key': subscriptionKey,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('loadAliases', () => {
]);

expect(aliases).toEqual({
fs: './fs-shim.js',
'fs': './fs-shim.js',
'./random.js': './random-shim.js',
'./log': './log-shim.js',
'./utils/printer.js': './printer-shim.js',
Expand All @@ -32,7 +32,7 @@ describe('loadAliases', () => {

expect(aliases).toEqual({
'./random.js': './random-shim.js',
fs: './fs-shim2.js',
'fs': './fs-shim2.js',
'./log': './log-shim.js',
});
});
Expand All @@ -45,7 +45,7 @@ describe('loadAliases', () => {

expect(aliases).toEqual({
'./random.js': './random-shim.js',
fs: './fs-shim.js',
'fs': './fs-shim.js',
'./log': './log-shim.js',
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ import {normalizeImportsConfig, unrollImportsConfig} from '../imports';
describe('normalizeImportsConfig()', () => {
it('works for empty string format normalization', () => {
const imports = normalizeImportsConfig({
provider1: {
'provider1': {
dep1: '^1.0.0',
dep2: '^2.0.0',
},
provider2: {
'provider2': {
dep9: '^9.0.0',
dep8: '^8.0.0',
},
'': {
depA: '3.0.0',
},
depB: {
'depB': {
'/': '4.0.0',
depC: '5.0.0',
'depC': '5.0.0',
},
});

Expand All @@ -31,20 +31,20 @@ describe('normalizeImportsConfig()', () => {
it('works for slash format normalization', () => {
const imports = normalizeImportsConfig(
{
provider1: {
'provider1': {
dep1: '^1.0.0',
dep2: '^2.0.0',
},
provider2: {
'provider2': {
dep9: '^9.0.0',
dep8: '^8.0.0',
},
'': {
depA: '3.0.0',
},
depB: {
'depB': {
'/': '4.0.0',
depC: '5.0.0',
'depC': '5.0.0',
},
},
true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ describe('project.jar', () => {

// Coming from .npmbundlerrc

Responsible: 'john.doe@somewhere.net',
'Responsible': 'john.doe@somewhere.net',

// Coming from manifest.json

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ export class Project {
* `.npmbundlerrc` options.
*/
set argv(argv: {
config: string;
'config': string;
'create-jar': boolean;
'dump-report': boolean;
}) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ it('injects imports', () => {
},
globalConfig: {
imports: {
provider: {
'provider': {
'pkg-a': '^1.0.0',
'pkg-b': '^2.0.0',
},
Expand Down Expand Up @@ -91,7 +91,7 @@ it('logs results correctly', () => {
},
globalConfig: {
imports: {
provider: {
'provider': {
'pkg-a': '^1.0.0',
'pkg-b': '^3.0.0',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {UnrolledAliasesMap, unrollAliasesMap} from '../util';
it('unrollAliasesMap works', () => {
const unrolledAliasesMap = unrollAliasesMap({
'/home/me/project': {
fs: false,
'fs': false,
'/log.js': './log-browser.js',
},
'/home/me/project/dir': {
Expand Down
3 changes: 2 additions & 1 deletion maintenance/projects/senna/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {
rules: {
'@liferay/no-abbreviations': 'off',
'@liferay/no-it-should': 'warn',
curly: 'warn',
'curly': 'warn',
'default-case': 'warn',
'no-console': 'warn',
'no-empty': 'warn',
Expand All @@ -29,6 +29,7 @@ module.exports = {
},
],
'prefer-arrow-callback': 'off',
'promise/catch-or-return': 'off',
'sort-keys': 'off',
},
};
Loading