Merge branch 'master' into bump-dependencies

Author: marvinhagemeister

Diff for: .gitignore

@@ -1,6 +1,7 @@
 /dist
 /node_modules
 /npm-debug.log
+package-lock.json
 /match.js
 /*.d.ts
 .DS_Store

Diff for: README.md

@@ -120,8 +120,7 @@ render(
 `<Link>` is just a normal link, but it automatically adds and removes an "active" classname to itself based on whether it matches the current URL.
 
 ```js
-import { Router } from 'preact-router';
-import { Link } from 'preact-router/match';
+import { Router, Link } from 'preact-router';
 
 render(
   <div>

Diff for: package.json

@@ -1,7 +1,7 @@
 {
   "name": "preact-router",
   "amdName": "preactRouter",
-  "version": "2.6.1",
+  "version": "3.0.0",
   "description": "Connect your components up to that address bar.",
   "main": "dist/preact-router.js",
   "jsnext:main": "dist/preact-router.es.js",
@@ -45,7 +45,7 @@
   },
   "homepage": "https://github.com/developit/preact-router",
   "peerDependencies": {
-    "preact": "*"
+    "preact": ">=10 || ^10.0.0-beta.0"
   },
   "devDependencies": {
     "babel-cli": "^6.9.0",
@@ -76,7 +76,7 @@
     "mocha": "^5.2.0",
     "npm-run-all": "^3.0.0",
     "phantomjs-prebuilt": "^2.1.7",
-    "preact": "^8.0.1",
+    "preact": "^10.0.0-beta.0",
     "pretty-bytes-cli": "^1.0.0",
     "puppeteer": "^1.9.0",
     "rimraf": "^2.5.1",
@@ -88,7 +88,7 @@
     "rollup-plugin-uglify": "^1.0.1",
     "sinon": "^7.1.0",
     "sinon-chai": "^2.8.0",
-    "typescript": "^2.5.3",
+    "typescript": "^3.4.4",
     "webpack": "^1.13.1"
   }
 }

Diff for: src/index.d.ts

@@ -62,7 +62,7 @@ export function Route<Props>(
     props: RouteProps<Props> & Partial<Props>
 ): preact.VNode;
 
-export function Link(props: {activeClassName?: string} & JSX.HTMLAttributes): preact.VNode;
+export function Link(props: {activeClassName?: string} & preact.JSX.HTMLAttributes): preact.VNode;
 
 declare module 'preact' {
     export interface Attributes extends RoutableProps {}

Diff for: src/index.js

@@ -1,4 +1,4 @@
-import { cloneElement, h, Component } from 'preact';
+import { cloneElement, createElement, Component, toChildArray } from 'preact';
 import { exec, prepareVNodeForRanking, assign, pathRankSort } from './util';
 
 let customHistory = null;
@@ -9,10 +9,6 @@ const subscribers = [];
 
 const EMPTY = {};
 
-function isPreactElement(node) {
-	return node.__preactattr_!=null || typeof Symbol!=='undefined' && node[Symbol.for('preactattr')]!=null;
-}
-
 function setUrl(url, type='push') {
 	if (customHistory && customHistory[type]) {
 		customHistory[type](url);
@@ -117,7 +113,7 @@ function delegateLinkHandler(e) {
 
 	let t = e.target;
 	do {
-		if (String(t.nodeName).toUpperCase()==='A' && t.getAttribute('href') && isPreactElement(t)) {
+		if (String(t.nodeName).toUpperCase()==='A' && t.getAttribute('href')) {
 			if (t.hasAttribute('native')) return;
 			// if link is handled by the router, prevent browser defaults
 			if (routeFromLink(t)) {
@@ -166,7 +162,8 @@ class Router extends Component {
 
 	/** Check if the given URL can be matched against any children */
 	canRoute(url) {
-		return this.getMatchingChildren(this.props.children, url, false).length > 0;
+		const children = toChildArray(this.props.children);
+		return this.getMatchingChildren(children, url, false).length > 0;
 	}
 
 	/** Re-render children with a new URL to match against. */
