Skip to content

Commit 010680d

Browse files
authored
Merge branch 'master' into custom-jsx-parser
2 parents d5d682a + f255386 commit 010680d

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
Develop with React/Preact directly in the browser, then compile `htm` away for production.
1313

14-
It's built using [Tagged Templates] and the browser's HTML parser.
14+
It's built using [Tagged Templates] and the browser's HTML parser. Works in [all modern browsers].
1515

1616
## `htm` by the numbers:
1717

@@ -221,3 +221,4 @@ console.log(html`
221221
[vhtml]: https://github.com/developit/vhtml
222222
[jsxobj]: https://github.com/developit/jsxobj
223223
[hyperscript]: https://github.com/hyperhype/hyperscript
224+
[all modern browsers]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals#Browser_compatibility

packages/babel-plugin-htm/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Like `pragma=false` but converts all inline text to objects, resulting in the sa
4949
html`<div id="foo">hello ${you}</div>`
5050
// output:
5151
{ type: 1, tag:"div", props:{ id: "foo" }, text: null, children:[
52-
{ type: 3, tag: null, props: null, text "hello ", children: null },
52+
{ type: 3, tag: null, props: null, text: "hello ", children: null },
5353
you
5454
] }
5555
```

packages/babel-plugin-htm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
],
2828
"author": "Jason Miller <[email protected]>",
2929
"license": "Apache-2.0",
30-
"homepage": "https://github.com/developit/htm/packages/babel-plugin-htm",
30+
"homepage": "https://github.com/developit/htm/tree/master/packages/babel-plugin-htm",
3131
"dependencies": {
3232
"htm": "^1.0.0",
3333
"jsdom": "^11.12.0"

0 commit comments

Comments
 (0)