From 15af1190ddc3b5554c3d840196c613924e3009fe Mon Sep 17 00:00:00 2001 From: Dom Christie Date: Fri, 1 Dec 2017 13:28:06 +0000 Subject: [PATCH 1/2] Add support for ES6 modules --- package.json | 2 ++ src/whitespace.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8813fa6..a7fbb90 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,8 @@ "description": "Remove unnecessary whitespace from an element.", "main": "lib/whitespace.js", "types": "whitespace.d.ts", + "module": "src/whitespace.js", + "jsnext:main": "src/whitespace.js", "scripts": { "prepublish": "make", "test": "make test" diff --git a/src/whitespace.js b/src/whitespace.js index a5b267e..353e654 100644 --- a/src/whitespace.js +++ b/src/whitespace.js @@ -150,4 +150,4 @@ function next (prev, current, isPre) { return current.firstChild || current.nextSibling || current.parentNode } -module.exports = collapseWhitespace +export default collapseWhitespace From 0fd94c2be2158e03fd69e970d3a126bd8d35ae1a Mon Sep 17 00:00:00 2001 From: Dom Christie Date: Fri, 1 Dec 2017 13:28:28 +0000 Subject: [PATCH 2/2] Remove unnecessary whitespace --- src/whitespace.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/whitespace.js b/src/whitespace.js index 353e654..cdee7c2 100644 --- a/src/whitespace.js +++ b/src/whitespace.js @@ -22,9 +22,9 @@ function isBlockElem (node) { /** * isPreElem(node) determines if the given node is a PRE element. - * + * * Whitespace for PRE elements are not collapsed. - * + * * @param {Node} node * @return {Boolean} */ @@ -85,7 +85,7 @@ function collapseWhitespace (elem, isBlock, isPre) { } node.data = text - + prevText = node } else if (node.nodeType === 1) { // Node.ELEMENT_NODE if (isBlock(node) || node.nodeName === 'BR') {