@@ -213,7 +210,7 @@ class Router extends Component {
 			.filter(prepareVNodeForRanking)
 			.sort(pathRankSort)
 			.map( vnode => {
-				let matches = exec(url, vnode.attributes.path, vnode.attributes);
+				let matches = exec(url, vnode.props.path, vnode.props);
 				if (matches) {
 					if (invoke !== false) {
 						let newProps = { url, matches };
@@ -228,7 +225,7 @@ class Router extends Component {
 	}
 
 	render({ children, onChange }, { url }) {
-		let active = this.getMatchingChildren(children, url, true);
+		let active = this.getMatchingChildren(toChildArray(children), url, true);
 
 		let current = active[0] || null;
 		this._didRoute = !!current;
@@ -252,10 +249,10 @@ class Router extends Component {
 }
 
 const Link = (props) => (
-	h('a', assign({ onClick: handleLinkClick }, props))
+	createElement('a', assign({ onClick: handleLinkClick }, props))
 );
 
-const Route = props => h(props.component, props);
+const Route = props => createElement(props.component, props);
 
 Router.subscribers = subscribers;
 Router.getCurrentUrl = getCurrentUrl;

Diff for: src/match.d.ts

@@ -6,8 +6,9 @@ export class Match extends preact.Component<RoutableProps, {}> {
     render(): preact.VNode;
 }
 
-export interface LinkProps extends JSX.HTMLAttributes {
+export interface LinkProps extends preact.JSX.HTMLAttributes {
     activeClassName: string;
+    children?: preact.ComponentChildren;
 }
 
 export function Link(props: LinkProps): preact.VNode;

Diff for: src/match.js

@@ -16,7 +16,7 @@ export class Match extends Component {
 		let url = this.nextUrl || getCurrentUrl(),
 			path = url.replace(/\?.+$/,'');
 		this.nextUrl = null;
-		return props.children[0] && props.children[0]({
+		return props.children({
 			url,
 			path,
 			matches: path===props.path

Diff for: src/util.js

@@ -62,7 +62,7 @@ export function pathRankSort(a, b) {
 export function prepareVNodeForRanking(vnode, index) {
 	vnode.index = index;
 	vnode.rank = rankChild(vnode);
-	return vnode.attributes;
+	return vnode.props;
 }
 
 export function segmentize(url) {
@@ -78,5 +78,5 @@ export function rank(path) {
 }
 
 function rankChild(vnode) {
-	return vnode.attributes.default ? 0 : rank(vnode.attributes.path);
+	return vnode.props.default ? 0 : rank(vnode.props.path);
 }

Diff for: test/dom.js

@@ -17,7 +17,7 @@ describe('dom', () => {
 		scratch = document.createElement('div');
 		document.body.appendChild(scratch);
 		$ = s => scratch.querySelector(s);
-		mount = jsx => render(jsx, scratch, scratch.firstChild);
+		mount = jsx => {render(jsx, scratch); return scratch.lastChild;};
 	});
 
 	beforeEach( () => {

Diff for: test/util.js

@@ -43,7 +43,7 @@ describe('util', () => {
 
 	describe('pathRankSort', () => {
 		it('should sort by highest rank first', () => {
-			let paths = arr => arr.map( path => ({ attributes:{path}} ) );
+			let paths = arr => arr.map( path => ({ props:{path}} ) );
 			let clean = vnode => { delete vnode.rank; delete vnode.index; return vnode; };
 
 			expect(
@@ -54,10 +54,10 @@ describe('util', () => {
 		});
 
 		it('should return default routes last', () => {
-			let paths = arr => arr.map( path => ({attributes:{path}}) );
+			let paths = arr => arr.map( path => ({props:{path}}) );
 			let clean = vnode => { delete vnode.rank; delete vnode.index; return vnode; };
 
-			let defaultPath = {attributes:{default:true}};
+			let defaultPath = {props:{default:true}};
 			let p = paths(['/a/b/', '/a/b', '/', 'b']);
 			p.splice(2,0,defaultPath);
 

Diff for: test_helpers/assert-clone-of.js

@@ -4,7 +4,7 @@ export default function assertCloneOf({ Assertion }) {
 	if (Assertion.__assertCloneOfMounted === true) return;
 	Assertion.__assertCloneOfMounted = true;
 
-	Assertion.addMethod('cloneOf', function(routeJsx, { matches = {}, url = this._obj.attributes.path } = {}) {
+	Assertion.addMethod('cloneOf', function(routeJsx, { matches = {}, url = this._obj.props.path } = {}) {
 		const vnode = this._obj;
 		const clonedRoute = cloneElement(routeJsx, { url, matches, ...matches });
 		new chai.Assertion(vnode).to.be.eql(clonedRoute);