Merge pull request #1381 from dougwilson/dougwilson-patch-1

Switch xml2json to xml2js in tooling

Author: interactivellama

package-lock.json

@@ -204,7 +204,7 @@
 		"webpack": "^3.4.1",
 		"webpack-dev-middleware": "^1.12.0",
 		"webpack-hot-middleware": "^2.18.2",
-		"xml2json": "^0.11.0"
+		"xml2js": "^0.4.19"
 	},
 	"components": [
 		{

package.json

@@ -3,7 +3,7 @@
 import async from 'async';
 import fs from 'fs-extra';
 import path from 'path';
-import parser from 'xml2json';
+import xml2js from 'xml2js';
 import omit from 'lodash.omit';
 
 console.log('# Building the inline SVG icons');
@@ -14,6 +14,18 @@ const outputFile = (filename, data, done) => {
 	fs.outputFile(outputPath, data.join('\n'), done);
 };
 
+const parseXml = (string, done) => {
+	xml2js.parseString(
+		string,
+		{
+			emptyTag: {},
+			explicitArray: false,
+			mergeAttrs: true,
+		},
+		done
+	);
+};
+
 const inlineIcons = (spriteType, done) => {
 	const inputPath = path.join(
 		__dirname,
@@ -35,32 +47,34 @@ const inlineIcons = (spriteType, done) => {
 		"let icons = {}; if ('__EXCLUDE_SLDS_ICONS__' === '__INCLUDE_SLDS_ICONS__') { icons = {",
 	];
 
-	const sprite = JSON.parse(parser.toJson(text));
-
-	let viewBox;
-	async.each(
-		sprite.svg.symbol,
-		(symbol, iconDone) => {
-			let data = omit(symbol, ['id']);
-			const iconName = symbol.id.toLowerCase();
-
-			const icon = [license, `export default ${JSON.stringify(data)};`, ''];
-
-			outputFile(`${spriteType}/${iconName}`, icon, iconDone);
-
-			if (!viewBox) viewBox = data.viewBox;
-			data = omit(data, ['viewBox']);
-			index.push(`${iconName}:${JSON.stringify(data)},`);
-		},
-		(err) => {
-			if (err) console.error(err);
-		}
-	);
-
-	index.push(`viewBox:'${viewBox}'`);
-	index.push('}; } export default icons;');
-	index.push('');
-	outputFile(`${spriteType}/index`, index, done);
+	parseXml(text, (error, sprite) => {
+		if (error) throw error;
+
+		let viewBox;
+		async.each(
+			sprite.svg.symbol,
+			(symbol, iconDone) => {
+				let data = omit(symbol, ['id']);
+				const iconName = symbol.id.toLowerCase();
+
+				const icon = [license, `export default ${JSON.stringify(data)};`, ''];
+
+				outputFile(`${spriteType}/${iconName}`, icon, iconDone);
+
+				if (!viewBox) viewBox = data.viewBox;
+				data = omit(data, ['viewBox']);
+				index.push(`${iconName}:${JSON.stringify(data)},`);
+			},
+			(err) => {
+				if (err) console.error(err);
+			}
+		);
+
+		index.push(`viewBox:'${viewBox}'`);
+		index.push('}; } export default icons;');
+		index.push('');
+		outputFile(`${spriteType}/index`, index, done);
+	});
 };
 
 async.each(