From 9bfae1ac6f77b4984d456dfb4cdfabdcf3340c86 Mon Sep 17 00:00:00 2001 From: Erik Demaine Date: Fri, 20 Aug 2021 11:03:36 -0400 Subject: [PATCH] Update xmldom Address https://github.com/xmldom/xmldom/security/advisories/GHSA-5fg8-2547-mr8q --- dist/fold.js | 2 +- package.json | 8 ++++---- src/oripa.coffee | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dist/fold.js b/dist/fold.js index ea1967f..a9ccf80 100644 --- a/dist/fold.js +++ b/dist/fold.js @@ -3049,7 +3049,7 @@ viewer.makeModel = function(fold) { if (m.fs[f1].ord[`f${f2}`] != null) { console.log(`Warning: duplicate ordering input information for faces ${f1} and ${f2}. Using first found in the faceOrder list.`); if (m.fs[f1].ord[`f${f2}`] !== o) { - console.log(`Error: duplicat ordering [${f1},${f2},${o}] is inconsistant with a previous entry.`); + console.log(`Error: duplicate ordering [${f1},${f2},${o}] is inconsistent with a previous entry.`); } } else { m.fs[f1].ord[`f${f2}`] = o; diff --git a/package.json b/package.json index bd34e16..4618449 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fold", - "version": "0.11.1", + "version": "0.11.2", "description": "FOLD file format for origami models, crease patterns, etc.", "main": "lib/index.js", "bin": { @@ -46,9 +46,6 @@ "jest-matcher-deep-close-to": "^2.0.1", "jest-preset-coffeescript": "1.1.1" }, - "dependencies": { - "xmldom": "^0.5.0" - }, "browser": { "xmldom": false, "./src/file.coffee": false @@ -58,5 +55,8 @@ "testPathIgnorePatterns": [ "/node_modules/" ] + }, + "dependencies": { + "@xmldom/xmldom": "^0.7.2" } } diff --git a/src/oripa.coffee b/src/oripa.coffee index 1387fae..d84e7ff 100644 --- a/src/oripa.coffee +++ b/src/oripa.coffee @@ -1,9 +1,9 @@ ##TODO: match spec (no frame_designer, no frame_reference, fix cw -> ccw) ##TODO: oripa folded state format -DOMParser = require('xmldom').DOMParser unless DOMParser? -#XMLSerializer = require('xmldom').XMLSerializer unless XMLSerializer? -#DOMImplementation = require('xmldom').DOMImplementation unless DOMImplementation? +DOMParser = require('@xmldom/xmldom').DOMParser unless DOMParser? +#XMLSerializer = require('@xmldom/xmldom').XMLSerializer unless XMLSerializer? +#DOMImplementation = require('@xmldom/xmldom').DOMImplementation unless DOMImplementation? convert = require './convert' filter = require './filter' oripa = exports