Merge branch 'passbolt-master'

kee-org · Sep 6, 2021 · f071f8f · f071f8f
2 parents 0ebbfb6 + e72d033
commit f071f8f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -273,7 +273,7 @@ npm test
 
 kdbxweb includes these 3rd party libraries:
 - [fflate](https://github.com/101arrowz/fflate)
-- [xmldom](https://github.com/jindw/xmldom)
+- [xmldom](https://github.com/xmldom/xmldom)
 
 ## Tools
 

diff --git a/conf/webpack.config.ts b/conf/webpack.config.ts
@@ -66,7 +66,7 @@ module.exports = {
     externals: {
         fs: true,
         path: true,
-        xmldom: true,
+        '@xmldom/xmldom': true,
         crypto: true,
         zlib: true
     },

diff --git a/conf/webpack.tests.config.ts b/conf/webpack.tests.config.ts
@@ -46,7 +46,7 @@ module.exports = {
     externals: {
         fs: true,
         path: true,
-        xmldom: true,
+        '@xmldom/xmldom': true,
         crypto: true,
         zlib: true
     },

diff --git a/lib/utils/xml-utils.ts b/lib/utils/xml-utils.ts
@@ -40,7 +40,7 @@ function createDOMParser() {
     };
 
     /* eslint-disable @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call */
-    const { DOMParser } = require('xmldom');
+    const { DOMParser } = require('@xmldom/xmldom');
     return <typeof global.DOMParser>new DOMParser(parserArg);
     /* eslint-enable */
 }
@@ -51,7 +51,7 @@ function createXMLSerializer() {
     }
 
     /* eslint-disable @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call */
-    const { XMLSerializer } = require('xmldom');
+    const { XMLSerializer } = require('@xmldom/xmldom');
     return <typeof global.XMLSerializer>new XMLSerializer();
     /* eslint-enable */
 }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,8 +66,8 @@
     "webpack-cli": "^4.7.2"
   },
   "dependencies": {
-    "fflate": "^0.7.1",
-    "xmldom": "^0.6.0"
+    "@xmldom/xmldom": "^0.7.3",
+    "fflate": "^0.7.1"
   },
   "funding": {
     "type": "github",