refactor: return devDeps from dependency manager

Author: sis0k0

Diff for: bin/ns-webpack-update

@@ -8,5 +8,6 @@ const forceUpdateProjectDeps = require("../dependencyManager").forceUpdateProjec
 const PROJECT_DIR = path.resolve(__dirname, "../../../");
 const packageJson = helpers.getPackageJson(PROJECT_DIR);
 
-forceUpdateProjectDeps(packageJson);
+packageJson.devDependencies = forceUpdateProjectDeps(packageJson);
+
 helpers.writePackageJson(packageJson, PROJECT_DIR);

Diff for: dependencyManager.js

@@ -1,35 +1,31 @@
 const helpers = require("./projectHelpers");
 
 function forceUpdateProjectDeps(packageJson) {
-    addProjectDeps(packageJson, true);
+    return addProjectDeps(packageJson, true);
 }
 
 function addProjectDeps(packageJson, force = false) {
     const depsToAdd = getRequiredDeps(packageJson);
     packageJson.devDependencies = packageJson.devDependencies || {};
-    let oldDeps = packageJson.devDependencies;
+    let deps = Object.assign({}, packageJson.devDependencies);
 
-    let alreadyAdded = false;
     Object.keys(depsToAdd).forEach(function(name) {
         const version = depsToAdd[name];
-        alreadyAdded = addDependency(oldDeps, name, version, force) || alreadyAdded;
+        deps = addDependency(deps, name, version, force);
     });
 
-    if (alreadyAdded) {
-        console.error("Some deps were not updated because they were already added.");
-        console.error("If you want to force update them, please run './node_modules/.bin/ns-webpack-update'");
-    }
+    return deps;
 }
 
 function addDependency(deps, name, version, force) {
     if (!deps[name] || force) {
         deps[name] = version;
         console.info(`Adding dev dependency: ${name}@${version}`);
-        return false;
-    } else {
+    } else if (deps[name] !== version) {
         console.info(`Dev dependency: ${name} already added. Leaving version: ${deps[name]}`);
-        return true;
     }
+
+    return deps;
 }
 
 function getRequiredDeps(packageJson) {

Diff for: installer.js

@@ -19,8 +19,7 @@ function install() {
     scripts = npmScriptsManager.addNpmScripts(scripts);
     packageJson.scripts = scripts;
 
-
-    dependencyManager.addProjectDeps(packageJson);
+    packageJson.devDependencies = dependencyManager.addProjectDeps(packageJson);
 
     helpers.writePackageJson(packageJson, PROJECT_DIR);
 }

Diff for: projectHelpers.js

@@ -1,18 +1,13 @@
 const path = require("path");
 const fs = require("fs");
 
-const isTypeScript = ({projectDir, packageJson} = {}) => {
-    packageJson = packageJson || getPackageJson(projectDir);
-
+const isTypeScript = packageJson => {
     return packageJson.dependencies.hasOwnProperty("typescript") ||
         packageJson.devDependencies.hasOwnProperty("typescript") ||
         isAngular(packageJson);
-
 };
 
-const isAngular = ({projectDir, packageJson} = {}) => {
-    packageJson = packageJson || getPackageJson(projectDir);
-
+const isAngular = projectDir => {
     return Object.keys(packageJson.dependencies)
         .some(dependency => /^@angular\b/.test(dependency));
 };

Diff for: resource-resolver-plugins/StyleUrlResolvePlugin.js

@@ -1,4 +1,3 @@
-const ts = require("typescript");
 const fs = require("fs");
 const path = require("path");