@bleedingdev/modern-js-runtime 3.2.0-ultramodern.98 → 3.4.0-ultramodern.0
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/boundary-debugger/index.js +19 -11
- package/dist/cjs/cache/index.js +9 -5
- package/dist/cjs/cli/alias.js +9 -5
- package/dist/cjs/cli/code.js +9 -5
- package/dist/cjs/cli/constants.js +20 -16
- package/dist/cjs/cli/entry.js +9 -5
- package/dist/cjs/cli/index.js +20 -5
- package/dist/cjs/cli/ssr/index.js +9 -5
- package/dist/cjs/cli/ssr/loadable-bundler-plugin.js +9 -5
- package/dist/cjs/cli/ssr/mode.js +12 -8
- package/dist/cjs/cli/template.js +9 -5
- package/dist/cjs/cli/template.server.js +9 -5
- package/dist/cjs/common.js +14 -10
- package/dist/cjs/core/browser/hydrate.js +9 -5
- package/dist/cjs/core/browser/index.js +9 -5
- package/dist/cjs/core/browser/withCallback.js +9 -5
- package/dist/cjs/core/compat/hooks.js +14 -10
- package/dist/cjs/core/compat/index.js +9 -5
- package/dist/cjs/core/compat/requestContext.js +13 -9
- package/dist/cjs/core/config.js +12 -8
- package/dist/cjs/core/constants.js +15 -10
- package/dist/cjs/core/context/extensions.js +69 -0
- package/dist/cjs/core/context/helmetContext.js +54 -0
- package/dist/cjs/core/context/index.js +74 -5
- package/dist/cjs/core/context/monitors/default.js +12 -8
- package/dist/cjs/core/context/monitors/index.js +9 -5
- package/dist/cjs/core/context/monitors/index.server.js +9 -5
- package/dist/cjs/core/context/request/index.js +12 -8
- package/dist/cjs/core/context/request/index.server.js +9 -5
- package/dist/cjs/core/context/response/index.js +15 -11
- package/dist/cjs/core/context/response/index.server.js +9 -5
- package/dist/cjs/core/context/runtime.js +9 -5
- package/dist/cjs/core/context/serverPayload/index.js +13 -9
- package/dist/cjs/core/context/serverPayload/index.server.js +9 -5
- package/dist/cjs/core/index.js +9 -5
- package/dist/cjs/core/plugin/index.js +9 -5
- package/dist/cjs/core/react/index.js +9 -5
- package/dist/cjs/core/react/wrapper.js +15 -9
- package/dist/cjs/core/server/constants.js +15 -11
- package/dist/cjs/core/server/federatedCss.js +11 -7
- package/dist/cjs/core/server/helmet.js +11 -6
- package/dist/cjs/core/server/index.js +9 -5
- package/dist/cjs/core/server/react/index.js +9 -5
- package/dist/cjs/core/server/react/no-ssr-cache/index.js +9 -5
- package/dist/cjs/core/server/react/nossr/index.js +9 -5
- package/dist/cjs/core/server/requestHandler.js +51 -34
- package/dist/cjs/core/server/routerCleanup.js +110 -0
- package/dist/cjs/core/server/scriptOrder.js +84 -9
- package/dist/cjs/core/server/server.js +9 -5
- package/dist/cjs/core/server/shared.js +12 -8
- package/dist/cjs/core/server/stream/afterTemplate.js +15 -23
- package/dist/cjs/core/server/stream/beforeTemplate.js +11 -7
- package/dist/cjs/core/server/stream/beforeTemplate.worker.js +10 -6
- package/dist/cjs/core/server/stream/createReadableStream.js +16 -10
- package/dist/cjs/core/server/stream/createReadableStream.worker.js +15 -7
- package/dist/cjs/core/server/stream/deferredScript.js +13 -6
- package/dist/cjs/core/server/stream/index.js +9 -5
- package/dist/cjs/core/server/stream/shared.js +9 -5
- package/dist/cjs/core/server/stream/template.js +9 -5
- package/dist/cjs/core/server/string/index.js +10 -12
- package/dist/cjs/core/server/string/loadable.js +24 -54
- package/dist/cjs/core/server/string/ssrData.js +10 -6
- package/dist/cjs/core/server/tracer.js +13 -9
- package/dist/cjs/core/server/utils.js +63 -13
- package/dist/cjs/document/Body.js +9 -5
- package/dist/cjs/document/Comment.js +9 -5
- package/dist/cjs/document/DocumentContext.js +9 -5
- package/dist/cjs/document/DocumentStructureContext.js +9 -5
- package/dist/cjs/document/Head.js +9 -5
- package/dist/cjs/document/Html.js +9 -5
- package/dist/cjs/document/Links.js +9 -5
- package/dist/cjs/document/Root.js +9 -5
- package/dist/cjs/document/Script.js +9 -5
- package/dist/cjs/document/Scripts.js +9 -5
- package/dist/cjs/document/Style.js +9 -5
- package/dist/cjs/document/Title.js +9 -5
- package/dist/cjs/document/cli/index.js +14 -11
- package/dist/cjs/document/constants.js +9 -5
- package/dist/cjs/document/index.js +9 -5
- package/dist/cjs/exports/config-routes.js +12 -8
- package/dist/cjs/exports/head.js +153 -83
- package/dist/cjs/exports/loadable.js +27 -18
- package/dist/cjs/exports/tanstack-router.js +50 -58
- package/dist/cjs/index.js +9 -5
- package/dist/cjs/internal.js +9 -5
- package/dist/cjs/module-federation/index.js +178 -0
- package/dist/cjs/react-server.js +9 -5
- package/dist/cjs/router/cli/code/getClientRoutes/getRoutes.js +9 -5
- package/dist/cjs/router/cli/code/getClientRoutes/index.js +9 -5
- package/dist/cjs/router/cli/code/getClientRoutes/utils.js +9 -5
- package/dist/cjs/router/cli/code/index.js +16 -52
- package/dist/cjs/router/cli/code/inspect.js +9 -5
- package/dist/cjs/router/cli/code/makeLegalIdentifier.js +12 -8
- package/dist/cjs/router/cli/code/nestedRoutes.js +9 -5
- package/dist/cjs/router/cli/code/templates.js +10 -19
- package/dist/cjs/router/cli/code/utils.js +9 -5
- package/dist/cjs/router/cli/config-routes/converter.js +9 -5
- package/dist/cjs/router/cli/config-routes/parseRouteConfig.js +9 -5
- package/dist/cjs/router/cli/constants.js +23 -19
- package/dist/cjs/router/cli/entry.js +9 -5
- package/dist/cjs/router/cli/handler.js +10 -6
- package/dist/cjs/router/cli/index.js +11 -29
- package/dist/cjs/router/index.js +9 -5
- package/dist/cjs/router/internal.js +12 -8
- package/dist/cjs/router/runtime/CSSLinks.js +9 -5
- package/dist/cjs/router/runtime/DefaultNotFound.js +9 -5
- package/dist/cjs/router/runtime/DeferredDataScripts.js +12 -8
- package/dist/cjs/router/runtime/DeferredDataScripts.node.js +25 -9
- package/dist/cjs/router/runtime/PrefetchLink.js +161 -26
- package/dist/cjs/router/runtime/constants.js +9 -5
- package/dist/cjs/router/runtime/hooks.js +9 -5
- package/dist/cjs/router/runtime/index.js +15 -10
- package/dist/cjs/router/runtime/internal.js +29 -18
- package/dist/cjs/router/runtime/lifecycle.js +38 -19
- package/dist/cjs/router/runtime/plugin.js +11 -14
- package/dist/cjs/router/runtime/plugin.node.js +11 -12
- package/dist/cjs/router/runtime/provider.js +107 -0
- package/dist/cjs/router/runtime/routerHelper.js +9 -5
- package/dist/cjs/router/runtime/rsc-router.js +19 -9
- package/dist/cjs/router/runtime/rsc.js +9 -5
- package/dist/cjs/router/runtime/server.js +9 -5
- package/dist/cjs/router/runtime/utils.js +44 -15
- package/dist/cjs/router/runtime/withRouter.js +9 -5
- package/dist/cjs/rsc/client.js +12 -8
- package/dist/cjs/rsc/server.js +9 -5
- package/dist/cjs/rsc/server.worker.js +9 -5
- package/dist/esm/boundary-debugger/index.mjs +10 -6
- package/dist/esm/cli/index.mjs +4 -2
- package/dist/esm/core/context/extensions.mjs +28 -0
- package/dist/esm/core/context/helmetContext.mjs +13 -0
- package/dist/esm/core/context/index.mjs +5 -0
- package/dist/esm/core/react/wrapper.mjs +6 -4
- package/dist/esm/core/server/federatedCss.mjs +2 -2
- package/dist/esm/core/server/helmet.mjs +2 -1
- package/dist/esm/core/server/requestHandler.mjs +43 -30
- package/dist/esm/core/server/routerCleanup.mjs +66 -0
- package/dist/esm/core/server/scriptOrder.mjs +62 -3
- package/dist/esm/core/server/stream/afterTemplate.mjs +8 -20
- package/dist/esm/core/server/stream/beforeTemplate.mjs +3 -3
- package/dist/esm/core/server/stream/beforeTemplate.worker.mjs +1 -1
- package/dist/esm/core/server/stream/createReadableStream.mjs +7 -5
- package/dist/esm/core/server/stream/createReadableStream.worker.mjs +6 -2
- package/dist/esm/core/server/stream/deferredScript.mjs +4 -1
- package/dist/esm/core/server/string/index.mjs +3 -9
- package/dist/esm/core/server/string/loadable.mjs +14 -48
- package/dist/esm/core/server/string/ssrData.mjs +2 -2
- package/dist/esm/core/server/utils.mjs +52 -9
- package/dist/esm/document/cli/index.mjs +5 -6
- package/dist/esm/exports/head.mjs +144 -78
- package/dist/esm/exports/loadable.mjs +12 -6
- package/dist/esm/exports/tanstack-router.mjs +30 -3
- package/dist/esm/module-federation/index.mjs +109 -0
- package/dist/esm/router/cli/code/index.mjs +8 -48
- package/dist/esm/router/cli/code/templates.mjs +1 -14
- package/dist/esm/router/cli/handler.mjs +1 -1
- package/dist/esm/router/cli/index.mjs +3 -25
- package/dist/esm/router/runtime/DeferredDataScripts.node.mjs +16 -4
- package/dist/esm/router/runtime/PrefetchLink.mjs +152 -21
- package/dist/esm/router/runtime/internal.mjs +16 -15
- package/dist/esm/router/runtime/lifecycle.mjs +22 -13
- package/dist/esm/router/runtime/plugin.mjs +4 -11
- package/dist/esm/router/runtime/plugin.node.mjs +4 -9
- package/dist/esm/router/runtime/provider.mjs +57 -0
- package/dist/esm/router/runtime/rsc-router.mjs +10 -4
- package/dist/esm/router/runtime/utils.mjs +35 -10
- package/dist/esm-node/boundary-debugger/index.mjs +10 -6
- package/dist/esm-node/cli/index.mjs +4 -2
- package/dist/esm-node/core/context/extensions.mjs +29 -0
- package/dist/esm-node/core/context/helmetContext.mjs +14 -0
- package/dist/esm-node/core/context/index.mjs +5 -0
- package/dist/esm-node/core/react/wrapper.mjs +6 -4
- package/dist/esm-node/core/server/federatedCss.mjs +2 -2
- package/dist/esm-node/core/server/helmet.mjs +2 -1
- package/dist/esm-node/core/server/requestHandler.mjs +43 -30
- package/dist/esm-node/core/server/routerCleanup.mjs +67 -0
- package/dist/esm-node/core/server/scriptOrder.mjs +62 -3
- package/dist/esm-node/core/server/stream/afterTemplate.mjs +8 -20
- package/dist/esm-node/core/server/stream/beforeTemplate.mjs +3 -3
- package/dist/esm-node/core/server/stream/beforeTemplate.worker.mjs +1 -1
- package/dist/esm-node/core/server/stream/createReadableStream.mjs +7 -5
- package/dist/esm-node/core/server/stream/createReadableStream.worker.mjs +6 -2
- package/dist/esm-node/core/server/stream/deferredScript.mjs +4 -1
- package/dist/esm-node/core/server/string/index.mjs +3 -9
- package/dist/esm-node/core/server/string/loadable.mjs +14 -48
- package/dist/esm-node/core/server/string/ssrData.mjs +2 -2
- package/dist/esm-node/core/server/utils.mjs +52 -9
- package/dist/esm-node/document/cli/index.mjs +5 -6
- package/dist/esm-node/exports/head.mjs +144 -78
- package/dist/esm-node/exports/loadable.mjs +12 -6
- package/dist/esm-node/exports/tanstack-router.mjs +30 -3
- package/dist/esm-node/module-federation/index.mjs +110 -0
- package/dist/esm-node/router/cli/code/index.mjs +8 -48
- package/dist/esm-node/router/cli/code/templates.mjs +1 -14
- package/dist/esm-node/router/cli/handler.mjs +1 -1
- package/dist/esm-node/router/cli/index.mjs +3 -25
- package/dist/esm-node/router/runtime/DeferredDataScripts.node.mjs +16 -4
- package/dist/esm-node/router/runtime/PrefetchLink.mjs +152 -21
- package/dist/esm-node/router/runtime/internal.mjs +16 -15
- package/dist/esm-node/router/runtime/lifecycle.mjs +22 -13
- package/dist/esm-node/router/runtime/plugin.mjs +4 -11
- package/dist/esm-node/router/runtime/plugin.node.mjs +4 -9
- package/dist/esm-node/router/runtime/provider.mjs +58 -0
- package/dist/esm-node/router/runtime/rsc-router.mjs +10 -4
- package/dist/esm-node/router/runtime/utils.mjs +35 -10
- package/dist/types/cli/entry.d.ts +2 -2
- package/dist/types/cli/index.d.ts +3 -1
- package/dist/types/core/context/extensions.d.ts +37 -0
- package/dist/types/core/context/helmetContext.d.ts +10 -0
- package/dist/types/core/context/index.d.ts +6 -0
- package/dist/types/core/context/response/index.server.d.ts +4 -1
- package/dist/types/core/context/runtime.d.ts +1 -11
- package/dist/types/core/plugin/index.d.ts +1 -1
- package/dist/types/core/server/routerCleanup.d.ts +28 -0
- package/dist/types/core/server/scriptOrder.d.ts +24 -0
- package/dist/types/core/server/string/loadable.d.ts +1 -7
- package/dist/types/core/server/utils.d.ts +19 -1
- package/dist/types/document/constants.d.ts +3 -1
- package/dist/types/exports/head.d.ts +4 -4
- package/dist/types/exports/loadable.d.ts +1 -1
- package/dist/types/exports/tanstack-router.d.ts +88 -5
- package/dist/types/module-federation/index.d.ts +65 -0
- package/dist/types/router/cli/code/index.d.ts +1 -3
- package/dist/types/router/cli/code/utils.d.ts +1 -1
- package/dist/types/router/cli/entry.d.ts +1 -1
- package/dist/types/router/cli/handler.d.ts +0 -3
- package/dist/types/router/runtime/DeferredDataScripts.d.ts +1 -1
- package/dist/types/router/runtime/PrefetchLink.d.ts +5 -1
- package/dist/types/router/runtime/internal.d.ts +1 -0
- package/dist/types/router/runtime/lifecycle.d.ts +2 -0
- package/dist/types/router/runtime/plugin.d.ts +1 -1
- package/dist/types/router/runtime/plugin.node.d.ts +1 -1
- package/dist/types/router/runtime/provider.d.ts +61 -0
- package/package.json +34 -26
- package/rstest.config.mts +2 -4
- package/dist/cjs/router/cli/code/tanstackTypes.js +0 -443
- package/dist/cjs/router/runtime/tanstack/basepathRewrite.js +0 -62
- package/dist/cjs/router/runtime/tanstack/dataMutation.js +0 -345
- package/dist/cjs/router/runtime/tanstack/hydrationBoundary.js +0 -43
- package/dist/cjs/router/runtime/tanstack/plugin.js +0 -240
- package/dist/cjs/router/runtime/tanstack/plugin.node.js +0 -268
- package/dist/cjs/router/runtime/tanstack/prefetchLink.js +0 -55
- package/dist/cjs/router/runtime/tanstack/routeTree.js +0 -510
- package/dist/cjs/router/runtime/tanstack/rsc/ClientSlot.js +0 -53
- package/dist/cjs/router/runtime/tanstack/rsc/CompositeComponent.js +0 -75
- package/dist/cjs/router/runtime/tanstack/rsc/ReplayableStream.js +0 -141
- package/dist/cjs/router/runtime/tanstack/rsc/RscNodeRenderer.js +0 -65
- package/dist/cjs/router/runtime/tanstack/rsc/SlotContext.js +0 -54
- package/dist/cjs/router/runtime/tanstack/rsc/client.js +0 -93
- package/dist/cjs/router/runtime/tanstack/rsc/createRscProxy.js +0 -141
- package/dist/cjs/router/runtime/tanstack/rsc/index.js +0 -42
- package/dist/cjs/router/runtime/tanstack/rsc/server.js +0 -246
- package/dist/cjs/router/runtime/tanstack/rsc/slotUsageSanitizer.js +0 -65
- package/dist/cjs/router/runtime/tanstack/rsc/symbols.js +0 -72
- package/dist/cjs/ssr/index.node.js +0 -121
- package/dist/cjs/ssr/serverRender/renderToStream/buildTemplate.after.js +0 -84
- package/dist/cjs/ssr/serverRender/renderToString/entry.js +0 -196
- package/dist/cjs/ssr/serverRender/types.js +0 -36
- package/dist/esm/router/cli/code/tanstackTypes.mjs +0 -396
- package/dist/esm/router/runtime/tanstack/basepathRewrite.mjs +0 -28
- package/dist/esm/router/runtime/tanstack/dataMutation.mjs +0 -305
- package/dist/esm/router/runtime/tanstack/hydrationBoundary.mjs +0 -9
- package/dist/esm/router/runtime/tanstack/plugin.mjs +0 -206
- package/dist/esm/router/runtime/tanstack/plugin.node.mjs +0 -234
- package/dist/esm/router/runtime/tanstack/prefetchLink.mjs +0 -18
- package/dist/esm/router/runtime/tanstack/routeTree.mjs +0 -470
- package/dist/esm/router/runtime/tanstack/rsc/ClientSlot.mjs +0 -19
- package/dist/esm/router/runtime/tanstack/rsc/CompositeComponent.mjs +0 -41
- package/dist/esm/router/runtime/tanstack/rsc/ReplayableStream.mjs +0 -104
- package/dist/esm/router/runtime/tanstack/rsc/RscNodeRenderer.mjs +0 -31
- package/dist/esm/router/runtime/tanstack/rsc/SlotContext.mjs +0 -17
- package/dist/esm/router/runtime/tanstack/rsc/client.mjs +0 -53
- package/dist/esm/router/runtime/tanstack/rsc/createRscProxy.mjs +0 -107
- package/dist/esm/router/runtime/tanstack/rsc/index.mjs +0 -1
- package/dist/esm/router/runtime/tanstack/rsc/server.mjs +0 -200
- package/dist/esm/router/runtime/tanstack/rsc/slotUsageSanitizer.mjs +0 -31
- package/dist/esm/router/runtime/tanstack/rsc/symbols.mjs +0 -17
- package/dist/esm/ssr/index.node.mjs +0 -44
- package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.after.mjs +0 -50
- package/dist/esm/ssr/serverRender/renderToString/entry.mjs +0 -151
- package/dist/esm/ssr/serverRender/types.mjs +0 -1
- package/dist/esm-node/router/cli/code/tanstackTypes.mjs +0 -397
- package/dist/esm-node/router/runtime/tanstack/basepathRewrite.mjs +0 -29
- package/dist/esm-node/router/runtime/tanstack/dataMutation.mjs +0 -306
- package/dist/esm-node/router/runtime/tanstack/hydrationBoundary.mjs +0 -10
- package/dist/esm-node/router/runtime/tanstack/plugin.mjs +0 -207
- package/dist/esm-node/router/runtime/tanstack/plugin.node.mjs +0 -235
- package/dist/esm-node/router/runtime/tanstack/prefetchLink.mjs +0 -19
- package/dist/esm-node/router/runtime/tanstack/routeTree.mjs +0 -471
- package/dist/esm-node/router/runtime/tanstack/rsc/ClientSlot.mjs +0 -20
- package/dist/esm-node/router/runtime/tanstack/rsc/CompositeComponent.mjs +0 -42
- package/dist/esm-node/router/runtime/tanstack/rsc/ReplayableStream.mjs +0 -105
- package/dist/esm-node/router/runtime/tanstack/rsc/RscNodeRenderer.mjs +0 -32
- package/dist/esm-node/router/runtime/tanstack/rsc/SlotContext.mjs +0 -18
- package/dist/esm-node/router/runtime/tanstack/rsc/client.mjs +0 -54
- package/dist/esm-node/router/runtime/tanstack/rsc/createRscProxy.mjs +0 -108
- package/dist/esm-node/router/runtime/tanstack/rsc/index.mjs +0 -2
- package/dist/esm-node/router/runtime/tanstack/rsc/server.mjs +0 -201
- package/dist/esm-node/router/runtime/tanstack/rsc/slotUsageSanitizer.mjs +0 -32
- package/dist/esm-node/router/runtime/tanstack/rsc/symbols.mjs +0 -18
- package/dist/esm-node/ssr/index.node.mjs +0 -45
- package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.after.mjs +0 -51
- package/dist/esm-node/ssr/serverRender/renderToString/entry.mjs +0 -152
- package/dist/esm-node/ssr/serverRender/types.mjs +0 -2
- package/dist/types/router/cli/code/tanstackTypes.d.ts +0 -10
- package/dist/types/router/runtime/tanstack/basepathRewrite.d.ts +0 -8
- package/dist/types/router/runtime/tanstack/dataMutation.d.ts +0 -29
- package/dist/types/router/runtime/tanstack/hydrationBoundary.d.ts +0 -2
- package/dist/types/router/runtime/tanstack/plugin.d.ts +0 -6
- package/dist/types/router/runtime/tanstack/plugin.node.d.ts +0 -6
- package/dist/types/router/runtime/tanstack/prefetchLink.d.ts +0 -11
- package/dist/types/router/runtime/tanstack/routeTree.d.ts +0 -8
- package/dist/types/router/runtime/tanstack/rsc/ClientSlot.d.ts +0 -5
- package/dist/types/router/runtime/tanstack/rsc/CompositeComponent.d.ts +0 -3
- package/dist/types/router/runtime/tanstack/rsc/ReplayableStream.d.ts +0 -24
- package/dist/types/router/runtime/tanstack/rsc/RscNodeRenderer.d.ts +0 -5
- package/dist/types/router/runtime/tanstack/rsc/SlotContext.d.ts +0 -11
- package/dist/types/router/runtime/tanstack/rsc/client.d.ts +0 -11
- package/dist/types/router/runtime/tanstack/rsc/createRscProxy.d.ts +0 -7
- package/dist/types/router/runtime/tanstack/rsc/index.d.ts +0 -2
- package/dist/types/router/runtime/tanstack/rsc/server.d.ts +0 -14
- package/dist/types/router/runtime/tanstack/rsc/slotUsageSanitizer.d.ts +0 -2
- package/dist/types/router/runtime/tanstack/rsc/symbols.d.ts +0 -46
|
@@ -1,397 +0,0 @@
|
|
|
1
|
-
import "node:module";
|
|
2
|
-
import { findExists, formatImportPath, fs, slash } from "@modern-js/utils";
|
|
3
|
-
import path from "path";
|
|
4
|
-
import { makeLegalIdentifier } from "./makeLegalIdentifier.mjs";
|
|
5
|
-
import { getPathWithoutExt } from "./utils.mjs";
|
|
6
|
-
const JS_OR_TS_EXTS = [
|
|
7
|
-
'.js',
|
|
8
|
-
'.jsx',
|
|
9
|
-
'.ts',
|
|
10
|
-
'.tsx',
|
|
11
|
-
'.mjs',
|
|
12
|
-
'.mts',
|
|
13
|
-
'.cjs',
|
|
14
|
-
'.cts'
|
|
15
|
-
];
|
|
16
|
-
function toTanstackPath(pathname) {
|
|
17
|
-
return pathname.split('/').map((segment)=>{
|
|
18
|
-
if (!segment) return segment;
|
|
19
|
-
if ('*' === segment) return '$';
|
|
20
|
-
if (segment.startsWith(':')) {
|
|
21
|
-
const name = segment.slice(1);
|
|
22
|
-
if (name.endsWith('?')) return `{-$${name.slice(0, -1)}}`;
|
|
23
|
-
return `$${name}`;
|
|
24
|
-
}
|
|
25
|
-
return segment;
|
|
26
|
-
}).join('/');
|
|
27
|
-
}
|
|
28
|
-
async function resolveFileNoExt(inputNoExtPath) {
|
|
29
|
-
const file = findExists(JS_OR_TS_EXTS.map((ext)=>`${inputNoExtPath}${ext}`));
|
|
30
|
-
return file ? getPathWithoutExt(file) : null;
|
|
31
|
-
}
|
|
32
|
-
function quote(str) {
|
|
33
|
-
return JSON.stringify(str);
|
|
34
|
-
}
|
|
35
|
-
function normalizeRelativeImport(p) {
|
|
36
|
-
const normalized = formatImportPath(slash(p));
|
|
37
|
-
if (normalized.startsWith('.')) return normalized;
|
|
38
|
-
return `./${normalized}`;
|
|
39
|
-
}
|
|
40
|
-
function pickModernLoaderModule(route) {
|
|
41
|
-
const loaderPath = route.data || route.loader;
|
|
42
|
-
if (!loaderPath || 'string' != typeof loaderPath) return null;
|
|
43
|
-
const inline = Boolean(route.data);
|
|
44
|
-
return {
|
|
45
|
-
loaderPath,
|
|
46
|
-
inline
|
|
47
|
-
};
|
|
48
|
-
}
|
|
49
|
-
function isPathlessLayout(route) {
|
|
50
|
-
return 'nested' === route.type && 'boolean' != typeof route.index && void 0 === route.path;
|
|
51
|
-
}
|
|
52
|
-
function isIndexRoute(route) {
|
|
53
|
-
return 'nested' === route.type && Boolean(route.index);
|
|
54
|
-
}
|
|
55
|
-
function createRouteStaticDataSnippet(opts) {
|
|
56
|
-
const staticDataLines = [];
|
|
57
|
-
if (opts.modernRouteId) staticDataLines.push(`modernRouteId: ${quote(opts.modernRouteId)},`);
|
|
58
|
-
if (opts.loaderName) staticDataLines.push(`modernRouteLoader: ${opts.loaderName},`);
|
|
59
|
-
if (opts.actionName) staticDataLines.push(`modernRouteAction: ${opts.actionName},`);
|
|
60
|
-
if (!staticDataLines.length) return null;
|
|
61
|
-
return `staticData: createRouteStaticData({\n ${staticDataLines.join('\n ')}\n }),`;
|
|
62
|
-
}
|
|
63
|
-
async function isTanstackRouterFrameworkEnabled(appContext) {
|
|
64
|
-
const runtimeConfigBase = path.join(appContext.srcDirectory, appContext.runtimeConfigFile);
|
|
65
|
-
const runtimeConfigFile = findExists(JS_OR_TS_EXTS.map((ext)=>`${runtimeConfigBase}${ext}`));
|
|
66
|
-
if (!runtimeConfigFile) return false;
|
|
67
|
-
try {
|
|
68
|
-
const content = await fs.readFile(runtimeConfigFile, 'utf-8');
|
|
69
|
-
return /framework\s*:\s*['"]tanstack['"]/.test(content);
|
|
70
|
-
} catch {
|
|
71
|
-
return false;
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
async function generateTanstackRouterTypesSourceForEntry(opts) {
|
|
75
|
-
const { appContext, entryName, routes } = opts;
|
|
76
|
-
const outDir = path.join(appContext.srcDirectory, 'modern-tanstack', entryName);
|
|
77
|
-
const rootModern = routes.find((r)=>r && 'nested' === r.type && r.isRoot);
|
|
78
|
-
const topLevel = rootModern ? rootModern.children || [] : routes;
|
|
79
|
-
const imports = [];
|
|
80
|
-
const statements = [];
|
|
81
|
-
const componentImportMap = new Map();
|
|
82
|
-
const loaderImportMap = new Map();
|
|
83
|
-
const usedRouteVarNames = new Set();
|
|
84
|
-
let componentIndex = 0;
|
|
85
|
-
let loaderIndex = 0;
|
|
86
|
-
let routeIndex = 0;
|
|
87
|
-
const getImportNameForComponent = (componentPath)=>{
|
|
88
|
-
if ('string' != typeof componentPath || 0 === componentPath.length) return null;
|
|
89
|
-
const existing = componentImportMap.get(componentPath);
|
|
90
|
-
if (existing) return existing;
|
|
91
|
-
const componentName = `component_${componentIndex++}`;
|
|
92
|
-
imports.push(`import ${componentName} from ${quote(componentPath)};`);
|
|
93
|
-
componentImportMap.set(componentPath, componentName);
|
|
94
|
-
return componentName;
|
|
95
|
-
};
|
|
96
|
-
const getImportNamesForLoader = async (aliasedNoExtPath, inline, hasAction)=>{
|
|
97
|
-
const key = `${inline ? 'inline' : 'default'}:${hasAction ? 'action' : 'loader'}:${aliasedNoExtPath}`;
|
|
98
|
-
const existing = loaderImportMap.get(key);
|
|
99
|
-
if (existing) return {
|
|
100
|
-
loaderName: existing,
|
|
101
|
-
actionName: hasAction ? existing.replace(/^loader_/, 'action_') : null
|
|
102
|
-
};
|
|
103
|
-
const prefix = `${appContext.internalSrcAlias}/`;
|
|
104
|
-
let absNoExt = null;
|
|
105
|
-
if (aliasedNoExtPath.startsWith(prefix)) {
|
|
106
|
-
const rel = aliasedNoExtPath.slice(prefix.length);
|
|
107
|
-
absNoExt = path.join(appContext.srcDirectory, rel);
|
|
108
|
-
} else absNoExt = path.isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : path.join(appContext.srcDirectory, aliasedNoExtPath);
|
|
109
|
-
const resolvedNoExt = await resolveFileNoExt(absNoExt);
|
|
110
|
-
if (!resolvedNoExt) return null;
|
|
111
|
-
const relImport = normalizeRelativeImport(path.relative(outDir, resolvedNoExt));
|
|
112
|
-
const importName = `loader_${loaderIndex++}`;
|
|
113
|
-
const actionName = hasAction ? importName.replace(/^loader_/, 'action_') : null;
|
|
114
|
-
if (inline) {
|
|
115
|
-
const specifiers = [
|
|
116
|
-
`loader as ${importName}`
|
|
117
|
-
];
|
|
118
|
-
if (actionName) specifiers.push(`action as ${actionName}`);
|
|
119
|
-
imports.push(`import { ${specifiers.join(', ')} } from ${quote(relImport)};`);
|
|
120
|
-
} else imports.push(`import ${importName} from ${quote(relImport)};`);
|
|
121
|
-
loaderImportMap.set(key, importName);
|
|
122
|
-
return {
|
|
123
|
-
loaderName: importName,
|
|
124
|
-
actionName
|
|
125
|
-
};
|
|
126
|
-
};
|
|
127
|
-
const reserveRouteVarName = (preferred)=>{
|
|
128
|
-
let candidate = preferred;
|
|
129
|
-
let suffix = 1;
|
|
130
|
-
while(usedRouteVarNames.has(candidate))candidate = `${preferred}_${suffix++}`;
|
|
131
|
-
usedRouteVarNames.add(candidate);
|
|
132
|
-
return candidate;
|
|
133
|
-
};
|
|
134
|
-
const createRouteVarName = (route)=>{
|
|
135
|
-
const id = route.id;
|
|
136
|
-
const base = id ? makeLegalIdentifier(id) : `r_${routeIndex++}`;
|
|
137
|
-
return reserveRouteVarName(`route_${base}`);
|
|
138
|
-
};
|
|
139
|
-
const buildRoute = async (opts)=>{
|
|
140
|
-
const { parentVar, route } = opts;
|
|
141
|
-
const varName = createRouteVarName(route);
|
|
142
|
-
const loaderInfo = pickModernLoaderModule(route);
|
|
143
|
-
const routeAction = route.action;
|
|
144
|
-
const loaderImports = loaderInfo ? await getImportNamesForLoader(loaderInfo.loaderPath, loaderInfo.inline, Boolean(loaderInfo.inline && routeAction === loaderInfo.loaderPath)) : null;
|
|
145
|
-
const loaderName = loaderImports?.loaderName || null;
|
|
146
|
-
const actionName = loaderImports?.actionName || null;
|
|
147
|
-
const rawPath = route.path;
|
|
148
|
-
const hasSplat = 'string' == typeof rawPath && rawPath.includes('*');
|
|
149
|
-
const routeOpts = [
|
|
150
|
-
`getParentRoute: () => ${parentVar},`
|
|
151
|
-
];
|
|
152
|
-
const componentName = getImportNameForComponent(route._component);
|
|
153
|
-
if (componentName) routeOpts.push(`component: ${componentName},`);
|
|
154
|
-
if (isPathlessLayout(route)) {
|
|
155
|
-
const id = route.id;
|
|
156
|
-
routeOpts.push(`id: ${quote(id || 'pathless')},`);
|
|
157
|
-
} else {
|
|
158
|
-
const p = isIndexRoute(route) ? '/' : toTanstackPath(rawPath || '');
|
|
159
|
-
routeOpts.push(`path: ${quote(p)},`);
|
|
160
|
-
}
|
|
161
|
-
if (loaderName) routeOpts.push(`loader: modernLoaderToTanstack({ hasSplat: ${hasSplat} }, ${loaderName}),`);
|
|
162
|
-
const staticDataSnippet = createRouteStaticDataSnippet({
|
|
163
|
-
modernRouteId: route.id,
|
|
164
|
-
loaderName,
|
|
165
|
-
actionName
|
|
166
|
-
});
|
|
167
|
-
if (staticDataSnippet) routeOpts.push(staticDataSnippet);
|
|
168
|
-
const children = route.children;
|
|
169
|
-
const hasChildren = Boolean(children && children.length > 0);
|
|
170
|
-
const routeCtorVarName = hasChildren ? reserveRouteVarName(`${varName}__base`) : varName;
|
|
171
|
-
statements.push(`const ${routeCtorVarName} = createRoute({\n ${routeOpts.join('\n ')}\n});`);
|
|
172
|
-
if (children && children.length > 0) {
|
|
173
|
-
const childVars = await Promise.all(children.map((child)=>buildRoute({
|
|
174
|
-
parentVar: routeCtorVarName,
|
|
175
|
-
route: child
|
|
176
|
-
})));
|
|
177
|
-
statements.push(`const ${varName} = ${routeCtorVarName}.addChildren([${childVars.join(', ')}]);`);
|
|
178
|
-
}
|
|
179
|
-
return varName;
|
|
180
|
-
};
|
|
181
|
-
const rootLoaderInfo = rootModern ? pickModernLoaderModule(rootModern) : null;
|
|
182
|
-
const rootAction = rootModern?.action;
|
|
183
|
-
const rootLoaderImports = rootLoaderInfo?.loaderPath ? await getImportNamesForLoader(rootLoaderInfo.loaderPath, rootLoaderInfo.inline, Boolean(rootLoaderInfo.inline && rootAction === rootLoaderInfo.loaderPath)) : null;
|
|
184
|
-
const rootLoaderName = rootLoaderImports?.loaderName || null;
|
|
185
|
-
const rootActionName = rootLoaderImports?.actionName || null;
|
|
186
|
-
const topLevelVars = await Promise.all(topLevel.map((route)=>buildRoute({
|
|
187
|
-
parentVar: 'rootRoute',
|
|
188
|
-
route
|
|
189
|
-
})));
|
|
190
|
-
const rootOpts = [];
|
|
191
|
-
const rootComponentName = getImportNameForComponent(rootModern?._component);
|
|
192
|
-
if (rootComponentName) rootOpts.push(`component: ${rootComponentName},`);
|
|
193
|
-
if (rootLoaderName) rootOpts.push(`loader: modernLoaderToTanstack({ hasSplat: false }, ${rootLoaderName}),`);
|
|
194
|
-
const routerGenTs = `/* eslint-disable */
|
|
195
|
-
// This file is auto-generated by Modern.js. Do not edit manually.
|
|
196
|
-
|
|
197
|
-
import {
|
|
198
|
-
createMemoryHistory,
|
|
199
|
-
createRootRouteWithContext,
|
|
200
|
-
createRoute,
|
|
201
|
-
createRouter,
|
|
202
|
-
notFound,
|
|
203
|
-
redirect,
|
|
204
|
-
} from '@modern-js/runtime/tanstack-router';
|
|
205
|
-
|
|
206
|
-
type ModernRouterContext = {
|
|
207
|
-
request?: Request;
|
|
208
|
-
requestContext?: unknown;
|
|
209
|
-
};
|
|
210
|
-
|
|
211
|
-
function isResponse(value: unknown): value is Response {
|
|
212
|
-
return (
|
|
213
|
-
value != null &&
|
|
214
|
-
typeof value === 'object' &&
|
|
215
|
-
typeof (value as any).status === 'number' &&
|
|
216
|
-
typeof (value as any).headers === 'object'
|
|
217
|
-
);
|
|
218
|
-
}
|
|
219
|
-
|
|
220
|
-
const redirectStatusCodes = new Set([301, 302, 303, 307, 308]);
|
|
221
|
-
function isRedirectResponse(res: Response) {
|
|
222
|
-
return redirectStatusCodes.has(res.status);
|
|
223
|
-
}
|
|
224
|
-
|
|
225
|
-
function throwTanstackRedirect(location: string) {
|
|
226
|
-
const target = location.length > 0 ? location : '/';
|
|
227
|
-
try {
|
|
228
|
-
void new URL(target);
|
|
229
|
-
throw redirect({ href: target });
|
|
230
|
-
} catch {
|
|
231
|
-
throw redirect({ to: target });
|
|
232
|
-
}
|
|
233
|
-
}
|
|
234
|
-
|
|
235
|
-
function mapParamsForModernLoader(params: Record<string, string>, hasSplat: boolean) {
|
|
236
|
-
if (!hasSplat) {
|
|
237
|
-
return params;
|
|
238
|
-
}
|
|
239
|
-
|
|
240
|
-
const { _splat, ...rest } = params as any;
|
|
241
|
-
if (typeof _splat !== 'undefined') {
|
|
242
|
-
return { ...rest, '*': _splat };
|
|
243
|
-
}
|
|
244
|
-
return rest;
|
|
245
|
-
}
|
|
246
|
-
|
|
247
|
-
function createRouteStaticData(opts: {
|
|
248
|
-
modernRouteId?: string;
|
|
249
|
-
modernRouteAction?: unknown;
|
|
250
|
-
modernRouteLoader?: unknown;
|
|
251
|
-
}) {
|
|
252
|
-
const staticData: {
|
|
253
|
-
modernRouteId?: string;
|
|
254
|
-
modernRouteAction?: unknown;
|
|
255
|
-
modernRouteLoader?: unknown;
|
|
256
|
-
} = {};
|
|
257
|
-
|
|
258
|
-
if (typeof opts.modernRouteId === 'string' && opts.modernRouteId.length > 0) {
|
|
259
|
-
staticData.modernRouteId = opts.modernRouteId;
|
|
260
|
-
}
|
|
261
|
-
|
|
262
|
-
if (typeof opts.modernRouteLoader !== 'undefined') {
|
|
263
|
-
staticData.modernRouteLoader = opts.modernRouteLoader;
|
|
264
|
-
}
|
|
265
|
-
|
|
266
|
-
if (typeof opts.modernRouteAction !== 'undefined') {
|
|
267
|
-
staticData.modernRouteAction = opts.modernRouteAction;
|
|
268
|
-
}
|
|
269
|
-
|
|
270
|
-
return staticData;
|
|
271
|
-
}
|
|
272
|
-
|
|
273
|
-
function getLoaderSignal(ctx: any): AbortSignal {
|
|
274
|
-
const abortSignal = ctx?.abortController?.signal;
|
|
275
|
-
if (abortSignal instanceof AbortSignal) {
|
|
276
|
-
return abortSignal;
|
|
277
|
-
}
|
|
278
|
-
if (ctx?.signal instanceof AbortSignal) {
|
|
279
|
-
return ctx.signal;
|
|
280
|
-
}
|
|
281
|
-
return new AbortController().signal;
|
|
282
|
-
}
|
|
283
|
-
|
|
284
|
-
function getLoaderHref(ctx: any): string {
|
|
285
|
-
if (typeof ctx?.location === 'string') {
|
|
286
|
-
return ctx.location;
|
|
287
|
-
}
|
|
288
|
-
|
|
289
|
-
const publicHref = ctx?.location?.publicHref;
|
|
290
|
-
if (typeof publicHref === 'string') {
|
|
291
|
-
return publicHref;
|
|
292
|
-
}
|
|
293
|
-
|
|
294
|
-
const href = ctx?.location?.href;
|
|
295
|
-
if (typeof href === 'string') {
|
|
296
|
-
return href;
|
|
297
|
-
}
|
|
298
|
-
|
|
299
|
-
const urlHref = ctx?.location?.url?.href;
|
|
300
|
-
return typeof urlHref === 'string' ? urlHref : '';
|
|
301
|
-
}
|
|
302
|
-
|
|
303
|
-
function getLoaderParams(ctx: any): Record<string, string> {
|
|
304
|
-
return typeof ctx?.params === 'object' && ctx.params !== null ? ctx.params : {};
|
|
305
|
-
}
|
|
306
|
-
|
|
307
|
-
function handleModernLoaderResult<LoaderResult>(result: LoaderResult): LoaderResult {
|
|
308
|
-
if (isResponse(result)) {
|
|
309
|
-
if (isRedirectResponse(result)) {
|
|
310
|
-
const location = result.headers.get('Location') ?? '/';
|
|
311
|
-
throwTanstackRedirect(location);
|
|
312
|
-
}
|
|
313
|
-
if (result.status === 404) {
|
|
314
|
-
throw notFound();
|
|
315
|
-
}
|
|
316
|
-
}
|
|
317
|
-
|
|
318
|
-
return result;
|
|
319
|
-
}
|
|
320
|
-
|
|
321
|
-
function handleModernLoaderError(err: unknown): never {
|
|
322
|
-
if (isResponse(err)) {
|
|
323
|
-
if (isRedirectResponse(err)) {
|
|
324
|
-
const location = err.headers.get('Location') ?? '/';
|
|
325
|
-
throwTanstackRedirect(location);
|
|
326
|
-
}
|
|
327
|
-
if (err.status === 404) {
|
|
328
|
-
throw notFound();
|
|
329
|
-
}
|
|
330
|
-
}
|
|
331
|
-
|
|
332
|
-
throw err;
|
|
333
|
-
}
|
|
334
|
-
|
|
335
|
-
function modernLoaderToTanstack<TLoader extends (args: any) => any>(
|
|
336
|
-
opts: { hasSplat: boolean },
|
|
337
|
-
modernLoader: TLoader,
|
|
338
|
-
) {
|
|
339
|
-
type LoaderResult = Awaited<ReturnType<TLoader>>;
|
|
340
|
-
|
|
341
|
-
return (ctx: any): Promise<LoaderResult> => {
|
|
342
|
-
try {
|
|
343
|
-
const signal = getLoaderSignal(ctx);
|
|
344
|
-
const baseRequest: Request | undefined =
|
|
345
|
-
ctx?.context?.request instanceof Request ? ctx.context.request : undefined;
|
|
346
|
-
|
|
347
|
-
const href = getLoaderHref(ctx);
|
|
348
|
-
|
|
349
|
-
const request = baseRequest !== undefined
|
|
350
|
-
? new Request(baseRequest, { signal })
|
|
351
|
-
: new Request(href, { signal });
|
|
352
|
-
|
|
353
|
-
const params = mapParamsForModernLoader(getLoaderParams(ctx), opts.hasSplat);
|
|
354
|
-
|
|
355
|
-
return Promise.resolve(
|
|
356
|
-
(modernLoader as any)({
|
|
357
|
-
request,
|
|
358
|
-
params,
|
|
359
|
-
context: ctx?.context?.requestContext,
|
|
360
|
-
}),
|
|
361
|
-
)
|
|
362
|
-
.then((result: LoaderResult) => handleModernLoaderResult(result))
|
|
363
|
-
.catch(handleModernLoaderError);
|
|
364
|
-
} catch (err) {
|
|
365
|
-
handleModernLoaderError(err);
|
|
366
|
-
}
|
|
367
|
-
};
|
|
368
|
-
}
|
|
369
|
-
|
|
370
|
-
${imports.join('\n')}
|
|
371
|
-
|
|
372
|
-
export const rootRoute = createRootRouteWithContext<ModernRouterContext>()({
|
|
373
|
-
${rootOpts.join('\n ')}
|
|
374
|
-
${createRouteStaticDataSnippet({
|
|
375
|
-
modernRouteId: rootModern?.id,
|
|
376
|
-
loaderName: rootLoaderName,
|
|
377
|
-
actionName: rootActionName
|
|
378
|
-
}) || ''}
|
|
379
|
-
});
|
|
380
|
-
|
|
381
|
-
${statements.join('\n\n')}
|
|
382
|
-
|
|
383
|
-
export const routeTree = rootRoute.addChildren([${topLevelVars.join(', ')}]);
|
|
384
|
-
|
|
385
|
-
export const router = createRouter({
|
|
386
|
-
routeTree,
|
|
387
|
-
history: createMemoryHistory({
|
|
388
|
-
initialEntries: ['/'],
|
|
389
|
-
}),
|
|
390
|
-
context: {} as ModernRouterContext,
|
|
391
|
-
});
|
|
392
|
-
`;
|
|
393
|
-
return {
|
|
394
|
-
routerGenTs
|
|
395
|
-
};
|
|
396
|
-
}
|
|
397
|
-
export { generateTanstackRouterTypesSourceForEntry, isTanstackRouterFrameworkEnabled };
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
import "node:module";
|
|
2
|
-
function normalizeBasepath(basepath) {
|
|
3
|
-
if (!basepath) return '/';
|
|
4
|
-
let normalized = basepath.startsWith('/') ? basepath : `/${basepath}`;
|
|
5
|
-
if (normalized.length > 1 && normalized.endsWith('/')) normalized = normalized.slice(0, -1);
|
|
6
|
-
return normalized || '/';
|
|
7
|
-
}
|
|
8
|
-
function createModernBasepathRewrite(basepath, caseSensitive = false) {
|
|
9
|
-
const normalizedBasepath = normalizeBasepath(basepath);
|
|
10
|
-
if ('/' === normalizedBasepath) return;
|
|
11
|
-
const normalizedBasepathWithSlash = `${normalizedBasepath}/`;
|
|
12
|
-
const checkBasepath = caseSensitive ? normalizedBasepath : normalizedBasepath.toLowerCase();
|
|
13
|
-
const checkBasepathWithSlash = caseSensitive ? normalizedBasepathWithSlash : normalizedBasepathWithSlash.toLowerCase();
|
|
14
|
-
return {
|
|
15
|
-
input: ({ url })=>{
|
|
16
|
-
const pathname = caseSensitive ? url.pathname : url.pathname.toLowerCase();
|
|
17
|
-
if (pathname === checkBasepath) url.pathname = '/';
|
|
18
|
-
else if (pathname.startsWith(checkBasepathWithSlash)) url.pathname = url.pathname.slice(normalizedBasepath.length) || '/';
|
|
19
|
-
return url;
|
|
20
|
-
},
|
|
21
|
-
output: ({ url })=>{
|
|
22
|
-
const pathname = url.pathname || '/';
|
|
23
|
-
if ('/' === pathname) url.pathname = normalizedBasepath;
|
|
24
|
-
else url.pathname = `${normalizedBasepath}${pathname.startsWith('/') ? '' : '/'}${pathname}`;
|
|
25
|
-
return url;
|
|
26
|
-
}
|
|
27
|
-
};
|
|
28
|
-
}
|
|
29
|
-
export { createModernBasepathRewrite };
|