CB-13912 Updated checked-in node_modules

node_modules/cordova-common/.npmignore

@@ -1,2 +0,0 @@
-spec
-coverage

node_modules/cordova-common/RELEASENOTES.md

@@ -20,6 +20,9 @@
 -->
 # Cordova-common Release Notes
 
+### 2.2.1 (Dec 14, 2017)
+* [CB-13674](https://issues.apache.org/jira/browse/CB-13674): updated dependencies
+
 ### 2.2.0 (Nov 22, 2017)
 * [CB-13471](https://issues.apache.org/jira/browse/CB-13471) File Provider fix belongs in cordova-common 
 * [CB-11244](https://issues.apache.org/jira/browse/CB-11244) Spot fix for upcoming `cordova-android@7` changes. https://github.com/apache/cordova-android/pull/389

node_modules/cordova-common/package.json

@@ -10,17 +10,17 @@
         "spec": ">=2.2.0 <3.0.0",
         "type": "range"
       },
-      "/Users/jbowser/cordova/cordova-android"
+      "/Users/steveng/repo/cordova/cordova-android"
     ]
   ],
   "_from": "cordova-common@>=2.2.0 <3.0.0",
-  "_id": "cordova-common@2.2.0",
+  "_id": "cordova-common@2.2.1",
   "_inCache": true,
   "_location": "/cordova-common",
-  "_nodeVersion": "6.6.0",
+  "_nodeVersion": "8.9.3",
   "_npmOperationalInternal": {
     "host": "s3://npm-registry-packages",
-    "tmp": "tmp/cordova-common-2.2.0.tgz_1511807085778_0.6969101736322045"
+    "tmp": "tmp/cordova-common-2.2.1.tgz_1513711030961_0.7797101123724133"
   },
   "_npmUser": {
     "name": "stevegill",
@@ -40,11 +40,11 @@
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.0.tgz",
-  "_shasum": "0d00f5bcd2bc6c7d06b1ddc0328aea3fe38bcf07",
+  "_resolved": "file:cordova-dist/tools/cordova-common-2.2.1.tgz",
+  "_shasum": "7009bc591729caa7285a588cfd6a7b54cd834f0c",
   "_shrinkwrap": null,
   "_spec": "cordova-common@^2.2.0",
-  "_where": "/Users/jbowser/cordova/cordova-android",
+  "_where": "/Users/steveng/repo/cordova/cordova-android",
   "author": {
     "name": "Apache Software Foundation"
   },
@@ -84,8 +84,8 @@
   },
   "directories": {},
   "dist": {
-    "shasum": "0d00f5bcd2bc6c7d06b1ddc0328aea3fe38bcf07",
-    "tarball": "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.0.tgz"
+    "shasum": "7009bc591729caa7285a588cfd6a7b54cd834f0c",
+    "tarball": "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.1.tgz"
   },
   "engines": {
     "node": ">=4.0.0"
@@ -144,5 +144,5 @@
     "jasmine": "jasmine JASMINE_CONFIG_PATH=spec/support/jasmine.json",
     "test": "npm run eslint && npm run jasmine"
   },
-  "version": "2.2.0"
+  "version": "2.2.1"
 }

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

@@ -32,7 +32,7 @@
 var path = require('path');
 var et = require('elementtree');
 var ConfigKeeper = require('./ConfigKeeper');
-var CordovaLogger = require('../CordovaLogger');
+var events = require('../events');
 
 var mungeutil = require('./munge-util');
 var xml_helpers = require('../util/xml-helpers');
@@ -134,7 +134,7 @@ function add_plugin_changes (pluginInfo, plugin_vars, is_top_level, should_incre
                 ' cannot be added. <edit-config> changes in this plugin conflicts with <edit-config> changes in config.xml. Conflicts must be resolved before plugin can be added.');
         }
         if (plugin_force) {
-            CordovaLogger.get().log(CordovaLogger.WARN, '--force is used. edit-config will overwrite conflicts if any. Conflicting plugins may not work as expected.');
+            events.emit('warn', '--force is used. edit-config will overwrite conflicts if any. Conflicting plugins may not work as expected.');
 
             // remove conflicting munges
             var conflict_munge = mungeutil.decrement_munge(platform_config.config_munge, isConflictingInfo.conflictingMunge);
@@ -198,7 +198,7 @@ function add_config_changes (config, should_increment) {
                 }
             }
             if (Object.keys(isConflictingInfo.conflictingMunge.files).length !== 0) {
-                CordovaLogger.get().log(CordovaLogger.WARN, 'Conflict found, edit-config changes from config.xml will overwrite plugin.xml changes');
+                events.emit('warn', 'Conflict found, edit-config changes from config.xml will overwrite plugin.xml changes');
 
                 // remove conflicting plugin.xml munges
                 conflict_munge = mungeutil.decrement_munge(platform_config.config_munge, isConflictingInfo.conflictingMunge);

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

@@ -31,7 +31,7 @@ function ConfigParser (path) {
         this.cdvNamespacePrefix = getCordovaNamespacePrefix(this.doc);
         et.register_namespace(this.cdvNamespacePrefix, 'http://cordova.apache.org/ns/1.0');
     } catch (e) {
-        console.error('Parsing ' + path + ' failed');
+        events.emit('error', 'Parsing ' + path + ' failed');
         throw e;
     }
     var r = this.doc.getroot();