1
- const helpers = require ( "./projectHelpers" ) ;
1
+ const { isAngular , isTypeScript } = require ( "./projectHelpers" ) ;
2
2
3
3
const NEW_DEPS_MESSAGE = `\
4
4
A few new dependencies were added. \
@@ -57,7 +57,7 @@ function addDependency(deps, name, version, force) {
57
57
}
58
58
59
59
function getRequiredDeps ( packageJson ) {
60
- let deps = {
60
+ const deps = {
61
61
"webpack" : "~3.0.0" ,
62
62
"webpack-bundle-analyzer" : "^2.8.2" ,
63
63
"webpack-sources" : "~1.0.1" ,
@@ -68,18 +68,18 @@ function getRequiredDeps(packageJson) {
68
68
"extract-text-webpack-plugin" : "~2.1.0" ,
69
69
} ;
70
70
71
- if ( helpers . isAngular ( { packageJson} ) ) {
71
+ if ( isAngular ( { packageJson} ) ) {
72
72
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" } ) ;
76
76
}
77
77
78
78
return deps ;
79
79
}
80
80
81
81
function resolveAngularDeps ( usedDependencies ) {
82
- let depsToAdd = {
82
+ const depsToAdd = {
83
83
"@angular/compiler-cli" : usedDependencies [ "@angular/core" ] ,
84
84
} ;
85
85
const tnsModulesVersion = getVersionWithoutPatch ( usedDependencies [ "tns-core-modules" ] ) ;
@@ -105,22 +105,21 @@ function resolveAngularDeps(usedDependencies) {
105
105
return depsToAdd ;
106
106
}
107
107
108
- function getVersionWithoutPatch ( version ) {
109
- if ( ! version ) {
108
+ function getVersionWithoutPatch ( fullVersion ) {
109
+ if ( ! fullVersion ) {
110
110
return "" ;
111
111
}
112
112
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 ;
115
116
}
116
117
117
- version = version . substring ( 0 , version . lastIndexOf ( "." ) ) ;
118
+ const version = fullVersion . substring ( 0 , fullVersion . lastIndexOf ( "." ) ) ;
118
119
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 ;
124
123
}
125
124
126
125
function showHelperMessages ( { newDepsAdded, hasOldDeps } ) {
0 commit comments