From d8bdba7fff8fb020a74f88bf23d593f6887c19e6 Mon Sep 17 00:00:00 2001 From: Bryce Osterhaus Date: Mon, 18 Oct 2021 14:54:39 -0700 Subject: [PATCH 1/3] feat(eslint-plugin): enable eqeqeq rule to enforce type-safe equality operators --- projects/eslint-plugin/configs/general.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/eslint-plugin/configs/general.js b/projects/eslint-plugin/configs/general.js index e2e53743b1..ae8cc4a5ed 100644 --- a/projects/eslint-plugin/configs/general.js +++ b/projects/eslint-plugin/configs/general.js @@ -114,6 +114,7 @@ const config = { '@liferay/use-state-naming-pattern': 'error', 'curly': 'error', 'default-case': 'error', + 'eqeqeq': 'error', 'lines-around-comment': [ 'error', { From 7e82974bb8eff646c0414d2b124130b0215cd8bd Mon Sep 17 00:00:00 2001 From: Bryce Osterhaus Date: Wed, 20 Oct 2021 11:34:53 -0700 Subject: [PATCH 2/3] fix: apply eqeqeq to entire codebase --- .../generators/themelet/index.js | 8 ++++---- .../lib/__tests__/layout_creator.test.js | 8 ++++---- .../generator-liferay-theme/lib/layout_creator.js | 10 +++++----- .../packages/liferay-theme-tasks/index.js | 2 +- .../liferay-theme-tasks/lib/lookup/template.js | 2 +- .../lib/prompts/__tests__/prompt_util.test.js | 6 +++--- .../packages/liferay-theme-tasks/test/util.js | 6 +++--- .../generator-liferay-theme/lib/LayoutCreator.js | 10 +++++----- .../lib/__tests__/LayoutCreator.test.js | 8 ++++---- .../packages/liferay-theme-tasks/index.js | 2 +- .../lib/prompts/__tests__/prompt_util.test.js | 6 +++--- .../lib/r2/liferay-r2/css-parse.js | 10 +++++----- .../liferay-theme-tasks/lib/r2/liferay-r2/index.js | 10 +++++----- .../liferay-theme-tasks/plugin/lib/init_prompt.js | 2 +- .../plugin/lib/register_hooks.js | 2 +- .../liferay-theme-tasks/plugin/tasks/version.js | 2 +- .../packages/liferay-theme-tasks/test/util.js | 6 +++--- .../projects/js-themes-toolkit-v9-x/scripts/qa.js | 2 +- .../babel-plugin-add-module-metadata/src/index.js | 2 +- .../babel-plugin-normalize-requires/src/index.js | 6 +++--- .../babel-plugin-wrap-modules-amd/src/index.js | 4 ++-- .../packages/generator-liferay-js/src/app/index.js | 2 +- .../liferay-npm-build-support/src/loader/util.ts | 2 +- .../src/portal/portal-shell.js | 8 ++++---- .../src/scripts/translate.js | 14 +++++++------- .../packages/liferay-npm-build-support/src/util.js | 4 ++-- .../liferay-npm-build-tools-common/src/format.ts | 4 ++-- .../liferay-npm-build-tools-common/src/imports.ts | 2 +- .../src/namespace.ts | 6 +++--- .../liferay-npm-build-tools-common/src/pkg-desc.ts | 2 +- .../src/index.js | 4 ++-- .../src/index.js | 2 +- .../src/index.js | 4 ++-- .../src/index.ts | 8 ++++---- .../src/index.js | 4 ++-- .../src/__tests__/dependencies.test.js | 8 ++++---- .../liferay-npm-bundler/src/dependencies.js | 4 ++-- .../packages/liferay-npm-bundler/src/index.ts | 4 ++-- .../packages/liferay-npm-bundler/src/jar/index.js | 4 ++-- .../packages/liferay-npm-bundler/src/jar/xml.js | 2 +- .../liferay-npm-bundler/src/report/html.js | 10 +++++----- .../liferay-npm-bundler/src/steps/rules.js | 6 +++--- .../liferay-npm-bundler/src/steps/transform.js | 2 +- .../packages/liferay-npm-bundler/src/steps/util.js | 2 +- .../src/liferay-npm-imports-checker.js | 2 +- .../qa/samples/packages/alias-test/scripts/test.js | 2 +- .../devtools/link-js-toolkit/link-js-toolkit.js | 4 ++-- .../resources/devtools/link-js-toolkit/util.js | 4 ++-- .../projects/js-toolkit/scripts/level-deps.js | 2 +- .../projects/js-toolkit/scripts/qa/index.js | 2 +- maintenance/projects/js-toolkit/scripts/qa/util.js | 2 +- .../amd-loader/src/loader/dependency-resolver.js | 2 +- projects/amd-loader/src/loader/loader.js | 14 +++++++------- projects/amd-loader/src/loader/script-loader.js | 2 +- .../generator-liferay-theme/lib/LayoutCreator.js | 10 +++++----- .../lib/__tests__/LayoutCreator.test.js | 8 ++++---- .../lib/r2/liferay-r2/css-parse.js | 10 +++++----- .../liferay-theme-tasks/lib/r2/liferay-r2/index.js | 10 +++++----- .../packages/liferay-theme-tasks/lib/test/util.js | 8 ++++---- .../plugin/lib/register_hooks.js | 2 +- .../liferay-theme-tasks/plugin/tasks/version.js | 2 +- .../theme/prompts/__tests__/prompt_util.test.js | 6 +++--- projects/js-themes-toolkit/scripts/qa.js | 2 +- .../js-toolkit/packages/dev-server/src/server.ts | 2 +- .../packages/js-toolkit-core/src/format.ts | 4 ++-- .../packages/js-toolkit-core/src/node/namespace.ts | 6 +++--- .../js-toolkit-core/src/transform/js/index.ts | 2 +- .../src/transform/js/operation/wrapModule.ts | 2 +- .../npm-bundler/src/bundle/ExplainedError.ts | 2 +- .../src/transform/js/operation/transformImports.ts | 2 +- .../src/webpack/loader/imports-loader.ts | 2 +- .../src/util/removeWebpackHash.ts | 2 +- .../src/util/runNodeModulesBin.ts | 2 +- .../portal-adapt-base/src/util/runPkgJsonScript.ts | 2 +- .../resources/devtools/link-js-toolkit/util.js | 2 +- projects/js-toolkit/scripts/watch.js | 2 +- .../packages/npm-scripts/src/jsp/Lexer.js | 2 +- 77 files changed, 175 insertions(+), 175 deletions(-) diff --git a/maintenance/projects/js-themes-toolkit-v8-x/packages/generator-liferay-theme/generators/themelet/index.js b/maintenance/projects/js-themes-toolkit-v8-x/packages/generator-liferay-theme/generators/themelet/index.js index 9820c0993f..d81a64a2dc 100644 --- a/maintenance/projects/js-themes-toolkit-v8-x/packages/generator-liferay-theme/generators/themelet/index.js +++ b/maintenance/projects/js-themes-toolkit-v8-x/packages/generator-liferay-theme/generators/themelet/index.js @@ -82,14 +82,14 @@ module.exports = class extends Base { return prompts.reduce((result, item) => { const name = item.name; - if (name == 'themeName') { + if (name === 'themeName') { item.default = 'My Liferay Themelet'; item.message = 'What would you like to call your themelet?'; } - else if (name == 'themeId') { + else if (name === 'themeId') { item.message = 'Would you like to use this as the themeletId?'; } - else if (name == 'liferayVersion') { + else if (name === 'liferayVersion') { item.choices = ['7.1', '7.0', 'All']; item.message = 'Which version of Liferay is this themelet for?'; } @@ -107,7 +107,7 @@ module.exports = class extends Base { } _promptCallback(props) { - if (props.liferayVersion == 'All') { + if (props.liferayVersion === 'All') { props.liferayVersion = '*'; } super._promptCallback.call(this, props); diff --git a/maintenance/projects/js-themes-toolkit-v8-x/packages/generator-liferay-theme/lib/__tests__/layout_creator.test.js b/maintenance/projects/js-themes-toolkit-v8-x/packages/generator-liferay-theme/lib/__tests__/layout_creator.test.js index ec98caef6a..303be9813d 100644 --- a/maintenance/projects/js-themes-toolkit-v8-x/packages/generator-liferay-theme/lib/__tests__/layout_creator.test.js +++ b/maintenance/projects/js-themes-toolkit-v8-x/packages/generator-liferay-theme/lib/__tests__/layout_creator.test.js @@ -509,7 +509,7 @@ describe('LayoutCreator', () => { _.forEach(choices, (choice, index) => { index = index + 1; - if (index % 2 == 0) { + if (index % 2 === 0) { assert.equal(choice.type, 'separator'); assert.equal( stripAnsi(choice.line), @@ -527,7 +527,7 @@ describe('LayoutCreator', () => { } }); - assert(choices[choices.length - 1].type != 'separator'); + assert(choices[choices.length - 1].type !== 'separator'); while (prototype.rows.length < 7) { prototype.rows.push({ @@ -569,7 +569,7 @@ describe('LayoutCreator', () => { _.forEach(choices, (choice, index) => { index = index + 1; - if (index % 2 == 0) { + if (index % 2 === 0) { assert.equal(choice.value, choiceValue); assert.equal( stripAnsi(choice.name), @@ -587,7 +587,7 @@ describe('LayoutCreator', () => { } }); - assert(choices[choices.length - 1].type == 'separator'); + assert(choices[choices.length - 1].type === 'separator'); while (prototype.rows.length < 7) { prototype.rows.push({ diff --git a/maintenance/projects/js-themes-toolkit-v8-x/packages/generator-liferay-theme/lib/layout_creator.js b/maintenance/projects/js-themes-toolkit-v8-x/packages/generator-liferay-theme/lib/layout_creator.js index 16fb15a2ad..c7fc2b43e5 100644 --- a/maintenance/projects/js-themes-toolkit-v8-x/packages/generator-liferay-theme/lib/layout_creator.js +++ b/maintenance/projects/js-themes-toolkit-v8-x/packages/generator-liferay-theme/lib/layout_creator.js @@ -29,7 +29,7 @@ inquirer.prompt.prompts.list.prototype.render = function () { var choices = _.reduce( this.opt.choices.choices, (result, item) => { - if (item.type != 'separator') { + if (item.type !== 'separator') { result.push(item); } @@ -113,16 +113,16 @@ LayoutCreator.prototype = { _afterPromptFinishRow(answers, cb) { var finish = answers.finish; - if (finish == 'add') { + if (finish === 'add') { this._promptRow(cb); } - else if (finish == 'insert') { + else if (finish === 'insert') { this._promptInsertRow(cb); } - else if (answers.finish == 'finish') { + else if (answers.finish === 'finish') { cb(null); } - else if (finish == 'remove') { + else if (finish === 'remove') { this._promptRemoveRow(cb); } }, diff --git a/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/index.js b/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/index.js index b828a35820..86858e73bb 100644 --- a/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/index.js +++ b/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/index.js @@ -51,7 +51,7 @@ function register(options) { store.set('changedFile'); globby.sync([path.resolve(__dirname, 'tasks/**/*')]).forEach((item) => { - if (item.indexOf('__tests__') == -1) { + if (item.indexOf('__tests__') === -1) { // eslint-disable-next-line @liferay/no-dynamic-require require(item)(options); } diff --git a/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/lib/lookup/template.js b/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/lib/lookup/template.js index 41cde6a3d5..64a50a7d3f 100644 --- a/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/lib/lookup/template.js +++ b/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/lib/lookup/template.js @@ -36,7 +36,7 @@ function isLanguage(version) { function printWarnings(version) { return function (generator, {templateLanguage}) { - if (templateLanguage == 'vm') { + if (templateLanguage === 'vm') { if (version === '7.0') { generator.log( chalk.yellow( diff --git a/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/lib/prompts/__tests__/prompt_util.test.js b/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/lib/prompts/__tests__/prompt_util.test.js index f0a9af8d8d..4a8aef046b 100644 --- a/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/lib/prompts/__tests__/prompt_util.test.js +++ b/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/lib/prompts/__tests__/prompt_util.test.js @@ -58,7 +58,7 @@ it('formatThemeletSelection should format themelet selection retrieved from getM it('getListType should get listType based on environment', () => { const listType = promptUtil.getListType(); - expect(listType == 'list' || listType == 'rawlist').toBe(true); + expect(listType === 'list' || listType === 'rawlist').toBe(true); }); it('getModuleChoices should get module choices that are appropriate for extend type', () => { @@ -80,7 +80,7 @@ it('getModuleChoices should get module choices that are appropriate for extend t const number = index + 1; const name = 'themelet-' + number; - if (number == 1) { + if (number === 1) { expect(item.name).toBe(name + ' (selected)'); } @@ -108,7 +108,7 @@ it('getModuleChoices should get module choices that are appropriate for extend t const number = index + 1; const name = 'themelet-' + number; - if (number == 1) { + if (number === 1) { expect(item.checked).toBe(true); } else { diff --git a/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/test/util.js b/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/test/util.js index c0219f4084..995d8d63b9 100644 --- a/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/test/util.js +++ b/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/test/util.js @@ -46,7 +46,7 @@ expect.extend({ pass = false; message = `Path '${path}' is not a folder`; } - else if (fs.readdirSync(path).length == 0) { + else if (fs.readdirSync(path).length === 0) { pass = false; message = `Folder '${path}' is empty`; } @@ -70,7 +70,7 @@ expect.extend({ pass = false; message = `Path '${path}' is not a folder`; } - else if (fs.readdirSync(path).length != 0) { + else if (fs.readdirSync(path).length !== 0) { pass = false; message = `Folder '${path}' is not empty`; } @@ -321,7 +321,7 @@ function cleanTempTheme(themeName, version, component, initCwd) { cleanDirectory(tempPath); - if (initCwd != null) { + if (initCwd !== null) { process.chdir(initCwd); } } diff --git a/maintenance/projects/js-themes-toolkit-v9-x/packages/generator-liferay-theme/lib/LayoutCreator.js b/maintenance/projects/js-themes-toolkit-v9-x/packages/generator-liferay-theme/lib/LayoutCreator.js index 61ed56bba5..4fd9997f99 100644 --- a/maintenance/projects/js-themes-toolkit-v9-x/packages/generator-liferay-theme/lib/LayoutCreator.js +++ b/maintenance/projects/js-themes-toolkit-v9-x/packages/generator-liferay-theme/lib/LayoutCreator.js @@ -29,7 +29,7 @@ inquirer.prompt.prompts.list.prototype.render = function () { var choices = _.reduce( this.opt.choices.choices, (result, item) => { - if (item.type != 'separator') { + if (item.type !== 'separator') { result.push(item); } @@ -106,16 +106,16 @@ LayoutCreator.prototype = { _afterPromptFinishRow(answers, cb) { var finish = answers.finish; - if (finish == 'add') { + if (finish === 'add') { this._promptRow(cb); } - else if (finish == 'insert') { + else if (finish === 'insert') { this._promptInsertRow(cb); } - else if (answers.finish == 'finish') { + else if (answers.finish === 'finish') { cb(null); } - else if (finish == 'remove') { + else if (finish === 'remove') { this._promptRemoveRow(cb); } }, diff --git a/maintenance/projects/js-themes-toolkit-v9-x/packages/generator-liferay-theme/lib/__tests__/LayoutCreator.test.js b/maintenance/projects/js-themes-toolkit-v9-x/packages/generator-liferay-theme/lib/__tests__/LayoutCreator.test.js index 68b9f6fa82..9c8516d5a7 100644 --- a/maintenance/projects/js-themes-toolkit-v9-x/packages/generator-liferay-theme/lib/__tests__/LayoutCreator.test.js +++ b/maintenance/projects/js-themes-toolkit-v9-x/packages/generator-liferay-theme/lib/__tests__/LayoutCreator.test.js @@ -500,7 +500,7 @@ describe('LayoutCreator', () => { _.forEach(choices, (choice, index) => { index = index + 1; - if (index % 2 == 0) { + if (index % 2 === 0) { assert.equal(choice.type, 'separator'); assert.equal( stripAnsi(choice.line), @@ -518,7 +518,7 @@ describe('LayoutCreator', () => { } }); - assert(choices[choices.length - 1].type != 'separator'); + assert(choices[choices.length - 1].type !== 'separator'); while (prototype.rows.length < 7) { prototype.rows.push({ @@ -560,7 +560,7 @@ describe('LayoutCreator', () => { _.forEach(choices, (choice, index) => { index = index + 1; - if (index % 2 == 0) { + if (index % 2 === 0) { assert.equal(choice.value, choiceValue); assert.equal( stripAnsi(choice.name), @@ -578,7 +578,7 @@ describe('LayoutCreator', () => { } }); - assert(choices[choices.length - 1].type == 'separator'); + assert(choices[choices.length - 1].type === 'separator'); while (prototype.rows.length < 7) { prototype.rows.push({ diff --git a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/index.js b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/index.js index ca17b6d95e..7015af767e 100644 --- a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/index.js +++ b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/index.js @@ -47,7 +47,7 @@ function register(options) { store.set('changedFile'); globby.sync([path.resolve(__dirname, 'tasks/**/*')]).forEach((item) => { - if (item.indexOf('__tests__') == -1) { + if (item.indexOf('__tests__') === -1) { // eslint-disable-next-line @liferay/no-dynamic-require require(item)(options); } diff --git a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/prompts/__tests__/prompt_util.test.js b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/prompts/__tests__/prompt_util.test.js index f0a9af8d8d..4a8aef046b 100644 --- a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/prompts/__tests__/prompt_util.test.js +++ b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/prompts/__tests__/prompt_util.test.js @@ -58,7 +58,7 @@ it('formatThemeletSelection should format themelet selection retrieved from getM it('getListType should get listType based on environment', () => { const listType = promptUtil.getListType(); - expect(listType == 'list' || listType == 'rawlist').toBe(true); + expect(listType === 'list' || listType === 'rawlist').toBe(true); }); it('getModuleChoices should get module choices that are appropriate for extend type', () => { @@ -80,7 +80,7 @@ it('getModuleChoices should get module choices that are appropriate for extend t const number = index + 1; const name = 'themelet-' + number; - if (number == 1) { + if (number === 1) { expect(item.name).toBe(name + ' (selected)'); } @@ -108,7 +108,7 @@ it('getModuleChoices should get module choices that are appropriate for extend t const number = index + 1; const name = 'themelet-' + number; - if (number == 1) { + if (number === 1) { expect(item.checked).toBe(true); } else { diff --git a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/css-parse.js b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/css-parse.js index 47e19edb32..9afd7927ec 100644 --- a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/css-parse.js +++ b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/css-parse.js @@ -126,7 +126,7 @@ module.exports = function (css, options) { comments(rules); while ( css.length && - css.charAt(0) != '}' && + css.charAt(0) !== '}' && (node = atrule() || rule()) ) { rules.push(node); @@ -180,14 +180,14 @@ module.exports = function (css, options) { function comment() { var pos = position(); - if ('/' != css.charAt(0) || '*' != css.charAt(1)) { + if ('/' !== css.charAt(0) || '*' !== css.charAt(1)) { return; } var i = 2; while ( - null != css.charAt(i) && - ('*' != css.charAt(i) || '/' != css.charAt(i + 1)) + null !== css.charAt(i) && + ('*' !== css.charAt(i) || '/' !== css.charAt(i + 1)) ) { ++i; } @@ -599,7 +599,7 @@ module.exports = function (css, options) { */ function atrule() { - if (css[0] != '@') { + if (css[0] !== '@') { return; } diff --git a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js index 17bc786c96..9aae0a42cc 100644 --- a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js +++ b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js @@ -15,7 +15,7 @@ function quad(v, m) { // 1px 2px 3px 4px => 1px 4px 3px 2px - if ((m = v.trim().split(/\s+(?=[^)]*(?:[(]|$))/)) && m.length == 4) { + if ((m = v.trim().split(/\s+(?=[^)]*(?:[(]|$))/)) && m.length === 4) { return [m[0], m[3], m[2], m[1]].join(' '); } @@ -29,10 +29,10 @@ function quad_radius(v) { // since border-radius: top-left top-right bottom-right bottom-left // will be border-radius: top-right top-left bottom-left bottom-right - if (m && m.length == 4) { + if (m && m.length === 4) { return [m[1], m[0], m[3], m[2]].join(' '); } - else if (m && m.length == 3) { + else if (m && m.length === 3) { // super odd how this works // 5px 10px 20px => 10px 5px 10px 20px @@ -67,10 +67,10 @@ function bgPosition(v) { v = v.replace(/\bright\b/, 'left'); } var m = v.trim().split(/\s+/); - if (m && m.length == 1 && v.match(/(\d+)([a-z]{2}|%)/)) { + if (m && m.length === 1 && v.match(/(\d+)([a-z]{2}|%)/)) { v = 'right ' + v; } - if (m && m.length == 2 && m[0].match(/\d+%/)) { + if (m && m.length === 2 && m[0].match(/\d+%/)) { // 30% => 70% (100 - x) diff --git a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/plugin/lib/init_prompt.js b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/plugin/lib/init_prompt.js index 16c077750a..62df597991 100644 --- a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/plugin/lib/init_prompt.js +++ b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/plugin/lib/init_prompt.js @@ -97,7 +97,7 @@ InitPrompt.prototype = { if (appServerPath) { var baseName = path.basename(appServerPath); - if (baseName != 'webapps') { + if (baseName !== 'webapps') { appServerPath = getPath(answers).join(appServerPath, 'webapps'); } diff --git a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/plugin/lib/register_hooks.js b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/plugin/lib/register_hooks.js index afa71e2d18..13c950c5ec 100644 --- a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/plugin/lib/register_hooks.js +++ b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/plugin/lib/register_hooks.js @@ -101,7 +101,7 @@ RegisterHooks.prototype = { var when = data[0]; var taskName = data[1]; - if (when != 'after' && when != 'before') { + if (when !== 'after' && when !== 'before') { return taskHookMap; } diff --git a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/plugin/tasks/version.js b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/plugin/tasks/version.js index d70322564e..ccfe393c03 100644 --- a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/plugin/tasks/version.js +++ b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/plugin/tasks/version.js @@ -39,7 +39,7 @@ module.exports = function (options) { var moduleVersion = result.match(REGEX_MODULE_VERSION); - if (moduleVersion && moduleVersion[1] != npmPackageVersion) { + if (moduleVersion && moduleVersion[1] !== npmPackageVersion) { result = result.replace( REGEX_MODULE_VERSION, (_match, _g1) => { diff --git a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/test/util.js b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/test/util.js index 5b20c1430b..651923787f 100644 --- a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/test/util.js +++ b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/test/util.js @@ -26,7 +26,7 @@ expect.extend({ pass = false; message = `Path '${path}' is not a folder`; } - else if (fs.readdirSync(path).length == 0) { + else if (fs.readdirSync(path).length === 0) { pass = false; message = `Folder '${path}' is empty`; } @@ -50,7 +50,7 @@ expect.extend({ pass = false; message = `Path '${path}' is not a folder`; } - else if (fs.readdirSync(path).length != 0) { + else if (fs.readdirSync(path).length !== 0) { pass = false; message = `Folder '${path}' is not empty`; } @@ -303,7 +303,7 @@ function cleanTempTheme(themeName, version, component, initCwd) { cleanDirectory(tempPath); - if (initCwd != null) { + if (initCwd !== null) { process.chdir(initCwd); } } diff --git a/maintenance/projects/js-themes-toolkit-v9-x/scripts/qa.js b/maintenance/projects/js-themes-toolkit-v9-x/scripts/qa.js index beeccabef0..cc6e0ef957 100644 --- a/maintenance/projects/js-themes-toolkit-v9-x/scripts/qa.js +++ b/maintenance/projects/js-themes-toolkit-v9-x/scripts/qa.js @@ -201,7 +201,7 @@ function spawn(cmd, args, options = {}) { ...options, }); - if (proc.error || proc.status != 0) { + if (proc.error || proc.status !== 0) { process.exit(1); } } diff --git a/maintenance/projects/js-toolkit/packages/babel-plugin-add-module-metadata/src/index.js b/maintenance/projects/js-toolkit/packages/babel-plugin-add-module-metadata/src/index.js index 6e7b6e2b38..0ea14a2659 100644 --- a/maintenance/projects/js-toolkit/packages/babel-plugin-add-module-metadata/src/index.js +++ b/maintenance/projects/js-toolkit/packages/babel-plugin-add-module-metadata/src/index.js @@ -65,7 +65,7 @@ function maybeAddEsModuleFlagCase1(t, path, state) { const args = parent.arguments; - if (args.length != 3) { + if (args.length !== 3) { return false; } diff --git a/maintenance/projects/js-toolkit/packages/babel-plugin-normalize-requires/src/index.js b/maintenance/projects/js-toolkit/packages/babel-plugin-normalize-requires/src/index.js index cbeaebc9dc..e42c32c2e4 100644 --- a/maintenance/projects/js-toolkit/packages/babel-plugin-normalize-requires/src/index.js +++ b/maintenance/projects/js-toolkit/packages/babel-plugin-normalize-requires/src/index.js @@ -16,7 +16,7 @@ export default function ({types: t}) { exit(path, state) { const {node} = path; - if (node.name == 'require') { + if (node.name === 'require') { const parent = path.parent; if (t.isCallExpression(parent)) { @@ -85,13 +85,13 @@ export default function ({types: t}) { function isPackageName(moduleName) { const firstSlashIndex = moduleName.indexOf('/'); - if (firstSlashIndex == -1) { + if (firstSlashIndex === -1) { return true; } const restOfModuleName = moduleName.substring(firstSlashIndex + 1); - if (moduleName.startsWith('@') && restOfModuleName.indexOf('/') == -1) { + if (moduleName.startsWith('@') && restOfModuleName.indexOf('/') === -1) { return true; } diff --git a/maintenance/projects/js-toolkit/packages/babel-plugin-wrap-modules-amd/src/index.js b/maintenance/projects/js-toolkit/packages/babel-plugin-wrap-modules-amd/src/index.js index eab7066efe..2d7f6f7f8d 100644 --- a/maintenance/projects/js-toolkit/packages/babel-plugin-wrap-modules-amd/src/index.js +++ b/maintenance/projects/js-toolkit/packages/babel-plugin-wrap-modules-amd/src/index.js @@ -52,7 +52,7 @@ export default function ({types: t}) { if ( !t.isCallExpression(parent) || parent.callee !== node || - parent.arguments.length != 1 + parent.arguments.length !== 1 ) { return; } @@ -134,7 +134,7 @@ export default function ({types: t}) { node.body = defineNode; - if (dependencies.length == 0) { + if (dependencies.length === 0) { log.info( 'wrap-modules-amd', 'No dependencies detected' diff --git a/maintenance/projects/js-toolkit/packages/generator-liferay-js/src/app/index.js b/maintenance/projects/js-toolkit/packages/generator-liferay-js/src/app/index.js index 7ebb66a2ed..b2bb269867 100644 --- a/maintenance/projects/js-toolkit/packages/generator-liferay-js/src/app/index.js +++ b/maintenance/projects/js-toolkit/packages/generator-liferay-js/src/app/index.js @@ -56,7 +56,7 @@ export default class extends Generator { _findTargets() { const tds = fs .readdirSync(path.join(__dirname, '..')) - .filter((file) => file.indexOf('target-') == 0) + .filter((file) => file.indexOf('target-') === 0) .map((target) => target.replace('target-', '')) .map((target) => ({ ...getTargetDescription(target), diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/loader/util.ts b/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/loader/util.ts index 6ff3a6de00..1c2f9e92a1 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/loader/util.ts +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/loader/util.ts @@ -52,7 +52,7 @@ export function removeWebpackHash(filePath: string): string { } } - if (hashIndex == -1) { + if (hashIndex === -1) { return filePath; } diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/portal/portal-shell.js b/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/portal/portal-shell.js index 434ada68e0..42b0fb142b 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/portal/portal-shell.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/portal/portal-shell.js @@ -38,7 +38,7 @@ export default class extends GogoShell { */ start(bundleId) { return this.sendCommand(`start ${bundleId}`).then((response) => { - if (response.length != 0) { + if (response.length !== 0) { throw new Error(response); } @@ -53,7 +53,7 @@ export default class extends GogoShell { */ stop(bundleId) { return this.sendCommand(`stop ${bundleId}`).then((response) => { - if (response.length != 0) { + if (response.length !== 0) { throw new Error(response); } @@ -68,7 +68,7 @@ export default class extends GogoShell { */ uninstall(bundleId) { return this.sendCommand(`uninstall ${bundleId}`).then((response) => { - if (response.length != 0) { + if (response.length !== 0) { throw new Error(response); } @@ -104,7 +104,7 @@ export default class extends GogoShell { const lines = response.split('\n'); const bundleLine = lines.find( - (line) => line.indexOf(`|${symbolicName} (${version})`) != -1 + (line) => line.indexOf(`|${symbolicName} (${version})`) !== -1 ); if (!bundleLine) { diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/scripts/translate.js b/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/scripts/translate.js index bdf1767ae4..d8617e2c79 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/scripts/translate.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/scripts/translate.js @@ -29,7 +29,7 @@ export default function () { subscriptionKey = cfg.getTranslatorTextKey(); } - if (!subscriptionKey || subscriptionKey == '') { + if (!subscriptionKey || subscriptionKey === '') { console.error( '-------------------------------------------------------------\n' + ' ๐Ÿ›‘ Microsoft Translator credentials not set ๐Ÿ›‘\n\n' + @@ -49,10 +49,10 @@ export default function () { const localizationFileMap = project.l10n.localizationFileMap; const locales = Object.keys(localizationFileMap).filter( - (locale) => locale != 'default' + (locale) => locale !== 'default' ); - if (locales.length == 0) { + if (locales.length === 0) { console.log( 'No locales found: nothing to translate.\n\n' + 'You can edit your .npmbuildrc file to add new supported ' + @@ -127,7 +127,7 @@ export function addMissingTranslations(translation, labels) { }); console.log( - count == 0 + count === 0 ? ` ยท No missing translations found for locale ${locale}` : ` ยท Added ${count} missing translations for locale ${locale}` ); @@ -228,7 +228,7 @@ function showMissingSupportedLocales() { const supportedLocales = cfg.getSupportedLocales(); const missingLocales = availableLocales.filter( - (locale) => supportedLocales.indexOf(locale) == -1 + (locale) => supportedLocales.indexOf(locale) === -1 ); if (missingLocales.length > 0) { @@ -252,7 +252,7 @@ function createMissingSupportedLocalesFiles() { const supportedLocales = cfg.getSupportedLocales(); const missingLocales = supportedLocales.filter( - (locale) => project.l10n.availableLocales.indexOf(locale) == -1 + (locale) => project.l10n.availableLocales.indexOf(locale) === -1 ); if (missingLocales.length > 0) { @@ -338,7 +338,7 @@ function translate(subscriptionKey, locales, texts) { if (err) { reject(err); } - else if (response.statusCode != 200) { + else if (response.statusCode !== 200) { reject({ code: response.statusCode, message: response.statusMessage, diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/util.js b/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/util.js index 48058dc3ee..f86a3b9359 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/util.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/util.js @@ -70,7 +70,7 @@ export function runNodeModulesBin(script, args = []) { if (proc.error) { throw proc.error; } - else if (proc.status != 0) { + else if (proc.status !== 0) { throw new Error( `Node modules binary '${script}' finished with status ${proc.status}` ); @@ -102,7 +102,7 @@ export function runPkgJsonScript(script, args = []) { if (proc.error) { throw proc.error; } - else if (proc.status != 0) { + else if (proc.status !== 0) { throw new Error( `Package script '${script}' finished with status ${proc.status}` ); diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/format.ts b/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/format.ts index 67371b1699..1b053701a1 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/format.ts +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/format.ts @@ -19,8 +19,8 @@ const lrFormatOpts = (process.env['LR_FORMAT_OPTS'] || '').split(','); /** Unrolled formatting options */ const opts = { - noColors: lrFormatOpts.indexOf('no-colors') != -1, - noDecorations: lrFormatOpts.indexOf('no-decorations') != -1, + noColors: lrFormatOpts.indexOf('no-colors') !== -1, + noDecorations: lrFormatOpts.indexOf('no-decorations') !== -1, }; const verbatim = (...args) => args.join(' '); diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/imports.ts b/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/imports.ts index 0a740e34c7..077e97e385 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/imports.ts +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/imports.ts @@ -91,7 +91,7 @@ export function normalizeImportsConfig( delete normalized[namespace][pkgName]; - if (Object.keys(normalized[namespace]).length == 0) { + if (Object.keys(normalized[namespace]).length === 0) { delete normalized[namespace]; } } diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/namespace.ts b/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/namespace.ts index 99094e965a..d0da96c004 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/namespace.ts +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/namespace.ts @@ -11,7 +11,7 @@ import * as mod from './modules'; * @return true if the module is namespaced */ export function isNamespaced(moduleName: string): boolean { - return getNamespace(moduleName) != null; + return getNamespace(moduleName) !== null; } /** @@ -31,7 +31,7 @@ export function addNamespace( const moduleNamespace = getNamespace(moduleName); const namespace = makeNamespace({name}); - if (moduleNamespace != null) { + if (moduleNamespace !== null) { if (moduleNamespace !== namespace) { if (!allowOverride) { throw new Error( @@ -70,7 +70,7 @@ export function addNamespace( export function removeNamespace(moduleName: string): string { const namespace = getNamespace(moduleName); - if (namespace != null) { + if (namespace !== null) { if (moduleName.startsWith('@')) { return moduleName.replace(`@${namespace}`, '@'); } diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/pkg-desc.ts b/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/pkg-desc.ts index fdd02d9fb9..b12a515896 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/pkg-desc.ts +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/pkg-desc.ts @@ -99,7 +99,7 @@ export default class PkgDesc { } get isRoot(): boolean { - return this.id == PkgDesc.ROOT_ID; + return this.id === PkgDesc.ROOT_ID; } private _clean: boolean; diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-css-loader/src/index.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-css-loader/src/index.js index be802fe146..cea4e10ae7 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-css-loader/src/index.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-css-loader/src/index.js @@ -92,7 +92,7 @@ function getHref(filePath, extension, pathModule, namespaceDependencies) { webContextPath = webContextPathLine.substring(16).trim(); } - if (filePath.indexOf(`node_modules${path.sep}`) != -1) { + if (filePath.indexOf(`node_modules${path.sep}`) !== -1) { const pathParts = filePath.split(path.sep); const projectNameIndex = lastIndexOf(pathParts, 'node_modules') + 1; @@ -156,7 +156,7 @@ function getHref(filePath, extension, pathModule, namespaceDependencies) { if (extension !== undefined) { const extname = path.extname(filePath); - if (extname == '') { + if (extname === '') { filePath = `${filePath}.${extension}`; } else { diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-sass-loader/src/index.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-sass-loader/src/index.js index fa29439f94..2530c4e38f 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-sass-loader/src/index.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-sass-loader/src/index.js @@ -67,7 +67,7 @@ function changeFilePathExtension(context) { const extname = path.extname(filePath); - if (extname == '') { + if (extname === '') { filePath = `${filePath}.css`; } else { diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-inject-peer-dependencies/src/index.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-inject-peer-dependencies/src/index.js index 53029ea7ce..961d649b33 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-inject-peer-dependencies/src/index.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-inject-peer-dependencies/src/index.js @@ -29,7 +29,7 @@ export default function ({config, log, pkg, source}, {pkgJson}) { const code = fs.readFileSync(file.asNative); const defineCallOffset = code.indexOf(defineCall); - if (defineCallOffset != -1) { + if (defineCallOffset !== -1) { const funOffset = code.indexOf(')', defineCallOffset); let defineCallLine; @@ -175,7 +175,7 @@ function removeModuleName(line) { function extractDependencies(line) { const indexOfClose = line.indexOf(']'); - if (!line.startsWith('[') || indexOfClose == -1) { + if (!line.startsWith('[') || indexOfClose === -1) { return []; } diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-replace-browser-modules/src/index.ts b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-replace-browser-modules/src/index.ts index 00a90006d5..5255b1c612 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-replace-browser-modules/src/index.ts +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-replace-browser-modules/src/index.ts @@ -161,13 +161,13 @@ export function reportAndResolveCollisions( absFromPosixPath ].filter((alias) => { const included = - alias.fromType != AliasFromType.EXTERNAL || + alias.fromType !== AliasFromType.EXTERNAL || !moduleExists(absFromPosixPath); if (!included) { const rootRelDir = absRootDir.relative(alias.absDir); const where = - rootRelDir.asPosix == '' + rootRelDir.asPosix === '' ? "project's root folder" : `'${rootRelDir.asPosix}'`; @@ -186,7 +186,7 @@ export function reportAndResolveCollisions( // Remove empty aliases Object.keys(unrolledAliasesMap).forEach((absFromPath) => { - if (unrolledAliasesMap[absFromPath].length == 0) { + if (unrolledAliasesMap[absFromPath].length === 0) { delete unrolledAliasesMap[absFromPath]; } }); @@ -213,7 +213,7 @@ export function reportAndResolveCollisions( const rootRelDir = absRootDir.relative(alias.absDir); const where = - rootRelDir.asPosix == '' + rootRelDir.asPosix === '' ? "project's root folder" : `'${rootRelDir.asPosix}'`; diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-resolve-linked-dependencies/src/index.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-resolve-linked-dependencies/src/index.js index 3bec5b5256..ed9853913d 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-resolve-linked-dependencies/src/index.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-resolve-linked-dependencies/src/index.js @@ -11,11 +11,11 @@ import semver from 'semver'; * @return {void} */ export default function ({log}, {pkgJson}) { - if (pkgJson.dependencies != null) { + if (pkgJson.dependencies !== null) { Object.keys(pkgJson.dependencies).forEach((name) => { const link = pkgJson.dependencies[name]; - if (semver.validRange(link) == null) { + if (semver.validRange(link) === null) { const depPkgJsonPath = path.join( 'node_modules', name, diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/__tests__/dependencies.test.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/__tests__/dependencies.test.js index 58d7040932..f597f7d8b1 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/__tests__/dependencies.test.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/__tests__/dependencies.test.js @@ -37,15 +37,15 @@ expect.extend({ const invalidFields = invalidDepFields[pkgId] || {}; - if (dep.id != pkgId) { + if (dep.id !== pkgId) { invalidFields.id = `${dep.id} (expected: ${pkgId})`; } - if (dep.name != pkgName) { + if (dep.name !== pkgName) { invalidFields.name = `${dep.name} (expected: ${pkgName})`; } - if (dep.version != pkgVersion) { + if (dep.version !== pkgVersion) { invalidFields.version = `${dep.version} ` + `(expected: ${pkgVersion})`; } @@ -70,7 +70,7 @@ expect.extend({ }); Object.keys(deps).forEach((depId) => { - if (pkgIds.indexOf(depId) == -1) { + if (pkgIds.indexOf(depId) === -1) { extraDeps.push(depId); } }); diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/dependencies.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/dependencies.js index e19a4afb84..fa72cf2a67 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/dependencies.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/dependencies.js @@ -41,7 +41,7 @@ export function addPackageDependencies( const pkg = new PkgDesc( packageJson.name, packageJson.version, - path.resolve(baseDirPath) == path.resolve(project.dir.asNative) + path.resolve(baseDirPath) === path.resolve(project.dir.asNative) ? null : baseDirPath ); @@ -65,7 +65,7 @@ export function addPackageDependencies( .map((dependency) => resolveDependencyDir(baseDirPath, packageJson, dependency) ) - .filter((dependencyDir) => dependencyDir != null); + .filter((dependencyDir) => dependencyDir !== null); dependencyDirs.forEach((dependencyDir) => { addPackageDependencies(collectedDependencies, dependencyDir); diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/index.ts b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/index.ts index e9da5eaf85..9791da2b60 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/index.ts +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/index.ts @@ -115,11 +115,11 @@ function run(): void { /** Report linked dependencies of a given package.json */ function reportLinkedDependencies(pkgJson: object): void { ['dependencies', 'devDependencies'].forEach((scope) => { - if (pkgJson[scope] != null) { + if (pkgJson[scope] !== null) { Object.keys(pkgJson[scope]).forEach((depName) => { const depVersion = pkgJson[scope][depName]; - if (semver.validRange(depVersion) == null) { + if (semver.validRange(depVersion) === null) { const depPkgJsonPath = path.join( 'node_modules', depName, diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/jar/index.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/jar/index.js index 5c13263ac8..be920c669c 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/jar/index.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/jar/index.js @@ -295,7 +295,7 @@ function getPortletInstanceConfigurationJson() { if ( !configurationJson.portletInstance || !configurationJson.portletInstance.fields || - Object.keys(configurationJson.portletInstance.fields).length == 0 + Object.keys(configurationJson.portletInstance.fields).length === 0 ) { return undefined; } @@ -318,7 +318,7 @@ function getSystemConfigurationJson() { if ( !configurationJson.system || !configurationJson.system.fields || - Object.keys(configurationJson.system.fields).length == 0 + Object.keys(configurationJson.system.fields).length === 0 ) { return undefined; } diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/jar/xml.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/jar/xml.js index e8c68d4d3f..90888edb6e 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/jar/xml.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/jar/xml.js @@ -124,7 +124,7 @@ function addChild(parentNode, childName) { function findChild(parentNode, childName, create = false) { const elements = parentNode.elements || []; - let childNode = elements.find((node) => node.name == childName); + let childNode = elements.find((node) => node.name === childName); if (childNode === undefined && create) { childNode = { diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/report/html.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/report/html.js index 1c74990d2a..692b2e5897 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/report/html.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/report/html.js @@ -89,7 +89,7 @@ export function htmlDump(report) { `
@@ -556,7 +556,7 @@ function htmlTable(...args) { content = content.join('\n'); } - if (columns.length == 0) { + if (columns.length === 0) { return ` ${content} @@ -595,7 +595,7 @@ function htmlLogOutput( rowLoggers, {source} = {source: true} ) { - if (prefixCells.length != rowLoggers.length) { + if (prefixCells.length !== rowLoggers.length) { throw new Error( 'The length of prefixCells and rowLoggers must be the same' ); @@ -612,7 +612,7 @@ function htmlLogOutput( const rows = []; prefixCells.forEach((cells, i) => { - if (cells.length != prefixColumns.length) { + if (cells.length !== prefixColumns.length) { throw new Error( `Prefix cells row ${i} has an invalid length: ${cells.length}` ); @@ -620,7 +620,7 @@ function htmlLogOutput( const msgs = rowLoggers[i].messages; - if (msgs.length == 0) { + if (msgs.length === 0) { rows.push( htmlRow(` ${cells.map((cell) => ``).join(' ')} diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/rules.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/rules.js index ceb039368c..e3e6ceb21b 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/rules.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/rules.js @@ -73,7 +73,7 @@ function processPackage(srcPkg) { function processFile(srcPkg, destPkg, prjRelPath) { const loaders = project.rules.loadersForFile(prjRelPath); - if (loaders.length == 0) { + if (loaders.length === 0) { return Promise.resolve(); } @@ -231,7 +231,7 @@ function assertString(object, field, what) { * @param {object} context */ function writeLoadersResult(srcPkg, destPkg, context) { - if (context.content != undefined) { + if (context.content !== undefined) { writeRuleFile( destPkg, srcPkg.dir.relative(project.dir.join(context.filePath)).asNative, @@ -241,7 +241,7 @@ function writeLoadersResult(srcPkg, destPkg, context) { Object.entries(context.extraArtifacts).forEach( ([extraPrjRelPath, content]) => { - if (content == undefined) { + if (content === undefined) { return; } diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/transform.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/transform.js index efa6410c13..b658e3959c 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/transform.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/transform.js @@ -297,7 +297,7 @@ export function loadSourceMap(filePath) { const url = matches[1]; - if (url.indexOf('data:') == 0) { + if (url.indexOf('data:') === 0) { const parsedData = parseDataURL(url); if (parsedData) { diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/util.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/util.js index 6ad72731e9..35196998a3 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/util.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/util.js @@ -63,7 +63,7 @@ export function getDestDir(pkg) { * finishes */ export function iterateSerially(values, asyncProcess) { - if (values.length == 0) { + if (values.length === 0) { return Promise.resolve(); } diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-imports-checker/src/liferay-npm-imports-checker.js b/maintenance/projects/js-toolkit/packages/liferay-npm-imports-checker/src/liferay-npm-imports-checker.js index ef3938fadf..4ca36b92a2 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-imports-checker/src/liferay-npm-imports-checker.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-imports-checker/src/liferay-npm-imports-checker.js @@ -175,7 +175,7 @@ function checkProjects(projects) { msg(0, 'Checking projects:'); Object.values(projects).forEach((project) => { - if (project.dir.asPosix.indexOf(cfg.getRunPath()) != 0) { + if (project.dir.asPosix.indexOf(cfg.getRunPath()) !== 0) { return; } diff --git a/maintenance/projects/js-toolkit/qa/samples/packages/alias-test/scripts/test.js b/maintenance/projects/js-toolkit/qa/samples/packages/alias-test/scripts/test.js index 96f9d347f7..ae87ca0083 100644 --- a/maintenance/projects/js-toolkit/qa/samples/packages/alias-test/scripts/test.js +++ b/maintenance/projects/js-toolkit/qa/samples/packages/alias-test/scripts/test.js @@ -36,7 +36,7 @@ function run(target) { ${proc.stderr}` ); } - if (proc.status != 0) { + if (proc.status !== 0) { abort( `${target}:`, `Exit with status code ${proc.status} diff --git a/maintenance/projects/js-toolkit/resources/devtools/link-js-toolkit/link-js-toolkit.js b/maintenance/projects/js-toolkit/resources/devtools/link-js-toolkit/link-js-toolkit.js index a8398c352e..2bf23f6256 100755 --- a/maintenance/projects/js-toolkit/resources/devtools/link-js-toolkit/link-js-toolkit.js +++ b/maintenance/projects/js-toolkit/resources/devtools/link-js-toolkit/link-js-toolkit.js @@ -9,10 +9,10 @@ const linkDependencies = require('./link-dependencies'); const setupProject = require('./setup-project'); const setupYarnWorkspace = require('./setup-yarn-workspace'); -if (process.argv[2] == '-w') { +if (process.argv[2] === '-w') { setupYarnWorkspace(); } -else if (process.argv[2] == '-p') { +else if (process.argv[2] === '-p') { setupProject(); } else { diff --git a/maintenance/projects/js-toolkit/resources/devtools/link-js-toolkit/util.js b/maintenance/projects/js-toolkit/resources/devtools/link-js-toolkit/util.js index c1964efb02..0e5ad84240 100644 --- a/maintenance/projects/js-toolkit/resources/devtools/link-js-toolkit/util.js +++ b/maintenance/projects/js-toolkit/resources/devtools/link-js-toolkit/util.js @@ -13,7 +13,7 @@ const toolkitProjectNames = fs.readdirSync( ); function isToolkitDep(pkgName) { - return toolkitProjectNames.indexOf(pkgName) != -1; + return toolkitProjectNames.indexOf(pkgName) !== -1; } function modifyPackageJson(pkgJsonPath, callback) { @@ -36,7 +36,7 @@ function yarn(...args) { if (proc.error) { throw proc.error; } - else if (proc.status != 0) { + else if (proc.status !== 0) { throw new Error( `'yarn ${args.join(' ')}' finished with status ${proc.status}` ); diff --git a/maintenance/projects/js-toolkit/scripts/level-deps.js b/maintenance/projects/js-toolkit/scripts/level-deps.js index 19e3525696..1a2c41b3fa 100755 --- a/maintenance/projects/js-toolkit/scripts/level-deps.js +++ b/maintenance/projects/js-toolkit/scripts/level-deps.js @@ -10,7 +10,7 @@ const getDepVersions = require('./util/get-dep-versions'); const argv = process.argv; -if (argv.length != 4) { +if (argv.length !== 4) { console.log('Usage: level-deps '); process.exit(2); } diff --git a/maintenance/projects/js-toolkit/scripts/qa/index.js b/maintenance/projects/js-toolkit/scripts/qa/index.js index 307a935fda..0db496186a 100644 --- a/maintenance/projects/js-toolkit/scripts/qa/index.js +++ b/maintenance/projects/js-toolkit/scripts/qa/index.js @@ -154,7 +154,7 @@ Remember that we have used your Liferay installation at: function getTargets() { let argv = process.argv.slice(2); - if (argv.length == 0) { + if (argv.length === 0) { argv = ['reset', 'generate', 'install', 'deploy']; } diff --git a/maintenance/projects/js-toolkit/scripts/qa/util.js b/maintenance/projects/js-toolkit/scripts/qa/util.js index ef7c787168..6bb6156b02 100644 --- a/maintenance/projects/js-toolkit/scripts/qa/util.js +++ b/maintenance/projects/js-toolkit/scripts/qa/util.js @@ -36,7 +36,7 @@ function spawn(cmd, args, options = {}) { ...options, }); - if (proc.error || proc.status != 0) { + if (proc.error || proc.status !== 0) { process.exit(1); } } diff --git a/projects/amd-loader/src/loader/dependency-resolver.js b/projects/amd-loader/src/loader/dependency-resolver.js index 577e7bb2c5..994b47adf7 100644 --- a/projects/amd-loader/src/loader/dependency-resolver.js +++ b/projects/amd-loader/src/loader/dependency-resolver.js @@ -27,7 +27,7 @@ export default class DependencyResolver { * (module name itself is being returned too) */ resolve(modules) { - if (modules === undefined || modules.length == 0) { + if (modules === undefined || modules.length === 0) { throw new Error(`Argument 'modules' cannot be undefined or empty`); } diff --git a/projects/amd-loader/src/loader/loader.js b/projects/amd-loader/src/loader/loader.js index fc1d92ebc8..9ec12594a8 100644 --- a/projects/amd-loader/src/loader/loader.js +++ b/projects/amd-loader/src/loader/loader.js @@ -75,7 +75,7 @@ export default class Loader { // Acccount for call polymorphism - if (args.length == 2) { + if (args.length === 2) { factory = dependencies; dependencies = ['require', 'exports', 'module']; } @@ -142,12 +142,12 @@ export default class Loader { // Account for call polymorphism - if (args.length == 1) { + if (args.length === 1) { moduleNames = args[0]; success = undefined; failure = undefined; } - else if (args.length == 2) { + else if (args.length === 2) { const lastArg = args[args.length - 1]; if (typeof lastArg === 'function') { @@ -155,7 +155,7 @@ export default class Loader { success = lastArg; failure = undefined; } - else if (lastArg == null) { + else if (lastArg === null) { moduleNames = args[0]; success = undefined; failure = undefined; @@ -170,7 +170,7 @@ export default class Loader { const lastArg = args[args.length - 1]; let successGiven = false; - if (typeof lastArg === 'function' || lastArg == null) { + if (typeof lastArg === 'function' || lastArg === null) { successGiven = true; } @@ -185,7 +185,7 @@ export default class Loader { if ( typeof penultimateArg === 'function' || - penultimateArg == null + penultimateArg === null ) { failureGiven = true; } @@ -208,7 +208,7 @@ export default class Loader { if (typeof moduleNames === 'string') { moduleNames = [moduleNames]; } - else if (moduleNames.length == 1 && Array.isArray(moduleNames[0])) { + else if (moduleNames.length === 1 && Array.isArray(moduleNames[0])) { moduleNames = [].concat(...moduleNames); } diff --git a/projects/amd-loader/src/loader/script-loader.js b/projects/amd-loader/src/loader/script-loader.js index 921d3317ff..46553844f8 100644 --- a/projects/amd-loader/src/loader/script-loader.js +++ b/projects/amd-loader/src/loader/script-loader.js @@ -35,7 +35,7 @@ export default class ScriptLoader { loadModules(moduleNames) { const urlBuilder = this._urlBuilder; - if (moduleNames.length == 0) { + if (moduleNames.length === 0) { return Promise.resolve(); } diff --git a/projects/js-themes-toolkit/packages/generator-liferay-theme/lib/LayoutCreator.js b/projects/js-themes-toolkit/packages/generator-liferay-theme/lib/LayoutCreator.js index c474553c30..578f50e067 100644 --- a/projects/js-themes-toolkit/packages/generator-liferay-theme/lib/LayoutCreator.js +++ b/projects/js-themes-toolkit/packages/generator-liferay-theme/lib/LayoutCreator.js @@ -29,7 +29,7 @@ inquirer.prompt.prompts.list.prototype.render = function () { var choices = _.reduce( this.opt.choices.choices, (result, item) => { - if (item.type != 'separator') { + if (item.type !== 'separator') { result.push(item); } @@ -106,16 +106,16 @@ LayoutCreator.prototype = { _afterPromptFinishRow(answers, callback) { var finish = answers.finish; - if (finish == 'add') { + if (finish === 'add') { this._promptRow(callback); } - else if (finish == 'insert') { + else if (finish === 'insert') { this._promptInsertRow(callback); } - else if (answers.finish == 'finish') { + else if (answers.finish === 'finish') { callback(null); } - else if (finish == 'remove') { + else if (finish === 'remove') { this._promptRemoveRow(callback); } }, diff --git a/projects/js-themes-toolkit/packages/generator-liferay-theme/lib/__tests__/LayoutCreator.test.js b/projects/js-themes-toolkit/packages/generator-liferay-theme/lib/__tests__/LayoutCreator.test.js index d46e6f537a..7aaa645f1d 100644 --- a/projects/js-themes-toolkit/packages/generator-liferay-theme/lib/__tests__/LayoutCreator.test.js +++ b/projects/js-themes-toolkit/packages/generator-liferay-theme/lib/__tests__/LayoutCreator.test.js @@ -500,7 +500,7 @@ describe('LayoutCreator', () => { _.forEach(choices, (choice, index) => { index = index + 1; - if (index % 2 == 0) { + if (index % 2 === 0) { assert.equal(choice.type, 'separator'); assert.equal( stripAnsi(choice.line), @@ -518,7 +518,7 @@ describe('LayoutCreator', () => { } }); - assert(choices[choices.length - 1].type != 'separator'); + assert(choices[choices.length - 1].type !== 'separator'); while (prototype.rows.length < 7) { prototype.rows.push({ @@ -560,7 +560,7 @@ describe('LayoutCreator', () => { _.forEach(choices, (choice, index) => { index = index + 1; - if (index % 2 == 0) { + if (index % 2 === 0) { assert.equal(choice.value, choiceValue); assert.equal( stripAnsi(choice.name), @@ -578,7 +578,7 @@ describe('LayoutCreator', () => { } }); - assert(choices[choices.length - 1].type == 'separator'); + assert(choices[choices.length - 1].type === 'separator'); while (prototype.rows.length < 7) { prototype.rows.push({ diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/r2/liferay-r2/css-parse.js b/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/r2/liferay-r2/css-parse.js index f9d5853df1..fe486ff053 100644 --- a/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/r2/liferay-r2/css-parse.js +++ b/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/r2/liferay-r2/css-parse.js @@ -126,7 +126,7 @@ module.exports = function (css, options) { comments(rules); while ( css.length && - css.charAt(0) != '}' && + css.charAt(0) !== '}' && (node = atrule() || rule()) ) { rules.push(node); @@ -180,14 +180,14 @@ module.exports = function (css, options) { function comment() { var pos = position(); - if ('/' != css.charAt(0) || '*' != css.charAt(1)) { + if ('/' !== css.charAt(0) || '*' !== css.charAt(1)) { return; } var i = 2; while ( - null != css.charAt(i) && - ('*' != css.charAt(i) || '/' != css.charAt(i + 1)) + null !== css.charAt(i) && + ('*' !== css.charAt(i) || '/' !== css.charAt(i + 1)) ) { ++i; } @@ -599,7 +599,7 @@ module.exports = function (css, options) { */ function atrule() { - if (css[0] != '@') { + if (css[0] !== '@') { return; } diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js b/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js index b719caa679..f7f190efd0 100644 --- a/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js +++ b/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js @@ -15,7 +15,7 @@ function quad(v, m) { // 1px 2px 3px 4px => 1px 4px 3px 2px - if ((m = v.trim().split(/\s+(?=[^)]*(?:[(]|$))/)) && m.length == 4) { + if ((m = v.trim().split(/\s+(?=[^)]*(?:[(]|$))/)) && m.length === 4) { return [m[0], m[3], m[2], m[1]].join(' '); } @@ -29,10 +29,10 @@ function quad_radius(v) { // since border-radius: top-left top-right bottom-right bottom-left // will be border-radius: top-right top-left bottom-left bottom-right - if (m && m.length == 4) { + if (m && m.length === 4) { return [m[1], m[0], m[3], m[2]].join(' '); } - else if (m && m.length == 3) { + else if (m && m.length === 3) { // super odd how this works // 5px 10px 20px => 10px 5px 10px 20px @@ -67,10 +67,10 @@ function bgPosition(v) { v = v.replace(/\bright\b/, 'left'); } var m = v.trim().split(/\s+/); - if (m && m.length == 1 && v.match(/(\d+)([a-z]{2}|%)/)) { + if (m && m.length === 1 && v.match(/(\d+)([a-z]{2}|%)/)) { v = 'right ' + v; } - if (m && m.length == 2 && m[0].match(/\d+%/)) { + if (m && m.length === 2 && m[0].match(/\d+%/)) { // 30% => 70% (100 - x) diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/test/util.js b/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/test/util.js index 3353ba5142..e00bb3c369 100644 --- a/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/test/util.js +++ b/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/test/util.js @@ -27,7 +27,7 @@ expect.extend({ pass = false; message = `Path '${path}' is not a folder`; } - else if (fs.readdirSync(path).length == 0) { + else if (fs.readdirSync(path).length === 0) { pass = false; message = `Folder '${path}' is empty`; } @@ -51,7 +51,7 @@ expect.extend({ pass = false; message = `Path '${path}' is not a folder`; } - else if (fs.readdirSync(path).length != 0) { + else if (fs.readdirSync(path).length !== 0) { pass = false; message = `Folder '${path}' is not empty`; } @@ -364,7 +364,7 @@ function setupTempTheme(options) { function cleanTempPlugin(tempPlugin) { const {savedCwd} = tempPlugin; - if (savedCwd != null) { + if (savedCwd !== null) { process.chdir(savedCwd); } } @@ -377,7 +377,7 @@ function cleanTempPlugin(tempPlugin) { function cleanTempTheme(tempTheme) { const {savedCwd} = tempTheme; - if (savedCwd != null) { + if (savedCwd !== null) { process.chdir(savedCwd); } } diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/plugin/lib/register_hooks.js b/projects/js-themes-toolkit/packages/liferay-theme-tasks/plugin/lib/register_hooks.js index 0909e6b374..61734886e4 100644 --- a/projects/js-themes-toolkit/packages/liferay-theme-tasks/plugin/lib/register_hooks.js +++ b/projects/js-themes-toolkit/packages/liferay-theme-tasks/plugin/lib/register_hooks.js @@ -78,7 +78,7 @@ RegisterHooks.prototype = { var when = data[0]; var taskName = data[1]; - if (when != 'after' && when != 'before') { + if (when !== 'after' && when !== 'before') { return taskHookMap; } diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/plugin/tasks/version.js b/projects/js-themes-toolkit/packages/liferay-theme-tasks/plugin/tasks/version.js index df5337a34e..dda8065713 100644 --- a/projects/js-themes-toolkit/packages/liferay-theme-tasks/plugin/tasks/version.js +++ b/projects/js-themes-toolkit/packages/liferay-theme-tasks/plugin/tasks/version.js @@ -39,7 +39,7 @@ module.exports = function () { var moduleVersion = result.match(REGEX_MODULE_VERSION); - if (moduleVersion && moduleVersion[1] != npmPackageVersion) { + if (moduleVersion && moduleVersion[1] !== npmPackageVersion) { result = result.replace( REGEX_MODULE_VERSION, (_match, _g1) => { diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/prompts/__tests__/prompt_util.test.js b/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/prompts/__tests__/prompt_util.test.js index cf16f20fad..2c9deb079f 100644 --- a/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/prompts/__tests__/prompt_util.test.js +++ b/projects/js-themes-toolkit/packages/liferay-theme-tasks/theme/prompts/__tests__/prompt_util.test.js @@ -58,7 +58,7 @@ it('formatThemeletSelection should format themelet selection retrieved from getM it('getListType should get listType based on environment', () => { const listType = promptUtil.getListType(); - expect(listType == 'list' || listType == 'rawlist').toBe(true); + expect(listType === 'list' || listType === 'rawlist').toBe(true); }); it('getModuleChoices should get module choices that are appropriate for extend type', () => { @@ -80,7 +80,7 @@ it('getModuleChoices should get module choices that are appropriate for extend t const number = index + 1; const name = 'themelet-' + number; - if (number == 1) { + if (number === 1) { expect(item.name).toBe(name + ' (selected)'); } @@ -108,7 +108,7 @@ it('getModuleChoices should get module choices that are appropriate for extend t const number = index + 1; const name = 'themelet-' + number; - if (number == 1) { + if (number === 1) { expect(item.checked).toBe(true); } else { diff --git a/projects/js-themes-toolkit/scripts/qa.js b/projects/js-themes-toolkit/scripts/qa.js index 788f6f82b0..8872ac1ca8 100644 --- a/projects/js-themes-toolkit/scripts/qa.js +++ b/projects/js-themes-toolkit/scripts/qa.js @@ -176,7 +176,7 @@ function spawn(cmd, args, options = {}) { ...options, }); - if (proc.error || proc.status != 0) { + if (proc.error || proc.status !== 0) { process.exit(1); } } diff --git a/projects/js-toolkit/packages/dev-server/src/server.ts b/projects/js-toolkit/packages/dev-server/src/server.ts index 841d51b9c9..6d71f887d9 100644 --- a/projects/js-toolkit/packages/dev-server/src/server.ts +++ b/projects/js-toolkit/packages/dev-server/src/server.ts @@ -194,7 +194,7 @@ export default async function (): Promise { if ( request.headers.accept && - request.headers.accept == 'text/event-stream' + request.headers.accept === 'text/event-stream' ) { if (url === '/events') { log(chalk.cyan('Connecting Live Session...')); diff --git a/projects/js-toolkit/packages/js-toolkit-core/src/format.ts b/projects/js-toolkit/packages/js-toolkit-core/src/format.ts index b4120df783..ffee3fdffa 100644 --- a/projects/js-toolkit/packages/js-toolkit-core/src/format.ts +++ b/projects/js-toolkit/packages/js-toolkit-core/src/format.ts @@ -19,8 +19,8 @@ const lrFormatOpts = (process.env['LR_FORMAT_OPTS'] || '').split(','); /** Unrolled formatting options */ const options = { - noColors: lrFormatOpts.indexOf('no-colors') != -1, - noDecorations: lrFormatOpts.indexOf('no-decorations') != -1, + noColors: lrFormatOpts.indexOf('no-colors') !== -1, + noDecorations: lrFormatOpts.indexOf('no-decorations') !== -1, }; const verbatim = (...args): string => args.join(' '); diff --git a/projects/js-toolkit/packages/js-toolkit-core/src/node/namespace.ts b/projects/js-toolkit/packages/js-toolkit-core/src/node/namespace.ts index 70e9ddf9b4..b95990db2c 100644 --- a/projects/js-toolkit/packages/js-toolkit-core/src/node/namespace.ts +++ b/projects/js-toolkit/packages/js-toolkit-core/src/node/namespace.ts @@ -11,7 +11,7 @@ import * as mod from './modules'; * @return true if the module is namespaced */ export function isNamespaced(moduleName: string): boolean { - return getNamespace(moduleName) != null; + return getNamespace(moduleName) !== null; } /** @@ -32,7 +32,7 @@ export function addNamespace( const moduleNamespace = getNamespace(moduleName); const namespace = makeNamespace(pkgJson); - if (moduleNamespace != null) { + if (moduleNamespace !== null) { if (moduleNamespace !== namespace) { if (!allowOverride) { throw new Error( @@ -71,7 +71,7 @@ export function addNamespace( export function removeNamespace(moduleName: string): string { const namespace = getNamespace(moduleName); - if (namespace != null) { + if (namespace !== null) { if (moduleName.startsWith('@')) { return moduleName.replace(`@${namespace}`, '@'); } diff --git a/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/index.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/index.ts index 14fb8f3af5..1012fc6e9f 100644 --- a/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/index.ts +++ b/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/index.ts @@ -140,7 +140,7 @@ async function mergeMaps( line: mapping.originalLine, }); - if (origPosInOldMap.source == null) { + if (origPosInOldMap.source === null) { return; } diff --git a/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/operation/wrapModule.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/operation/wrapModule.ts index 0a4a39f4a5..d3bde3e1f0 100644 --- a/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/operation/wrapModule.ts +++ b/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/operation/wrapModule.ts @@ -163,7 +163,7 @@ function getDefineDependencies( const {arguments: params} = node; - if (params.length != 1) { + if (params.length !== 1) { return; } diff --git a/projects/js-toolkit/packages/npm-bundler/src/bundle/ExplainedError.ts b/projects/js-toolkit/packages/npm-bundler/src/bundle/ExplainedError.ts index 6d516372b3..b1fbdaeb3c 100644 --- a/projects/js-toolkit/packages/npm-bundler/src/bundle/ExplainedError.ts +++ b/projects/js-toolkit/packages/npm-bundler/src/bundle/ExplainedError.ts @@ -46,7 +46,7 @@ ${lines .map((line, i) => { i += beginLine; - const errorMarker = i == aroundLine ? '>' : ' '; + const errorMarker = i === aroundLine ? '>' : ' '; const lineNumber = i.toString().padStart(padMinChars); return `${errorMarker} ${lineNumber}: ${line}`; diff --git a/projects/js-toolkit/packages/npm-bundler/src/transform/js/operation/transformImports.ts b/projects/js-toolkit/packages/npm-bundler/src/transform/js/operation/transformImports.ts index d50296807b..1b9bba80fe 100644 --- a/projects/js-toolkit/packages/npm-bundler/src/transform/js/operation/transformImports.ts +++ b/projects/js-toolkit/packages/npm-bundler/src/transform/js/operation/transformImports.ts @@ -70,7 +70,7 @@ function transformCallExpression( const {arguments: params} = node; - if (params.length != 1) { + if (params.length !== 1) { return false; } diff --git a/projects/js-toolkit/packages/npm-bundler/src/webpack/loader/imports-loader.ts b/projects/js-toolkit/packages/npm-bundler/src/webpack/loader/imports-loader.ts index fd3aa65175..20bcbdeaf2 100644 --- a/projects/js-toolkit/packages/npm-bundler/src/webpack/loader/imports-loader.ts +++ b/projects/js-toolkit/packages/npm-bundler/src/webpack/loader/imports-loader.ts @@ -62,7 +62,7 @@ async function asyncTransform( let importsFound = false; for (const pkgName of Object.keys(imports)) { - if (content.indexOf(pkgName) != -1) { + if (content.indexOf(pkgName) !== -1) { importsFound = true; break; diff --git a/projects/js-toolkit/packages/portal-adapt-base/src/util/removeWebpackHash.ts b/projects/js-toolkit/packages/portal-adapt-base/src/util/removeWebpackHash.ts index d9921e390f..8860471eea 100644 --- a/projects/js-toolkit/packages/portal-adapt-base/src/util/removeWebpackHash.ts +++ b/projects/js-toolkit/packages/portal-adapt-base/src/util/removeWebpackHash.ts @@ -20,7 +20,7 @@ export default function removeWebpackHash(filePath: string): string { } } - if (hashIndex == -1) { + if (hashIndex === -1) { return filePath; } diff --git a/projects/js-toolkit/packages/portal-adapt-base/src/util/runNodeModulesBin.ts b/projects/js-toolkit/packages/portal-adapt-base/src/util/runNodeModulesBin.ts index 168a1e1564..912db4a6e2 100644 --- a/projects/js-toolkit/packages/portal-adapt-base/src/util/runNodeModulesBin.ts +++ b/projects/js-toolkit/packages/portal-adapt-base/src/util/runNodeModulesBin.ts @@ -23,7 +23,7 @@ export default function runNodeModulesBin( if (proc.error) { throw proc.error; } - else if (proc.status != 0) { + else if (proc.status !== 0) { throw new Error( `Node modules binary '${script}' finished with status ${proc.status}` ); diff --git a/projects/js-toolkit/packages/portal-adapt-base/src/util/runPkgJsonScript.ts b/projects/js-toolkit/packages/portal-adapt-base/src/util/runPkgJsonScript.ts index 7eba898447..4b421db13e 100644 --- a/projects/js-toolkit/packages/portal-adapt-base/src/util/runPkgJsonScript.ts +++ b/projects/js-toolkit/packages/portal-adapt-base/src/util/runPkgJsonScript.ts @@ -26,7 +26,7 @@ export default function runPkgJsonScript( if (proc.error) { throw proc.error; } - else if (proc.status != 0) { + else if (proc.status !== 0) { throw new Error( `Package script '${script}' finished with status ${proc.status}` ); diff --git a/projects/js-toolkit/resources/devtools/link-js-toolkit/util.js b/projects/js-toolkit/resources/devtools/link-js-toolkit/util.js index 34e1a5a9f6..72d7b75a1b 100644 --- a/projects/js-toolkit/resources/devtools/link-js-toolkit/util.js +++ b/projects/js-toolkit/resources/devtools/link-js-toolkit/util.js @@ -15,7 +15,7 @@ const toolkitProjectNames = fs .map((dir) => `@liferay/${dir}`); function isToolkitDep(pkgName) { - return toolkitProjectNames.indexOf(pkgName) != -1; + return toolkitProjectNames.indexOf(pkgName) !== -1; } function modifyPackageJson(pkgJsonPath, callback) { diff --git a/projects/js-toolkit/scripts/watch.js b/projects/js-toolkit/scripts/watch.js index 98a84f5c47..def08b8c6a 100644 --- a/projects/js-toolkit/scripts/watch.js +++ b/projects/js-toolkit/scripts/watch.js @@ -85,7 +85,7 @@ watch.watchTree( '.', {filter: filterStaticFiles, ignoreDotFiles: false, interval: 1}, (filename, curr, prev) => { - if (typeof filename == 'object' && prev === null && curr === null) { + if (typeof filename === 'object' && prev === null && curr === null) { console.log( 'Watching', Object.keys(filename).length, diff --git a/projects/npm-tools/packages/npm-scripts/src/jsp/Lexer.js b/projects/npm-tools/packages/npm-scripts/src/jsp/Lexer.js index d78a024c94..d16cdfd6df 100644 --- a/projects/npm-tools/packages/npm-scripts/src/jsp/Lexer.js +++ b/projects/npm-tools/packages/npm-scripts/src/jsp/Lexer.js @@ -663,7 +663,7 @@ class Lexer { // Return result of previous `peek()`. - if (peeked != undefined) { + if (peeked !== undefined) { result = peeked; } else { From 79c0f2927ead8e1c13b5210253d63da0d068728d Mon Sep 17 00:00:00 2001 From: Bryce Osterhaus Date: Wed, 20 Oct 2021 12:06:20 -0700 Subject: [PATCH 3/3] chore: update instances where value could be null or undefined --- .../packages/liferay-theme-tasks/test/util.js | 2 +- .../packages/liferay-theme-tasks/test/util.js | 2 +- .../src/scripts/translate.js | 2 +- .../liferay-npm-build-tools-common/src/namespace.ts | 6 ++++-- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 7 +++++-- .../packages/liferay-npm-bundler/src/dependencies.js | 5 ++++- .../packages/liferay-npm-bundler/src/index.ts | 7 +++++-- .../packages/liferay-npm-bundler/src/steps/rules.js | 4 ++-- projects/amd-loader/src/loader/loader.js | 11 ++++++++--- .../packages/liferay-theme-tasks/lib/test/util.js | 4 ++-- .../packages/js-toolkit-core/src/node/namespace.ts | 6 ++++-- .../js-toolkit-core/src/transform/js/index.ts | 5 ++++- projects/js-toolkit/scripts/watch.js | 7 ++++++- .../npm-tools/packages/npm-scripts/src/jsp/Lexer.js | 2 +- 16 files changed, 50 insertions(+), 24 deletions(-) diff --git a/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/test/util.js b/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/test/util.js index 995d8d63b9..feb7dfe6f0 100644 --- a/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/test/util.js +++ b/maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/test/util.js @@ -321,7 +321,7 @@ function cleanTempTheme(themeName, version, component, initCwd) { cleanDirectory(tempPath); - if (initCwd !== null) { + if (initCwd !== null && initCwd !== undefined) { process.chdir(initCwd); } } diff --git a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/test/util.js b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/test/util.js index 651923787f..c25c44cb84 100644 --- a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/test/util.js +++ b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/test/util.js @@ -303,7 +303,7 @@ function cleanTempTheme(themeName, version, component, initCwd) { cleanDirectory(tempPath); - if (initCwd !== null) { + if (initCwd !== null && initCwd !== undefined) { process.chdir(initCwd); } } diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/scripts/translate.js b/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/scripts/translate.js index d8617e2c79..9affc64e5c 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/scripts/translate.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/scripts/translate.js @@ -29,7 +29,7 @@ export default function () { subscriptionKey = cfg.getTranslatorTextKey(); } - if (!subscriptionKey || subscriptionKey === '') { + if (!subscriptionKey) { console.error( '-------------------------------------------------------------\n' + ' ๐Ÿ›‘ Microsoft Translator credentials not set ๐Ÿ›‘\n\n' + diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/namespace.ts b/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/namespace.ts index d0da96c004..158e9ac8b5 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/namespace.ts +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/namespace.ts @@ -11,7 +11,9 @@ import * as mod from './modules'; * @return true if the module is namespaced */ export function isNamespaced(moduleName: string): boolean { - return getNamespace(moduleName) !== null; + const nameSpace = getNamespace(moduleName); + + return nameSpace !== null && nameSpace !== undefined; } /** @@ -70,7 +72,7 @@ export function addNamespace( export function removeNamespace(moduleName: string): string { const namespace = getNamespace(moduleName); - if (namespace !== null) { + if (namespace !== null && namespace !== undefined) { if (moduleName.startsWith('@')) { return moduleName.replace(`@${namespace}`, '@'); } diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-css-loader/src/index.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-css-loader/src/index.js index cea4e10ae7..842315fe6a 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-css-loader/src/index.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-css-loader/src/index.js @@ -156,7 +156,7 @@ function getHref(filePath, extension, pathModule, namespaceDependencies) { if (extension !== undefined) { const extname = path.extname(filePath); - if (extname === '') { + if (!extname) { filePath = `${filePath}.${extension}`; } else { diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-sass-loader/src/index.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-sass-loader/src/index.js index 2530c4e38f..e3d27d1530 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-sass-loader/src/index.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-sass-loader/src/index.js @@ -67,7 +67,7 @@ function changeFilePathExtension(context) { const extname = path.extname(filePath); - if (extname === '') { + if (!extname) { filePath = `${filePath}.css`; } else { diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-resolve-linked-dependencies/src/index.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-resolve-linked-dependencies/src/index.js index ed9853913d..55c621d331 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-resolve-linked-dependencies/src/index.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-resolve-linked-dependencies/src/index.js @@ -11,11 +11,14 @@ import semver from 'semver'; * @return {void} */ export default function ({log}, {pkgJson}) { - if (pkgJson.dependencies !== null) { + if (pkgJson.dependencies !== null && pkgJson.dependencies !== undefined) { Object.keys(pkgJson.dependencies).forEach((name) => { const link = pkgJson.dependencies[name]; - if (semver.validRange(link) === null) { + if ( + semver.validRange(link) === null || + semver.validRange(link) === undefined + ) { const depPkgJsonPath = path.join( 'node_modules', name, diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/dependencies.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/dependencies.js index fa72cf2a67..a657665a1c 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/dependencies.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/dependencies.js @@ -65,7 +65,10 @@ export function addPackageDependencies( .map((dependency) => resolveDependencyDir(baseDirPath, packageJson, dependency) ) - .filter((dependencyDir) => dependencyDir !== null); + .filter( + (dependencyDir) => + dependencyDir !== null && dependencyDir !== undefined + ); dependencyDirs.forEach((dependencyDir) => { addPackageDependencies(collectedDependencies, dependencyDir); diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/index.ts b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/index.ts index 9791da2b60..40ae0015d0 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/index.ts +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/index.ts @@ -115,11 +115,14 @@ function run(): void { /** Report linked dependencies of a given package.json */ function reportLinkedDependencies(pkgJson: object): void { ['dependencies', 'devDependencies'].forEach((scope) => { - if (pkgJson[scope] !== null) { + if (pkgJson[scope] !== null && pkgJson[scope] !== undefined) { Object.keys(pkgJson[scope]).forEach((depName) => { const depVersion = pkgJson[scope][depName]; - if (semver.validRange(depVersion) === null) { + if ( + semver.validRange(depVersion) === null || + semver.validRange(depVersion) === undefined + ) { const depPkgJsonPath = path.join( 'node_modules', depName, diff --git a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/rules.js b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/rules.js index e3e6ceb21b..8220fb79ff 100644 --- a/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/rules.js +++ b/maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/rules.js @@ -231,7 +231,7 @@ function assertString(object, field, what) { * @param {object} context */ function writeLoadersResult(srcPkg, destPkg, context) { - if (context.content !== undefined) { + if (context.content !== undefined && context.content !== null) { writeRuleFile( destPkg, srcPkg.dir.relative(project.dir.join(context.filePath)).asNative, @@ -241,7 +241,7 @@ function writeLoadersResult(srcPkg, destPkg, context) { Object.entries(context.extraArtifacts).forEach( ([extraPrjRelPath, content]) => { - if (content === undefined) { + if (content === undefined || content === null) { return; } diff --git a/projects/amd-loader/src/loader/loader.js b/projects/amd-loader/src/loader/loader.js index 9ec12594a8..301a654e64 100644 --- a/projects/amd-loader/src/loader/loader.js +++ b/projects/amd-loader/src/loader/loader.js @@ -155,7 +155,7 @@ export default class Loader { success = lastArg; failure = undefined; } - else if (lastArg === null) { + else if (lastArg === null || lastArg === undefined) { moduleNames = args[0]; success = undefined; failure = undefined; @@ -170,7 +170,11 @@ export default class Loader { const lastArg = args[args.length - 1]; let successGiven = false; - if (typeof lastArg === 'function' || lastArg === null) { + if ( + typeof lastArg === 'function' || + lastArg === null || + lastArg === undefined + ) { successGiven = true; } @@ -185,7 +189,8 @@ export default class Loader { if ( typeof penultimateArg === 'function' || - penultimateArg === null + penultimateArg === null || + penultimateArg === undefined ) { failureGiven = true; } diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/test/util.js b/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/test/util.js index e00bb3c369..a81138981b 100644 --- a/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/test/util.js +++ b/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/test/util.js @@ -364,7 +364,7 @@ function setupTempTheme(options) { function cleanTempPlugin(tempPlugin) { const {savedCwd} = tempPlugin; - if (savedCwd !== null) { + if (savedCwd !== null && savedCwd !== undefined) { process.chdir(savedCwd); } } @@ -377,7 +377,7 @@ function cleanTempPlugin(tempPlugin) { function cleanTempTheme(tempTheme) { const {savedCwd} = tempTheme; - if (savedCwd !== null) { + if (savedCwd !== null && savedCwd !== undefined) { process.chdir(savedCwd); } } diff --git a/projects/js-toolkit/packages/js-toolkit-core/src/node/namespace.ts b/projects/js-toolkit/packages/js-toolkit-core/src/node/namespace.ts index b95990db2c..9b489affe1 100644 --- a/projects/js-toolkit/packages/js-toolkit-core/src/node/namespace.ts +++ b/projects/js-toolkit/packages/js-toolkit-core/src/node/namespace.ts @@ -11,7 +11,9 @@ import * as mod from './modules'; * @return true if the module is namespaced */ export function isNamespaced(moduleName: string): boolean { - return getNamespace(moduleName) !== null; + const namespace = getNamespace(moduleName); + + return namespace !== null && namespace !== undefined; } /** @@ -71,7 +73,7 @@ export function addNamespace( export function removeNamespace(moduleName: string): string { const namespace = getNamespace(moduleName); - if (namespace !== null) { + if (namespace !== null && namespace !== undefined) { if (moduleName.startsWith('@')) { return moduleName.replace(`@${namespace}`, '@'); } diff --git a/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/index.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/index.ts index 1012fc6e9f..f39b14545f 100644 --- a/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/index.ts +++ b/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/index.ts @@ -140,7 +140,10 @@ async function mergeMaps( line: mapping.originalLine, }); - if (origPosInOldMap.source === null) { + if ( + origPosInOldMap.source === null || + origPosInOldMap.source === undefined + ) { return; } diff --git a/projects/js-toolkit/scripts/watch.js b/projects/js-toolkit/scripts/watch.js index def08b8c6a..ff1fa73771 100644 --- a/projects/js-toolkit/scripts/watch.js +++ b/projects/js-toolkit/scripts/watch.js @@ -85,7 +85,12 @@ watch.watchTree( '.', {filter: filterStaticFiles, ignoreDotFiles: false, interval: 1}, (filename, curr, prev) => { - if (typeof filename === 'object' && prev === null && curr === null) { + if ( + filename !== null && + typeof filename === 'object' && + (prev === null || prev === undefined) && + (curr === null || curr === undefined) + ) { console.log( 'Watching', Object.keys(filename).length, diff --git a/projects/npm-tools/packages/npm-scripts/src/jsp/Lexer.js b/projects/npm-tools/packages/npm-scripts/src/jsp/Lexer.js index d16cdfd6df..ddd1c10a17 100644 --- a/projects/npm-tools/packages/npm-scripts/src/jsp/Lexer.js +++ b/projects/npm-tools/packages/npm-scripts/src/jsp/Lexer.js @@ -663,7 +663,7 @@ class Lexer { // Return result of previous `peek()`. - if (peeked !== undefined) { + if (peeked !== undefined && peeked !== null) { result = peeked; } else {
${cell}