Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

Commit cf9d6c3

Browse files
committed
refactor: dependencyManager code style
1 parent ac32b14 commit cf9d6c3

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

Diff for: dependencyManager.js

+16-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const helpers = require("./projectHelpers");
1+
const { isAngular, isTypeScript } = require("./projectHelpers");
22

33
const NEW_DEPS_MESSAGE = `\
44
A few new dependencies were added. \
@@ -57,7 +57,7 @@ function addDependency(deps, name, version, force) {
5757
}
5858

5959
function getRequiredDeps(packageJson) {
60-
let deps = {
60+
const deps = {
6161
"webpack": "~3.0.0",
6262
"webpack-bundle-analyzer": "^2.8.2",
6363
"webpack-sources": "~1.0.1",
@@ -68,18 +68,18 @@ function getRequiredDeps(packageJson) {
6868
"extract-text-webpack-plugin": "~2.1.0",
6969
};
7070

71-
if (helpers.isAngular({packageJson})) {
71+
if (isAngular({packageJson})) {
7272
const angularDeps = resolveAngularDeps(packageJson.dependencies);
73-
deps = Object.assign(deps, angularDeps);
74-
} else if (helpers.isTypeScript({packageJson})) {
75-
deps["awesome-typescript-loader"] = "~3.1.3";
73+
Object.assign(deps, angularDeps);
74+
} else if (isTypeScript({packageJson})) {
75+
Object.assign(deps, { "awesome-typescript-loader": "~3.1.3" });
7676
}
7777

7878
return deps;
7979
}
8080

8181
function resolveAngularDeps(usedDependencies) {
82-
let depsToAdd = {
82+
const depsToAdd = {
8383
"@angular/compiler-cli": usedDependencies["@angular/core"],
8484
};
8585
const tnsModulesVersion = getVersionWithoutPatch(usedDependencies["tns-core-modules"]);
@@ -105,22 +105,21 @@ function resolveAngularDeps(usedDependencies) {
105105
return depsToAdd;
106106
}
107107

108-
function getVersionWithoutPatch(version) {
109-
if (!version) {
108+
function getVersionWithoutPatch(fullVersion) {
109+
if (!fullVersion) {
110110
return "";
111111
}
112112

113-
if (version === "next" || version === "latest" || version === "rc") {
114-
return version;
113+
const prereleaseVersions = Object.freeze(["next", "latest", "rc"]);
114+
if (prereleaseVersions.includes(fullVersion)) {
115+
return fullVersion;
115116
}
116117

117-
version = version.substring(0, version.lastIndexOf("."));
118+
const version = fullVersion.substring(0, fullVersion.lastIndexOf("."));
118119

119-
if (version.startsWith("~") || version.startsWith("^")) {
120-
return version.substring(1);
121-
} else {
122-
return version;
123-
}
120+
return version.startsWith("~") || version.startsWith("^") ?
121+
version.substring(1) :
122+
version;
124123
}
125124

126125
function showHelperMessages({ newDepsAdded, hasOldDeps }) {

0 commit comments

Comments
 (0)