@zohodesk/codestandard-validator 0.0.6-exp-13 → 0.0.6-exp-15

package/build/utils/PluginsInstallation/checkIfPluginsAreInstalled.js

@@ -51,10 +51,13 @@ function checkIfPluginsAreInstalled() {
       packageName,
       version
     } = plugin;
-    // const { isPluginPresent, pluginPath } = checkPluginsPresentInNodemodules(packageName)
-    // if( isPluginPresent && checkPluginHasProperVersion(packageName,pluginPath,version)){
-    //   return false
-    // }
+    const {
+      isPluginPresent,
+      pluginPath
+    } = checkPluginsPresentInNodemodules(packageName);
+    if (isPluginPresent && checkPluginHasProperVersion(packageName, pluginPath, version)) {
+      return false;
+    }
     return `${packageName}@${version}`;
   }).filter(Boolean);
   if (uninstalledPlugins.length > 0) {

package/build/utils/PluginsInstallation/installPlugins.js

@@ -28,8 +28,11 @@ function installPlugins(pluginsToBeInstalled) {
     Logger.log(Logger.INFO_TYPE, 'Plugins are already installed');
     return true;
   }
-  const packageJsonBackup = getPackageJsonContentBeforeInstallingPlugins();
-  const installCommand = `npm install --no-dev ${pluginsToBeInstalled.join(' ')}`;
+  const {
+    packageJsonContentBeforePluginsInstallation,
+    packageLockJsonContentBeforePluginsInstallation
+  } = getPackageJsonContentBeforeInstallingPlugins();
+  const installCommand = `npm install --save-dev ${pluginsToBeInstalled.join(' ')}`;
   Logger.log(Logger.INFO_TYPE, 'Installing plugins...');
   Logger.log(Logger.INFO_TYPE, `Install command being executed: ${installCommand}`);
   const installed = executeSynchronizedCommands(execSync, [installCommand, {
@@ -41,7 +44,10 @@ function installPlugins(pluginsToBeInstalled) {
     return false;
   }
   Logger.log(Logger.SUCCESS_TYPE, 'Plugins installation successful');
-  const restored = restorePackageJsonContent(packageJsonBackup);
+  const restored = restorePackageJsonContent({
+    packageJsonContentBeforePluginsInstallation,
+    packageLockJsonContentBeforePluginsInstallation
+  });
   if (!restored) {
     Logger.log(Logger.FAILURE_TYPE, 'Unable to restore package.json content');
     return false;
@@ -56,18 +62,29 @@ function installPlugins(pluginsToBeInstalled) {
  */
 function getPackageJsonContentBeforeInstallingPlugins() {
   let packageJsonFilePath = `${getNodeModulesPath()}/package.json`;
+  let packageLockJsonFilePath = `${getNodeModulesPath()}/package-lock.json`;
   let packageJsonContentBeforePluginsInstallation = require(packageJsonFilePath);
-  return packageJsonContentBeforePluginsInstallation;
+  let packageLockJsonContentBeforePluginsInstallation = require(packageLockJsonFilePath);
+  return {
+    packageJsonContentBeforePluginsInstallation,
+    packageLockJsonContentBeforePluginsInstallation
+  };
 }
 
 /**
  * @function restorePackageJsonContent - restore the same content as it was before installing plugins
  * @returns {Boolean} - indicating the success or failure of restoring package.json content
  */
-function restorePackageJsonContent(packageJsonContentBeforePluginsInstallation) {
+function restorePackageJsonContent(obj) {
+  const {
+    packageJsonContentBeforePluginsInstallation,
+    packageLockJsonContentBeforePluginsInstallation
+  } = obj;
   let packageJsonFilePath = `${getNodeModulesPath()}/package.json`;
+  let packageLockJsonFilePath = `${getNodeModulesPath()}/package-lock.json`;
   let isPackageJsonRestored = executeSynchronizedCommands(writeFileSync, [packageJsonFilePath, JSON.stringify(packageJsonContentBeforePluginsInstallation, null, 2)], 'Package.json content restored successfully', 'Unable to restore package.json content', false, true);
-  return isPackageJsonRestored;
+  let isPackageLockJsonRestored = executeSynchronizedCommands(writeFileSync, [packageLockJsonFilePath, JSON.stringify(packageLockJsonContentBeforePluginsInstallation, null, 2)], 'Packagk Locj.json content restored successfully', 'Unable to restore package-lock.json content', false, true);
+  return isPackageJsonRestored && isPackageLockJsonRestored;
 }
 module.exports = {
   installPlugins

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/codestandard-validator",
-  "version": "0.0.6-exp-13",
+  "version": "0.0.6-exp-15",
   "description": "library to enforce code standard using eslint",
   "main": "index.js",
   "scripts": {