Move tests to mjs

Author: developit

package.json

@@ -6,11 +6,11 @@
   "umd:main": "dist/htm.umd.js",
   "module": "dist/htm.mjs",
   "scripts": {
-    "build": "npm run build:main && npm run build:preact && npm run build:babel",
+    "build": "npm run -s build:main && npm run -s build:preact && npm run -s build:babel",
     "build:main": "microbundle src/index.mjs -f es,umd --no-sourcemap --target web && microbundle src/cjs.mjs -f iife --no-sourcemap --target web",
     "build:preact": "cd src/integrations/preact && npm run build",
     "build:babel": "cd packages/babel-plugin-htm && npm run build",
-    "test": "eslint src/**/*.mjs test && npm run build && jest test",
+    "test": "eslint src/**/*.mjs test/**/*.mjs && npm run build && jest test",
     "release": "npm run build && git checkout --detach && git add -f babel dist preact && git commit -am \"$npm_package_version\" && git tag $npm_package_version && git push --tags && git checkout master"
   },
   "files": [
@@ -32,17 +32,16 @@
       "**/?(*.)(spec|test).?(m)js?(x)"
     ],
     "transform": {
-      "\\.mjs$": "babel-jest"
+      "\\.m?js$": "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-plugin-htm$": "<rootDir>/packages/babel-plugin-htm/index.mjs",
+      "^htm$": "<rootDir>/src/index.mjs",
+      "^htm/preact$": "<rootDir>/src/integrations/preact/index.mjs"
     }
   },
   "babel": {

packages/babel-plugin-htm/index.mjs

@@ -1,8 +1,4 @@
-import { JSDOM } from 'jsdom';
-const before = global.document;
-global.document = new JSDOM().window.document;
-const htm = require('htm');
-global.document = before;
+import htm from 'htm';
 
 // htm() uses the HTML parser, which serializes attribute values.
 // this is a problem, because composite values here can be made up

packages/babel-plugin-htm/package.json

@@ -29,8 +29,7 @@
 	"license": "Apache-2.0",
 	"homepage": "https://github.com/developit/htm/tree/master/packages/babel-plugin-htm",
 	"dependencies": {
-		"htm": "^1.0.0",
-		"jsdom": "^11.12.0"
+		"htm": "^1.0.0"
 	},
 	"devDependencies": {
 		"microbundle": "^0.6.0"

test/babel.test.js test/babel.test.mjstest/babel.test.js renamed to test/babel.test.mjs

@@ -2,8 +2,8 @@
  * @jest-environment node
  */
 
-const { transform } = require('@babel/core');
-const htmBabelPlugin = require('babel-plugin-htm');
+import { transform } from '@babel/core';
+import htmBabelPlugin from 'babel-plugin-htm';
 
 describe('htm/babel', () => {
 	test('basic transformation', () => {

test/preact.test.js test/preact.test.mjstest/preact.test.js renamed to test/preact.test.mjs

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-const { html, Component, render } = require('htm/preact');
+import { html, Component, render } from 'htm/preact';
 
 describe('htm/preact', () => {
 	const scratch = document.createElement('div');
@@ -45,7 +45,7 @@ describe('htm/preact', () => {
 
 	const Baz = ({ myCaseSensitiveProp }) => html`<div>${myCaseSensitiveProp}</div>`;
 
-	const fullHtml = '<div class="foo">\n\t\t\t\t\t<h1>Name: jason</h1>\n\t\t\t\t\t<p>Hello world!</p>\n\t\t\t\t\t<button>Click Me</button>\n\t\t\t\t\t<pre>Count: 0</pre>\n\t\t\t\t\txml-style end tags:\n\t\t\t\t\t<div>\n\t\tValue of hello: true\n\t\t\n\t</div>\n\t\t\t\t\texplicit end tags:\n\t\t\t\t\t<div>\n\t\tValue of hello: true\n\t\tsome children (count=0)\n\t</div>\n\t\t\t\t\timplicit end tags: (&lt;//&gt;)\n\t\t\t\t\t<div>\n\t\tValue of hello: true\n\t\tsome children (count=0)\n\t</div>\n\t\t\t\t\tsome text at the end\n\t\t\t\t</div>';
+	const fullHtml = '<div class="foo"><h1>Name: jason</h1><p>Hello world!</p><button>Click Me</button><pre>Count: 0</pre>xml-style end tags:<div>Value of hello: true</div>explicit end tags:<div>Value of hello: truesome children (count=0)</div>implicit end tags: (&lt;//&gt;)<div>Value of hello: truesome children (count=0)</div>some text at the end</div>';
 
 	test('initial render', () => {
 		render(html`<${Foo} name=jason />`, scratch);