Migrate to @xmldom/xmldom (xmldom/xmldom#271) (#499)

Author: MatthijsBurgh

package-lock.json

@@ -9,7 +9,7 @@
     "./src/RosLibNode.js": "./src/RosLib.js",
     "canvas": "./src/util/shim/canvas.js",
     "ws": "./src/util/shim/WebSocket.js",
-    "xmldom": "./src/util/shim/xmldom.js",
+    "@xmldom/xmldom": "./src/util/shim/@xmldom/xmldom.js",
     "./src/util/decompressPng.js": "./src/util/shim/decompressPng.js"
   },
   "devDependencies": {
@@ -33,14 +33,14 @@
     "time-grunt": "^2.0.0"
   },
   "dependencies": {
+    "@xmldom/xmldom": "^0.7.5",
     "cbor-js": "^0.1.0",
     "eventemitter2": "^6.4.0",
     "object-assign": "^4.0.0",
     "pngparse": "^2.0.0",
     "socket.io": "^4.0.0",
     "webworkify": "^1.5.0",
-    "ws": "^8.0.0",
-    "xmldom": "^0.6.0"
+    "ws": "^8.0.0"
   },
   "directories": {
     "example": "examples",

package.json

@@ -1,13 +1,13 @@
 /**
- * @fileOverview 
+ * @fileOverview
  * @author Benjamin Pitzer - [email protected]
  * @author Russell Toris - [email protected]
  */
 
 var UrdfMaterial = require('./UrdfMaterial');
 var UrdfLink = require('./UrdfLink');
 var UrdfJoint = require('./UrdfJoint');
-var DOMParser = require('xmldom').DOMParser;
+var DOMParser = require('@xmldom/xmldom').DOMParser;
 
 // See https://developer.mozilla.org/docs/XPathResult#Constants
 var XPATH_FIRST_ORDERED_NODE_TYPE = 9;
@@ -70,7 +70,7 @@ function UrdfModel(options) {
         // Check for a material
         for( var j=0; j<link.visuals.length; j++ )
         {
-          var mat = link.visuals[j].material; 
+          var mat = link.visuals[j].material;
           if ( mat !== null && mat.name ) {
             if (this.materials[mat.name] !== void 0) {
               link.visuals[j].material = this.materials[mat.name];

src/urdf/UrdfModel.js

@@ -1,7 +1,7 @@
 window.require = function require(path) {
 	switch (path) {
 		case 'eventemitter2': return EventEmitter2;
-		case 'xmldom': return {DOMParser: DOMParser};
+		case '@xmldom/xmldom': return {DOMParser: DOMParser};
 		case 'cbor-js': return CBOR;
 		case '../src/util/cborTypedArrayTags.js': return cborTypedArrayTagger;
 	}

src/util/shim/xmldom.js src/util/shim/@xmldom/xmldom.jssrc/util/shim/xmldom.js renamed to src/util/shim/@xmldom/xmldom.js

@@ -1,7 +1,7 @@
 var expect = require('chai').expect;
 var ROSLIB = require('..');
 
-var DOMParser = require('xmldom').DOMParser;
+var DOMParser = require('@xmldom/xmldom').DOMParser;
 // See https://developer.mozilla.org/docs/XPathResult#Constants
 var XPATH_FIRST_ORDERED_NODE_TYPE = 9;