cordova-android - npm Package Compare versions

Comparing version 5.3.0-nightly.2016.8.16.ed543dc6 to 5.3.0-nightly.2016.8.17.2efe2406

node_modules/cordova-common/cordova-common.js

@@ -30,2 +30,3 @@ /**
 addProperty(module, 'CordovaLogger', './src/CordovaLogger');
+addProperty(module, 'CordovaCheck', './src/CordovaCheck');
 addProperty(module, 'CordovaExternalToolErrorContext', './src/CordovaError/CordovaExternalToolErrorContext');
@@ -32,0 +33,0 @@ addProperty(module, 'PlatformJson', './src/PlatformJson');

node_modules/cordova-common/package.json

@@ -17,16 +17,16 @@ {
   "_from": "cordova-common@>=1.4.0 <2.0.0",
-  "_id": "cordova-common@1.4.0",
+  "_id": "cordova-common@1.4.1",
   "_inCache": true,
   "_installable": true,
   "_location": "/cordova-common",
-  "_nodeVersion": "6.3.0",
+  "_nodeVersion": "6.2.2",
   "_npmOperationalInternal": {
     "host": "packages-16-east.internal.npmjs.com",
-    "tmp": "tmp/cordova-common-1.4.0.tgz_1469092638680_0.9961137105710804"
+    "tmp": "tmp/cordova-common-1.4.1.tgz_1471306335501_0.6723270947113633"
   },
   "_npmUser": {
-    "name": "kotikov.vladimir",
-    "email": "[e-mail]"
+    "name": "stevegill",
+    "email": "[e-mail]"
   },
-  "_npmVersion": "3.10.5",
+  "_npmVersion": "3.9.5",
   "_phantomChildren": {},
@@ -45,4 +45,4 @@ "_requested": {
   ],
-  "_resolved": "http://registry.npmjs.org/cordova-common/-/cordova-common-1.4.0.tgz",
-  "_shasum": "b3ba73595caa34fe8250ac11f20a4ed44e7c84e4",
+  "_resolved": "file:cordova-dist-dev/CB-11690/cordova-common-1.4.1.tgz",
+  "_shasum": "8b4f07b3199b398fff553b32bff66676ecd30ab9",
   "_shrinkwrap": null,
@@ -84,4 +84,4 @@ "_spec": "cordova-common@^1.4.0",
   "dist": {
-    "shasum": "b3ba73595caa34fe8250ac11f20a4ed44e7c84e4",
-    "tarball": "https://registry.npmjs.org/cordova-common/-/cordova-common-1.4.0.tgz"
+    "shasum": "8b4f07b3199b398fff553b32bff66676ecd30ab9",
+    "tarball": "https://registry.npmjs.org/cordova-common/-/cordova-common-1.4.1.tgz"
   },
@@ -133,3 +133,3 @@ "engineStrict": true,
   },
-  "version": "1.4.0"
+  "version": "1.4.1"
 }

node_modules/cordova-common/RELEASENOTES.md

@@ -23,4 +23,8 @@ <!--
 
-### 1.4.0 (Jul 12, 2016)
-* [CB-11023](https://issues.apache.org/jira/browse/CB-11023) Add edit-config functionality
+### 1.4.1 (Aug 09, 2016)
+* Add general purpose `ConfigParser.getAttribute` API
+* [CB-11653](https://issues.apache.org/jira/browse/CB-11653) moved `findProjectRoot` from `cordova-lib` to `cordova-common`
+* [CB-11636](https://issues.apache.org/jira/browse/CB-11636) Handle attributes with quotes correctly
+* [CB-11645](https://issues.apache.org/jira/browse/CB-11645) added check to see if `getEditConfig` exists before trying to use it
+* [CB-9825](https://issues.apache.org/jira/browse/CB-9825) framework tag spec parsing
 
@@ -27,0 +31,0 @@ ### 1.3.0 (May 12, 2016)

node_modules/cordova-common/src/ConfigChanges/ConfigChanges.js

@@ -100,3 +100,6 @@ /*
         platform_config.dependent_plugins[pluginInfo.id];
-    var edit_config_changes = pluginInfo.getEditConfigs(self.platform);
+    var edit_config_changes = null;
+    if(pluginInfo.getEditConfigs) {
+        edit_config_changes = pluginInfo.getEditConfigs(self.platform);
+    }
 
@@ -135,3 +138,8 @@ // get config munge, aka how did this plugin change various config files
     var platform_config = self.platformJson.root;
-    var edit_config_changes = pluginInfo.getEditConfigs(self.platform);
+
+    var edit_config_changes = null;
+    if(pluginInfo.getEditConfigs) {
+        edit_config_changes = pluginInfo.getEditConfigs(self.platform);
+    }
+
     var config_munge;
@@ -138,0 +146,0 @@

node_modules/cordova-common/src/ConfigParser/ConfigParser.js

@@ -93,4 +93,8 @@ /**
 ConfigParser.prototype = {
+    getAttribute: function(attr) {
+        return this.doc.getroot().attrib[attr];
+    },
+
     packageName: function(id) {
-        return this.doc.getroot().attrib['id'];
+        return this.getAttribute('id');
     },
@@ -101,9 +105,9 @@ setPackageName: function(id) {
     android_packageName: function() {
-        return this.doc.getroot().attrib['android-packageName'];
+        return this.getAttribute('android-packageName');
     },
     android_activityName: function() {
-	return this.doc.getroot().attrib['android-activityName'];
+        return this.getAttribute('android-activityName');
     },
     ios_CFBundleIdentifier: function() {
-        return this.doc.getroot().attrib['ios-CFBundleIdentifier'];
+        return this.getAttribute('ios-CFBundleIdentifier');
     },
@@ -125,12 +129,12 @@ name: function() {
     version: function() {
-        return this.doc.getroot().attrib['version'];
+        return this.getAttribute('version');
     },
     windows_packageVersion: function() {
-        return this.doc.getroot().attrib('windows-packageVersion');
+        return this.getAttribute('windows-packageVersion');
     },
     android_versionCode: function() {
-        return this.doc.getroot().attrib['android-versionCode'];
+        return this.getAttribute('android-versionCode');
     },
     ios_CFBundleVersion: function() {
-        return this.doc.getroot().attrib['ios-CFBundleVersion'];
+        return this.getAttribute('ios-CFBundleVersion');
     },
@@ -137,0 +141,0 @@ setVersion: function(value) {

node_modules/cordova-common/src/PluginInfo/PluginInfo.js

@@ -321,2 +321,3 @@ /**
                 src: el.attrib.src,
+                spec: el.attrib.spec,
                 weak: isStrTrue(el.attrib.weak),
@@ -323,0 +324,0 @@ versions: el.attrib.versions,

node_modules/cordova-common/src/util/xml-helpers.js

@@ -47,19 +47,5 @@ /*
 
-        var oneAttribKeys = Object.keys(one.attrib),
-            twoAttribKeys = Object.keys(two.attrib),
-            i = 0, attribName;
+        if (!attribMatch(one, two)) return false;
 
-        if (oneAttribKeys.length != twoAttribKeys.length) {
-            return false;
-        }
-
-        for (i; i < oneAttribKeys.length; i++) {
-            attribName = oneAttribKeys[i];
-
-            if (one.attrib[attribName] != two.attrib[attribName]) {
-                return false;
-            }
-        }
-
-        for (i; i < one._children.length; i++) {
+        for (var i = 0; i < one._children.length; i++) {
             if (!module.exports.equalNodes(one._children[i], two._children[i])) {
@@ -291,29 +277,26 @@ return false;
 
-        if (BLACKLIST.indexOf(srcTag) === -1) {
-            if (SINGLETONS.indexOf(srcTag) !== -1) {
-                foundChild = dest.find(query);
-                if (foundChild) {
-                    destChild = foundChild;
-                    dest.remove(destChild);
-                }
-            } else {
-                //Check for an exact match and if you find one don't add
-                Object.getOwnPropertyNames(srcChild.attrib).forEach(function (attribute) {
-                    query += '[@' + attribute + '="' + srcChild.attrib[attribute] + '"]';
-                });
-                var foundChildren = dest.findall(query);
-                for(var i = 0; i < foundChildren.length; i++) {
-                    foundChild = foundChildren[i];
-                    if (foundChild && textMatch(srcChild, foundChild) && (Object.keys(srcChild.attrib).length==Object.keys(foundChild.attrib).length)) {
-                        destChild = foundChild;
-                        dest.remove(destChild);
-                        shouldMerge = false;
-                        break;
-                    }
-                }
+        if (BLACKLIST.indexOf(srcTag) !== -1) return;
+
+        if (SINGLETONS.indexOf(srcTag) !== -1) {
+            foundChild = dest.find(query);
+            if (foundChild) {
+                destChild = foundChild;
+                dest.remove(destChild);
             }
+        } else {
+            //Check for an exact match and if you find one don't add
+            var mergeCandidates = dest.findall(query)
+            .filter(function (foundChild) {
+                return foundChild && textMatch(srcChild, foundChild) && attribMatch(srcChild, foundChild);
+            });
 
-            mergeXml(srcChild, destChild, platform, clobber && shouldMerge);
-            dest.append(destChild);
+            if (mergeCandidates.length > 0) {
+                destChild = mergeCandidates[0];
+                dest.remove(destChild);
+                shouldMerge = false;
+            }
         }
+
+        mergeXml(srcChild, destChild, platform, clobber && shouldMerge);
+        dest.append(destChild);
     }
@@ -350,1 +333,20 @@
 }
+
+function attribMatch(one, two) {
+    var oneAttribKeys = Object.keys(one.attrib);
+    var twoAttribKeys = Object.keys(two.attrib);
+
+    if (oneAttribKeys.length != twoAttribKeys.length) {
+        return false;
+    }
+
+    for (var i = 0; i < oneAttribKeys.length; i++) {
+        var attribName = oneAttribKeys[i];
+
+        if (one.attrib[attribName] != two.attrib[attribName]) {
+            return false;
+        }
+    }
+
+    return true;
+}

package.json

 {
   "name": "cordova-android",
-  "version": "5.3.0-nightly.2016.8.16.ed543dc6",
+  "version": "5.3.0-nightly.2016.8.17.2efe2406",
   "description": "cordova-android release",
@@ -5,0 +5,0 @@ "bin": {

New alerts

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

3152694

0.09%

Number of package files

350

0.29%

Lines of code

25029

0.32%

Worsened metrics

Number of low supply chain risk alerts

117

1.74%

No dependency changes