Merge 8e6804b into 8f69ee2

preactjs · Mar 29, 2019 · a9c6a27 · a9c6a27
2 parents 8f69ee2 + 8e6804b
commit a9c6a27
Show file tree

Hide file tree

Showing 19 changed files with 1,289 additions and 98 deletions.
diff --git a/compat/mangle.json b/compat/mangle.json
@@ -19,4 +19,4 @@
       "$_processingException": "__p"
     }
   }
-}
+}
diff --git a/debug/mangle.json b/debug/mangle.json
@@ -31,4 +31,4 @@
       "$_processingException": "__p"
     }
   }
-}
+}
diff --git a/demo/index.js b/demo/index.js
@@ -1,7 +1,7 @@
 import { createElement, render, hydrate, Component, options, Fragment } from 'preact';
 // import renderToString from 'preact-render-to-string';
 import './style.scss';
-import { Router, Link } from './router';
+import { Router, Link } from 'preact-router';
 import Pythagoras from './pythagoras';
 import Spiral from './spiral';
 import Reorder from './reorder';
@@ -11,6 +11,7 @@ import Context from './context';
 import installLogger from './logger';
 import ProfilerDemo from './profiler';
 import KeyBug from './key_bug';
+import PeopleBrowser from './people';
 import { initDevTools } from 'preact/debug/src/devtools';
 import DevtoolsDemo from './devtools';
 
@@ -21,6 +22,9 @@ if (!isBenchmark) {
 	initDevTools();
 }
 
+// mobx-state-tree fix
+window.setImmediate = setTimeout;
+
 class Home extends Component {
 	a = 1;
 	render() {
@@ -61,6 +65,7 @@ class App extends Component {
 						<Link href="/context" activeClassName="active">Context</Link>
 						<Link href="/devtools" activeClassName="active">Devtools</Link>
 						<Link href="/empty-fragment" activeClassName="active">Empty Fragment</Link>
+						<Link href="/people" activeClassName="active">People Browser</Link>
 					</nav>
 				</header>
 				<main>
@@ -86,6 +91,7 @@ class App extends Component {
 						<Context path="/context" />
 						<DevtoolsDemo path="/devtools" />
 						<EmptyFragment path="/empty-fragment" />
+						<PeopleBrowser path="/people/:user?" />
 					</Router>
 				</main>
 			</div>