Fix issue where multiline attribute values could trigger indentation of children in non-pretty mode. /cc @rauchg

Author: developit

.eslintrc

@@ -25,7 +25,6 @@
     "indent": [2, "tab", {"SwitchCase": 1}],
     "no-mixed-spaces-and-tabs": [2, "smart-tabs"],
     "no-trailing-spaces": [2, { "skipBlankLines": true }],
-    "max-nested-callbacks": [2, 3],
     "no-eval": 2,
     "no-implied-eval": 2,
     "no-new-func": 2,

package.json

@@ -9,7 +9,7 @@
     "build": "npm run -s transpile && npm run -s transpile:jsx",
     "transpile": "rollup -c rollup.config.js -m ${npm_package_main}.map -f umd -n $npm_package_amdName $npm_package_jsnext_main -o $npm_package_main",
     "transpile:jsx": "ENTRY=jsx rollup -c rollup.config.js -m dist/jsx.js.map -f umd -n $npm_package_amdName src/jsx.js -o dist/jsx.js",
-    "test": "eslint {src,test} && mocha --compilers js:babel-register test/**/*.js",
+    "test": "eslint src test && mocha --compilers js:babel-register test/**/*.js",
     "prepublish": "npm run build",
     "release": "npm run build && git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags && npm publish"
   },

src/index.js

@@ -156,7 +156,7 @@ export default function renderToString(vnode, context, opts, inner, isSvgMode) {
 	// account for >1 multiline attribute
 	let sub = s.replace(/^\n\s*/, ' ');
 	if (sub!==s && !~sub.indexOf('\n')) s = sub;
-	else if (~s.indexOf('\n')) s += '\n';
+	else if (pretty && ~s.indexOf('\n')) s += '\n';
 
 	s = `<${nodeName}${s}>`;
 
@@ -184,7 +184,7 @@ export default function renderToString(vnode, context, opts, inner, isSvgMode) {
 				if (ret) pieces.push(ret);
 			}
 		}
-		if (hasLarge) {
+		if (pretty && hasLarge) {
 			for (let i=pieces.length; i--; ) {
 				pieces[i] = '\n' + indentChar + indent(pieces[i], indentChar);
 			}

test/render.js

@@ -14,6 +14,39 @@ describe('render', () => {
 			expect(rendered).to.equal(expected);
 		});
 
+		describe('whitespace', () => {
+			it('should omit whitespace between elements', () => {
+				let children = [];
+				for (let i=0; i<1000; i++) {
+					children.push(Math.random()>.5 ? String(i) : h('x-'+String(i), null, i));
+				}
+				let rendered = render(
+					<div class="foo">
+						x
+						<a>a</a>
+						<b>b</b>
+						c
+						{children}
+						d
+					</div>
+				);
+
+				expect(rendered).not.to.contain(/\s/);
+			});
+
+			it('should not indent when attributes contain newlines', () => {
+				let rendered = render(
+					<div class={`foo\n\tbar\n\tbaz`}>
+						<a>a</a>
+						<b>b</b>
+						c
+					</div>
+				);
+
+				expect(rendered).to.equal(`<div class="foo\n\tbar\n\tbaz"><a>a</a><b>b</b>c</div>`);
+			});
+		});
+
 		it('should omit falsey attributes', () => {
 			let rendered = render(<div a={null} b={undefined} c={false} />),
 				expected = `<div></div>`;