minimal-piral 0.15.0-beta.4465 → 0.15.0-beta.4512

package/app/{index.e9de4f.js → index.19cb2a.js}

@@ -2072,7 +2072,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "includeProvider": () => (/* binding */ includeProvider),
 /* harmony export */   "initialize": () => (/* binding */ initialize),
 /* harmony export */   "injectPilet": () => (/* binding */ injectPilet),
-/* harmony export */   "navigate": () => (/* binding */ navigate),
 /* harmony export */   "removePilet": () => (/* binding */ removePilet),
 /* harmony export */   "setComponent": () => (/* binding */ setComponent),
 /* harmony export */   "setErrorComponent": () => (/* binding */ setErrorComponent),
@@ -2094,12 +2093,6 @@ function initialize(ctx, loading, error, modules) {
     });
   });
 }
-function navigate(ctx, path, state) {
-  ctx.emit('navigate', {
-    path: path,
-    state: state
-  });
-}
 function addPilet(ctx, meta) {
   return ctx.options.loadPilet(meta).then(function (pilet) {
     return ctx.injectPilet(pilet);
@@ -2306,7 +2299,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "includeProvider": () => (/* reexport safe */ _app__WEBPACK_IMPORTED_MODULE_0__.includeProvider),
 /* harmony export */   "initialize": () => (/* reexport safe */ _app__WEBPACK_IMPORTED_MODULE_0__.initialize),
 /* harmony export */   "injectPilet": () => (/* reexport safe */ _app__WEBPACK_IMPORTED_MODULE_0__.injectPilet),
-/* harmony export */   "navigate": () => (/* reexport safe */ _app__WEBPACK_IMPORTED_MODULE_0__.navigate),
 /* harmony export */   "readDataItem": () => (/* reexport safe */ _data__WEBPACK_IMPORTED_MODULE_2__.readDataItem),
 /* harmony export */   "readDataValue": () => (/* reexport safe */ _data__WEBPACK_IMPORTED_MODULE_2__.readDataValue),
 /* harmony export */   "readState": () => (/* reexport safe */ _state__WEBPACK_IMPORTED_MODULE_5__.readState),
@@ -3166,19 +3158,17 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "../../../node_modules/react/index.js");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _PortalRenderer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./PortalRenderer */ "../../framework/piral-core/esm/components/PortalRenderer.js");
-/* harmony import */ var _ForeignComponentContainer__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./ForeignComponentContainer */ "../../framework/piral-core/esm/components/ForeignComponentContainer.js");
+/* harmony import */ var _PortalRenderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./PortalRenderer */ "../../framework/piral-core/esm/components/PortalRenderer.js");
+/* harmony import */ var _ForeignComponentContainer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./ForeignComponentContainer */ "../../framework/piral-core/esm/components/ForeignComponentContainer.js");
 /* harmony import */ var _hooks__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../hooks */ "../../framework/piral-core/esm/hooks/globalState.js");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils */ "../../framework/piral-core/esm/utils/helpers.js");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils */ "../../framework/piral-core/esm/utils/foreign.js");
-/* harmony import */ var _app_codegen__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../app.codegen */ "../../framework/piral-core/app.codegen");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils */ "../../framework/piral-core/esm/utils/helpers.js");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils */ "../../framework/piral-core/esm/utils/foreign.js");
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 
 
 
 
-
  // this is an arbitrary start number to have 6 digits
 
 var portalIdBase = 123456;
