piral-core 0.15.0-beta.4670 → 0.15.0-beta.4672

package/app.codegen

@@ -65,146 +65,20 @@ function createDefaultState(imports, exports) {
     imports.push(
       `import { DefaultRouter } from 'piral-core/${cat}/defaults/DefaultRouter_v5';`,
       `import { DefaultRouteSwitch } from 'piral-core/${cat}/defaults/DefaultRouteSwitch_v5';`,
-      `import { __RouterContext as RouterContext } from 'react-router'`,
+      `import { createRedirect, createNavigation, useCurrentNavigation, useRouterContext } from 'piral-core/${cat}/defaults/navigator_v5'`,
     );
-    exports.push(`
-      function useCurrentNavigation() {
-        const ctx = useRouterContext();
-
-        useEffect(() => {
-          _nav = ctx.history;
-          return () => {
-            _nav = undefined;
-          };
-        }, []);
-      }
-    `);
-
-    exports.push(`
-      export function createNavigation() {
-        const enhance = info => ({
-          ...info,
-          location: {
-            get href() {
-              return _nav.createHref(info.location);
-            },
-            ...info.location,
-          },
-        });
-
-        return {
-          get path() {
-            if (_nav) {
-              return _nav.location.pathname;
-            }
-
-            return location.pathname;
-          },
-          push(target, state) {
-            if (_nav) {
-              _nav.push(target, state);
-            }
-          },
-          replace(target, state) {
-            if (_nav) {
-              _nav.replace(target, state);
-            }
-          },
-          go(n) {
-            if (_nav) {
-              _nav.go(n);
-            }
-          },
-          block(blocker) {
-            if (!_nav) {
-              return _noop;
-            }
-            return _nav.block((location, action) => blocker(enhance({ location, action })));
-          },
-          listen(listener) {
-            if (!_nav) {
-              return _noop;
-            }
-            return _nav.listen((location, action) => listener(enhance({ location, action })));
-          },
-          router: {
-            history: _nav,
-          },
-        };
-      }
-    `);
   } else {
     imports.push(
       `import { DefaultRouter } from 'piral-core/${cat}/defaults/DefaultRouter_v6';`,
       `import { DefaultRouteSwitch } from 'piral-core/${cat}/defaults/DefaultRouteSwitch_v6';`,
-      `import { UNSAFE_NavigationContext as RouterContext } from 'react-router'`,
+      `import { createRedirect, createNavigation, useCurrentNavigation, useRouterContext } from 'piral-core/${cat}/defaults/navigator_v6'`,
     );
-    exports.push(`
-      function useCurrentNavigation() {
-        const ctx = useRouterContext();
-
-        useEffect(() => {
-          _nav = ctx.navigator;
-          return () => {
-            _nav = undefined;
-          };
-        }, []);
-      }
-    `);
-
-    exports.push(`
-      export function createNavigation() {
-        const enhance = info => ({
-          ...info,
-          location: {
-            get href() {
-              return _nav.createHref(info.location);
-            },
-            ...info.location,
-          },
-        });
-
-        return {
-          get path() {
-            if (_nav) {
-              return _nav.location.pathname;
-            }
-
-            return location.pathname;
-          },
-          push(target, state) {
-            if (_nav) {
-              _nav.push(target, state);
-            }
-          },
-          replace(target, state) {
-            if (_nav) {
-              _nav.replace(target, state);
-            }
-          },
-          go(n) {
-            if (_nav) {
-              _nav.go(n);
-            }
-          },
-          block(blocker) {
-            if (!_nav) {
-              return _noop;
-            }
-            return _nav.block(transition => blocker(enhance(transition)));
-          },
-          listen(listener) {
-            if (!_nav) {
-              return _noop;
-            }
-            return _nav.listen(update => listener(enhance(update)));
-          },
-          router: _nav,
-        };
-      }
-    `);
   }
 
+  exports.push(`
+    export { createRedirect, createNavigation, useRouterContext };
+  `);
+
   exports.push(`
     export const publicPath = ${JSON.stringify(publicPath)};
   `);
