Update test harness and reorganize tests a bit.

Author: developit

package.json

@@ -28,13 +28,29 @@
   },
   "jest": {
     "testURL": "http://localhost",
+    "testMatch": [
+      "**/__tests__/**/*.?(m)js?(x)",
+      "**/?(*.)(spec|test).?(m)js?(x)"
+    ],
+    "transform": {
+      "\\.mjs$": "babel-jest"
+    },
+    "moduleFileExtensions": [
+      "mjs",
+      "js"
+    ],
     "moduleNameMapper": {
       "^htm-babel-plugin$": "<rootDir>/packages/babel-plugin-htm/dist/babel-plugin-htm.js",
       "^babel-plugin-htm$": "<rootDir>/packages/babel-plugin-htm/dist/babel-plugin-htm.js",
       "^htm$": "<rootDir>/dist/htm.js",
       "^htm/preact$": "<rootDir>/preact/index.js"
     }
   },
+  "babel": {
+    "presets": [
+      "env"
+    ]
+  },
   "repository": "developit/htm",
   "keywords": [
     "Hyperscript Tagged Markup",
@@ -50,7 +66,9 @@
   "license": "Apache-2.0",
   "homepage": "https://github.com/developit/htm",
   "devDependencies": {
-    "@babel/core": "^7.1.2",
+    "@babel/preset-env": "^7.1.6",
+    "babel-jest": "^23.6.0",
+    "babel-preset-env": "^1.7.0",
     "eslint": "^5.2.0",
     "eslint-config-developit": "^1.1.1",
     "jest": "^23.4.2",

test/preact.test.js

@@ -13,7 +13,7 @@
 
 const { html, Component, render } = require('htm/preact');
 
-describe('preact-html', () => {
+describe('htm/preact', () => {
 	const scratch = document.createElement('div');
 	document.body.appendChild(scratch);
 
@@ -100,36 +100,36 @@ describe('preact-html', () => {
 		scratch.innerHTML = '';
 
 	});
-});
 
-describe('performance', () => {
-	test('creation', () => {
-		const results = [];
-		const Foo = ({ name }) => html`<div class="foo">${name}</div>`;
-		const statics = [
-			'\n<div id=app data-loading="true">\n\t<h1>Hello World</h1>\n\t<ul class="items" id=', '>\n\t',
-			'\n\t</ul>\n\t\n\t<', ' name="foo" />\n\t<', ' name="other">content</', '>\n\n</div>'
-		];
-		let count = 0;
-		function go(count) {
-			return html(
-				statics.concat(['count:', count]),
-				`id${count}`,
-				html(['<li data-id="','">', '</li>'], 'i'+count, 'some text #'+count),
-				Foo, Foo, Foo
-			);
-		}
-		let now = performance.now();
-		const start = now;
-		while ((now = performance.now()) < start+2000) {
-			count++;
-			if (results.push(String(go(count)))===10) results.length = 0;
-		}
-		const elapsed = now - start;
-		const hz = count / elapsed * 1000;
-		// eslint-disable-next-line no-console
-		console.log(`Creation: ${hz|0}/s, average: ${elapsed/count.toFixed(4)}ms`);
-		expect(elapsed).toBeGreaterThan(999);
-		expect(hz).toBeGreaterThan(10);
-	});
-});
+	// describe('performance', () => {
+	// 	test('creation', () => {
+	// 		const results = [];
+	// 		const Foo = ({ name }) => html`<div class="foo">${name}</div>`;
+	// 		const statics = [
+	// 			'\n<div id=app data-loading="true">\n\t<h1>Hello World</h1>\n\t<ul class="items" id=', '>\n\t',
+	// 			'\n\t</ul>\n\t\n\t<', ' name="foo" />\n\t<', ' name="other">content</', '>\n\n</div>'
+	// 		];
+	// 		let count = 0;
+	// 		function go(count) {
+	// 			return html(
+	// 				statics.concat(['count:', count]),
+	// 				`id${count}`,
+	// 				html(['<li data-id="','">', '</li>'], 'i'+count, 'some text #'+count),
+	// 				Foo, Foo, Foo
+	// 			);
+	// 		}
+	// 		let now = performance.now();
+	// 		const start = now;
+	// 		while ((now = performance.now()) < start+2000) {
+	// 			count++;
+	// 			if (results.push(String(go(count)))===10) results.length = 0;
+	// 		}
+	// 		const elapsed = now - start;
+	// 		const hz = count / elapsed * 1000;
+	// 		// eslint-disable-next-line no-console
+	// 		console.log(`Creation: ${hz|0}/s, average: ${elapsed/count.toFixed(4)}ms`);
+	// 		expect(elapsed).toBeGreaterThan(999);
+	// 		expect(hz).toBeGreaterThan(10);
+	// 	});
+	// });
+});