@@ -3192,21 +3182,22 @@ function wrapReactComponent(Component, captured, Wrapper) {
 function wrapForeignComponent(component, captured, Wrapper) {
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.memo(function (props) {
     var _useGlobalStateContex = (0,_hooks__WEBPACK_IMPORTED_MODULE_1__.useGlobalStateContext)(),
-        state = _useGlobalStateContex.state,
         readState = _useGlobalStateContex.readState,
-        destroyPortal = _useGlobalStateContex.destroyPortal;
+        destroyPortal = _useGlobalStateContex.destroyPortal,
+        navigation = _useGlobalStateContex.navigation;
 
-    var router = (0,_app_codegen__WEBPACK_IMPORTED_MODULE_2__.useRouterContext)();
+    var publicPath = readState(function (s) {
+      return s.app.publicPath;
+    });
     var id = react__WEBPACK_IMPORTED_MODULE_0__.useMemo(function () {
       return (portalIdBase++).toString(26);
-    }, _utils__WEBPACK_IMPORTED_MODULE_3__.none);
+    }, _utils__WEBPACK_IMPORTED_MODULE_2__.none);
     var context = react__WEBPACK_IMPORTED_MODULE_0__.useMemo(function () {
       return {
-        router: router,
-        state: state,
-        readState: readState
+        publicPath: publicPath,
+        navigation: navigation
       };
-    }, [router, state]);
+    }, []);
     var innerProps = react__WEBPACK_IMPORTED_MODULE_0__.useMemo(function () {
       return Object.assign(Object.assign({}, props), captured);
     }, [props]);
@@ -3214,10 +3205,10 @@ function wrapForeignComponent(component, captured, Wrapper) {
       return function () {
         return destroyPortal(id);
       };
-    }, _utils__WEBPACK_IMPORTED_MODULE_3__.none);
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(Wrapper, Object.assign({}, props), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(_PortalRenderer__WEBPACK_IMPORTED_MODULE_4__.PortalRenderer, {
+    }, _utils__WEBPACK_IMPORTED_MODULE_2__.none);
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(Wrapper, Object.assign({}, props), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(_PortalRenderer__WEBPACK_IMPORTED_MODULE_3__.PortalRenderer, {
       id: id
-    }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(_ForeignComponentContainer__WEBPACK_IMPORTED_MODULE_5__.ForeignComponentContainer, {
+    }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement(_ForeignComponentContainer__WEBPACK_IMPORTED_MODULE_4__.ForeignComponentContainer, {
       innerProps: innerProps,
       "$portalId": id,
       "$component": component,
@@ -3241,7 +3232,7 @@ function wrapComponent(converters, component, captured, Wrapper) {
   }
 
   if (_typeof(component) === 'object' && isNotExotic(component)) {
-    var result = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.convertComponent)(converters[component.type], component);
+    var result = (0,_utils__WEBPACK_IMPORTED_MODULE_5__.convertComponent)(converters[component.type], component);
     return wrapForeignComponent(result, captured, Wrapper);
   }
 
@@ -3432,7 +3423,7 @@ function integrateDebugger(context, options) {
       });
     },
     navigate: function navigate(path, state) {
-      return context.navigate(path, state);
+      return context.navigation.push(path, state);
     },
     getPilets: function getPilets() {
       return context.readState(function (s) {
@@ -4239,7 +4230,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "createActions": () => (/* binding */ createActions),
 /* harmony export */   "includeActions": () => (/* binding */ includeActions)
 /* harmony export */ });
-/* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../actions */ "../../framework/piral-core/esm/actions/index.js");
+/* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../actions */ "../../framework/piral-core/esm/actions/index.js");
+/* harmony import */ var _app_codegen__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../app.codegen */ "../../framework/piral-core/app.codegen");
+
 
 
 function createContext(state, events) {
@@ -4251,6 +4244,7 @@ function createContext(state, events) {
         return component;
       }
     },
+    navigation: (0,_app_codegen__WEBPACK_IMPORTED_MODULE_0__.createNavigation)(),
     state: state
   });
   return ctx;
@@ -4267,7 +4261,7 @@ function includeActions(ctx, actions) {
 }
 function createActions(state, events) {
   var context = createContext(state, events);
-  includeActions(context, _actions__WEBPACK_IMPORTED_MODULE_0__);
+  includeActions(context, _actions__WEBPACK_IMPORTED_MODULE_1__);
   return context;
 }
 
