Merge branch 'master' into TIMOB-25238

Jenkinsfile

@@ -115,8 +115,8 @@ timestamps {
 			nodejs(nodeJSInstallationName: "node ${nodeVersion}") {
 
 				stage('Lint') {
-					// Enforce npm 5.2.0 right now, since 5.3.0 has a bug in pruning to production: https://github.com/npm/npm/issues/17781
-					sh 'npm install -g npm@5.2'
+					// NPM 5.2.0 had a bug taht broke pruning to production, but latest npm 5.4.1 works well
+					sh 'npm install -g npm@5.4.1'
 
 					// Install dependencies
 					timeout(5) {

iphone/cli/hooks/frameworks.js

@@ -768,12 +768,10 @@ class FrameworkInspector {
 				}
 
 				let type;
-				if (stdout.indexOf('current ar archive') !== -1) {
-					type = FRAMEWORK_TYPE_STATIC;
-				} else if (stdout.indexOf('dynamically linked shared library') !== -1) {
+				if (stdout.indexOf('dynamically linked shared library') !== -1) {
 					type = FRAMEWORK_TYPE_DYNAMIC;
 				} else {
-					return reject(new Error('Unknown framework type:\n' + stdout));
+					type = FRAMEWORK_TYPE_STATIC;
 				}
 
 				resolve({

package.json

@@ -45,7 +45,7 @@
     "request": "2.81.0",
     "sprintf": "0.1.5",
     "temp": "0.8.3",
-    "windowslib": "0.5.4",
+    "windowslib": "0.5.5",
     "wrench": "1.5.9",
     "xcode": "0.9.2",
     "xmldom": "0.1.22"