Skip to content

Commit 5eabe1b

Browse files
Migrate to @xmldom/xmldom (xmldom/xmldom#271) (#499)
1 parent 459ed62 commit 5eabe1b

File tree

6 files changed

+23
-20
lines changed

6 files changed

+23
-20
lines changed

package-lock.json

+15-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"./src/RosLibNode.js": "./src/RosLib.js",
1010
"canvas": "./src/util/shim/canvas.js",
1111
"ws": "./src/util/shim/WebSocket.js",
12-
"xmldom": "./src/util/shim/xmldom.js",
12+
"@xmldom/xmldom": "./src/util/shim/@xmldom/xmldom.js",
1313
"./src/util/decompressPng.js": "./src/util/shim/decompressPng.js"
1414
},
1515
"devDependencies": {
@@ -33,14 +33,14 @@
3333
"time-grunt": "^2.0.0"
3434
},
3535
"dependencies": {
36+
"@xmldom/xmldom": "^0.7.5",
3637
"cbor-js": "^0.1.0",
3738
"eventemitter2": "^6.4.0",
3839
"object-assign": "^4.0.0",
3940
"pngparse": "^2.0.0",
4041
"socket.io": "^4.0.0",
4142
"webworkify": "^1.5.0",
42-
"ws": "^8.0.0",
43-
"xmldom": "^0.6.0"
43+
"ws": "^8.0.0"
4444
},
4545
"directories": {
4646
"example": "examples",

src/urdf/UrdfModel.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/**
2-
* @fileOverview
2+
* @fileOverview
33
* @author Benjamin Pitzer - ben.pitzer@gmail.com
44
* @author Russell Toris - rctoris@wpi.edu
55
*/
66

77
var UrdfMaterial = require('./UrdfMaterial');
88
var UrdfLink = require('./UrdfLink');
99
var UrdfJoint = require('./UrdfJoint');
10-
var DOMParser = require('xmldom').DOMParser;
10+
var DOMParser = require('@xmldom/xmldom').DOMParser;
1111

1212
// See https://developer.mozilla.org/docs/XPathResult#Constants
1313
var XPATH_FIRST_ORDERED_NODE_TYPE = 9;
@@ -70,7 +70,7 @@ function UrdfModel(options) {
7070
// Check for a material
7171
for( var j=0; j<link.visuals.length; j++ )
7272
{
73-
var mat = link.visuals[j].material;
73+
var mat = link.visuals[j].material;
7474
if ( mat !== null && mat.name ) {
7575
if (this.materials[mat.name] !== void 0) {
7676
link.visuals[j].material = this.materials[mat.name];
File renamed without changes.

test/require-shim.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
window.require = function require(path) {
22
switch (path) {
33
case 'eventemitter2': return EventEmitter2;
4-
case 'xmldom': return {DOMParser: DOMParser};
4+
case '@xmldom/xmldom': return {DOMParser: DOMParser};
55
case 'cbor-js': return CBOR;
66
case '../src/util/cborTypedArrayTags.js': return cborTypedArrayTagger;
77
}

test/urdf.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var expect = require('chai').expect;
22
var ROSLIB = require('..');
33

4-
var DOMParser = require('xmldom').DOMParser;
4+
var DOMParser = require('@xmldom/xmldom').DOMParser;
55
// See https://developer.mozilla.org/docs/XPathResult#Constants
66
var XPATH_FIRST_ORDERED_NODE_TYPE = 9;
77

0 commit comments

Comments
 (0)