@@ -5548,6 +5542,15 @@ function installPiralDebug(options) {
   var eventDispatcher = document.body.dispatchEvent;
   var systemResolve = System.constructor.prototype.resolve;
   var depMap = {};
+  var subDeps = {};
+
+  var findAncestor = function findAncestor(parent) {
+    while (subDeps[parent]) {
+      parent = subDeps[parent];
+    }
+
+    return parent;
+  };
 
   System.constructor.prototype.resolve = function () {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -5558,10 +5561,18 @@ function installPiralDebug(options) {
         parent = args[1];
     var result = systemResolve.call.apply(systemResolve, [this].concat(args));
 
-    if (parent) {
-      var deps = depMap[parent] || {};
+    if (!parent) {
+      return result;
+    }
+
+    var ancestor = findAncestor(parent);
+
+    if (url.startsWith('./')) {
+      subDeps[result] = ancestor;
+    } else {
+      var deps = depMap[ancestor] || {};
       deps[url] = result;
-      depMap[parent] = deps;
+      depMap[ancestor] = deps;
     }
 
     return result;
@@ -5571,11 +5582,11 @@ function installPiralDebug(options) {
     debug: debugApiVersion,
     instance: {
       name: "minimal-piral",
-      version: "0.15.0-beta.4465",
-      dependencies: "tslib,react,react-dom,react-router,react-router-dom,history"
+      version: "0.15.0-beta.4512",
+      dependencies: "tslib,react,react-dom,react-router,react-router-dom"
     },
     build: {
-      date: "2022-07-21T08:15:26.695Z",
+      date: "2022-07-29T23:05:37.606Z",
       cli: "0.14.29",
       compat: "0.14"
     }
@@ -7500,9 +7511,10 @@ var react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache;
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "createDefaultState": () => (/* binding */ createDefaultState),
+/* harmony export */   "createNavigation": () => (/* binding */ createNavigation),
 /* harmony export */   "fillDependencies": () => (/* binding */ fillDependencies),
-/* harmony export */   "integrateDebugger": () => (/* reexport safe */ piral_core_debugger__WEBPACK_IMPORTED_MODULE_11__.integrateDebugger),
-/* harmony export */   "integrateEmulator": () => (/* reexport safe */ piral_core_emulator__WEBPACK_IMPORTED_MODULE_12__.integrateEmulator),
+/* harmony export */   "integrateDebugger": () => (/* reexport safe */ piral_core_debugger__WEBPACK_IMPORTED_MODULE_10__.integrateDebugger),
+/* harmony export */   "integrateEmulator": () => (/* reexport safe */ piral_core_emulator__WEBPACK_IMPORTED_MODULE_11__.integrateEmulator),
 /* harmony export */   "useRouteFilter": () => (/* binding */ useRouteFilter),
 /* harmony export */   "useRouterContext": () => (/* binding */ useRouterContext)
 /* harmony export */ });
@@ -7512,16 +7524,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-dom */ "../../../node_modules/react-dom/index.js");
 /* harmony import */ var react_router__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react-router */ "../../../node_modules/react-router/esm/react-router.js");
 /* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-router-dom */ "../../../node_modules/react-router-dom/esm/react-router-dom.js");
