Merge pull request #163 from liferay/wincent/remove-is-plain-object

Remove _.isPlainObject calls in divert.js (x2)
liferay · Feb 27, 2019 · dba05f6 · dba05f6
2 parents 84db003 + d4b4e40
commit dba05f6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/packages/generator-liferay-theme/lib/divert/index.js b/packages/generator-liferay-theme/lib/divert/index.js
@@ -1,6 +1,11 @@
 'use strict';
 
-let _ = require('lodash');
+function isPlainObject(value) {
+	return (
+		value !== null &&
+		Object.prototype.toString.call(value) === '[object Object]'
+	);
+}
 
 function divert(moduleName, version) {
 	version = version || divert.defaultVersion;
@@ -30,7 +35,7 @@ function safeRequire(moduleName) {
 		}
 	}
 
-	if (!_.isPlainObject(module)) {
+	if (!isPlainObject(module)) {
 		throw new Error(
 			'Only modules exporting plain objects can be used with divert'
 		);

diff --git a/packages/liferay-theme-tasks/lib/divert/common/kickstart_prompt_helpers.js b/packages/liferay-theme-tasks/lib/divert/common/kickstart_prompt_helpers.js
@@ -3,7 +3,6 @@
 const inquirer = require('inquirer');
 const _ = require('lodash');
 
-const divert = require('../../divert');
 const GlobalModulePrompt = require('../../prompts/global_module_prompt');
 const NPMModulePrompt = require('../../prompts/npm_module_prompt');
 const themeUtil = require('../../util');

diff --git a/packages/liferay-theme-tasks/lib/divert/index.js b/packages/liferay-theme-tasks/lib/divert/index.js
@@ -1,6 +1,11 @@
 'use strict';
 
-let _ = require('lodash');
+function isPlainObject(value) {
+	return (
+		value !== null &&
+		Object.prototype.toString.call(value) === '[object Object]'
+	);
+}
 
 let lfrThemeConfig = require('../liferay_theme_config');
 
@@ -30,7 +35,7 @@ function safeRequire(moduleName) {
 		}
 	}
 
-	if (!_.isPlainObject(module)) {
+	if (!isPlainObject(module)) {
 		throw new Error(
 			'Only modules exporting plain objects can be used with divert'
 		);

diff --git a/packages/liferay-theme-tasks/tasks/deploy.js b/packages/liferay-theme-tasks/tasks/deploy.js
@@ -8,8 +8,6 @@ const lfrThemeConfig = require('../lib/liferay_theme_config');
 const themeUtil = require('../lib/util');
 const WarDeployer = require('../lib/war_deployer');
 
-const divert = require('../lib/divert');
-
 const themeConfig = lfrThemeConfig.getConfig(true);
 const DEPLOYMENT_STRATEGIES = themeUtil.DEPLOYMENT_STRATEGIES;