one 1.2.57 → 1.2.58
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/cli/buildPage.cjs +1 -1
- package/dist/cjs/cli/buildPage.js +1 -1
- package/dist/cjs/cli/buildPage.native.js +1 -1
- package/dist/cjs/cli/buildPage.native.js.map +1 -1
- package/dist/cjs/cli/dev.cjs +4 -4
- package/dist/cjs/cli/dev.js +4 -4
- package/dist/cjs/cli/dev.js.map +1 -1
- package/dist/cjs/cli/dev.native.js +4 -4
- package/dist/cjs/cli/dev.native.js.map +1 -1
- package/dist/cjs/createApp.cjs +2 -1
- package/dist/cjs/createApp.js +2 -2
- package/dist/cjs/createApp.js.map +1 -1
- package/dist/cjs/createHandleRequest.test.js +3 -1
- package/dist/cjs/createHandleRequest.test.js.map +1 -1
- package/dist/cjs/createHandleRequest.test.native.js.map +1 -1
- package/dist/cjs/devtools/registry.cjs +30 -0
- package/dist/cjs/devtools/registry.js +25 -0
- package/dist/cjs/devtools/registry.js.map +6 -0
- package/dist/cjs/devtools/registry.native.js +33 -0
- package/dist/cjs/devtools/registry.native.js.map +1 -0
- package/dist/cjs/fork/createMemoryHistory.cjs +20 -9
- package/dist/cjs/fork/createMemoryHistory.js +22 -4
- package/dist/cjs/fork/createMemoryHistory.js.map +1 -1
- package/dist/cjs/fork/createMemoryHistory.native.js +20 -9
- package/dist/cjs/fork/createMemoryHistory.native.js.map +1 -1
- package/dist/cjs/fork/useLinking.cjs +11 -5
- package/dist/cjs/fork/useLinking.js +6 -6
- package/dist/cjs/fork/useLinking.js.map +1 -1
- package/dist/cjs/index.cjs +17 -1
- package/dist/cjs/index.js +12 -2
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/index.native.js +17 -1
- package/dist/cjs/index.native.js.map +1 -1
- package/dist/cjs/layouts/withLayoutContext.cjs +34 -15
- package/dist/cjs/layouts/withLayoutContext.js +29 -13
- package/dist/cjs/layouts/withLayoutContext.js.map +1 -1
- package/dist/cjs/layouts/withLayoutContext.native.js +42 -19
- package/dist/cjs/layouts/withLayoutContext.native.js.map +1 -1
- package/dist/cjs/link/Link.cjs +5 -2
- package/dist/cjs/link/Link.js +3 -2
- package/dist/cjs/link/Link.js.map +1 -1
- package/dist/cjs/link/Link.native.js +6 -1
- package/dist/cjs/link/Link.native.js.map +1 -1
- package/dist/cjs/link/useLinkTo.cjs +11 -3
- package/dist/cjs/link/useLinkTo.js +6 -3
- package/dist/cjs/link/useLinkTo.js.map +1 -1
- package/dist/cjs/link/useLinkTo.native.js +11 -3
- package/dist/cjs/link/useLinkTo.native.js.map +1 -1
- package/dist/cjs/router/Route.js.map +1 -1
- package/dist/cjs/router/Route.native.js.map +1 -1
- package/dist/cjs/router/findRouteNode.cjs +70 -0
- package/dist/cjs/router/findRouteNode.js +72 -0
- package/dist/cjs/router/findRouteNode.js.map +6 -0
- package/dist/cjs/router/findRouteNode.native.js +104 -0
- package/dist/cjs/router/findRouteNode.native.js.map +1 -0
- package/dist/cjs/router/router.cjs +160 -11
- package/dist/cjs/router/router.js +142 -7
- package/dist/cjs/router/router.js.map +2 -2
- package/dist/cjs/router/router.native.js +241 -57
- package/dist/cjs/router/router.native.js.map +1 -1
- package/dist/cjs/router/useScreens.cjs +1 -1
- package/dist/cjs/router/useScreens.js +1 -1
- package/dist/cjs/router/useScreens.js.map +1 -1
- package/dist/cjs/router/useScreens.native.js +5 -2
- package/dist/cjs/router/useScreens.native.js.map +1 -1
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js.map +1 -1
- package/dist/cjs/useBlocker.cjs +158 -0
- package/dist/cjs/useBlocker.js +145 -0
- package/dist/cjs/useBlocker.js.map +6 -0
- package/dist/cjs/useBlocker.native.js +89 -0
- package/dist/cjs/useBlocker.native.js.map +1 -0
- package/dist/cjs/useLoader.cjs +69 -3
- package/dist/cjs/useLoader.js +57 -4
- package/dist/cjs/useLoader.js.map +2 -2
- package/dist/cjs/useLoader.native.js +90 -6
- package/dist/cjs/useLoader.native.js.map +1 -1
- package/dist/cjs/useScrollGroup.cjs +37 -0
- package/dist/cjs/useScrollGroup.js +30 -0
- package/dist/cjs/useScrollGroup.js.map +6 -0
- package/dist/cjs/useScrollGroup.native.js +29 -0
- package/dist/cjs/useScrollGroup.native.js.map +1 -0
- package/dist/cjs/validateParams.cjs +80 -0
- package/dist/cjs/validateParams.js +84 -0
- package/dist/cjs/validateParams.js.map +6 -0
- package/dist/cjs/validateParams.native.js +180 -0
- package/dist/cjs/validateParams.native.js.map +1 -0
- package/dist/cjs/validateSearch.cjs +104 -0
- package/dist/cjs/validateSearch.js +99 -0
- package/dist/cjs/validateSearch.js.map +6 -0
- package/dist/cjs/validateSearch.native.js +202 -0
- package/dist/cjs/validateSearch.native.js.map +1 -0
- package/dist/cjs/views/ErrorBoundary.cjs +293 -10
- package/dist/cjs/views/ErrorBoundary.js +328 -8
- package/dist/cjs/views/ErrorBoundary.js.map +2 -2
- package/dist/cjs/views/ErrorBoundary.native.js +159 -4
- package/dist/cjs/views/ErrorBoundary.native.js.map +1 -1
- package/dist/cjs/views/Navigator.cjs +10 -3
- package/dist/cjs/views/Navigator.js +7 -3
- package/dist/cjs/views/Navigator.js.map +1 -1
- package/dist/cjs/views/Navigator.native.js +12 -3
- package/dist/cjs/views/Navigator.native.js.map +1 -1
- package/dist/cjs/views/Protected.cjs +36 -0
- package/dist/cjs/views/Protected.js +27 -0
- package/dist/cjs/views/Protected.js.map +6 -0
- package/dist/cjs/views/Protected.native.js +44 -0
- package/dist/cjs/views/Protected.native.js.map +1 -0
- package/dist/cjs/views/RootErrorBoundary.cjs +193 -8
- package/dist/cjs/views/RootErrorBoundary.js +213 -8
- package/dist/cjs/views/RootErrorBoundary.js.map +1 -1
- package/dist/cjs/views/RootErrorBoundary.native.js +192 -8
- package/dist/cjs/views/RootErrorBoundary.native.js.map +1 -1
- package/dist/cjs/views/ScrollBehavior.cjs +49 -11
- package/dist/cjs/views/ScrollBehavior.js +47 -11
- package/dist/cjs/views/ScrollBehavior.js.map +1 -1
- package/dist/cjs/views/ScrollBehavior.native.js +68 -10
- package/dist/cjs/views/ScrollBehavior.native.js.map +1 -1
- package/dist/cjs/views/SourceInspector.cjs +28 -0
- package/dist/cjs/views/SourceInspector.js +23 -0
- package/dist/cjs/views/SourceInspector.js.map +6 -0
- package/dist/cjs/views/SourceInspector.native.js +32 -0
- package/dist/cjs/views/SourceInspector.native.js.map +1 -0
- package/dist/cjs/views/Try.cjs +40 -7
- package/dist/cjs/views/Try.js +38 -4
- package/dist/cjs/views/Try.js.map +1 -1
- package/dist/cjs/views/Try.native.js +42 -7
- package/dist/cjs/views/Try.native.js.map +1 -1
- package/dist/cjs/vite/DevHead.cjs +797 -43
- package/dist/cjs/vite/DevHead.js +802 -51
- package/dist/cjs/vite/DevHead.js.map +1 -1
- package/dist/cjs/vite/DevHead.native.js +783 -1
- package/dist/cjs/vite/DevHead.native.js.map +1 -1
- package/dist/cjs/vite/one.cjs +7 -1
- package/dist/cjs/vite/one.js +7 -2
- package/dist/cjs/vite/one.js.map +1 -1
- package/dist/cjs/vite/one.native.js +11 -1
- package/dist/cjs/vite/one.native.js.map +1 -1
- package/dist/cjs/vite/plugins/SSRCSSPlugin.cjs +44 -4
- package/dist/cjs/vite/plugins/SSRCSSPlugin.js +48 -4
- package/dist/cjs/vite/plugins/SSRCSSPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/SSRCSSPlugin.native.js +62 -5
- package/dist/cjs/vite/plugins/SSRCSSPlugin.native.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js +6 -3
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.cjs +5 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js +11 -6
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.native.js +1 -0
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.native.js.map +1 -1
- package/dist/cjs/vite/plugins/sourceInspectorPlugin.cjs +155 -0
- package/dist/cjs/vite/plugins/sourceInspectorPlugin.js +148 -0
- package/dist/cjs/vite/plugins/sourceInspectorPlugin.js.map +6 -0
- package/dist/cjs/vite/plugins/sourceInspectorPlugin.native.js +231 -0
- package/dist/cjs/vite/plugins/sourceInspectorPlugin.native.js.map +1 -0
- package/dist/cjs/vite/plugins/virtualEntryPlugin.cjs +25 -6
- package/dist/cjs/vite/plugins/virtualEntryPlugin.js +16 -6
- package/dist/cjs/vite/plugins/virtualEntryPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/virtualEntryPlugin.native.js +26 -7
- package/dist/cjs/vite/plugins/virtualEntryPlugin.native.js.map +1 -1
- package/dist/esm/cli/buildPage.js +1 -1
- package/dist/esm/cli/buildPage.mjs +1 -1
- package/dist/esm/cli/buildPage.mjs.map +1 -1
- package/dist/esm/cli/buildPage.native.js +1 -1
- package/dist/esm/cli/buildPage.native.js.map +1 -1
- package/dist/esm/cli/dev.js +4 -4
- package/dist/esm/cli/dev.js.map +1 -1
- package/dist/esm/cli/dev.mjs +4 -4
- package/dist/esm/cli/dev.mjs.map +1 -1
- package/dist/esm/cli/dev.native.js +4 -4
- package/dist/esm/cli/dev.native.js.map +1 -1
- package/dist/esm/createApp.js +2 -2
- package/dist/esm/createApp.js.map +1 -1
- package/dist/esm/createApp.mjs +2 -1
- package/dist/esm/createApp.mjs.map +1 -1
- package/dist/esm/createHandleRequest.test.js +3 -1
- package/dist/esm/createHandleRequest.test.js.map +1 -1
- package/dist/esm/createHandleRequest.test.mjs.map +1 -1
- package/dist/esm/createHandleRequest.test.native.js.map +1 -1
- package/dist/esm/devtools/registry.js +9 -0
- package/dist/esm/devtools/registry.js.map +6 -0
- package/dist/esm/devtools/registry.mjs +6 -0
- package/dist/esm/devtools/registry.mjs.map +1 -0
- package/dist/esm/devtools/registry.native.js +6 -0
- package/dist/esm/devtools/registry.native.js.map +1 -0
- package/dist/esm/fork/createMemoryHistory.js +22 -4
- package/dist/esm/fork/createMemoryHistory.js.map +1 -1
- package/dist/esm/fork/createMemoryHistory.mjs +20 -9
- package/dist/esm/fork/createMemoryHistory.mjs.map +1 -1
- package/dist/esm/fork/createMemoryHistory.native.js +20 -9
- package/dist/esm/fork/createMemoryHistory.native.js.map +1 -1
- package/dist/esm/fork/useLinking.js +6 -5
- package/dist/esm/fork/useLinking.js.map +1 -1
- package/dist/esm/fork/useLinking.mjs +11 -5
- package/dist/esm/fork/useLinking.mjs.map +1 -1
- package/dist/esm/index.js +30 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/index.mjs +8 -2
- package/dist/esm/index.mjs.map +1 -1
- package/dist/esm/index.native.js +8 -2
- package/dist/esm/index.native.js.map +1 -1
- package/dist/esm/layouts/withLayoutContext.js +30 -12
- package/dist/esm/layouts/withLayoutContext.js.map +1 -1
- package/dist/esm/layouts/withLayoutContext.mjs +34 -15
- package/dist/esm/layouts/withLayoutContext.mjs.map +1 -1
- package/dist/esm/layouts/withLayoutContext.native.js +42 -19
- package/dist/esm/layouts/withLayoutContext.native.js.map +1 -1
- package/dist/esm/link/Link.js +3 -2
- package/dist/esm/link/Link.js.map +1 -1
- package/dist/esm/link/Link.mjs +5 -2
- package/dist/esm/link/Link.mjs.map +1 -1
- package/dist/esm/link/Link.native.js +6 -1
- package/dist/esm/link/Link.native.js.map +1 -1
- package/dist/esm/link/useLinkTo.js +6 -3
- package/dist/esm/link/useLinkTo.js.map +1 -1
- package/dist/esm/link/useLinkTo.mjs +11 -3
- package/dist/esm/link/useLinkTo.mjs.map +1 -1
- package/dist/esm/link/useLinkTo.native.js +11 -3
- package/dist/esm/link/useLinkTo.native.js.map +1 -1
- package/dist/esm/router/Route.js.map +1 -1
- package/dist/esm/router/Route.mjs.map +1 -1
- package/dist/esm/router/Route.native.js.map +1 -1
- package/dist/esm/router/findRouteNode.js +56 -0
- package/dist/esm/router/findRouteNode.js.map +6 -0
- package/dist/esm/router/findRouteNode.mjs +44 -0
- package/dist/esm/router/findRouteNode.mjs.map +1 -0
- package/dist/esm/router/findRouteNode.native.js +75 -0
- package/dist/esm/router/findRouteNode.native.js.map +1 -0
- package/dist/esm/router/router.js +154 -6
- package/dist/esm/router/router.js.map +1 -1
- package/dist/esm/router/router.mjs +151 -10
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js +232 -56
- package/dist/esm/router/router.native.js.map +1 -1
- package/dist/esm/router/useScreens.js +1 -1
- package/dist/esm/router/useScreens.js.map +1 -1
- package/dist/esm/router/useScreens.mjs +1 -1
- package/dist/esm/router/useScreens.mjs.map +1 -1
- package/dist/esm/router/useScreens.native.js +5 -2
- package/dist/esm/router/useScreens.native.js.map +1 -1
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/useBlocker.js +122 -0
- package/dist/esm/useBlocker.js.map +6 -0
- package/dist/esm/useBlocker.mjs +123 -0
- package/dist/esm/useBlocker.mjs.map +1 -0
- package/dist/esm/useBlocker.native.js +51 -0
- package/dist/esm/useBlocker.native.js.map +1 -0
- package/dist/esm/useLoader.js +57 -3
- package/dist/esm/useLoader.js.map +2 -2
- package/dist/esm/useLoader.mjs +69 -4
- package/dist/esm/useLoader.mjs.map +1 -1
- package/dist/esm/useLoader.native.js +90 -7
- package/dist/esm/useLoader.native.js.map +1 -1
- package/dist/esm/useScrollGroup.js +16 -0
- package/dist/esm/useScrollGroup.js.map +6 -0
- package/dist/esm/useScrollGroup.mjs +14 -0
- package/dist/esm/useScrollGroup.mjs.map +1 -0
- package/dist/esm/useScrollGroup.native.js +3 -0
- package/dist/esm/useScrollGroup.native.js.map +1 -0
- package/dist/esm/validateParams.js +68 -0
- package/dist/esm/validateParams.js.map +6 -0
- package/dist/esm/validateParams.mjs +54 -0
- package/dist/esm/validateParams.mjs.map +1 -0
- package/dist/esm/validateParams.native.js +151 -0
- package/dist/esm/validateParams.native.js.map +1 -0
- package/dist/esm/validateSearch.js +83 -0
- package/dist/esm/validateSearch.js.map +6 -0
- package/dist/esm/validateSearch.mjs +77 -0
- package/dist/esm/validateSearch.mjs.map +1 -0
- package/dist/esm/validateSearch.native.js +172 -0
- package/dist/esm/validateSearch.native.js.map +1 -0
- package/dist/esm/views/ErrorBoundary.js +325 -7
- package/dist/esm/views/ErrorBoundary.js.map +2 -2
- package/dist/esm/views/ErrorBoundary.mjs +289 -6
- package/dist/esm/views/ErrorBoundary.mjs.map +1 -1
- package/dist/esm/views/ErrorBoundary.native.js +159 -4
- package/dist/esm/views/ErrorBoundary.native.js.map +1 -1
- package/dist/esm/views/Navigator.js +7 -2
- package/dist/esm/views/Navigator.js.map +1 -1
- package/dist/esm/views/Navigator.mjs +10 -3
- package/dist/esm/views/Navigator.mjs.map +1 -1
- package/dist/esm/views/Navigator.native.js +12 -3
- package/dist/esm/views/Navigator.native.js.map +1 -1
- package/dist/esm/views/Protected.js +14 -0
- package/dist/esm/views/Protected.js.map +6 -0
- package/dist/esm/views/Protected.mjs +11 -0
- package/dist/esm/views/Protected.mjs.map +1 -0
- package/dist/esm/views/Protected.native.js +16 -0
- package/dist/esm/views/Protected.native.js.map +1 -0
- package/dist/esm/views/RootErrorBoundary.js +214 -7
- package/dist/esm/views/RootErrorBoundary.js.map +1 -1
- package/dist/esm/views/RootErrorBoundary.mjs +192 -7
- package/dist/esm/views/RootErrorBoundary.mjs.map +1 -1
- package/dist/esm/views/RootErrorBoundary.native.js +191 -7
- package/dist/esm/views/RootErrorBoundary.native.js.map +1 -1
- package/dist/esm/views/ScrollBehavior.js +47 -11
- package/dist/esm/views/ScrollBehavior.js.map +1 -1
- package/dist/esm/views/ScrollBehavior.mjs +48 -11
- package/dist/esm/views/ScrollBehavior.mjs.map +1 -1
- package/dist/esm/views/ScrollBehavior.native.js +67 -10
- package/dist/esm/views/ScrollBehavior.native.js.map +1 -1
- package/dist/esm/views/SourceInspector.js +7 -0
- package/dist/esm/views/SourceInspector.js.map +6 -0
- package/dist/esm/views/SourceInspector.mjs +5 -0
- package/dist/esm/views/SourceInspector.mjs.map +1 -0
- package/dist/esm/views/SourceInspector.native.js +6 -0
- package/dist/esm/views/SourceInspector.native.js.map +1 -0
- package/dist/esm/views/Try.js +38 -4
- package/dist/esm/views/Try.js.map +1 -1
- package/dist/esm/views/Try.mjs +40 -7
- package/dist/esm/views/Try.mjs.map +1 -1
- package/dist/esm/views/Try.native.js +42 -7
- package/dist/esm/views/Try.native.js.map +1 -1
- package/dist/esm/vite/DevHead.js +802 -51
- package/dist/esm/vite/DevHead.js.map +1 -1
- package/dist/esm/vite/DevHead.mjs +797 -43
- package/dist/esm/vite/DevHead.mjs.map +1 -1
- package/dist/esm/vite/DevHead.native.js +782 -0
- package/dist/esm/vite/DevHead.native.js.map +1 -1
- package/dist/esm/vite/one.js +7 -1
- package/dist/esm/vite/one.js.map +1 -1
- package/dist/esm/vite/one.mjs +7 -1
- package/dist/esm/vite/one.mjs.map +1 -1
- package/dist/esm/vite/one.native.js +11 -1
- package/dist/esm/vite/one.native.js.map +1 -1
- package/dist/esm/vite/plugins/SSRCSSPlugin.js +48 -4
- package/dist/esm/vite/plugins/SSRCSSPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/SSRCSSPlugin.mjs +44 -4
- package/dist/esm/vite/plugins/SSRCSSPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/SSRCSSPlugin.native.js +61 -4
- package/dist/esm/vite/plugins/SSRCSSPlugin.native.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js +6 -3
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js +11 -6
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs +5 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js +1 -0
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js.map +1 -1
- package/dist/esm/vite/plugins/sourceInspectorPlugin.js +126 -0
- package/dist/esm/vite/plugins/sourceInspectorPlugin.js.map +6 -0
- package/dist/esm/vite/plugins/sourceInspectorPlugin.mjs +121 -0
- package/dist/esm/vite/plugins/sourceInspectorPlugin.mjs.map +1 -0
- package/dist/esm/vite/plugins/sourceInspectorPlugin.native.js +194 -0
- package/dist/esm/vite/plugins/sourceInspectorPlugin.native.js.map +1 -0
- package/dist/esm/vite/plugins/virtualEntryPlugin.js +16 -6
- package/dist/esm/vite/plugins/virtualEntryPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.mjs +25 -6
- package/dist/esm/vite/plugins/virtualEntryPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.native.js +26 -7
- package/dist/esm/vite/plugins/virtualEntryPlugin.native.js.map +1 -1
- package/package.json +11 -9
- package/src/cli/buildPage.ts +1 -1
- package/src/cli/dev.ts +4 -4
- package/src/createApp.tsx +11 -1
- package/src/createHandleRequest.test.ts +3 -1
- package/src/devtools/registry.ts +21 -0
- package/src/fork/createMemoryHistory.tsx +43 -11
- package/src/fork/useLinking.ts +14 -4
- package/src/index.ts +34 -1
- package/src/interfaces/router.ts +48 -0
- package/src/layouts/withLayoutContext.tsx +48 -8
- package/src/link/Link.tsx +7 -2
- package/src/link/useLinkTo.tsx +7 -3
- package/src/router/Route.tsx +32 -3
- package/src/router/findRouteNode.ts +127 -0
- package/src/router/router.ts +286 -2
- package/src/router/useScreens.tsx +9 -3
- package/src/useBlocker.native.ts +153 -0
- package/src/useBlocker.ts +340 -0
- package/src/useLoader.ts +139 -1
- package/src/useScrollGroup.native.ts +7 -0
- package/src/useScrollGroup.ts +44 -0
- package/src/validateParams.ts +196 -0
- package/src/validateSearch.ts +241 -0
- package/src/views/ErrorBoundary.tsx +154 -156
- package/src/views/ErrorBoundary.web.tsx +321 -0
- package/src/views/Navigator.tsx +14 -2
- package/src/views/Protected.tsx +62 -0
- package/src/views/RootErrorBoundary.tsx +214 -17
- package/src/views/ScrollBehavior.tsx +82 -3
- package/src/views/SourceInspector.tsx +39 -0
- package/src/views/Try.tsx +81 -12
- package/src/vite/DevHead.tsx +819 -54
- package/src/vite/one.ts +13 -0
- package/src/vite/plugins/SSRCSSPlugin.ts +104 -0
- package/src/vite/plugins/fileSystemRouterPlugin.tsx +11 -8
- package/src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx +4 -0
- package/src/vite/plugins/sourceInspectorPlugin.ts +246 -0
- package/src/vite/plugins/virtualEntryPlugin.ts +35 -10
- package/src/vite/types.ts +28 -0
- package/types/Route.d.ts.map +1 -0
- package/types/cleanUrl.d.ts.map +1 -0
- package/types/cli/run.d.ts.map +1 -0
- package/types/createApp.d.ts +5 -0
- package/types/createApp.d.ts.map +1 -1
- package/types/createRoute.d.ts.map +1 -0
- package/types/devtools/registry.d.ts +15 -0
- package/types/devtools/registry.d.ts.map +1 -0
- package/types/fork/NavigationContainer.native.d.ts.map +1 -0
- package/types/fork/createMemoryHistory.d.ts +8 -3
- package/types/fork/createMemoryHistory.d.ts.map +1 -1
- package/types/fork/useLinking.d.ts.map +1 -1
- package/types/getLinkingConfig.d.ts.map +1 -0
- package/types/getRoutes.d.ts.map +1 -0
- package/types/imperative-api.d.ts.map +1 -0
- package/types/index.d.ts +8 -1
- package/types/index.d.ts.map +1 -1
- package/types/interfaces/router.d.ts +47 -0
- package/types/interfaces/router.d.ts.map +1 -1
- package/types/layouts/withLayoutContext.d.ts +2 -1
- package/types/layouts/withLayoutContext.d.ts.map +1 -1
- package/types/link/Link.d.ts.map +1 -1
- package/types/link/useLinkTo.d.ts +1 -0
- package/types/link/useLinkTo.d.ts.map +1 -1
- package/types/matchers.d.ts.map +1 -0
- package/types/platform.d.ts.map +1 -0
- package/types/router/Route.d.ts +32 -3
- package/types/router/Route.d.ts.map +1 -1
- package/types/router/findRouteNode.d.ts +31 -0
- package/types/router/findRouteNode.d.ts.map +1 -0
- package/types/router/router.d.ts +35 -0
- package/types/router/router.d.ts.map +1 -1
- package/types/router/useScreens.d.ts +2 -0
- package/types/router/useScreens.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/sortRoutes.d.ts.map +1 -0
- package/types/useBlocker.d.ts +72 -0
- package/types/useBlocker.d.ts.map +1 -0
- package/types/useBlocker.native.d.ts +60 -0
- package/types/useBlocker.native.d.ts.map +1 -0
- package/types/useLoader.d.ts +10 -0
- package/types/useLoader.d.ts.map +1 -1
- package/types/useNavigation.d.ts.map +1 -0
- package/types/useScreens.d.ts.map +1 -0
- package/types/useScrollGroup.d.ts +27 -0
- package/types/useScrollGroup.d.ts.map +1 -0
- package/types/useScrollGroup.native.d.ts +6 -0
- package/types/useScrollGroup.native.d.ts.map +1 -0
- package/types/useSearch.d.ts.map +1 -0
- package/types/useViteRoutes.d.ts.map +1 -0
- package/types/validateParams.d.ts +85 -0
- package/types/validateParams.d.ts.map +1 -0
- package/types/validateSearch.d.ts +107 -0
- package/types/validateSearch.d.ts.map +1 -0
- package/types/views/ErrorBoundary.d.ts +11 -1
- package/types/views/ErrorBoundary.d.ts.map +1 -1
- package/types/views/ErrorBoundary.web.d.ts +13 -0
- package/types/views/ErrorBoundary.web.d.ts.map +1 -0
- package/types/views/Navigator.d.ts.map +1 -1
- package/types/views/Protected.d.ts +39 -0
- package/types/views/Protected.d.ts.map +1 -0
- package/types/views/RootErrorBoundary.d.ts +14 -8
- package/types/views/RootErrorBoundary.d.ts.map +1 -1
- package/types/views/ScrollBehavior.d.ts +8 -0
- package/types/views/ScrollBehavior.d.ts.map +1 -1
- package/types/views/ScrollRestoration.d.ts.map +1 -0
- package/types/views/SourceInspector.d.ts +35 -0
- package/types/views/SourceInspector.d.ts.map +1 -0
- package/types/views/Try.d.ts +29 -6
- package/types/views/Try.d.ts.map +1 -1
- package/types/vite/DevHead.d.ts.map +1 -1
- package/types/vite/build.d.ts.map +1 -0
- package/types/vite/headers.d.ts.map +1 -0
- package/types/vite/headers.native.d.ts.map +1 -0
- package/types/vite/one.d.ts.map +1 -1
- package/types/vite/plugins/SSRCSSPlugin.d.ts.map +1 -1
- package/types/vite/plugins/fileSystemRouterPlugin.d.ts.map +1 -1
- package/types/vite/plugins/generateFileSystemRouteTypesPlugin.d.ts.map +1 -1
- package/types/vite/plugins/seoPreviewPlugin.d.ts.map +1 -0
- package/types/vite/plugins/sourceInspectorPlugin.d.ts +3 -0
- package/types/vite/plugins/sourceInspectorPlugin.d.ts.map +1 -0
- package/types/vite/plugins/virtualEntryPlugin.d.ts.map +1 -1
- package/types/vite/resolveAPIRequest.d.ts.map +1 -0
- package/types/vite/server.d.ts.map +1 -0
- package/types/vite/types.d.ts +24 -0
- package/types/vite/types.d.ts.map +1 -1
package/dist/esm/cli/dev.mjs
CHANGED
|
@@ -29,15 +29,15 @@ async function dev(args) {
|
|
|
29
29
|
} = await start();
|
|
30
30
|
process.on("beforeExit", () => {
|
|
31
31
|
stop();
|
|
32
|
-
}), process.on("SIGINT", () => {
|
|
32
|
+
}), process.on("SIGINT", async () => {
|
|
33
33
|
try {
|
|
34
|
-
stop();
|
|
34
|
+
await stop();
|
|
35
35
|
} finally {
|
|
36
36
|
process.exit(2);
|
|
37
37
|
}
|
|
38
|
-
}), process.on("SIGTERM", () => {
|
|
38
|
+
}), process.on("SIGTERM", async () => {
|
|
39
39
|
try {
|
|
40
|
-
stop();
|
|
40
|
+
await stop();
|
|
41
41
|
} finally {
|
|
42
42
|
process.exit(0);
|
|
43
43
|
}
|
package/dist/esm/cli/dev.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["setServerGlobals","virtualEntryIdNative","checkNodeVersion","labelProcess","dev","args","dev2","start","stop","mode","clean","root","process","cwd","debugBundle","debug","server","host","port","entries","native","closePromise","on","exit","err","console","error","message"],"sources":["../../../src/cli/dev.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,QAAwB;AACjC,SAASC,oBAAA,QAA4B;AACrC,SAASC,gBAAA,QAAwB;AACjC,SAASC,YAAA,QAAoB;AAE7B,eAAsBC,IAAIC,IAAA,EAQvB;EACDF,YAAA,CAAa,KAAK,GAClBD,gBAAA,CAAiB,GACjBF,gBAAA,CAAiB;EAEjB,MAAM;MAAEI,GAAA,EAAAE;IAAI,IAAI,MAAM,OAAO,UAAU;IAEjC;MAAEC,KAAA;MAAOC;IAAK,IAAI,MAAMF,IAAA,CAAI;MAChCG,IAAA,EAAMJ,IAAA,CAAKI,IAAA;MACXC,KAAA,EAAOL,IAAA,CAAKK,KAAA;MACZC,IAAA,EAAMC,OAAA,CAAQC,GAAA,CAAI;MAClBC,WAAA,EAAaT,IAAA,CAAKS,WAAA;MAClBC,KAAA,EAAOV,IAAA,CAAKU,KAAA;MACZC,MAAA,EAAQ;QACNC,IAAA,EAAMZ,IAAA,CAAKY,IAAA;QACXC,IAAA,EAAMb,IAAA,CAAKa,IAAA,GAAO,CAACb,IAAA,CAAKa,IAAA,GAAO;MACjC;MACAC,OAAA,EAAS;QACPC,MAAA,EAAQnB;MACV;IACF,CAAC;IAEK;MAAEoB;IAAa,IAAI,MAAMd,KAAA,CAAM;EAErCK,OAAA,CAAQU,EAAA,CAAG,cAAc,MAAM;IAC7Bd,IAAA,CAAK;EACP,CAAC,GAEDI,OAAA,CAAQU,EAAA,CAAG,UAAU,
|
|
1
|
+
{"version":3,"names":["setServerGlobals","virtualEntryIdNative","checkNodeVersion","labelProcess","dev","args","dev2","start","stop","mode","clean","root","process","cwd","debugBundle","debug","server","host","port","entries","native","closePromise","on","exit","err","console","error","message"],"sources":["../../../src/cli/dev.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,QAAwB;AACjC,SAASC,oBAAA,QAA4B;AACrC,SAASC,gBAAA,QAAwB;AACjC,SAASC,YAAA,QAAoB;AAE7B,eAAsBC,IAAIC,IAAA,EAQvB;EACDF,YAAA,CAAa,KAAK,GAClBD,gBAAA,CAAiB,GACjBF,gBAAA,CAAiB;EAEjB,MAAM;MAAEI,GAAA,EAAAE;IAAI,IAAI,MAAM,OAAO,UAAU;IAEjC;MAAEC,KAAA;MAAOC;IAAK,IAAI,MAAMF,IAAA,CAAI;MAChCG,IAAA,EAAMJ,IAAA,CAAKI,IAAA;MACXC,KAAA,EAAOL,IAAA,CAAKK,KAAA;MACZC,IAAA,EAAMC,OAAA,CAAQC,GAAA,CAAI;MAClBC,WAAA,EAAaT,IAAA,CAAKS,WAAA;MAClBC,KAAA,EAAOV,IAAA,CAAKU,KAAA;MACZC,MAAA,EAAQ;QACNC,IAAA,EAAMZ,IAAA,CAAKY,IAAA;QACXC,IAAA,EAAMb,IAAA,CAAKa,IAAA,GAAO,CAACb,IAAA,CAAKa,IAAA,GAAO;MACjC;MACAC,OAAA,EAAS;QACPC,MAAA,EAAQnB;MACV;IACF,CAAC;IAEK;MAAEoB;IAAa,IAAI,MAAMd,KAAA,CAAM;EAErCK,OAAA,CAAQU,EAAA,CAAG,cAAc,MAAM;IAC7Bd,IAAA,CAAK;EACP,CAAC,GAEDI,OAAA,CAAQU,EAAA,CAAG,UAAU,YAAY;IAC/B,IAAI;MACF,MAAMd,IAAA,CAAK;IACb,UAAE;MACAI,OAAA,CAAQW,IAAA,CAAK,CAAC;IAChB;EACF,CAAC,GAEDX,OAAA,CAAQU,EAAA,CAAG,WAAW,YAAY;IAChC,IAAI;MACF,MAAMd,IAAA,CAAK;IACb,UAAE;MACAI,OAAA,CAAQW,IAAA,CAAK,CAAC;IAChB;EACF,CAAC,GAEDX,OAAA,CAAQU,EAAA,CAAG,qBAAsBE,GAAA,IAAQ;IACvCC,OAAA,CAAQC,KAAA,CAAMF,GAAA,EAAKG,OAAA,IAAWH,GAAG;EACnC,CAAC,GAKDZ,OAAA,CAAQU,EAAA,CAAG,sBAAuBE,GAAA,IAAQ;IACxCC,OAAA,CAAQC,KAAA,CAAMF,GAAG;EACnB,CAAC,GAED,MAAMH,YAAA;AACR","ignoreList":[]}
|
|
@@ -29,15 +29,15 @@ async function dev(args) {
|
|
|
29
29
|
} = await start();
|
|
30
30
|
process.on("beforeExit", function () {
|
|
31
31
|
stop();
|
|
32
|
-
}), process.on("SIGINT", function () {
|
|
32
|
+
}), process.on("SIGINT", async function () {
|
|
33
33
|
try {
|
|
34
|
-
stop();
|
|
34
|
+
await stop();
|
|
35
35
|
} finally {
|
|
36
36
|
process.exit(2);
|
|
37
37
|
}
|
|
38
|
-
}), process.on("SIGTERM", function () {
|
|
38
|
+
}), process.on("SIGTERM", async function () {
|
|
39
39
|
try {
|
|
40
|
-
stop();
|
|
40
|
+
await stop();
|
|
41
41
|
} finally {
|
|
42
42
|
process.exit(0);
|
|
43
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["setServerGlobals","virtualEntryIdNative","checkNodeVersion","labelProcess","dev","args","dev2","start","stop","mode","clean","root","process","cwd","debugBundle","debug","server","host","port","entries","native","closePromise","on","exit","err","console","error","message"],"sources":["../../../src/cli/dev.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,QAAwB;AACjC,SAASC,oBAAA,QAA4B;AACrC,SAASC,gBAAA,QAAwB;AACjC,SAASC,YAAA,QAAoB;AAE7B,eAAsBC,IAAIC,IAAA,EAQvB;EACDF,YAAA,CAAa,KAAK,GAClBD,gBAAA,CAAiB,GACjBF,gBAAA,CAAiB;EAEjB;MAAMI,GAAE,EAAAE;IAAA,IAAI,MAAI,MAAM,WAAO;IAAU;MAEjCC,KAAE;MAAAC;IAAO,IAAK,MAAIF,IAAM;MAC5BG,IAAA,EAAMJ,IAAA,CAAKI,IAAA;MACXC,KAAA,EAAOL,IAAA,CAAKK,KAAA;MACZC,IAAA,EAAMC,OAAA,CAAQC,GAAA,CAAI;MAClBC,WAAA,EAAaT,IAAA,CAAKS,WAAA;MAClBC,KAAA,EAAOV,IAAA,CAAKU,KAAA;MACZC,MAAA,EAAQ;QACNC,IAAA,EAAMZ,IAAA,CAAKY,IAAA;QACXC,IAAA,EAAMb,IAAA,CAAKa,IAAA,GAAO,CAACb,IAAA,CAAKa,IAAA,GAAO;MACjC;MACAC,OAAA,EAAS;QACPC,MAAA,EAAQnB;MACV;IACF,CAAC;IAEK;MAAEoB;IAAa,IAAI,MAAMd,KAAA,CAAM;EAErCK,OAAA,CAAQU,EAAA,CAAG,cAAc,YAAM;IAC7Bd,IAAA,CAAK;EACP,CAAC,GAEDI,OAAA,CAAQU,EAAA,CAAG,UAAU,
|
|
1
|
+
{"version":3,"names":["setServerGlobals","virtualEntryIdNative","checkNodeVersion","labelProcess","dev","args","dev2","start","stop","mode","clean","root","process","cwd","debugBundle","debug","server","host","port","entries","native","closePromise","on","exit","err","console","error","message"],"sources":["../../../src/cli/dev.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,QAAwB;AACjC,SAASC,oBAAA,QAA4B;AACrC,SAASC,gBAAA,QAAwB;AACjC,SAASC,YAAA,QAAoB;AAE7B,eAAsBC,IAAIC,IAAA,EAQvB;EACDF,YAAA,CAAa,KAAK,GAClBD,gBAAA,CAAiB,GACjBF,gBAAA,CAAiB;EAEjB;MAAMI,GAAE,EAAAE;IAAA,IAAI,MAAI,MAAM,WAAO;IAAU;MAEjCC,KAAE;MAAAC;IAAO,IAAK,MAAIF,IAAM;MAC5BG,IAAA,EAAMJ,IAAA,CAAKI,IAAA;MACXC,KAAA,EAAOL,IAAA,CAAKK,KAAA;MACZC,IAAA,EAAMC,OAAA,CAAQC,GAAA,CAAI;MAClBC,WAAA,EAAaT,IAAA,CAAKS,WAAA;MAClBC,KAAA,EAAOV,IAAA,CAAKU,KAAA;MACZC,MAAA,EAAQ;QACNC,IAAA,EAAMZ,IAAA,CAAKY,IAAA;QACXC,IAAA,EAAMb,IAAA,CAAKa,IAAA,GAAO,CAACb,IAAA,CAAKa,IAAA,GAAO;MACjC;MACAC,OAAA,EAAS;QACPC,MAAA,EAAQnB;MACV;IACF,CAAC;IAEK;MAAEoB;IAAa,IAAI,MAAMd,KAAA,CAAM;EAErCK,OAAA,CAAQU,EAAA,CAAG,cAAc,YAAM;IAC7Bd,IAAA,CAAK;EACP,CAAC,GAEDI,OAAA,CAAQU,EAAA,CAAG,UAAU,kBAAY;IAC/B,IAAI;MACF,MAAMd,IAAA,CAAK;IACb,UAAE;MACAI,OAAA,CAAQW,IAAA,CAAK,CAAC;IAChB;EACF,CAAC,GAEDX,OAAA,CAAQU,EAAA,CAAG,WAAW,kBAAY;IAChC,IAAI;MACF,MAAMd,IAAA,CAAK;IACb,UAAE;MACAI,OAAA,CAAQW,IAAA,CAAK,CAAC;IAChB;EACF,CAAC,GAEDX,OAAA,CAAQU,EAAA,CAAG,qBAAqB,UAASE,GAAA;IACvCC,OAAA,CAAQC,KAAA,CAAMF,GAAA,EAAKG,OAAA,IAAWH,GAAG;EACnC,CAAC,GAKDZ,OAAA,CAAQU,EAAA,CAAG,sBAAsB,UAASE,GAAA;IACxCC,OAAA,CAAQC,KAAA,CAAMF,GAAG;EACnB,CAAC,GAED,MAAMH,YAAA;AACR","ignoreList":[]}
|
package/dist/esm/createApp.js
CHANGED
|
@@ -84,14 +84,14 @@ function createApp(options) {
|
|
|
84
84
|
)), html;
|
|
85
85
|
}
|
|
86
86
|
};
|
|
87
|
-
const serverContext = getServerContext() || {}, routePreloads = serverContext.routePreloads, preloadPromises = routePreloads ? Object.entries(routePreloads).map(async ([routeKey, bundlePath]) => {
|
|
87
|
+
const serverContext = getServerContext() || {}, routePreloads = serverContext.routePreloads, setupComplete = options.setupPromise || Promise.resolve(), preloadPromises = routePreloads ? Object.entries(routePreloads).map(async ([routeKey, bundlePath]) => {
|
|
88
88
|
const mod = await import(
|
|
89
89
|
/* @vite-ignore */
|
|
90
90
|
bundlePath
|
|
91
91
|
);
|
|
92
92
|
return registerPreloadedRoute(routeKey, mod), mod;
|
|
93
93
|
}) : [options.routes[`/${options.routerRoot}/_layout.tsx`]?.()];
|
|
94
|
-
return Promise.all(preloadPromises).then(() => resolveClientLoader(serverContext)).then(() => {
|
|
94
|
+
return setupComplete.then(() => Promise.all(preloadPromises)).then(() => resolveClientLoader(serverContext)).then(() => {
|
|
95
95
|
render(
|
|
96
96
|
/* @__PURE__ */ jsx(
|
|
97
97
|
Root,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createApp.tsx"],
|
|
4
|
-
"mappings": "AAAA,OAAO;AAEP,SAAS,oBAAoB;AAC7B,SAAS,mBAAmB;AAC5B,SAAS,2BAA2B;AACpC,SAAS,YAAY;AACrB,SAAS,cAAc;AACvB,SAAS,8BAA8B;AAEvC,SAAS,+BAA+B;AACxC,SAAS,oBAAoB;AAC7B,SAAS,yBAAyB;AAClC,SAAS,yCAAyC;AAClD,SAAS,kBAAkB,wBAAwB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["routePreloads"]
|
|
6
6
|
}
|
package/dist/esm/createApp.mjs
CHANGED
|
@@ -81,12 +81,13 @@ function createApp(options) {
|
|
|
81
81
|
};
|
|
82
82
|
const serverContext = getServerContext() || {},
|
|
83
83
|
routePreloads = serverContext.routePreloads,
|
|
84
|
+
setupComplete = options.setupPromise || Promise.resolve(),
|
|
84
85
|
preloadPromises = routePreloads ? Object.entries(routePreloads).map(async ([routeKey, bundlePath]) => {
|
|
85
86
|
const mod = await import(/* @vite-ignore */
|
|
86
87
|
bundlePath);
|
|
87
88
|
return registerPreloadedRoute(routeKey, mod), mod;
|
|
88
89
|
}) : [options.routes[`/${options.routerRoot}/_layout.tsx`]?.()];
|
|
89
|
-
return Promise.all(preloadPromises).then(() => resolveClientLoader(serverContext)).then(() => {
|
|
90
|
+
return setupComplete.then(() => Promise.all(preloadPromises)).then(() => resolveClientLoader(serverContext)).then(() => {
|
|
90
91
|
render(/* @__PURE__ */jsx(Root, {
|
|
91
92
|
isClient: !0,
|
|
92
93
|
flags: options.flags,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["cloneElement","AppRegistry","resolveClientLoader","Root","render","registerPreloadedRoute","getServerHeadInsertions","ensureExists","safeJsonStringify","SERVER_CONTEXT_POST_RENDER_STRING","getServerContext","setServerContext","Fragment","jsx","createApp","options","import","meta","env","SSR","props","ReactDOMServer","serverRender","Promise","all","renderToStaticMarkup","default","renderToString","loaderData","loaderProps","css","cssContents","mode","loaderServerData","routePreloads","routePreloads2","postRenderData","renderId","App","flags","onRenderId","id","routes","routerRoot","registerComponent","Application","getApplication","rootElement","element","children","html","preloads","deferredPreloads","extraHeadElements","styleTag","getStyleElement","nonce","process","ONE_NONCE","push","insertions","insertion","out","length","extraHeadHTML","map","x","i","key","replace","err","includes","serverContext","preloadPromises","Object","entries","routeKey","bundlePath","mod","then","isClient","path","window","location","href","catch","console","error"],"sources":["../../src/createApp.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAO;AAEP,SAASA,YAAA,QAAoB;AAC7B,SAASC,WAAA,QAAmB;AAC5B,SAASC,mBAAA,QAA2B;AACpC,SAASC,IAAA,QAAY;AACrB,SAASC,MAAA,QAAc;AACvB,SAASC,sBAAA,QAA8B;AAEvC,SAASC,uBAAA,QAA+B;AACxC,SAASC,YAAA,QAAoB;AAC7B,SAASC,iBAAA,QAAyB;AAClC,SAASC,iCAAA,QAAyC;AAClD,SAASC,gBAAA,EAAkBC,gBAAA,QAAwB;
|
|
1
|
+
{"version":3,"names":["cloneElement","AppRegistry","resolveClientLoader","Root","render","registerPreloadedRoute","getServerHeadInsertions","ensureExists","safeJsonStringify","SERVER_CONTEXT_POST_RENDER_STRING","getServerContext","setServerContext","Fragment","jsx","createApp","options","import","meta","env","SSR","props","ReactDOMServer","serverRender","Promise","all","renderToStaticMarkup","default","renderToString","loaderData","loaderProps","css","cssContents","mode","loaderServerData","routePreloads","routePreloads2","postRenderData","renderId","App","flags","onRenderId","id","routes","routerRoot","registerComponent","Application","getApplication","rootElement","element","children","html","preloads","deferredPreloads","extraHeadElements","styleTag","getStyleElement","nonce","process","ONE_NONCE","push","insertions","insertion","out","length","extraHeadHTML","map","x","i","key","replace","err","includes","serverContext","setupComplete","setupPromise","resolve","preloadPromises","Object","entries","routeKey","bundlePath","mod","then","isClient","path","window","location","href","catch","console","error"],"sources":["../../src/createApp.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -65,7 +65,9 @@ describe("createHandleRequest", () => {
|
|
|
65
65
|
const mockHandlersWithLoader = {
|
|
66
66
|
handlePage: vi.fn().mockResolvedValue("<html></html>"),
|
|
67
67
|
handleLoader: vi.fn().mockResolvedValue("loader data")
|
|
68
|
-
}, { handler } = createHandleRequest(mockHandlersWithLoader, {
|
|
68
|
+
}, { handler } = createHandleRequest(mockHandlersWithLoader, {
|
|
69
|
+
routerRoot: "/app"
|
|
70
|
+
});
|
|
69
71
|
await handler(createRequest("/assets/my-page_123_vxrn_loader.js")), expect(mockHandlersWithLoader.handleLoader).toHaveBeenCalled();
|
|
70
72
|
});
|
|
71
73
|
}), describe("dynamic route matching", () => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createHandleRequest.test.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "AAAA,SAAS,UAAU,QAAQ,IAAI,IAAI,kBAAkB;AACrD,SAAS,2BAA2B;AAGpC,GAAG,KAAK,sBAAsB,OAAO;AAAA,EACnC,aAAa,OAAO;AAAA,IAClB,YAAY;AAAA,MACV;AAAA,QACE,MAAM;AAAA,QACN,MAAM;AAAA,QACN,YAAY;AAAA,QACZ,WAAW,EAAE,UAAU,OAAO;AAAA,QAC9B,MAAM;AAAA,QACN,aAAa,CAAC;AAAA,MAChB;AAAA,MACA;AAAA,QACE,MAAM;AAAA,QACN,MAAM;AAAA,QACN,YAAY;AAAA,QACZ,WAAW,CAAC;AAAA,QACZ,MAAM;AAAA,QACN,aAAa,CAAC;AAAA,MAChB;AAAA,IACF;AAAA,IACA,WAAW,CAAC;AAAA,EACd;AACF,EAAE;AAEF,SAAS,cAAc,MAAc;AACnC,SAAO,IAAI,QAAQ,wBAAwB,IAAI,IAAI;AAAA,IACjD,SAAS;AAAA,MACP,MAAM;AAAA,IACR;AAAA,EACF,CAAC;AACH;AAEA,SAAS,uBAAuB,MAAM;AACpC,QAAM,eAAe;AAAA,IACnB,YAAY,GAAG,GAAG,EAAE,kBAAkB,eAAe;AAAA,EACvD;AAEA,aAAW,MAAM;AACf,OAAG,cAAc;AAAA,EACnB,CAAC,GAED,SAAS,mCAAmC,MAAM;AAChD,OAAG,wDAAwD,YAAY;AACrE,YAAM,EAAE,QAAQ,IAAI,oBAAoB,cAAc,EAAE,YAAY,OAAO,CAAC,GACtE,SAAS,MAAM,QAAQ,cAAc,cAAc,CAAC;AAC1D,aAAO,MAAM,EAAE,SAAS,GACxB,OAAO,aAAa,UAAU,EAAE,IAAI,iBAAiB;AAAA,IACvD,CAAC,GAED,GAAG,qDAAqD,YAAY;AAClE,YAAM,EAAE,QAAQ,IAAI,oBAAoB,cAAc,EAAE,YAAY,OAAO,CAAC,GACtE,SAAS,MAAM,QAAQ,cAAc,WAAW,CAAC;AACvD,aAAO,MAAM,EAAE,SAAS,GACxB,OAAO,aAAa,UAAU,EAAE,IAAI,iBAAiB;AAAA,IACvD,CAAC,GAED,GAAG,uDAAuD,YAAY;AACpE,YAAM,EAAE,QAAQ,IAAI,oBAAoB,cAAc,EAAE,YAAY,OAAO,CAAC,GACtE,SAAS,MAAM,QAAQ,cAAc,aAAa,CAAC;AACzD,aAAO,MAAM,EAAE,SAAS,GACxB,OAAO,aAAa,UAAU,EAAE,IAAI,iBAAiB;AAAA,IACvD,CAAC,GAED,GAAG,uDAAuD,YAAY;AACpE,YAAM,EAAE,QAAQ,IAAI,oBAAoB,cAAc,EAAE,YAAY,OAAO,CAAC,GACtE,SAAS,MAAM,QAAQ,cAAc,aAAa,CAAC;AACzD,aAAO,MAAM,EAAE,SAAS,GACxB,OAAO,aAAa,UAAU,EAAE,IAAI,iBAAiB;AAAA,IACvD,CAAC,GAED,GAAG,iDAAiD,YAAY;AAC9D,YAAM,EAAE,QAAQ,IAAI,oBAAoB,cAAc,EAAE,YAAY,OAAO,CAAC,GACtE,SAAS,MAAM,QAAQ,cAAc,yBAAyB,CAAC;AACrE,aAAO,MAAM,EAAE,SAAS,GACxB,OAAO,aAAa,UAAU,EAAE,IAAI,iBAAiB;AAAA,IACvD,CAAC,GAED,GAAG,8CAA8C,YAAY;AAC3D,YAAM,EAAE,QAAQ,IAAI,oBAAoB,cAAc,EAAE,YAAY,OAAO,CAAC,GACtE,SAAS,MAAM,QAAQ,cAAc,eAAe,CAAC;AAC3D,aAAO,MAAM,EAAE,SAAS,GACxB,OAAO,aAAa,UAAU,EAAE,IAAI,iBAAiB;AAAA,IACvD,CAAC,GAED,GAAG,8EAA8E,YAAY;AAC3F,YAAM,EAAE,QAAQ,IAAI,oBAAoB,cAAc,EAAE,YAAY,OAAO,CAAC;AAC5E,YAAM,QAAQ,cAAc,eAAe,CAAC,GAC5C,OAAO,aAAa,UAAU,EAAE,iBAAiB;AAAA,IACnD,CAAC,GAED,GAAG,kDAAkD,YAAY;AAC/D,YAAM,EAAE,QAAQ,IAAI,oBAAoB,cAAc,EAAE,YAAY,OAAO,CAAC;AAC5E,YAAM,QAAQ,cAAc,aAAa,CAAC,GAC1C,OAAO,aAAa,UAAU,EAAE,iBAAiB;AAAA,IACnD,CAAC,GAED,GAAG,4DAA4D,YAAY;AACzE,YAAM,yBAAyB;AAAA,QAC7B,YAAY,GAAG,GAAG,EAAE,kBAAkB,eAAe;AAAA,QACrD,cAAc,GAAG,GAAG,EAAE,kBAAkB,aAAa;AAAA,MACvD,GACM,EAAE,QAAQ,IAAI,oBAAoB,wBAAwB;AAAA,QAC9D,YAAY;AAAA,MACd,CAAC;AAGD,YAAM,QAAQ,cAAc,oCAAoC,CAAC,GACjE,OAAO,uBAAuB,YAAY,EAAE,iBAAiB;AAAA,IAC/D,CAAC;AAAA,EACH,CAAC,GAED,SAAS,0BAA0B,MAAM;AACvC,OAAG,oEAAoE,YAAY;AACjF,YAAM,EAAE,QAAQ,IAAI,oBAAoB,cAAc,EAAE,YAAY,OAAO,CAAC;AAC5E,YAAM,QAAQ,cAAc,UAAU,CAAC,GACvC,OAAO,aAAa,UAAU,EAAE,iBAAiB;AAAA,IACnD,CAAC,GAED,GAAG,4BAA4B,YAAY;AACzC,YAAM,EAAE,QAAQ,IAAI,oBAAoB,cAAc,EAAE,YAAY,OAAO,CAAC;AAC5E,YAAM,QAAQ,cAAc,GAAG,CAAC,GAChC,OAAO,aAAa,UAAU,EAAE,iBAAiB;AAAA,IACnD,CAAC,GAED,GAAG,mCAAmC,YAAY;AAChD,YAAM,EAAE,QAAQ,IAAI,oBAAoB,cAAc,EAAE,YAAY,OAAO,CAAC;AAC5E,YAAM,QAAQ,cAAc,kBAAkB,CAAC,GAC/C,OAAO,aAAa,UAAU,EAAE,iBAAiB;AAAA,IACnD,CAAC;AAAA,EACH,CAAC,GAED,SAAS,iBAAiB,MAAM;AAC9B,OAAG,8BAA8B,YAAY;AAC3C,YAAM,EAAE,QAAQ,IAAI,oBAAoB,cAAc,EAAE,YAAY,OAAO,CAAC,GACtE,SAAS,MAAM,QAAQ,cAAc,YAAY,CAAC;AACxD,aAAO,MAAM,EAAE,SAAS;AAAA,IAC1B,CAAC,GAED,GAAG,sCAAsC,YAAY;AACnD,YAAM,EAAE,QAAQ,IAAI,oBAAoB,cAAc,EAAE,YAAY,OAAO,CAAC,GACtE,SAAS,MAAM,QAAQ,cAAc,gBAAgB,CAAC;AAC5D,aAAO,MAAM,EAAE,SAAS;AAAA,IAC1B,CAAC;AAAA,EACH,CAAC;AACH,CAAC;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["describe","expect","it","vi","beforeEach","createHandleRequest","mock","getManifest","pageRoutes","file","page","namedRegex","routeKeys","nxtPslug","type","middlewares","apiRoutes","createRequest","path","Request","headers","host","mockHandlers","handlePage","fn","mockResolvedValue","clearAllMocks","handler","routerRoot","result","toBeNull","not","toHaveBeenCalled","mockHandlersWithLoader","handleLoader"],"sources":["../../src/createHandleRequest.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,EAAIC,EAAA,EAAIC,UAAA,QAAkB;AACrD,SAASC,mBAAA,QAA2B;AAGpCF,EAAA,CAAGG,IAAA,CAAK,sBAAsB,OAAO;EACnCC,WAAA,EAAaA,CAAA,MAAO;IAClBC,UAAA,EAAY,CACV;MACEC,IAAA,EAAM;MACNC,IAAA,EAAM;MACNC,UAAA,EAAY;MACZC,SAAA,EAAW;QAAEC,QAAA,EAAU;MAAO;MAC9BC,IAAA,EAAM;MACNC,WAAA,EAAa;IACf,GACA;MACEN,IAAA,EAAM;MACNC,IAAA,EAAM;MACNC,UAAA,EAAY;MACZC,SAAA,EAAW,CAAC;MACZE,IAAA,EAAM;MACNC,WAAA,EAAa;IACf,EACF;IACAC,SAAA,EAAW;EACb;AACF,EAAE;AAEF,SAASC,cAAcC,IAAA,EAAc;EACnC,OAAO,IAAIC,OAAA,CAAQ,wBAAwBD,IAAI,IAAI;IACjDE,OAAA,EAAS;MACPC,IAAA,EAAM;IACR;EACF,CAAC;AACH;AAEArB,QAAA,CAAS,uBAAuB,MAAM;EACpC,MAAMsB,YAAA,GAAe;IACnBC,UAAA,EAAYpB,EAAA,CAAGqB,EAAA,CAAG,EAAEC,iBAAA,CAAkB,eAAe;EACvD;EAEArB,UAAA,CAAW,MAAM;IACfD,EAAA,CAAGuB,aAAA,CAAc;EACnB,CAAC,GAED1B,QAAA,CAAS,mCAAmC,MAAM;IAChDE,EAAA,CAAG,wDAAwD,YAAY;MACrE,MAAM;UAAEyB;QAAQ,IAAItB,mBAAA,CAAoBiB,YAAA,EAAc;UAAEM,UAAA,EAAY;QAAO,CAAC;QACtEC,MAAA,GAAS,MAAMF,OAAA,CAAQV,aAAA,CAAc,cAAc,CAAC;MAC1DhB,MAAA,CAAO4B,MAAM,EAAEC,QAAA,CAAS,GACxB7B,MAAA,CAAOqB,YAAA,CAAaC,UAAU,EAAEQ,GAAA,CAAIC,gBAAA,CAAiB;IACvD,CAAC,GAED9B,EAAA,CAAG,qDAAqD,YAAY;MAClE,MAAM;UAAEyB;QAAQ,IAAItB,mBAAA,CAAoBiB,YAAA,EAAc;UAAEM,UAAA,EAAY;QAAO,CAAC;QACtEC,MAAA,GAAS,MAAMF,OAAA,CAAQV,aAAA,CAAc,WAAW,CAAC;MACvDhB,MAAA,CAAO4B,MAAM,EAAEC,QAAA,CAAS,GACxB7B,MAAA,CAAOqB,YAAA,CAAaC,UAAU,EAAEQ,GAAA,CAAIC,gBAAA,CAAiB;IACvD,CAAC,GAED9B,EAAA,CAAG,uDAAuD,YAAY;MACpE,MAAM;UAAEyB;QAAQ,IAAItB,mBAAA,CAAoBiB,YAAA,EAAc;UAAEM,UAAA,EAAY;QAAO,CAAC;QACtEC,MAAA,GAAS,MAAMF,OAAA,CAAQV,aAAA,CAAc,aAAa,CAAC;MACzDhB,MAAA,CAAO4B,MAAM,EAAEC,QAAA,CAAS,GACxB7B,MAAA,CAAOqB,YAAA,CAAaC,UAAU,EAAEQ,GAAA,CAAIC,gBAAA,CAAiB;IACvD,CAAC,GAED9B,EAAA,CAAG,uDAAuD,YAAY;MACpE,MAAM;UAAEyB;QAAQ,IAAItB,mBAAA,CAAoBiB,YAAA,EAAc;UAAEM,UAAA,EAAY;QAAO,CAAC;QACtEC,MAAA,GAAS,MAAMF,OAAA,CAAQV,aAAA,CAAc,aAAa,CAAC;MACzDhB,MAAA,CAAO4B,MAAM,EAAEC,QAAA,CAAS,GACxB7B,MAAA,CAAOqB,YAAA,CAAaC,UAAU,EAAEQ,GAAA,CAAIC,gBAAA,CAAiB;IACvD,CAAC,GAED9B,EAAA,CAAG,iDAAiD,YAAY;MAC9D,MAAM;UAAEyB;QAAQ,IAAItB,mBAAA,CAAoBiB,YAAA,EAAc;UAAEM,UAAA,EAAY;QAAO,CAAC;QACtEC,MAAA,GAAS,MAAMF,OAAA,CAAQV,aAAA,CAAc,yBAAyB,CAAC;MACrEhB,MAAA,CAAO4B,MAAM,EAAEC,QAAA,CAAS,GACxB7B,MAAA,CAAOqB,YAAA,CAAaC,UAAU,EAAEQ,GAAA,CAAIC,gBAAA,CAAiB;IACvD,CAAC,GAED9B,EAAA,CAAG,8CAA8C,YAAY;MAC3D,MAAM;UAAEyB;QAAQ,IAAItB,mBAAA,CAAoBiB,YAAA,EAAc;UAAEM,UAAA,EAAY;QAAO,CAAC;QACtEC,MAAA,GAAS,MAAMF,OAAA,CAAQV,aAAA,CAAc,eAAe,CAAC;MAC3DhB,MAAA,CAAO4B,MAAM,EAAEC,QAAA,CAAS,GACxB7B,MAAA,CAAOqB,YAAA,CAAaC,UAAU,EAAEQ,GAAA,CAAIC,gBAAA,CAAiB;IACvD,CAAC,GAED9B,EAAA,CAAG,8EAA8E,YAAY;MAC3F,MAAM;QAAEyB;MAAQ,IAAItB,mBAAA,CAAoBiB,YAAA,EAAc;QAAEM,UAAA,EAAY;MAAO,CAAC;MAC5E,MAAMD,OAAA,CAAQV,aAAA,CAAc,eAAe,CAAC,GAC5ChB,MAAA,CAAOqB,YAAA,CAAaC,UAAU,EAAES,gBAAA,CAAiB;IACnD,CAAC,GAED9B,EAAA,CAAG,kDAAkD,YAAY;MAC/D,MAAM;QAAEyB;MAAQ,IAAItB,mBAAA,CAAoBiB,YAAA,EAAc;QAAEM,UAAA,EAAY;MAAO,CAAC;MAC5E,MAAMD,OAAA,CAAQV,aAAA,CAAc,aAAa,CAAC,GAC1ChB,MAAA,CAAOqB,YAAA,CAAaC,UAAU,EAAES,gBAAA,CAAiB;IACnD,CAAC,GAED9B,EAAA,CAAG,4DAA4D,YAAY;MACzE,MAAM+B,sBAAA,GAAyB;UAC7BV,UAAA,EAAYpB,EAAA,CAAGqB,EAAA,CAAG,EAAEC,iBAAA,CAAkB,eAAe;UACrDS,YAAA,EAAc/B,EAAA,CAAGqB,EAAA,CAAG,EAAEC,iBAAA,CAAkB,aAAa;QACvD;QACM;UAAEE;QAAQ,IAAItB,mBAAA,CAAoB4B,sBAAA,EAAwB;
|
|
1
|
+
{"version":3,"names":["describe","expect","it","vi","beforeEach","createHandleRequest","mock","getManifest","pageRoutes","file","page","namedRegex","routeKeys","nxtPslug","type","middlewares","apiRoutes","createRequest","path","Request","headers","host","mockHandlers","handlePage","fn","mockResolvedValue","clearAllMocks","handler","routerRoot","result","toBeNull","not","toHaveBeenCalled","mockHandlersWithLoader","handleLoader"],"sources":["../../src/createHandleRequest.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["describe","expect","it","vi","beforeEach","createHandleRequest","mock","getManifest","pageRoutes","file","page","namedRegex","routeKeys","nxtPslug","type","middlewares","apiRoutes","createRequest","path","Request","headers","host","mockHandlers","handlePage","fn","mockResolvedValue","clearAllMocks","handler","routerRoot","result","toBeNull","not","toHaveBeenCalled","mockHandlersWithLoader","handleLoader"],"sources":["../../src/createHandleRequest.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,EAAIC,EAAA,EAAIC,UAAA,QAAkB;AACrD,SAASC,mBAAA,QAA2B;AAGpCF,EAAA,CAAGG,IAAA,CAAK,sBAAsB,YAAO;EACnC;IACEC,WAAA,EAAY,SAAAA,CAAA;MACV;QACEC,UAAM,GACN;UACAC,IAAA,kBAAY;UACZC,IAAA,WAAa;UACbC,UAAM;UACNC,SAAa,EAAC;YAChBC,QAAA;UACA;UACEC,IAAM;UACNC,WAAM;QACN,GACA;UACAN,IAAM;UACNC,IAAA,KAAa;UACfC,UAAA;UACFC,SAAA;UACAE,IAAY;UACdC,WAAA;QACA,EAEO;QACPC,SAAW;MACT;IAAS;EACD;AACR,EACF;AACF,SAAAC,cAAAC,IAAA;EAEA,OAAS,IAAAC,OAAA,yBAA6BD,IAAA;IACpCE,OAAM;MACJC,IAAA;IACF;EAEA;AACE;AAAiBrB,QAGnB,sBAAS;EACP,IAAAsB,YAAG;IACDC,UAAQ,EAAApB,EAAA,CAAAqB,EAAA,CAAQ,EAAAC,iBAAI,gBAAoB;EAExC;EACqDrB,UAGpD;IACDD,EAAA,CAAAuB,aAAQ,EAAQ;EAEhB,IAAA1B,QAAO,kCACA,cAAa;IACtBE,EAAC,uDAEE,oBAAmE;MACpE;UAAMyB;QAAE,IAAQtB,mBAAI,CAAAiB,YAAoB;UAExCM,UAAO,EAAM;QAEd,EAED;QAAAC,MAAG,SAAAF,OAAA,CAAAV,aAAA;MACDhB,MAAM,CAAA4B,MAAE,EAAAC,QAAY,IAAA7B,MAAA,CAAAqB,YAAoB,CAAAC,UAAgB,EAAAQ,GAAA,CAAAC,gBAClD;IACN,IAAA9B,EAAA,oDACoB,EAAU,kBAAM;MACrC,IAED;UAAGyB;QAAA,IAAAtB,mBAAA,CAAAiB,YAAA;UACDM,UAAQ;QAER;QAAAC,MAAO,GAAM,MAAEF,OAAS,CACxBV,aAAO,YAAa;MACrBhB,MAEE,CAAA4B,MAAA,EAAAC,QAAA,IAAA7B,MAAA,CAAAqB,YAAA,CAAAC,UAA8C,EAAAQ,GAAA,CAAYC,gBAAA;IAC3D,IAAA9B,EAAA,sDAAwD,oBAAoB;MAE5E;UAAAyB;QAAa,CAAE,GAAAtB,mBACR,CAAAiB,YAAa;UAGtBM,UAAG;QACD;QAAAC,MAAQ,SAAQF,OAAI,CAAAV,aAAoB,cAAc,EAAE;MACxDhB,MAAM,CAAA4B,MAAA,CAAQ,CAAAC,QAAA,IAAA7B,MAAc,CAAAqB,YAAgB,CAC5CC,UAAO,EAAAQ,GAAA,CAAAC,gBAAyB;IAClC,CAAC,GAED9B,EAAA,CAAG,qDAAkD,oBAAY;MAC/D;UAAMyB;QAAE,IAAQtB,mBAAI,CAAAiB,YAAoB;UACxCM,UAAM,EAAQ;QAEf,EAED;QAAAC,MAAG,SAAAF,OAAA,CAAAV,aAAA;MACDhB,MAAM,CAAA4B,MAAA,EAAAC,QAAA,IAAA7B,MAAyB,CAAAqB,YAAA,CAAAC,UAAA,EAAAQ,GAAA,CAAAC,gBAAA;IAAA,IAC7B9B,EAAA,gDAAsC,oBAAe;MAAA,IACrD;UAAAyB;QAAA,IAActB,mBAAQ,CAAAiB,YAAkB;UAC1CM,UACQ,EAAQ;
|
|
1
|
+
{"version":3,"names":["describe","expect","it","vi","beforeEach","createHandleRequest","mock","getManifest","pageRoutes","file","page","namedRegex","routeKeys","nxtPslug","type","middlewares","apiRoutes","createRequest","path","Request","headers","host","mockHandlers","handlePage","fn","mockResolvedValue","clearAllMocks","handler","routerRoot","result","toBeNull","not","toHaveBeenCalled","mockHandlersWithLoader","handleLoader"],"sources":["../../src/createHandleRequest.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["devtoolsRegistry","registerDevtoolsFunction","key","fn"],"sources":["../../../src/devtools/registry.ts"],"sourcesContent":[null],"mappings":"AAUO,MAAMA,gBAAA,GAAqC,CAAC;AAK5C,SAASC,yBACdC,GAAA,EACAC,EAAA,EACA;EACAH,gBAAA,CAAiBE,GAAG,IAAIC,EAAA;AAC1B","ignoreList":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["devtoolsRegistry","registerDevtoolsFunction","key","fn"],"sources":["../../../src/devtools/registry.ts"],"sourcesContent":[null],"mappings":"AAUO,IAAAA,gBAAM,KAAqC;AAK3C,SAASC,yBACdC,GAAA,EACAC,EAAA,EACA;EACAH,gBAAA,CAAiBE,GAAG,IAAIC,EAAA;AAC1B","ignoreList":[]}
|
|
@@ -25,17 +25,35 @@ function createMemoryHistory() {
|
|
|
25
25
|
return i;
|
|
26
26
|
return -1;
|
|
27
27
|
},
|
|
28
|
-
|
|
28
|
+
// @modified - added displayPath parameter for route masking
|
|
29
|
+
push({
|
|
30
|
+
path,
|
|
31
|
+
state,
|
|
32
|
+
displayPath
|
|
33
|
+
}) {
|
|
29
34
|
interrupt();
|
|
30
35
|
const id = nanoid();
|
|
31
|
-
items = items.slice(0, index + 1), items.push({ path, state, id }), index = items.length - 1
|
|
36
|
+
items = items.slice(0, index + 1), items.push({ path, state, id, displayPath }), index = items.length - 1;
|
|
37
|
+
const urlPath = displayPath ?? path;
|
|
38
|
+
process.env.ONE_DEBUG_ROUTER && console.info(
|
|
39
|
+
`[one] \u{1F4DC} history.push path=${path}${displayPath ? ` displayPath=${displayPath}` : ""}`
|
|
40
|
+
), window.history.pushState({ id }, "", urlPath);
|
|
32
41
|
},
|
|
33
|
-
|
|
42
|
+
// @modified - added displayPath parameter for route masking
|
|
43
|
+
replace({
|
|
44
|
+
path,
|
|
45
|
+
state,
|
|
46
|
+
displayPath
|
|
47
|
+
}) {
|
|
34
48
|
interrupt();
|
|
35
49
|
const id = window.history.state?.id ?? nanoid();
|
|
36
50
|
let pathWithHash = path;
|
|
37
51
|
const hash = pathWithHash.includes("#") ? "" : location.hash;
|
|
38
|
-
!items.length || items.findIndex((item) => item.id === id) < 0 ? (pathWithHash = pathWithHash + hash, items = [{ path: pathWithHash, state, id }], index = 0) : (items[index].path === path && (pathWithHash = pathWithHash + hash), items[index] = { path, state, id
|
|
52
|
+
!items.length || items.findIndex((item) => item.id === id) < 0 ? (pathWithHash = pathWithHash + hash, items = [{ path: pathWithHash, state, id, displayPath }], index = 0) : (items[index].path === path && (pathWithHash = pathWithHash + hash), items[index] = { path, state, id, displayPath });
|
|
53
|
+
const urlPath = displayPath ? displayPath + hash : pathWithHash;
|
|
54
|
+
process.env.ONE_DEBUG_ROUTER && console.info(
|
|
55
|
+
`[one] \u{1F4DC} history.replace path=${pathWithHash}${displayPath ? ` displayPath=${displayPath}` : ""}`
|
|
56
|
+
), window.history.replaceState({ id }, "", urlPath);
|
|
39
57
|
},
|
|
40
58
|
// `history.go(n)` is asynchronous, there are couple of things to keep in mind:
|
|
41
59
|
// - it won't do anything if we can't go `n` steps, the `popstate` event won't fire.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/fork/createMemoryHistory.tsx"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["index"]
|
|
6
6
|
}
|
|
@@ -27,23 +27,30 @@ function createMemoryHistory() {
|
|
|
27
27
|
for (let i = index - 1; i >= 0; i--) if (items[i].path === path) return i;
|
|
28
28
|
return -1;
|
|
29
29
|
},
|
|
30
|
+
// @modified - added displayPath parameter for route masking
|
|
30
31
|
push({
|
|
31
32
|
path,
|
|
32
|
-
state
|
|
33
|
+
state,
|
|
34
|
+
displayPath
|
|
33
35
|
}) {
|
|
34
36
|
interrupt();
|
|
35
37
|
const id = nanoid();
|
|
36
38
|
items = items.slice(0, index + 1), items.push({
|
|
37
39
|
path,
|
|
38
40
|
state,
|
|
41
|
+
id,
|
|
42
|
+
displayPath
|
|
43
|
+
}), index = items.length - 1;
|
|
44
|
+
const urlPath = displayPath ?? path;
|
|
45
|
+
process.env.ONE_DEBUG_ROUTER && console.info(`[one] \u{1F4DC} history.push path=${path}${displayPath ? ` displayPath=${displayPath}` : ""}`), window.history.pushState({
|
|
39
46
|
id
|
|
40
|
-
}
|
|
41
|
-
id
|
|
42
|
-
}, "", path);
|
|
47
|
+
}, "", urlPath);
|
|
43
48
|
},
|
|
49
|
+
// @modified - added displayPath parameter for route masking
|
|
44
50
|
replace({
|
|
45
51
|
path,
|
|
46
|
-
state
|
|
52
|
+
state,
|
|
53
|
+
displayPath
|
|
47
54
|
}) {
|
|
48
55
|
interrupt();
|
|
49
56
|
const id = window.history.state?.id ?? nanoid();
|
|
@@ -52,14 +59,18 @@ function createMemoryHistory() {
|
|
|
52
59
|
!items.length || items.findIndex(item => item.id === id) < 0 ? (pathWithHash = pathWithHash + hash, items = [{
|
|
53
60
|
path: pathWithHash,
|
|
54
61
|
state,
|
|
55
|
-
id
|
|
62
|
+
id,
|
|
63
|
+
displayPath
|
|
56
64
|
}], index = 0) : (items[index].path === path && (pathWithHash = pathWithHash + hash), items[index] = {
|
|
57
65
|
path,
|
|
58
66
|
state,
|
|
67
|
+
id,
|
|
68
|
+
displayPath
|
|
69
|
+
});
|
|
70
|
+
const urlPath = displayPath ? displayPath + hash : pathWithHash;
|
|
71
|
+
process.env.ONE_DEBUG_ROUTER && console.info(`[one] \u{1F4DC} history.replace path=${pathWithHash}${displayPath ? ` displayPath=${displayPath}` : ""}`), window.history.replaceState({
|
|
59
72
|
id
|
|
60
|
-
}
|
|
61
|
-
id
|
|
62
|
-
}, "", pathWithHash);
|
|
73
|
+
}, "", urlPath);
|
|
63
74
|
},
|
|
64
75
|
// `history.go(n)` is asynchronous, there are couple of things to keep in mind:
|
|
65
76
|
// - it won't do anything if we can't go `n` steps, the `popstate` event won't fire.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","id","window","history","state","index2","findIndex","item","get","backIndex","path","i","push","slice","length","process","env","ONE_DEBUG_ROUTER","console","info","pushState","replace","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document","ref","setTimeout","splice","onPopState","currentIndex","Math","max","last","pop","removeEventListener","addEventListener","listen","listener"],"sources":["../../../src/fork/createMemoryHistory.tsx"],"sourcesContent":[null],"mappings":"
|
|
1
|
+
{"version":3,"names":["nanoid","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","id","window","history","state","index2","findIndex","item","get","backIndex","path","i","push","displayPath","slice","length","urlPath","process","env","ONE_DEBUG_ROUTER","console","info","pushState","replace","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document","ref","setTimeout","splice","onPopState","currentIndex","Math","max","last","pop","removeEventListener","addEventListener","listen","listener"],"sources":["../../../src/fork/createMemoryHistory.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -35,25 +35,32 @@ function createMemoryHistory() {
|
|
|
35
35
|
}
|
|
36
36
|
return -1;
|
|
37
37
|
},
|
|
38
|
+
// @modified - added displayPath parameter for route masking
|
|
38
39
|
push(param) {
|
|
39
40
|
var {
|
|
40
41
|
path,
|
|
41
|
-
state
|
|
42
|
+
state,
|
|
43
|
+
displayPath
|
|
42
44
|
} = param;
|
|
43
45
|
interrupt();
|
|
44
46
|
var id = nanoid();
|
|
45
47
|
items = items.slice(0, index + 1), items.push({
|
|
46
48
|
path,
|
|
47
49
|
state,
|
|
50
|
+
id,
|
|
51
|
+
displayPath
|
|
52
|
+
}), index = items.length - 1;
|
|
53
|
+
var urlPath = displayPath ?? path;
|
|
54
|
+
process.env.ONE_DEBUG_ROUTER && console.info(`[one] \u{1F4DC} history.push path=${path}${displayPath ? ` displayPath=${displayPath}` : ""}`), window.history.pushState({
|
|
48
55
|
id
|
|
49
|
-
}
|
|
50
|
-
id
|
|
51
|
-
}, "", path);
|
|
56
|
+
}, "", urlPath);
|
|
52
57
|
},
|
|
58
|
+
// @modified - added displayPath parameter for route masking
|
|
53
59
|
replace(param) {
|
|
54
60
|
var {
|
|
55
61
|
path,
|
|
56
|
-
state
|
|
62
|
+
state,
|
|
63
|
+
displayPath
|
|
57
64
|
} = param,
|
|
58
65
|
_window_history_state;
|
|
59
66
|
interrupt();
|
|
@@ -66,14 +73,18 @@ function createMemoryHistory() {
|
|
|
66
73
|
}) < 0 ? (pathWithHash = pathWithHash + hash, items = [{
|
|
67
74
|
path: pathWithHash,
|
|
68
75
|
state,
|
|
69
|
-
id
|
|
76
|
+
id,
|
|
77
|
+
displayPath
|
|
70
78
|
}], index = 0) : (items[index].path === path && (pathWithHash = pathWithHash + hash), items[index] = {
|
|
71
79
|
path,
|
|
72
80
|
state,
|
|
81
|
+
id,
|
|
82
|
+
displayPath
|
|
83
|
+
});
|
|
84
|
+
var urlPath = displayPath ? displayPath + hash : pathWithHash;
|
|
85
|
+
process.env.ONE_DEBUG_ROUTER && console.info(`[one] \u{1F4DC} history.replace path=${pathWithHash}${displayPath ? ` displayPath=${displayPath}` : ""}`), window.history.replaceState({
|
|
73
86
|
id
|
|
74
|
-
}
|
|
75
|
-
id
|
|
76
|
-
}, "", pathWithHash);
|
|
87
|
+
}, "", urlPath);
|
|
77
88
|
},
|
|
78
89
|
// `history.go(n)` is asynchronous, there are couple of things to keep in mind:
|
|
79
90
|
// - it won't do anything if we can't go `n` steps, the `popstate` event won't fire.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","_window_history_state","id","window","state","index1","findIndex","item","get","index2","backIndex","param","path","i","push","slice","length","process","env","ONE_DEBUG_ROUTER","console","info","pushState","replace","_window_history_state_id","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document"],"sources":["../../../src/fork/createMemoryHistory.tsx"],"sourcesContent":[null],"mappings":"
|
|
1
|
+
{"version":3,"names":["nanoid","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","_window_history_state","id","window","state","index1","findIndex","item","get","index2","backIndex","param","path","i","push","displayPath","slice","length","urlPath","process","env","ONE_DEBUG_ROUTER","console","info","pushState","replace","_window_history_state_id","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document","ref","setTimeout","splice"],"sources":["../../../src/fork/createMemoryHistory.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
import isEqual from "fast-deep-equal";
|
|
9
9
|
import * as React from "react";
|
|
10
10
|
import { rootState as routerRootState } from "../router/router";
|
|
11
|
+
import { stripGroupSegmentsFromPath } from "../router/matchers";
|
|
11
12
|
import { ServerLocationContext } from "../router/serverLocationContext";
|
|
12
13
|
import { createMemoryHistory } from "./createMemoryHistory";
|
|
13
14
|
import { appendBaseUrl } from "./getPathFromState-mods";
|
|
@@ -83,7 +84,7 @@ function useLinking(ref, {
|
|
|
83
84
|
`[one] \u{1F4DC} history.listen path=${path} index=${index} prevIndex=${previousIndex}`
|
|
84
85
|
), previousIndexRef.current = index, pendingPopStatePathRef.current = path;
|
|
85
86
|
const record = history.get(index);
|
|
86
|
-
if (record?.path === path && record?.state) {
|
|
87
|
+
if ((record?.path === path || record?.displayPath === path) && record?.state) {
|
|
87
88
|
process.env.ONE_DEBUG_ROUTER && console.info("[one] \u{1F4DC} history record found, resetRoot to:", record.state), navigation.resetRoot(record.state);
|
|
88
89
|
return;
|
|
89
90
|
}
|
|
@@ -148,7 +149,7 @@ function useLinking(ref, {
|
|
|
148
149
|
const previousState = previousStateRef.current, refState = navigation.getRootState(), state = routerRootState || refState;
|
|
149
150
|
if (!state)
|
|
150
151
|
return;
|
|
151
|
-
const pendingPath = pendingPopStatePathRef.current, route = findFocusedRoute(state), path = getPathForRoute(route, state);
|
|
152
|
+
const pendingPath = pendingPopStatePathRef.current, route = findFocusedRoute(state), path = getPathForRoute(route, state), maskHref = state.linkOptions?.mask?.href, displayPath = maskHref ? appendBaseUrl(stripGroupSegmentsFromPath(maskHref) || "/") : void 0;
|
|
152
153
|
previousStateRef.current = refState, pendingPopStatePathRef.current = void 0;
|
|
153
154
|
const [previousFocusedState, focusedState] = findMatchingState(previousState, state);
|
|
154
155
|
if (previousFocusedState && focusedState && // We should only handle push/pop if path changed from what was in last `popstate`
|
|
@@ -156,7 +157,7 @@ function useLinking(ref, {
|
|
|
156
157
|
path !== pendingPath) {
|
|
157
158
|
const historyDelta = (focusedState.history ? focusedState.history.length : focusedState.routes.length) - (previousFocusedState.history ? previousFocusedState.history.length : previousFocusedState.routes.length);
|
|
158
159
|
if (historyDelta > 0)
|
|
159
|
-
history.push({ path, state });
|
|
160
|
+
history.push({ path, state, displayPath });
|
|
160
161
|
else if (historyDelta < 0) {
|
|
161
162
|
const nextIndex = history.backIndex({ path }), currentIndex = history.index;
|
|
162
163
|
try {
|
|
@@ -165,9 +166,9 @@ function useLinking(ref, {
|
|
|
165
166
|
} catch {
|
|
166
167
|
}
|
|
167
168
|
} else
|
|
168
|
-
history.replace({ path, state });
|
|
169
|
+
history.replace({ path, state, displayPath });
|
|
169
170
|
} else
|
|
170
|
-
history.replace({ path, state });
|
|
171
|
+
history.replace({ path, state, displayPath });
|
|
171
172
|
};
|
|
172
173
|
return ref.current?.addListener("state", series(onStateChange));
|
|
173
174
|
}, [enabled, history, ref]), {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/fork/useLinking.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["location"]
|
|
6
6
|
}
|