Skip to content

Commit

Permalink
chore: fix lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
bryceosterhaus committed Sep 30, 2021
1 parent 282e8a3 commit 15d274b
Show file tree
Hide file tree
Showing 54 changed files with 67 additions and 64 deletions.
2 changes: 1 addition & 1 deletion maintenance/projects/js-themes-toolkit-v8-x/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const path = require('path');

module.exports = {
rules: {
'@liferay/liferay/no-abbreviations': 'off',
'@liferay/no-abbreviations': 'off',
'notice/notice': [
'error',
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ module.exports = class extends Base {

fs.stat(themePackagePath, (err, stat) => {
if (!err && stat.isFile()) {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const themePackage = require(themePackagePath);

if (themePackage.liferayTheme) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function register(options) {

globby.sync([path.resolve(__dirname, 'tasks/**/*')]).forEach((item) => {
if (item.indexOf('__tests__') == -1) {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
require(item)(options);
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ afterEach(() => {

it('throws appropriate error message', () => {
const pkgJsonPath = path.join(__dirname, './fixtures/doctor/_package.json');
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const pkgJson = require(pkgJsonPath);

expect(() =>
Expand All @@ -59,7 +59,7 @@ it('looks for dependencies regardless if devDependency or not', () => {
__dirname,
'./fixtures/doctor/_package_mixed_dependencies.json'
);
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const pkgJson = require(pkgJsonPath);

expect(() =>
Expand All @@ -73,7 +73,7 @@ it('looks for dependencies regardless if devDependency or not', () => {

it('removes supportCompass', () => {
const pkgJsonPath = path.join(tempPath, 'package.json');
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const pkgJson = require(pkgJsonPath);

doctor({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function mergeLookAndFeelJSON(themePath, lookAndFeelJSON, cb) {
lookAndFeelJSON = mergeJSON(lookAndFeelJSON, json);
}

// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const {liferayTheme: themeInfo} = require(path.join(
themePath,
'package.json'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ function searchGlobalModules(config, cb) {
modules,
(result, item) => {
try {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const json = require(path.join(item, 'package.json'));

json.__realPath__ = item;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function getBaseThemeGlob(themePath) {
}

function getLiferayThemeJSON(themePath) {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
return require(path.join(themePath, 'package.json')).liferayTheme;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function requireDependency(dependency, version) {

const dependencyPath = require.resolve(dependency, {paths: [depsPath]});

// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
return require(dependencyPath);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class WarDeployer extends EventEmitter {
}

_makeRequest() {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const protocol = require(this.protocol);

const req = protocol.request(this._getPostOptions(), (res) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function getPostCSSOptions(config) {
postCSSOptions.enabled = true;

postCSSOptions.plugins = config.map((pluginDependency) =>
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
require(pluginDependency)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ function getThemeletFilePathArray(filePath) {
}

function getThemeletDependencies() {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const packageJSON = require(path.join(CWD, 'package.json'));

let themeletDependencies;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module.exports = function (options) {
let versionUpgradeTask;

if (fs.existsSync(modulePath)) {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
versionUpgradeTask = require(modulePath)(options);
}

Expand Down
2 changes: 1 addition & 1 deletion maintenance/projects/js-themes-toolkit-v9-x/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const path = require('path');

module.exports = {
rules: {
'@liferay/liferay/no-abbreviations': 'off',
'@liferay/no-abbreviations': 'off',
'notice/notice': [
'error',
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function register(options) {

globby.sync([path.resolve(__dirname, 'tasks/**/*')]).forEach((item) => {
if (item.indexOf('__tests__') == -1) {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
require(item)(options);
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function mergeLookAndFeelJSON(themePath, lookAndFeelJSON, cb) {
lookAndFeelJSON = mergeJSON(lookAndFeelJSON, json);
}

// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const {liferayTheme: themeInfo} = require(path.join(
themePath,
'package.json'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ function searchGlobalModules(config, cb) {
modules,
(result, item) => {
try {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const json = require(path.join(item, 'package.json'));

json.__realPath__ = item;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function getBaseThemeGlob(themePath) {
}

function getLiferayThemeJSON(themePath) {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
return require(path.join(themePath, 'package.json')).liferayTheme;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class WarDeployer extends EventEmitter {
}

_makeRequest() {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const protocol = require(this.protocol);

const req = protocol.request(this._getPostOptions(), (res) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ RegisterHooks.prototype = {

_registerHookModule(moduleName) {
try {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
var hookFn = require(moduleName);

if (_.isFunction(hookFn)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ test('_registerHookModule should register hook or log appropriate log messages',
);
expect(gutil.log.callCount).toBe(1);

// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
require(path.join(__dirname, '../fixtures/hook_modules/hook-module-1'));

prototype.gulp = {
Expand Down Expand Up @@ -227,7 +227,7 @@ test('_registerHookModule should pass correct arguments to hook modules', () =>
'../fixtures/hook_modules/hook-module-4'
);

// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
var moduleHook = require(hookModulePath)().resetHistory();

prototype.gulp = 'gulp';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ test('plugin:version should add package.json version to liferay-plugin-package.p
test('plugin:version should add package.json version to liferay-plugin-package.properties', (done) => {
var pkgPath = path.join(tempPath, 'package.json');

// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
var pkg = require(pkgPath);

pkg.version = '1.2.4';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ function getPostCSSOptions(config) {
postCSSOptions.enabled = true;

postCSSOptions.plugins = config.map((pluginDependency) =>
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
require(pluginDependency)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module.exports = function (options) {
let versionUpgradeTask;

if (fs.existsSync(modulePath)) {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
versionUpgradeTask = require(modulePath)(options);
}

Expand Down
2 changes: 1 addition & 1 deletion maintenance/projects/js-themes-toolkit-v9-x/scripts/qa.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: MIT
*/

/* eslint-disable no-console, @liferay/liferay/no-dynamic-require */
/* eslint-disable no-console, @liferay/no-dynamic-require */

const childProcess = require('child_process');
const fs = require('fs-extra');
Expand Down
4 changes: 2 additions & 2 deletions maintenance/projects/js-toolkit/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ module.exports = {
jest: true,
},
rules: {
'@liferay/liferay/no-abbreviations': 'off',
'@liferay/liferay/no-dynamic-require': 'off',
'@liferay/no-abbreviations': 'off',
'@liferay/no-dynamic-require': 'off',
'no-console': 'off',
'no-return-assign': ['error', 'except-parens'],
'notice/notice': [
Expand Down
4 changes: 2 additions & 2 deletions maintenance/projects/senna/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ module.exports = {
browser: true,
},
rules: {
'@liferay/liferay/no-abbreviations': 'off',
'@liferay/liferay/no-it-should': 'warn',
'@liferay/no-abbreviations': 'off',
'@liferay/no-it-should': 'warn',
curly: 'warn',
'default-case': 'warn',
'no-console': 'warn',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function runGulpInit(registerTasksModule) {
);

// We cannot load this before the project is created because it crashes
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const liferayThemeTasks = require(`liferay-theme-tasks/${registerTasksModule}`);

liferayThemeTasks.registerTasks({gulp});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Gulp {
this._gulp = gulp;
}
else {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
this._gulp = require(resolve.sync('gulp', {
basedir: project.dir,
}));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ test('_registerHookModule should register hook or log appropriate log messages',
);
expect(gutil.log.callCount).toBe(1);

// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
require(path.join(__dirname, 'fixtures', 'hook_modules', 'hook-module-1'));

prototype.gulp = {
Expand Down Expand Up @@ -199,7 +199,7 @@ test('_registerHookModule should pass correct arguments to hook modules', () =>
'hook-module-4'
);

// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
var moduleHook = require(hookModulePath)().resetHistory();

prototype.gulp = 'gulp';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ RegisterHooks.prototype = {

_registerHookModule(moduleName) {
try {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
var hookFn = require(moduleName);

if (_.isFunction(hookFn)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ test('plugin:version should add package.json version to liferay-plugin-package.p
test('plugin:version should add package.json version to liferay-plugin-package.properties', (done) => {
const pkgPath = path.join(tempPlugin.tempPath, 'package.json');

// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const pkg = require(pkgPath);

pkg.version = '1.2.4';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function mergeLookAndFeelJSON(themePath, lookAndFeelJSON, callback) {
lookAndFeelJSON = mergeJSON(lookAndFeelJSON, json);
}

// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const {liferayTheme: themeInfo} = require(path.join(
themePath,
'package.json'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ function searchGlobalModules(config, callback) {
modules,
(result, item) => {
try {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const json = require(path.join(item, 'package.json'));

json.__realPath__ = item;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function getBaseThemeGlob(themePath) {
}

function getLiferayThemeJSON(themePath) {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
return require(path.join(themePath, 'package.json')).liferayTheme;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class WarDeployer extends EventEmitter {
}

_makeRequest() {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
const protocol = require(this.protocol);

const req = protocol.request(this._getPostOptions(), (res) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ function getPostCSSOptions(config) {
postCSSOptions.enabled = true;

postCSSOptions.plugins = config.map((pluginDependency) =>
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
require(pluginDependency)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ module.exports = function () {
let versionUpgrade;

if (fs.existsSync(modulePath)) {
// eslint-disable-next-line @liferay/liferay/no-dynamic-require
// eslint-disable-next-line @liferay/no-dynamic-require
versionUpgrade = require(modulePath)();
}

Expand Down
2 changes: 1 addition & 1 deletion projects/js-themes-toolkit/scripts/qa.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: MIT
*/

/* eslint-disable no-console, @liferay/liferay/no-dynamic-require */
/* eslint-disable no-console, @liferay/no-dynamic-require */

const childProcess = require('child_process');
const fs = require('fs-extra');
Expand Down
4 changes: 2 additions & 2 deletions projects/js-toolkit/packages/js-toolkit-core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export {transformText, transformTextFile} from './transform/text';

// Transformation operations per file type

/* eslint-disable @liferay/liferay/imports-first, @liferay/liferay/group-imports */
/* eslint-disable @liferay/imports-first, @liferay/group-imports */
import replaceInStringLiterals from './transform/js/operation/replaceInStringLiterals';
import wrapModule from './transform/js/operation/wrapModule';

Expand All @@ -115,7 +115,7 @@ import addPkgJsonScripts from './transform/json/operation/addPkgJsonScripts';
import deletePkgJsonDependencies from './transform/json/operation/deletePkgJsonDependencies';

import appendLines from './transform/text/operation/appendLines';
/* eslint-enable @liferay/liferay/imports-first, @liferay/liferay/group-imports */
/* eslint-enable @liferay/imports-first, @liferay/group-imports */

export const TRANSFORM_OPERATIONS = {
ConfigurationJson: {
Expand Down
Loading

0 comments on commit 15d274b

Please sign in to comment.