-/* harmony import */ var history__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! history */ "../../../node_modules/history/esm/history.js");
-/* harmony import */ var piral_core_defaults_DefaultErrorInfo__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! piral-core/_/defaults/DefaultErrorInfo */ "../../framework/piral-core/esm/defaults/DefaultErrorInfo.js");
-/* harmony import */ var piral_core_defaults_DefaultLoadingIndicator__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! piral-core/_/defaults/DefaultLoadingIndicator */ "../../framework/piral-core/esm/defaults/DefaultLoadingIndicator.js");
-/* harmony import */ var piral_core_defaults_DefaultLayout__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! piral-core/_/defaults/DefaultLayout */ "../../framework/piral-core/esm/defaults/DefaultLayout.js");
-/* harmony import */ var piral_core_defaults_DefaultRouter_v5__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! piral-core/_/defaults/DefaultRouter_v5 */ "../../framework/piral-core/esm/defaults/DefaultRouter_v5.js");
-/* harmony import */ var piral_core_defaults_DefaultRouteSwitch_v5__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! piral-core/_/defaults/DefaultRouteSwitch_v5 */ "../../framework/piral-core/esm/defaults/DefaultRouteSwitch_v5.js");
-/* harmony import */ var piral_core_debugger__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! piral-core/_/debugger */ "../../framework/piral-core/esm/debugger.js");
-/* harmony import */ var piral_core_emulator__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! piral-core/_/emulator */ "../../framework/piral-core/esm/emulator.js");
-/* harmony import */ var piral_core_hooks_globalState__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! piral-core/_/hooks/globalState */ "../../framework/piral-core/esm/hooks/globalState.js");
-/* harmony import */ var piral_debug_utils__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! piral-debug-utils */ "../../utilities/piral-debug-utils/esm/emulator.js");
+/* harmony import */ var piral_core_defaults_DefaultErrorInfo__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! piral-core/_/defaults/DefaultErrorInfo */ "../../framework/piral-core/esm/defaults/DefaultErrorInfo.js");
+/* harmony import */ var piral_core_defaults_DefaultLoadingIndicator__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! piral-core/_/defaults/DefaultLoadingIndicator */ "../../framework/piral-core/esm/defaults/DefaultLoadingIndicator.js");
+/* harmony import */ var piral_core_defaults_DefaultLayout__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! piral-core/_/defaults/DefaultLayout */ "../../framework/piral-core/esm/defaults/DefaultLayout.js");
+/* harmony import */ var piral_core_defaults_DefaultRouter_v5__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! piral-core/_/defaults/DefaultRouter_v5 */ "../../framework/piral-core/esm/defaults/DefaultRouter_v5.js");
+/* harmony import */ var piral_core_defaults_DefaultRouteSwitch_v5__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! piral-core/_/defaults/DefaultRouteSwitch_v5 */ "../../framework/piral-core/esm/defaults/DefaultRouteSwitch_v5.js");
+/* harmony import */ var piral_core_debugger__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! piral-core/_/debugger */ "../../framework/piral-core/esm/debugger.js");
+/* harmony import */ var piral_core_emulator__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! piral-core/_/emulator */ "../../framework/piral-core/esm/emulator.js");
+/* harmony import */ var piral_debug_utils__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! piral-debug-utils */ "../../utilities/piral-debug-utils/esm/emulator.js");
 
     
 
@@ -7540,16 +7550,67 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+    let _nav;
+    const _noop = () => {};
 
     
     function fillDependencies(deps) {
-      deps['minimal-piral']={};deps["tslib"]=tslib__WEBPACK_IMPORTED_MODULE_2__;deps["tslib@2.3.1"]=tslib__WEBPACK_IMPORTED_MODULE_2__;deps["react"]=react__WEBPACK_IMPORTED_MODULE_0__;deps["react@18.2.0"]=react__WEBPACK_IMPORTED_MODULE_0__;deps["react-dom"]=/*#__PURE__*/ (react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache || (react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache = __webpack_require__.t(react_dom__WEBPACK_IMPORTED_MODULE_1__, 2)));deps["react-dom@18.2.0"]=/*#__PURE__*/ (react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache || (react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache = __webpack_require__.t(react_dom__WEBPACK_IMPORTED_MODULE_1__, 2)));deps["react-router"]=react_router__WEBPACK_IMPORTED_MODULE_3__;deps["react-router@5.3.3"]=react_router__WEBPACK_IMPORTED_MODULE_3__;deps["react-router-dom"]=react_router_dom__WEBPACK_IMPORTED_MODULE_4__;deps["react-router-dom@5.3.3"]=react_router_dom__WEBPACK_IMPORTED_MODULE_4__;deps["history"]=history__WEBPACK_IMPORTED_MODULE_5__;deps["history@4.10.1"]=history__WEBPACK_IMPORTED_MODULE_5__
+      deps['minimal-piral']={};deps["tslib"]=tslib__WEBPACK_IMPORTED_MODULE_2__;deps["tslib@2.3.1"]=tslib__WEBPACK_IMPORTED_MODULE_2__;deps["react"]=react__WEBPACK_IMPORTED_MODULE_0__;deps["react@18.2.0"]=react__WEBPACK_IMPORTED_MODULE_0__;deps["react-dom"]=/*#__PURE__*/ (react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache || (react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache = __webpack_require__.t(react_dom__WEBPACK_IMPORTED_MODULE_1__, 2)));deps["react-dom@18.2.0"]=/*#__PURE__*/ (react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache || (react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache = __webpack_require__.t(react_dom__WEBPACK_IMPORTED_MODULE_1__, 2)));deps["react-router"]=react_router__WEBPACK_IMPORTED_MODULE_3__;deps["react-router@5.3.3"]=react_router__WEBPACK_IMPORTED_MODULE_3__;deps["react-router-dom"]=react_router_dom__WEBPACK_IMPORTED_MODULE_4__;deps["react-router-dom@5.3.3"]=react_router_dom__WEBPACK_IMPORTED_MODULE_4__
     }
   
 
