Skip to content

Commit 79c0f29

Browse files
chore: update instances where value could be null or undefined
1 parent 7e82974 commit 79c0f29

File tree

16 files changed

+50
-24
lines changed

16 files changed

+50
-24
lines changed

maintenance/projects/js-themes-toolkit-v8-x/packages/liferay-theme-tasks/test/util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ function cleanTempTheme(themeName, version, component, initCwd) {
321321

322322
cleanDirectory(tempPath);
323323

324-
if (initCwd !== null) {
324+
if (initCwd !== null && initCwd !== undefined) {
325325
process.chdir(initCwd);
326326
}
327327
}

maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/test/util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ function cleanTempTheme(themeName, version, component, initCwd) {
303303

304304
cleanDirectory(tempPath);
305305

306-
if (initCwd !== null) {
306+
if (initCwd !== null && initCwd !== undefined) {
307307
process.chdir(initCwd);
308308
}
309309
}

maintenance/projects/js-toolkit/packages/liferay-npm-build-support/src/scripts/translate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default function () {
2929
subscriptionKey = cfg.getTranslatorTextKey();
3030
}
3131

32-
if (!subscriptionKey || subscriptionKey === '') {
32+
if (!subscriptionKey) {
3333
console.error(
3434
'-------------------------------------------------------------\n' +
3535
' 🛑 Microsoft Translator credentials not set 🛑\n\n' +

maintenance/projects/js-toolkit/packages/liferay-npm-build-tools-common/src/namespace.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import * as mod from './modules';
1111
* @return true if the module is namespaced
1212
*/
1313
export function isNamespaced(moduleName: string): boolean {
14-
return getNamespace(moduleName) !== null;
14+
const nameSpace = getNamespace(moduleName);
15+
16+
return nameSpace !== null && nameSpace !== undefined;
1517
}
1618

1719
/**
@@ -70,7 +72,7 @@ export function addNamespace(
7072
export function removeNamespace(moduleName: string): string {
7173
const namespace = getNamespace(moduleName);
7274

73-
if (namespace !== null) {
75+
if (namespace !== null && namespace !== undefined) {
7476
if (moduleName.startsWith('@')) {
7577
return moduleName.replace(`@${namespace}`, '@');
7678
}

maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-css-loader/src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ function getHref(filePath, extension, pathModule, namespaceDependencies) {
156156
if (extension !== undefined) {
157157
const extname = path.extname(filePath);
158158

159-
if (extname === '') {
159+
if (!extname) {
160160
filePath = `${filePath}.${extension}`;
161161
}
162162
else {

maintenance/projects/js-toolkit/packages/liferay-npm-bundler-loader-sass-loader/src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function changeFilePathExtension(context) {
6767

6868
const extname = path.extname(filePath);
6969

70-
if (extname === '') {
70+
if (!extname) {
7171
filePath = `${filePath}.css`;
7272
}
7373
else {

maintenance/projects/js-toolkit/packages/liferay-npm-bundler-plugin-resolve-linked-dependencies/src/index.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ import semver from 'semver';
1111
* @return {void}
1212
*/
1313
export default function ({log}, {pkgJson}) {
14-
if (pkgJson.dependencies !== null) {
14+
if (pkgJson.dependencies !== null && pkgJson.dependencies !== undefined) {
1515
Object.keys(pkgJson.dependencies).forEach((name) => {
1616
const link = pkgJson.dependencies[name];
1717

18-
if (semver.validRange(link) === null) {
18+
if (
19+
semver.validRange(link) === null ||
20+
semver.validRange(link) === undefined
21+
) {
1922
const depPkgJsonPath = path.join(
2023
'node_modules',
2124
name,

maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/dependencies.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ export function addPackageDependencies(
6565
.map((dependency) =>
6666
resolveDependencyDir(baseDirPath, packageJson, dependency)
6767
)
68-
.filter((dependencyDir) => dependencyDir !== null);
68+
.filter(
69+
(dependencyDir) =>
70+
dependencyDir !== null && dependencyDir !== undefined
71+
);
6972

7073
dependencyDirs.forEach((dependencyDir) => {
7174
addPackageDependencies(collectedDependencies, dependencyDir);

maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/index.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,14 @@ function run(): void {
115115
/** Report linked dependencies of a given package.json */
116116
function reportLinkedDependencies(pkgJson: object): void {
117117
['dependencies', 'devDependencies'].forEach((scope) => {
118-
if (pkgJson[scope] !== null) {
118+
if (pkgJson[scope] !== null && pkgJson[scope] !== undefined) {
119119
Object.keys(pkgJson[scope]).forEach((depName) => {
120120
const depVersion = pkgJson[scope][depName];
121121

122-
if (semver.validRange(depVersion) === null) {
122+
if (
123+
semver.validRange(depVersion) === null ||
124+
semver.validRange(depVersion) === undefined
125+
) {
123126
const depPkgJsonPath = path.join(
124127
'node_modules',
125128
depName,

maintenance/projects/js-toolkit/packages/liferay-npm-bundler/src/steps/rules.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ function assertString(object, field, what) {
231231
* @param {object} context
232232
*/
233233
function writeLoadersResult(srcPkg, destPkg, context) {
234-
if (context.content !== undefined) {
234+
if (context.content !== undefined && context.content !== null) {
235235
writeRuleFile(
236236
destPkg,
237237
srcPkg.dir.relative(project.dir.join(context.filePath)).asNative,
@@ -241,7 +241,7 @@ function writeLoadersResult(srcPkg, destPkg, context) {
241241

242242
Object.entries(context.extraArtifacts).forEach(
243243
([extraPrjRelPath, content]) => {
244-
if (content === undefined) {
244+
if (content === undefined || content === null) {
245245
return;
246246
}
247247

0 commit comments

Comments
 (0)