Update dependencies

- Update to latest versions
- Update JSDOM calls
- Remove Bluebird

Author: dstillman

lib/citeServer.js

@@ -67,7 +67,6 @@ var url = require('url');
 var querystring = require('querystring');
 var _ = require('underscore')._;
 var log = require('npmlog');
-var Promise = require('bluebird');
 var styles = require('./styles');
 var locales = require('./locales');
 var citeprocnode = require('./citeprocnode');

lib/citeprocnode.js

@@ -13,7 +13,6 @@
 var fs = require('fs');
 var log = require('npmlog');
 var _ = require('underscore')._;
-var Promise = require('bluebird');
 let jsonWalker = require("./json_walker.js");
 
 //var sampleCites = require('../test/loadcitesnode.js');

lib/engineCaching.js

@@ -30,7 +30,6 @@ let http = require('http');
 let url = require('url');
 let jsdom = require('jsdom');
 let log = require('npmlog');
-let Promise = require('bluebird');
 let citeproc = require('./citeprocnode');
 let path = require('path');
 let jsonWalker = require("./json_walker.js");

lib/json_walker.js

@@ -2,16 +2,12 @@
 
 'use strict';
 
-let jsdom = require("jsdom").jsdom;
+const jsdom = require("jsdom");
+const { JSDOM } = jsdom;
 
 exports.MakeDoc = function(xmlString) {
-    let doc = jsdom(xmlString, {
-        'parsingMode': 'xml',
-        'features': {
-            'FetchExternalResources': false,
-        }
-    });
-    return doc;
+    let { document } = (new JSDOM(xmlString, { contentType: 'text/xml' })).window;
+    return document;
 }
 
 

lib/styles.js

@@ -44,8 +44,8 @@ var http = require('http');
 var https = require('https');
 var url = require('url');
 var jsdom = require('jsdom');
+const { JSDOM } = jsdom;
 var log = require('npmlog');
-var Promise = require('bluebird');
 var path = require('path');
 
 /**
@@ -337,9 +337,8 @@ exports.CslLoader.prototype.readDependent = function(xml){
     xml = xml.replace(/<style\s/, "<cslstyle ").replace("</style", "</cslstyle");
     xml = xml.trim();
 
-    let jsdom = require('jsdom').jsdom;
-    let dStyle = jsdom(xml, {'parsingMode': 'xml'});
-    let linkEls = dStyle.getElementsByTagName('link');
+    let { document } = (new JSDOM(xml, { contentType: 'text/xml' })).window;
+    let linkEls = document.getElementsByTagName('link');
     for(let i = 0; i < linkEls.length; i++){
         log.verbose("CslLoader.readDependent", "rel: " + linkEls[i].getAttribute("rel"));
         if(linkEls[i].getAttribute("rel") == "independent-parent"){

package.json

@@ -10,15 +10,12 @@
   "directories": {
     "lib": "./lib"
   },
-  "engines": {
-    "node": ">=0.10.25"
-  },
   "dependencies": {
-    "jsdom": ">=4.0",
+    "config": "^3.0.0",
+    "jsdom": "^13.0.0",
+    "npmlog": "^4.1.2",
     "optimist": ">=0.3.1",
-    "underscore": ">=1.8",
-    "npmlog": ">=1.2",
-    "bluebird": ">=2.9"
+    "underscore": "^1.9.1"
   },
   "devDependencies": {}
 }

test/benchServer.js

@@ -27,7 +27,6 @@
 
 let util = require('util');
 let fs = require('fs');
-let Promise = require('bluebird');
 let log = require('npmlog');
 let _ = require('underscore')._;
 let querystring = require('querystring');

test/testallstyles.js

@@ -24,7 +24,6 @@
 */
 
 var fs = require('fs');
-var Promise = require('bluebird');
 var log = require('npmlog');
 var _ = require('underscore')._;
 var querystring = require('querystring');