-      function useNavigate() {
+      function useCurrentNavigation() {
         const ctx = useRouterContext();
-        return (...args) => ctx.history.push(...args);
+
+        (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
+          _nav = ctx.history;
+          return () => {
+            _nav = undefined;
+          };
+        }, []);
+      }
+    
+
+      function createNavigation() {
+        const enhance = info => ({
+          ...info,
+          location: {
+            get href() {
+              return _nav.createHref(info.location);
+            },
+            ...info.location,
+          },
+        });
+
+        return {
+          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 })));
+          },
+        };
       }
     
 
@@ -7561,11 +7622,11 @@ __webpack_require__.r(__webpack_exports__);
           publicPath: "/",
         },
         components: {
-          ErrorInfo: piral_core_defaults_DefaultErrorInfo__WEBPACK_IMPORTED_MODULE_6__.DefaultErrorInfo,
-          LoadingIndicator: piral_core_defaults_DefaultLoadingIndicator__WEBPACK_IMPORTED_MODULE_7__.DefaultLoadingIndicator,
-          Router: piral_core_defaults_DefaultRouter_v5__WEBPACK_IMPORTED_MODULE_8__.DefaultRouter,
-          RouteSwitch: piral_core_defaults_DefaultRouteSwitch_v5__WEBPACK_IMPORTED_MODULE_9__.DefaultRouteSwitch,
-          Layout: piral_core_defaults_DefaultLayout__WEBPACK_IMPORTED_MODULE_10__.DefaultLayout,
+          ErrorInfo: piral_core_defaults_DefaultErrorInfo__WEBPACK_IMPORTED_MODULE_5__.DefaultErrorInfo,
+          LoadingIndicator: piral_core_defaults_DefaultLoadingIndicator__WEBPACK_IMPORTED_MODULE_6__.DefaultLoadingIndicator,
+          Router: piral_core_defaults_DefaultRouter_v5__WEBPACK_IMPORTED_MODULE_7__.DefaultRouter,
+          RouteSwitch: piral_core_defaults_DefaultRouteSwitch_v5__WEBPACK_IMPORTED_MODULE_8__.DefaultRouteSwitch,
+          Layout: piral_core_defaults_DefaultLayout__WEBPACK_IMPORTED_MODULE_9__.DefaultLayout,
         },
         errorComponents: {},
         registry: {
@@ -7590,16 +7651,9 @@ __webpack_require__.r(__webpack_exports__);
 
     function useRouteFilter(paths) {
       
-    const stateContext = (0,piral_core_hooks_globalState__WEBPACK_IMPORTED_MODULE_13__.useGlobalStateContext)();
-    const navigate = useNavigate();
-
-    (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
-      const handler = ({ path, state }) => navigate(path, state);
-      stateContext.on('navigate', handler);
-      return () => stateContext.off('navigate', handler);
-    }, []);
+    useCurrentNavigation();
   
-return (0,piral_debug_utils__WEBPACK_IMPORTED_MODULE_14__.debugRouteFilter)(paths);
+return (0,piral_debug_utils__WEBPACK_IMPORTED_MODULE_12__.debugRouteFilter)(paths);
     }
   
   
@@ -45572,4 +45626,4 @@ var instance = (0,piral_core__WEBPACK_IMPORTED_MODULE_2__.createInstance)({
 
 /******/ })()
 ;
-//# sourceMappingURL=index.e9de4f.js.map
+//# sourceMappingURL=index.19cb2a.js.map