@@ -260,8 +134,6 @@ function createRouteHandler(imports, exports) {
   const assignments = [];
 
   imports.push(
-    `import { useContext, useEffect, createElement } from 'react';`,
-    `import { Redirect } from 'react-router';`,
     `import { useGlobalStateContext } from 'piral-core/${cat}/hooks/globalState';`,
   );
 
@@ -276,18 +148,6 @@ function createRouteHandler(imports, exports) {
     assignments.push('return paths;');
   }
 
-  exports.push(`
-    export function createRedirect(to) {
-      return () => createElement(Redirect, { to });
-    }
-  `);
-
-  exports.push(`
-    export function useRouterContext() {
-      return useContext(RouterContext);
-    }
-  `);
-
   exports.push(`
     export function useRouteFilter(paths) {
       ${assignments.join('\n')}
@@ -307,9 +167,6 @@ module.exports = function () {
   return `
     ${imports.join('\n')}
 
-    let _nav;
-    const _noop = () => {};
-
     ${exports.join('\n')}
   `;
 };

package/esm/defaults/navigator_v5.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+import { NavigationApi } from '../types';
+export declare function useRouterContext(): import("react-router").RouteComponentProps<{}, import("react-router").StaticContext, unknown>;
+export declare function useCurrentNavigation(): void;
+export declare function createRedirect(to: string): () => JSX.Element;
+export declare function createNavigation(): NavigationApi;

package/esm/defaults/navigator_v5.js

@@ -0,0 +1,77 @@
+import * as React from 'react';
+import { __RouterContext as RouterContext, Redirect, useLocation } from 'react-router';
+let _nav;
+const _noop = () => { };
+export function useRouterContext() {
+    return React.useContext(RouterContext);
+}
+export function useCurrentNavigation() {
+    const ctx = useRouterContext();
+    const location = useLocation();
+    React.useEffect(() => {
+        if (_nav) {
+            window.dispatchEvent(new CustomEvent('piral-navigate', {
+                detail: {
+                    location,
+                },
+            }));
+        }
+    }, [location]);
+    React.useEffect(() => {
+        _nav = ctx.history;
+        return () => {
+            _nav = undefined;
+        };
+    }, []);
+}
+export function createRedirect(to) {
+    return () => React.createElement(Redirect, { to: to });
+}
+export function createNavigation() {
+    const enhance = (location, action) => ({
+        action,
+        location: Object.assign({ get href() {
+                return _nav.createHref(location);
+            } }, location),
+    });
+    return {
+        get path() {
+            if (_nav) {
+                return _nav.location.pathname;
+            }
+            return location.pathname;
+        },
+        push(target, state) {
+            if (_nav) {
+                _nav.push(target, state);
+            }
+        },
+        replace(target, state) {
+            if (_nav) {
+                _nav.replace(target, state);
+            }
+        },
+        go(n) {
+            if (_nav) {
+                _nav.go(n);
+            }
+        },
+        block(blocker) {
+            if (!_nav) {
+                return _noop;
+            }
+            return _nav.block((location, action) => blocker(enhance(location, action)));
+        },
+        listen(listener) {
+            const handler = (e) => listener(enhance(e.detail, _nav.action));
+            window.addEventListener('piral-navigate', handler);
+            return () => {
+                window.removeEventListener('piral-navigate', handler);
+            };
+        },
+        router: {
+            history: _nav,
+        },
+    };
+}
+//# sourceMappingURL=navigator_v5.js.map

package/esm/defaults/navigator_v5.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"navigator_v5.js","sourceRoot":"","sources":["../../src/defaults/navigator_v5.tsx"],"names":[],"mappings":"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"}

package/esm/defaults/navigator_v6.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+import { NavigationApi } from '../types';
+export declare function useRouterContext(): unknown;
+export declare function useCurrentNavigation(): void;
+export declare function createRedirect(to: string): () => JSX.Element;
+export declare function createNavigation(): NavigationApi;

package/esm/defaults/navigator_v6.js

@@ -0,0 +1,73 @@
+import * as React from 'react';
+//@ts-ignore
+import { UNSAFE_NavigationContext as RouterContext, Navigate, useLocation } from 'react-router';
+let _nav;
+const _noop = () => { };
+export function useRouterContext() {
+    return React.useContext(RouterContext);
+}
+export function useCurrentNavigation() {
+    const ctx = useRouterContext();
+    const location = useLocation();
+    React.useEffect(() => {
+        if (_nav) {
+            window.dispatchEvent(new CustomEvent('piral-navigate', {
+                detail: {
+                    location,
+                },
+            }));
+        }
+    }, [location]);
+    React.useEffect(() => {
+        _nav = ctx.navigator;
+        return () => {
+            _nav = undefined;
+        };
+    }, []);
+}
+export function createRedirect(to) {
+    return () => React.createElement(Navigate, { to: to });
+}
+export function createNavigation() {
+    const enhance = (info) => (Object.assign(Object.assign({}, info), { location: Object.assign({ get href() {
+                return _nav.createHref(info.location);
+            } }, info.location) }));
+    return {
+        get path() {
+            if (_nav) {
+                return _nav.location.pathname;
+            }
+            return location.pathname;
+        },
+        push(target, state) {
+            if (_nav) {
+                _nav.push(target, state);
+            }
+        },
+        replace(target, state) {
+            if (_nav) {
+                _nav.replace(target, state);
+            }
+        },
+        go(n) {
+            if (_nav) {
+                _nav.go(n);
+            }
+        },
+        block(blocker) {
+            if (!_nav) {
+                return _noop;
+            }
+            return _nav.block((transition) => blocker(enhance(transition)));
+        },
+        listen(listener) {
+            const handler = (e) => listener(enhance(e.detail));
+            window.addEventListener('piral-navigate', handler);
+            return () => {
+                window.removeEventListener('piral-navigate', handler);
+            };
+        },
+        router: _nav,
+    };
+}
+//# sourceMappingURL=navigator_v6.js.map

package/esm/defaults/navigator_v6.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"navigator_v6.js","sourceRoot":"","sources":["../../src/defaults/navigator_v6.tsx"],"names":[],"mappings":"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"}

package/esm/types/navigation.d.ts

@@ -34,7 +34,7 @@ export interface NavigationLocation {
      * On the initial location, this will be the string default. On all subsequent
      * locations, this string will be a unique identifier.
      */
-    key: string;
+    key?: string;
 }
 export interface NavigationListener {
     (update: NavigationUpdate): void;
@@ -47,7 +47,7 @@ export interface NavigationUpdate {
     location: NavigationLocation;
 }
 export interface NavigationTransition extends NavigationUpdate {
-    retry(): void;
+    retry?(): void;
 }
 export interface NavigationApi {
     /**

package/lib/defaults/navigator_v5.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+import { NavigationApi } from '../types';
+export declare function useRouterContext(): import("react-router").RouteComponentProps<{}, import("react-router").StaticContext, unknown>;
+export declare function useCurrentNavigation(): void;
+export declare function createRedirect(to: string): () => JSX.Element;
+export declare function createNavigation(): NavigationApi;

package/lib/defaults/navigator_v5.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNavigation = exports.createRedirect = exports.useCurrentNavigation = exports.useRouterContext = void 0;
+const React = require("react");
+const react_router_1 = require("react-router");
+let _nav;
+const _noop = () => { };
+function useRouterContext() {
+    return React.useContext(react_router_1.__RouterContext);
+}
+exports.useRouterContext = useRouterContext;
+function useCurrentNavigation() {
+    const ctx = useRouterContext();
+    const location = (0, react_router_1.useLocation)();
+    React.useEffect(() => {
+        if (_nav) {
+            window.dispatchEvent(new CustomEvent('piral-navigate', {
+                detail: {
+                    location,
+                },
+            }));
+        }
+    }, [location]);
+    React.useEffect(() => {
+        _nav = ctx.history;
+        return () => {
+            _nav = undefined;
+        };
+    }, []);
+}
+exports.useCurrentNavigation = useCurrentNavigation;
+function createRedirect(to) {
+    return () => React.createElement(react_router_1.Redirect, { to: to });
+}
+exports.createRedirect = createRedirect;
+function createNavigation() {
+    const enhance = (location, action) => ({
+        action,
+        location: Object.assign({ get href() {
+                return _nav.createHref(location);
+            } }, location),
+    });
+    return {
+        get path() {
+            if (_nav) {
+                return _nav.location.pathname;
+            }
+            return location.pathname;
+        },
+        push(target, state) {
+            if (_nav) {
+                _nav.push(target, state);
+            }
+        },
+        replace(target, state) {
+            if (_nav) {
+                _nav.replace(target, state);
+            }
+        },
+        go(n) {
+            if (_nav) {
+                _nav.go(n);
+            }
+        },
+        block(blocker) {
+            if (!_nav) {
+                return _noop;
+            }
+            return _nav.block((location, action) => blocker(enhance(location, action)));
+        },
+        listen(listener) {
+            const handler = (e) => listener(enhance(e.detail, _nav.action));
+            window.addEventListener('piral-navigate', handler);
+            return () => {
+                window.removeEventListener('piral-navigate', handler);
+            };
+        },
+        router: {
+            history: _nav,
+        },
+    };
+}
+exports.createNavigation = createNavigation;
+//# sourceMappingURL=navigator_v5.js.map

package/lib/defaults/navigator_v5.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"navigator_v5.js","sourceRoot":"","sources":["../../src/defaults/navigator_v5.tsx"],"names":[],"mappings":"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"}

package/lib/defaults/navigator_v6.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+import { NavigationApi } from '../types';
+export declare function useRouterContext(): unknown;
+export declare function useCurrentNavigation(): void;
+export declare function createRedirect(to: string): () => JSX.Element;
+export declare function createNavigation(): NavigationApi;

package/lib/defaults/navigator_v6.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNavigation = exports.createRedirect = exports.useCurrentNavigation = exports.useRouterContext = void 0;
+const React = require("react");
+//@ts-ignore
+const react_router_1 = require("react-router");
+let _nav;
+const _noop = () => { };
+function useRouterContext() {
+    return React.useContext(react_router_1.UNSAFE_NavigationContext);
+}
+exports.useRouterContext = useRouterContext;
+function useCurrentNavigation() {
+    const ctx = useRouterContext();
+    const location = (0, react_router_1.useLocation)();
+    React.useEffect(() => {
+        if (_nav) {
+            window.dispatchEvent(new CustomEvent('piral-navigate', {
+                detail: {
+                    location,
+                },
+            }));
+        }
+    }, [location]);
+    React.useEffect(() => {
+        _nav = ctx.navigator;
+        return () => {
+            _nav = undefined;
+        };
+    }, []);
+}
+exports.useCurrentNavigation = useCurrentNavigation;
+function createRedirect(to) {
+    return () => React.createElement(react_router_1.Navigate, { to: to });
+}
+exports.createRedirect = createRedirect;
+function createNavigation() {
+    const enhance = (info) => (Object.assign(Object.assign({}, info), { location: Object.assign({ get href() {
+                return _nav.createHref(info.location);
+            } }, info.location) }));
+    return {
+        get path() {
+            if (_nav) {
+                return _nav.location.pathname;
+            }
+            return location.pathname;
+        },
+        push(target, state) {
+            if (_nav) {
+                _nav.push(target, state);
+            }
+        },
+        replace(target, state) {
+            if (_nav) {
+                _nav.replace(target, state);
+            }
+        },
+        go(n) {
+            if (_nav) {
+                _nav.go(n);
+            }
+        },
+        block(blocker) {
+            if (!_nav) {
+                return _noop;
+            }
+            return _nav.block((transition) => blocker(enhance(transition)));
+        },
+        listen(listener) {
+            const handler = (e) => listener(enhance(e.detail));
+            window.addEventListener('piral-navigate', handler);
+            return () => {
+                window.removeEventListener('piral-navigate', handler);
+            };
+        },
+        router: _nav,
+    };
+}
+exports.createNavigation = createNavigation;
+//# sourceMappingURL=navigator_v6.js.map

package/lib/defaults/navigator_v6.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"navigator_v6.js","sourceRoot":"","sources":["../../src/defaults/navigator_v6.tsx"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,YAAY;AACZ,+CAAgG;AAGhG,IAAI,IAAS,CAAC;AACd,MAAM,KAAK,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AAEvB,SAAgB,gBAAgB;IAC9B,OAAO,KAAK,CAAC,UAAU,CAAC,uCAAa,CAAC,CAAC;AACzC,CAAC;AAFD,4CAEC;AAED,SAAgB,oBAAoB;IAClC,MAAM,GAAG,GAAQ,gBAAgB,EAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAC;IAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,IAAI,EAAE;YACR,MAAM,CAAC,aAAa,CAClB,IAAI,WAAW,CAAC,gBAAgB,EAAE;gBAChC,MAAM,EAAE;oBACN,QAAQ;iBACT;aACF,CAAC,CACH,CAAC;SACH;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC;QAErB,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,SAAS,CAAC;QACnB,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAvBD,oDAuBC;AAED,SAAgB,cAAc,CAAC,EAAU;IACvC,OAAO,GAAG,EAAE,CAAC,oBAAC,uBAAQ,IAAC,EAAE,EAAE,EAAE,GAAI,CAAC;AACpC,CAAC;AAFD,wCAEC;AAED,SAAgB,gBAAgB;IAC9B,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,iCACrB,IAAI,KACP,QAAQ,kBACN,IAAI,IAAI;gBACN,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACxC,CAAC,IACE,IAAI,CAAC,QAAQ,KAElB,CAAC;IAEH,OAAO;QACL,IAAI,IAAI;YACN,IAAI,IAAI,EAAE;gBACR,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;aAC/B;YAED,OAAO,QAAQ,CAAC,QAAQ,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,KAAK;YAChB,IAAI,IAAI,EAAE;gBACR,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;aAC1B;QACH,CAAC;QACD,OAAO,CAAC,MAAM,EAAE,KAAK;YACnB,IAAI,IAAI,EAAE;gBACR,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;aAC7B;QACH,CAAC;QACD,EAAE,CAAC,CAAC;YACF,IAAI,IAAI,EAAE;gBACR,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aACZ;QACH,CAAC;QACD,KAAK,CAAC,OAAO;YACX,IAAI,CAAC,IAAI,EAAE;gBACT,OAAO,KAAK,CAAC;aACd;YACD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,CAAC,QAAQ;YACb,MAAM,OAAO,GAAG,CAAC,CAAc,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YAEhE,MAAM,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;YAEnD,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;YACxD,CAAC,CAAC;QACJ,CAAC;QACD,MAAM,EAAE,IAAI;KACb,CAAC;AACJ,CAAC;AAnDD,4CAmDC"}

package/lib/types/navigation.d.ts

@@ -34,7 +34,7 @@ export interface NavigationLocation {
      * On the initial location, this will be the string default. On all subsequent
      * locations, this string will be a unique identifier.
      */
-    key: string;
+    key?: string;
 }
 export interface NavigationListener {
     (update: NavigationUpdate): void;
@@ -47,7 +47,7 @@ export interface NavigationUpdate {
     location: NavigationLocation;
 }
 export interface NavigationTransition extends NavigationUpdate {
-    retry(): void;
+    retry?(): void;
 }
 export interface NavigationApi {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-core",
-  "version": "0.15.0-beta.4670",
+  "version": "0.15.0-beta.4672",
   "description": "The core library for creating a Piral instance.",
   "keywords": [
     "portal",
@@ -71,8 +71,8 @@
   },
   "dependencies": {
     "enhanced-resolve": "^5.10.0",
-    "piral-base": "0.15.0-beta.4670",
-    "piral-debug-utils": "0.15.0-beta.4670",
+    "piral-base": "0.15.0-beta.4672",
+    "piral-debug-utils": "0.15.0-beta.4672",
     "zustand": "^3.0.0"
   },
   "peerDependencies": {
@@ -98,5 +98,5 @@
     "react-router-dom",
     "tslib"
   ],
-  "gitHead": "ffd8707600e028a55258028d394b76fe3a0cd175"
+  "gitHead": "cd1026b70c90290fa5ba3f9b86c038eb852595be"
 }

package/src/defaults/navigator_v5.tsx

@@ -0,0 +1,96 @@
+import * as React from 'react';
+import type { History, Location, Action } from 'history';
+import { __RouterContext as RouterContext, Redirect, useLocation } from 'react-router';
+import { NavigationApi } from '../types';
+
+let _nav: History;
+const _noop = () => {};
+
+export function useRouterContext() {
+  return React.useContext(RouterContext);
+}
+
+export function useCurrentNavigation() {
+  const ctx = useRouterContext();
+  const location = useLocation();
+
+  React.useEffect(() => {
+    if (_nav) {
+      window.dispatchEvent(
+        new CustomEvent('piral-navigate', {
+          detail: {
+            location,
+          },
+        }),
+      );
+    }
+  }, [location]);
+
+  React.useEffect(() => {
+    _nav = ctx.history;
+
+    return () => {
+      _nav = undefined;
+    };
+  }, []);
+}
+
+export function createRedirect(to: string) {
+  return () => <Redirect to={to} />;
+}
+
+export function createNavigation(): NavigationApi {
+  const enhance = (location: Location, action: Action) => ({
+    action,
+    location: {
+      get href() {
+        return _nav.createHref(location);
+      },
+      ...location,
+    },
+  });
+
+  return {
+    get path() {
+      if (_nav) {
+        return _nav.location.pathname;
+      }
+
+      return location.pathname;
+    },
+    push(target, state) {
+      if (_nav) {
+        _nav.push(target, state);
+      }
+    },
+    replace(target, state) {
+      if (_nav) {
+        _nav.replace(target, state);
+      }
+    },
+    go(n) {
+      if (_nav) {
+        _nav.go(n);
+      }
+    },
+    block(blocker) {
+      if (!_nav) {
+        return _noop;
+      }
+
+      return _nav.block((location, action) => blocker(enhance(location, action)));
+    },
+    listen(listener) {
+      const handler = (e: CustomEvent) => listener(enhance(e.detail, _nav.action));
+
+      window.addEventListener('piral-navigate', handler);
+
+      return () => {
+        window.removeEventListener('piral-navigate', handler);
+      };
+    },
+    router: {
+      history: _nav,
+    },
+  };
+}

package/src/defaults/navigator_v6.tsx

@@ -0,0 +1,93 @@
+import * as React from 'react';
+//@ts-ignore
+import { UNSAFE_NavigationContext as RouterContext, Navigate, useLocation } from 'react-router';
+import { NavigationApi } from '../types';
+
+let _nav: any;
+const _noop = () => {};
+
+export function useRouterContext() {
+  return React.useContext(RouterContext);
+}
+
+export function useCurrentNavigation() {
+  const ctx: any = useRouterContext();
+  const location = useLocation();
+
+  React.useEffect(() => {
+    if (_nav) {
+      window.dispatchEvent(
+        new CustomEvent('piral-navigate', {
+          detail: {
+            location,
+          },
+        }),
+      );
+    }
+  }, [location]);
+
+  React.useEffect(() => {
+    _nav = ctx.navigator;
+
+    return () => {
+      _nav = undefined;
+    };
+  }, []);
+}
+
+export function createRedirect(to: string) {
+  return () => <Navigate to={to} />;
+}
+
+export function createNavigation(): NavigationApi {
+  const enhance = (info) => ({
+    ...info,
+    location: {
+      get href() {
+        return _nav.createHref(info.location);
+      },
+      ...info.location,
+    },
+  });
+
+  return {
+    get path() {
+      if (_nav) {
+        return _nav.location.pathname;
+      }
+
+      return location.pathname;
+    },
+    push(target, state) {
+      if (_nav) {
+        _nav.push(target, state);
+      }
+    },
+    replace(target, state) {
+      if (_nav) {
+        _nav.replace(target, state);
+      }
+    },
+    go(n) {
+      if (_nav) {
+        _nav.go(n);
+      }
+    },
+    block(blocker) {
+      if (!_nav) {
+        return _noop;
+      }
+      return _nav.block((transition) => blocker(enhance(transition)));
+    },
+    listen(listener) {
+      const handler = (e: CustomEvent) => listener(enhance(e.detail));
+
+      window.addEventListener('piral-navigate', handler);
+
+      return () => {
+        window.removeEventListener('piral-navigate', handler);
+      };
+    },
+    router: _nav,
+  };
+}

package/src/types/navigation.ts

@@ -36,7 +36,7 @@ export interface NavigationLocation {
    * On the initial location, this will be the string default. On all subsequent
    * locations, this string will be a unique identifier.
    */
-  key: string;
+  key?: string;
 }
 
 export interface NavigationListener {
@@ -53,7 +53,7 @@ export interface NavigationUpdate {
 }
 
 export interface NavigationTransition extends NavigationUpdate {
-  retry(): void;
+  retry?(): void;
 }
 
 export interface NavigationApi {