eddev 2.0.0-beta.99 → 2.1.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/css/editor-styles.css +4 -0
- package/dist/app/entry/HydrationOverlay.d.ts +1 -0
- package/dist/app/entry/HydrationOverlay.d.ts.map +1 -0
- package/dist/app/entry/MetaTags.d.ts +1 -0
- package/dist/app/entry/MetaTags.d.ts.map +1 -0
- package/dist/app/entry/MetaTags.js +18 -3
- package/dist/app/entry/boot-admin.d.ts +1 -0
- package/dist/app/entry/boot-admin.d.ts.map +1 -0
- package/dist/app/entry/boot-admin.js +0 -1
- package/dist/app/entry/hydration-script.d.ts +1 -0
- package/dist/app/entry/hydration-script.d.ts.map +1 -0
- package/dist/app/entry/spa-root.d.ts +1 -0
- package/dist/app/entry/spa-root.d.ts.map +1 -0
- package/dist/app/entry/spa-root.js +1 -2
- package/dist/app/entry/ssr-root-client.d.ts +1 -0
- package/dist/app/entry/ssr-root-client.d.ts.map +1 -0
- package/dist/app/entry/ssr-root-client.js +3 -2
- package/dist/app/entry/ssr-root.d.ts +3 -0
- package/dist/app/entry/ssr-root.d.ts.map +1 -0
- package/dist/app/entry/ssr-root.js +3 -3
- package/dist/app/lib/admin/defineField.d.ts +1 -0
- package/dist/app/lib/admin/defineField.d.ts.map +1 -0
- package/dist/app/lib/admin/defineWidget.d.ts +1 -0
- package/dist/app/lib/admin/defineWidget.d.ts.map +1 -0
- package/dist/app/lib/admin/index.d.ts +1 -0
- package/dist/app/lib/admin/index.d.ts.map +1 -0
- package/dist/app/lib/admin/installFieldTypes.d.ts +1 -0
- package/dist/app/lib/admin/installFieldTypes.d.ts.map +1 -0
- package/dist/app/lib/admin/installFieldTypes.js +2 -0
- package/dist/app/lib/admin/runWidgets.d.ts +1 -0
- package/dist/app/lib/admin/runWidgets.d.ts.map +1 -0
- package/dist/app/lib/admin/runWidgets.js +7 -2
- package/dist/app/lib/blocks/BlockPropMutator.d.ts +33 -0
- package/dist/app/lib/blocks/BlockPropMutator.d.ts.map +1 -0
- package/dist/app/lib/blocks/BlockPropMutator.js +20 -0
- package/dist/app/lib/blocks/ContentBlocks.d.ts +7 -4
- package/dist/app/lib/blocks/ContentBlocks.d.ts.map +1 -0
- package/dist/app/lib/blocks/ContentBlocks.js +14 -1
- package/dist/app/lib/blocks/EditableText.d.ts +30 -5
- package/dist/app/lib/blocks/EditableText.d.ts.map +1 -0
- package/dist/app/lib/blocks/EditableText.js +34 -5
- package/dist/app/lib/blocks/InnerBlocks.d.ts +11 -6
- package/dist/app/lib/blocks/InnerBlocks.d.ts.map +1 -0
- package/dist/app/lib/blocks/InnerBlocks.js +67 -27
- package/dist/app/lib/blocks/SlotBlocks.d.ts +8 -0
- package/dist/app/lib/blocks/SlotBlocks.d.ts.map +1 -0
- package/dist/app/lib/blocks/SlotBlocks.js +45 -0
- package/dist/app/lib/blocks/block-utils.d.ts +1 -0
- package/dist/app/lib/blocks/block-utils.d.ts.map +1 -0
- package/dist/app/lib/blocks/block-utils.js +18 -1
- package/dist/app/lib/blocks/builtin-blocks.d.ts +2 -0
- package/dist/app/lib/blocks/builtin-blocks.d.ts.map +1 -0
- package/dist/app/lib/blocks/builtin-blocks.js +55 -0
- package/dist/app/lib/blocks/defineBlock.d.ts +4 -0
- package/dist/app/lib/blocks/defineBlock.d.ts.map +1 -0
- package/dist/app/lib/blocks/defineBlock.js +9 -0
- package/dist/app/lib/blocks/editor/EditingContext.d.ts +2 -0
- package/dist/app/lib/blocks/editor/EditingContext.d.ts.map +1 -0
- package/dist/app/lib/blocks/editor/EditingContext.js +31 -0
- package/dist/app/lib/blocks/editor/EditorHighlights.d.ts +1 -0
- package/dist/app/lib/blocks/editor/EditorHighlights.d.ts.map +1 -0
- package/dist/app/lib/blocks/editor/EditorHighlights.js +43 -9
- package/dist/app/lib/blocks/editor/EditorSupport.d.ts +1 -4
- package/dist/app/lib/blocks/editor/EditorSupport.d.ts.map +1 -0
- package/dist/app/lib/blocks/editor/EditorSupport.js +23 -9
- package/dist/app/lib/blocks/editor/ErrorBoundaryEditor.d.ts +1 -0
- package/dist/app/lib/blocks/editor/ErrorBoundaryEditor.d.ts.map +1 -0
- package/dist/app/lib/blocks/editor/block-templates.d.ts +8 -1
- package/dist/app/lib/blocks/editor/block-templates.d.ts.map +1 -0
- package/dist/app/lib/blocks/editor/block-templates.js +71 -2
- package/dist/app/lib/blocks/editor/blocks-by-tag.d.ts +1 -0
- package/dist/app/lib/blocks/editor/blocks-by-tag.d.ts.map +1 -0
- package/dist/app/lib/blocks/editor/controls.d.ts +1 -0
- package/dist/app/lib/blocks/editor/controls.d.ts.map +1 -0
- package/dist/app/lib/blocks/editor/create-block.d.ts +10 -0
- package/dist/app/lib/blocks/editor/create-block.d.ts.map +1 -0
- package/dist/app/lib/blocks/editor/create-block.js +13 -0
- package/dist/app/lib/blocks/editor/editor-config.d.ts +64 -7
- package/dist/app/lib/blocks/editor/editor-config.d.ts.map +1 -0
- package/dist/app/lib/blocks/editor/editor-config.js +28 -73
- package/dist/app/lib/blocks/editor/installGutenbergHooks.d.ts +4 -0
- package/dist/app/lib/blocks/editor/installGutenbergHooks.d.ts.map +1 -0
- package/dist/app/lib/blocks/editor/installGutenbergHooks.js +152 -27
- package/dist/app/lib/blocks/editor/root-blocks.d.ts +1 -0
- package/dist/app/lib/blocks/editor/root-blocks.d.ts.map +1 -0
- package/dist/app/lib/blocks/editor/usePostEditor.d.ts +12 -1
- package/dist/app/lib/blocks/editor/usePostEditor.d.ts.map +1 -0
- package/dist/app/lib/blocks/editor/usePostEditor.js +38 -13
- package/dist/app/lib/blocks/index.d.ts +8 -5
- package/dist/app/lib/blocks/index.d.ts.map +1 -0
- package/dist/app/lib/blocks/index.js +8 -5
- package/dist/app/lib/blocks/inline-editing.d.ts +16 -1
- package/dist/app/lib/blocks/inline-editing.d.ts.map +1 -0
- package/dist/app/lib/blocks/inline-editing.js +14 -1
- package/dist/app/lib/devtools/components/BreakpointIndicator.d.ts +1 -0
- package/dist/app/lib/devtools/components/BreakpointIndicator.d.ts.map +1 -0
- package/dist/app/lib/devtools/components/BreakpointIndicator.js +1 -1
- package/dist/app/lib/devtools/components/DevUI.d.ts +1 -0
- package/dist/app/lib/devtools/components/DevUI.d.ts.map +1 -0
- package/dist/app/lib/devtools/components/DevUI.js +1 -1
- package/dist/app/lib/devtools/components/GridIndicator.d.ts +1 -0
- package/dist/app/lib/devtools/components/GridIndicator.d.ts.map +1 -0
- package/dist/app/lib/devtools/components/GridIndicator.js +1 -1
- package/dist/app/lib/devtools/dev-tools-store.d.ts +1 -0
- package/dist/app/lib/devtools/dev-tools-store.d.ts.map +1 -0
- package/dist/app/lib/devtools/hooks/usePersistState.d.ts +1 -0
- package/dist/app/lib/devtools/hooks/usePersistState.d.ts.map +1 -0
- package/dist/app/lib/devtools/hooks/useTailwind.d.ts +1358 -313
- package/dist/app/lib/devtools/hooks/useTailwind.d.ts.map +1 -0
- package/dist/app/lib/devtools/index.d.ts +1 -0
- package/dist/app/lib/devtools/index.d.ts.map +1 -0
- package/dist/app/lib/devtools/loader.d.ts +2 -1
- package/dist/app/lib/devtools/loader.d.ts.map +1 -0
- package/dist/app/lib/devtools/loader.js +4 -3
- package/dist/app/lib/devtools/tailwind.config.d.ts +1 -0
- package/dist/app/lib/devtools/tailwind.config.d.ts.map +1 -0
- package/dist/app/lib/devtools/useQueryDebug.d.ts +2 -1
- package/dist/app/lib/devtools/useQueryDebug.d.ts.map +1 -0
- package/dist/app/lib/dynamic/dynamic.d.ts +1 -0
- package/dist/app/lib/dynamic/dynamic.d.ts.map +1 -0
- package/dist/app/lib/dynamic/index.d.ts +1 -0
- package/dist/app/lib/dynamic/index.d.ts.map +1 -0
- package/dist/app/lib/hooks/index.d.ts +2 -1
- package/dist/app/lib/hooks/index.d.ts.map +1 -0
- package/dist/app/lib/hooks/index.js +1 -1
- package/dist/app/lib/hooks/{queryUtils.d.ts → query-hooks.d.ts} +8 -2
- package/dist/app/lib/hooks/query-hooks.d.ts.map +1 -0
- package/dist/app/lib/hooks/{queryUtils.js → query-hooks.js} +43 -11
- package/dist/app/lib/hooks/useAppData.d.ts +1 -0
- package/dist/app/lib/hooks/useAppData.d.ts.map +1 -0
- package/dist/app/lib/hooks/useAppData.js +11 -0
- package/dist/app/lib/hooks/useRPC.d.ts +1 -0
- package/dist/app/lib/hooks/useRPC.d.ts.map +1 -0
- package/dist/app/lib/hooks/useRPC.js +0 -1
- package/dist/app/lib/integrations/gravityforms/index.d.ts +3 -0
- package/dist/app/lib/integrations/gravityforms/index.d.ts.map +1 -0
- package/dist/app/lib/integrations/gravityforms/index.js +2 -0
- package/dist/app/lib/integrations/gravityforms/types.d.ts +145 -0
- package/dist/app/lib/integrations/gravityforms/types.d.ts.map +1 -0
- package/dist/app/lib/integrations/gravityforms/types.js +1 -0
- package/dist/app/lib/integrations/gravityforms/useGravityForm.d.ts +31 -0
- package/dist/app/lib/integrations/gravityforms/useGravityForm.d.ts.map +1 -0
- package/dist/app/lib/integrations/gravityforms/useGravityForm.js +298 -0
- package/dist/app/lib/internal/finalize-rpc.d.ts +1 -0
- package/dist/app/lib/internal/finalize-rpc.d.ts.map +1 -0
- package/dist/app/lib/internal/index.d.ts +1 -0
- package/dist/app/lib/internal/index.d.ts.map +1 -0
- package/dist/app/lib/internal/internal-store.d.ts +1 -0
- package/dist/app/lib/internal/internal-store.d.ts.map +1 -0
- package/dist/app/lib/internal/read-admin-manifest.d.ts +1 -0
- package/dist/app/lib/internal/read-admin-manifest.d.ts.map +1 -0
- package/dist/app/lib/internal/read-block-manifest.d.ts +2 -0
- package/dist/app/lib/internal/read-block-manifest.d.ts.map +1 -0
- package/dist/app/lib/internal/read-block-manifest.js +7 -0
- package/dist/app/lib/internal/read-view-manifest.d.ts +7 -4
- package/dist/app/lib/internal/read-view-manifest.d.ts.map +1 -0
- package/dist/app/lib/internal/read-view-manifest.js +18 -0
- package/dist/app/lib/legacy-stitches/createStitches.d.ts +8 -7
- package/dist/app/lib/legacy-stitches/createStitches.d.ts.map +1 -0
- package/dist/app/lib/legacy-stitches/index.d.ts +1 -0
- package/dist/app/lib/legacy-stitches/index.d.ts.map +1 -0
- package/dist/app/lib/routing/components/BackButton.d.ts +1 -0
- package/dist/app/lib/routing/components/BackButton.d.ts.map +1 -0
- package/dist/app/lib/routing/components/BrowserRouter.d.ts +7 -1
- package/dist/app/lib/routing/components/BrowserRouter.d.ts.map +1 -0
- package/dist/app/lib/routing/components/BrowserRouter.js +85 -14
- package/dist/app/lib/routing/components/ClientOnly.d.ts +1 -0
- package/dist/app/lib/routing/components/ClientOnly.d.ts.map +1 -0
- package/dist/app/lib/routing/components/ClientOnly.js +3 -3
- package/dist/app/lib/routing/components/Link.d.ts +21 -2
- package/dist/app/lib/routing/components/Link.d.ts.map +1 -0
- package/dist/app/lib/routing/components/Link.js +52 -23
- package/dist/app/lib/routing/components/NativeLinkHandler.d.ts +10 -0
- package/dist/app/lib/routing/components/NativeLinkHandler.d.ts.map +1 -0
- package/dist/app/lib/routing/components/NativeLinkHandler.js +23 -0
- package/dist/app/lib/routing/components/RouteRenderer.d.ts +1 -0
- package/dist/app/lib/routing/components/RouteRenderer.d.ts.map +1 -0
- package/dist/app/lib/routing/components/RouteRenderer.js +14 -1
- package/dist/app/lib/routing/components/SSRRouter.d.ts +3 -0
- package/dist/app/lib/routing/components/SSRRouter.d.ts.map +1 -0
- package/dist/app/lib/routing/components/SSRRouter.js +2 -0
- package/dist/app/lib/routing/components/ScrollRestoration.d.ts +1 -0
- package/dist/app/lib/routing/components/ScrollRestoration.d.ts.map +1 -0
- package/dist/app/lib/routing/context.d.ts +1 -0
- package/dist/app/lib/routing/context.d.ts.map +1 -0
- package/dist/app/lib/routing/hooks/{useIsSSR.d.ts → useHydrating.d.ts} +7 -0
- package/dist/app/lib/routing/hooks/useHydrating.d.ts.map +1 -0
- package/dist/app/lib/routing/hooks/{useIsSSR.js → useHydrating.js} +13 -3
- package/dist/app/lib/routing/hooks/useRestorableState.d.ts +1 -0
- package/dist/app/lib/routing/hooks/useRestorableState.d.ts.map +1 -0
- package/dist/app/lib/routing/hooks/useRestorableState.js +7 -2
- package/dist/app/lib/routing/hooks/useRoute.d.ts +1 -0
- package/dist/app/lib/routing/hooks/useRoute.d.ts.map +1 -0
- package/dist/app/lib/routing/hooks/useRouteMeta.d.ts +1 -0
- package/dist/app/lib/routing/hooks/useRouteMeta.d.ts.map +1 -0
- package/dist/app/lib/routing/hooks/useRouteTransition.d.ts +1 -0
- package/dist/app/lib/routing/hooks/useRouteTransition.d.ts.map +1 -0
- package/dist/app/lib/routing/hooks/useRouter.d.ts +1 -0
- package/dist/app/lib/routing/hooks/useRouter.d.ts.map +1 -0
- package/dist/app/lib/routing/hooks/useRouterEvents.d.ts +1 -0
- package/dist/app/lib/routing/hooks/useRouterEvents.d.ts.map +1 -0
- package/dist/app/lib/routing/hooks/useRouterState.d.ts +1 -0
- package/dist/app/lib/routing/hooks/useRouterState.d.ts.map +1 -0
- package/dist/app/lib/routing/hooks/useSearchParams.d.ts +78 -6
- package/dist/app/lib/routing/hooks/useSearchParams.d.ts.map +1 -0
- package/dist/app/lib/routing/hooks/useSearchParams.js +75 -15
- package/dist/app/lib/routing/index.d.ts +4 -1
- package/dist/app/lib/routing/index.d.ts.map +1 -0
- package/dist/app/lib/routing/index.js +3 -1
- package/dist/app/lib/routing/loader.d.ts +1 -0
- package/dist/app/lib/routing/loader.d.ts.map +1 -0
- package/dist/app/lib/routing/loader.js +1 -1
- package/dist/app/lib/routing/types.d.ts +40 -6
- package/dist/app/lib/routing/types.d.ts.map +1 -0
- package/dist/app/lib/routing/utils.d.ts +2 -0
- package/dist/app/lib/routing/utils.d.ts.map +1 -0
- package/dist/app/lib/routing/utils.js +5 -1
- package/dist/app/lib/runtime/apiConfig.d.ts +5 -0
- package/dist/app/lib/runtime/apiConfig.d.ts.map +1 -0
- package/dist/app/lib/runtime/errorHandling.d.ts +1 -0
- package/dist/app/lib/runtime/errorHandling.d.ts.map +1 -0
- package/dist/app/lib/runtime/index.d.ts +1 -0
- package/dist/app/lib/runtime/index.d.ts.map +1 -0
- package/dist/app/lib/views/defineView.d.ts +2 -1
- package/dist/app/lib/views/defineView.d.ts.map +1 -0
- package/dist/app/lib/views/index.d.ts +1 -0
- package/dist/app/lib/views/index.d.ts.map +1 -0
- package/dist/app/server/index.d.ts +4 -3
- package/dist/app/server/index.d.ts.map +1 -0
- package/dist/app/server/index.js +3 -3
- package/dist/app/server/proxy-wp-admin.d.ts +1 -0
- package/dist/app/server/proxy-wp-admin.d.ts.map +1 -0
- package/dist/app/server/proxy-wp-admin.js +23 -9
- package/dist/app/server/render-ai-page.d.ts +13 -0
- package/dist/app/server/render-ai-page.d.ts.map +1 -0
- package/dist/app/server/render-ai-page.js +102 -0
- package/dist/app/server/render-ssr-page.d.ts +17 -6
- package/dist/app/server/render-ssr-page.d.ts.map +1 -0
- package/dist/app/server/render-ssr-page.js +120 -35
- package/dist/app/server/rpc.d.ts +18 -41
- package/dist/app/server/rpc.d.ts.map +1 -0
- package/dist/app/server/server-context.d.ts +14 -3
- package/dist/app/server/server-context.d.ts.map +1 -0
- package/dist/app/server/server-context.js +204 -21
- package/dist/app/server/server-custom-config.d.ts +3 -0
- package/dist/app/server/server-custom-config.d.ts.map +1 -0
- package/dist/app/server/server-custom-config.js +1 -0
- package/dist/app/server/utils/content-security.d.ts +26 -0
- package/dist/app/server/utils/content-security.d.ts.map +1 -0
- package/dist/app/server/utils/content-security.js +124 -0
- package/dist/app/server/utils/headers.d.ts +1 -0
- package/dist/app/server/utils/headers.d.ts.map +1 -0
- package/dist/app/server/utils/replace-host.d.ts +1 -0
- package/dist/app/server/utils/replace-host.d.ts.map +1 -0
- package/dist/app/server/utils/swr-cache.d.ts +1 -0
- package/dist/app/server/utils/swr-cache.d.ts.map +1 -0
- package/dist/app/utils/APIProvider.d.ts +1 -0
- package/dist/app/utils/APIProvider.d.ts.map +1 -0
- package/dist/app/utils/BlockErrorBoundary.d.ts +1 -0
- package/dist/app/utils/BlockErrorBoundary.d.ts.map +1 -0
- package/dist/app/utils/ErrorMessage.d.ts +1 -0
- package/dist/app/utils/ErrorMessage.d.ts.map +1 -0
- package/dist/app/utils/RouteErrorBoundary.d.ts +2 -0
- package/dist/app/utils/RouteErrorBoundary.d.ts.map +1 -0
- package/dist/app/utils/RouteErrorBoundary.js +3 -0
- package/dist/app/utils/asset-capture.d.ts +1 -0
- package/dist/app/utils/asset-capture.d.ts.map +1 -0
- package/dist/app/utils/hydration-debugger.d.ts +1 -0
- package/dist/app/utils/hydration-debugger.d.ts.map +1 -0
- package/dist/app/utils/query-client.d.ts +1 -0
- package/dist/app/utils/query-client.d.ts.map +1 -0
- package/dist/app/utils/query-monitor.d.ts +27 -0
- package/dist/app/utils/query-monitor.d.ts.map +1 -0
- package/dist/app/utils/query-monitor.js +7 -0
- package/dist/app/utils/trpc-client.d.ts +1 -0
- package/dist/app/utils/trpc-client.d.ts.map +1 -0
- package/dist/app/utils/trpc-client.js +1 -1
- package/dist/app/utils/wp.d.ts +11 -10
- package/dist/app/utils/wp.d.ts.map +1 -0
- package/dist/node/cli/cli-mode.d.ts +1 -0
- package/dist/node/cli/cli-mode.d.ts.map +1 -0
- package/dist/node/cli/cli-worker.d.ts +1 -0
- package/dist/node/cli/cli-worker.d.ts.map +1 -0
- package/dist/node/cli/cli-worker.js +1 -0
- package/dist/node/cli/cli.d.ts +1 -0
- package/dist/node/cli/cli.d.ts.map +1 -0
- package/dist/node/cli/cli.js +100 -11
- package/dist/node/cli/display/CLIApp.d.ts +1 -0
- package/dist/node/cli/display/CLIApp.d.ts.map +1 -0
- package/dist/node/cli/display/boot-cli-app.d.ts +1 -0
- package/dist/node/cli/display/boot-cli-app.d.ts.map +1 -0
- package/dist/node/cli/display/components/Fullscreen.d.ts +1 -0
- package/dist/node/cli/display/components/Fullscreen.d.ts.map +1 -0
- package/dist/node/cli/display/components/LogEntries.d.ts +1 -0
- package/dist/node/cli/display/components/LogEntries.d.ts.map +1 -0
- package/dist/node/cli/display/components/MenuItem.d.ts +1 -0
- package/dist/node/cli/display/components/MenuItem.d.ts.map +1 -0
- package/dist/node/cli/display/components/TextInput.d.ts +1 -0
- package/dist/node/cli/display/components/TextInput.d.ts.map +1 -0
- package/dist/node/cli/display/hooks/useManifest.d.ts +1 -0
- package/dist/node/cli/display/hooks/useManifest.d.ts.map +1 -0
- package/dist/node/cli/display/hooks/useStatefulLog.d.ts +1 -0
- package/dist/node/cli/display/hooks/useStatefulLog.d.ts.map +1 -0
- package/dist/node/cli/display/tools/BlockList.d.ts +1 -0
- package/dist/node/cli/display/tools/BlockList.d.ts.map +1 -0
- package/dist/node/cli/display/tools/CreateBlock.d.ts +1 -0
- package/dist/node/cli/display/tools/CreateBlock.d.ts.map +1 -0
- package/dist/node/cli/display/tools/cli-tool-list.d.ts +1 -0
- package/dist/node/cli/display/tools/cli-tool-list.d.ts.map +1 -0
- package/dist/node/cli/display/tools/cli-tools.d.ts +1 -0
- package/dist/node/cli/display/tools/cli-tools.d.ts.map +1 -0
- package/dist/node/cli/display/util/colors.d.ts +1 -0
- package/dist/node/cli/display/util/colors.d.ts.map +1 -0
- package/dist/node/cli/version.d.ts +2 -1
- package/dist/node/cli/version.d.ts.map +1 -0
- package/dist/node/cli/version.js +1 -1
- package/dist/node/compiler/build-vinxi.d.ts +1 -0
- package/dist/node/compiler/build-vinxi.d.ts.map +1 -0
- package/dist/node/compiler/build-vinxi.js +1 -0
- package/dist/node/compiler/bundler.admin.d.ts +1 -0
- package/dist/node/compiler/bundler.admin.d.ts.map +1 -0
- package/dist/node/compiler/bundler.frontend.d.ts +2 -0
- package/dist/node/compiler/bundler.frontend.d.ts.map +1 -0
- package/dist/node/compiler/bundler.frontend.js +25 -11
- package/dist/node/compiler/cache-config.d.ts +3 -0
- package/dist/node/compiler/cache-config.d.ts.map +1 -0
- package/dist/node/compiler/cache-config.js +16 -0
- package/dist/node/compiler/dev-server.d.ts +4 -1
- package/dist/node/compiler/dev-server.d.ts.map +1 -0
- package/dist/node/compiler/dev-server.js +26 -13
- package/dist/node/compiler/get-vite-config.d.ts +11 -1
- package/dist/node/compiler/get-vite-config.d.ts.map +1 -0
- package/dist/node/compiler/get-vite-config.js +164 -36
- package/dist/node/compiler/vinxi-app.d.ts +1 -0
- package/dist/node/compiler/vinxi-app.d.ts.map +1 -0
- package/dist/node/compiler/vinxi-app.js +56 -39
- package/dist/node/compiler/vinxi-codegen.d.ts +1 -0
- package/dist/node/compiler/vinxi-codegen.d.ts.map +1 -0
- package/dist/node/compiler/vinxi-codegen.js +152 -85
- package/dist/node/graphql/graphql-codegen.d.ts +1 -0
- package/dist/node/graphql/graphql-codegen.d.ts.map +1 -0
- package/dist/node/graphql/graphql-codegen.js +52 -24
- package/dist/node/graphql/graphql-schema-loader.d.ts +1 -0
- package/dist/node/graphql/graphql-schema-loader.d.ts.map +1 -0
- package/dist/node/graphql/plugins/gql-plugin-files.d.ts +3 -1
- package/dist/node/graphql/plugins/gql-plugin-files.d.ts.map +1 -0
- package/dist/node/graphql/plugins/gql-plugin-files.js +3 -2
- package/dist/node/graphql/plugins/gql-plugin-no-duplicates.d.ts +1 -0
- package/dist/node/graphql/plugins/gql-plugin-no-duplicates.d.ts.map +1 -0
- package/dist/node/graphql/plugins/gql-plugin-queries.d.ts +1 -0
- package/dist/node/graphql/plugins/gql-plugin-queries.d.ts.map +1 -0
- package/dist/node/graphql/plugins/gql-plugin-queries.js +1 -1
- package/dist/node/graphql/query-files-loader.d.ts +1 -0
- package/dist/node/graphql/query-files-loader.d.ts.map +1 -0
- package/dist/node/graphql/wp-info-query.d.ts +1 -0
- package/dist/node/graphql/wp-info-query.d.ts.map +1 -0
- package/dist/node/project/config.d.ts +112 -7
- package/dist/node/project/config.d.ts.map +1 -0
- package/dist/node/project/config.js +54 -24
- package/dist/node/project/eddev-build-file.d.ts +1 -0
- package/dist/node/project/eddev-build-file.d.ts.map +1 -0
- package/dist/node/project/eddev-build-file.js +4 -2
- package/dist/node/project/env.d.ts +1 -0
- package/dist/node/project/env.d.ts.map +1 -0
- package/dist/node/project/favicons.d.ts +1 -0
- package/dist/node/project/favicons.d.ts.map +1 -0
- package/dist/node/project/manifest/block-manifest.d.ts +1 -0
- package/dist/node/project/manifest/block-manifest.d.ts.map +1 -0
- package/dist/node/project/manifest/block-manifest.js +7 -2
- package/dist/node/project/manifest/field-manifest.d.ts +1 -0
- package/dist/node/project/manifest/field-manifest.d.ts.map +1 -0
- package/dist/node/project/manifest/manifest.d.ts +1 -0
- package/dist/node/project/manifest/manifest.d.ts.map +1 -0
- package/dist/node/project/manifest/routes-manifest.d.ts +1 -0
- package/dist/node/project/manifest/routes-manifest.d.ts.map +1 -0
- package/dist/node/project/manifest/routes-manifest.js +1 -1
- package/dist/node/project/manifest/view-manifest.d.ts +1 -0
- package/dist/node/project/manifest/view-manifest.d.ts.map +1 -0
- package/dist/node/project/manifest/widget-manifest.d.ts +1 -0
- package/dist/node/project/manifest/widget-manifest.d.ts.map +1 -0
- package/dist/node/project/project.d.ts +4 -0
- package/dist/node/project/project.d.ts.map +1 -0
- package/dist/node/project/project.js +24 -1
- package/dist/node/project/wp-info.d.ts +2 -0
- package/dist/node/project/wp-info.d.ts.map +1 -0
- package/dist/node/storybook/index.d.ts +3 -0
- package/dist/node/storybook/index.d.ts.map +1 -0
- package/dist/node/storybook/index.js +13 -0
- package/dist/node/types/block-type.d.ts +33 -6
- package/dist/node/types/block-type.d.ts.map +1 -0
- package/dist/node/types/block-type.js +3 -1
- package/dist/node/types/view-type.d.ts +1 -0
- package/dist/node/types/view-type.d.ts.map +1 -0
- package/dist/node/utils/fetch-wp.d.ts +1 -0
- package/dist/node/utils/fetch-wp.d.ts.map +1 -0
- package/dist/node/utils/fetch-wp.js +4 -3
- package/dist/node/utils/format-zod-error.d.ts +1 -0
- package/dist/node/utils/format-zod-error.d.ts.map +1 -0
- package/dist/node/utils/fs-codegen.d.ts +2 -0
- package/dist/node/utils/fs-codegen.d.ts.map +1 -0
- package/dist/node/utils/fs-codegen.js +8 -1
- package/dist/node/utils/fs.d.ts +24 -16
- package/dist/node/utils/fs.d.ts.map +1 -0
- package/dist/node/utils/get-repo-info.d.ts +1 -0
- package/dist/node/utils/get-repo-info.d.ts.map +1 -0
- package/dist/node/utils/helpers.d.ts +1 -0
- package/dist/node/utils/helpers.d.ts.map +1 -0
- package/dist/node/utils/highlight-code.d.ts +1 -0
- package/dist/node/utils/highlight-code.d.ts.map +1 -0
- package/dist/node/utils/is-deploying.d.ts +1 -0
- package/dist/node/utils/is-deploying.d.ts.map +1 -0
- package/dist/node/utils/report-builder.d.ts +7 -6
- package/dist/node/utils/report-builder.d.ts.map +1 -0
- package/dist/node/utils/self-signed-cert.d.ts +5 -0
- package/dist/node/utils/self-signed-cert.d.ts.map +1 -0
- package/dist/node/utils/self-signed-cert.js +28 -4
- package/dist/node/utils/stateful-log.d.ts +1 -0
- package/dist/node/utils/stateful-log.d.ts.map +1 -0
- package/dist/node/utils/ts-export-extractor.d.ts +1 -0
- package/dist/node/utils/ts-export-extractor.d.ts.map +1 -0
- package/dist/node/utils/watch-file-tree.d.ts +1 -0
- package/dist/node/utils/watch-file-tree.d.ts.map +1 -0
- package/package.json +34 -24
- package/tsconfig.app.json +8 -3
- package/tsconfig.node.json +1 -0
- package/types.env.d.ts +3 -0
- package/types.meta.d.ts +449 -136
- package/dist/app/server/defineRouter.d.ts +0 -2
- package/dist/app/server/defineRouter.js +0 -4
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { Suspense } from "react";
|
|
3
|
+
import { renderToPipeableStream, renderToString } from "react-dom/server";
|
|
4
|
+
import { Writable } from "stream";
|
|
5
|
+
import { MetaTags } from "../entry/MetaTags.js";
|
|
6
|
+
import { SSRRoot } from "../entry/ssr-root.js";
|
|
7
|
+
import { RouteLoader } from "../lib/routing/loader.js";
|
|
8
|
+
import { ServerContext } from "./server-context.js";
|
|
9
|
+
import { parseHTML } from "linkedom";
|
|
10
|
+
async function getAiSsrStream(args) {
|
|
11
|
+
const jsx = (_jsx(Suspense, { children: _jsx(SSRRoot, { metaTags: args.initialData?.meta?.head || [], pathname: args.pathname, initialData: args.initialData, loader: new RouteLoader(), isAI: true }) }));
|
|
12
|
+
const stream = await new Promise(async (resolve, reject) => {
|
|
13
|
+
// console.log("Rendering to pipable")
|
|
14
|
+
const stream = renderToPipeableStream(jsx, {
|
|
15
|
+
identifierPrefix: "ed",
|
|
16
|
+
onShellReady() {
|
|
17
|
+
// console.log("Shell ready")
|
|
18
|
+
resolve(stream);
|
|
19
|
+
},
|
|
20
|
+
onShellError(err) {
|
|
21
|
+
console.log("onShellError", err);
|
|
22
|
+
reject(err);
|
|
23
|
+
},
|
|
24
|
+
onError(err, errInfo) {
|
|
25
|
+
console.log("Error occurred after shell ready", err, errInfo);
|
|
26
|
+
console.error(err);
|
|
27
|
+
},
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
const [initial, middle, end] = renderToString(_jsxs("html", { lang: "en", children: [_jsxs("head", { children: ["%%$%%", _jsx(MetaTags, { tags: args.initialData.meta?.head ?? [] })] }), _jsx("body", { children: _jsx("div", { id: "root", children: "%%$%%" }) })] })).split("%%$%%");
|
|
31
|
+
const inner = await new Promise((resolve, reject) => {
|
|
32
|
+
let buffer = [];
|
|
33
|
+
const writableStream = new Writable({
|
|
34
|
+
emitClose: true,
|
|
35
|
+
write(chunk, encoding, callback) {
|
|
36
|
+
buffer.push(new TextDecoder().decode(chunk));
|
|
37
|
+
callback();
|
|
38
|
+
},
|
|
39
|
+
final(callback) {
|
|
40
|
+
resolve(buffer.join("\n"));
|
|
41
|
+
callback();
|
|
42
|
+
},
|
|
43
|
+
});
|
|
44
|
+
stream.pipe(writableStream);
|
|
45
|
+
});
|
|
46
|
+
const renderedContent = initial + "\n" + middle + "\n" + inner + "\n" + end;
|
|
47
|
+
return processRenderedContent(renderedContent);
|
|
48
|
+
}
|
|
49
|
+
function processRenderedContent(content) {
|
|
50
|
+
const { document } = parseHTML(content);
|
|
51
|
+
// Immediately remove unnecessary tags
|
|
52
|
+
document.querySelectorAll("script, link, style, svg, img, video, [data-ai-hidden]").forEach((el) => {
|
|
53
|
+
el.remove();
|
|
54
|
+
});
|
|
55
|
+
document.querySelectorAll("*").forEach((el) => {
|
|
56
|
+
el.removeAttribute("style");
|
|
57
|
+
el.removeAttribute("class");
|
|
58
|
+
});
|
|
59
|
+
const pageContents = document.querySelectorAll("#ai-page-contents");
|
|
60
|
+
document.body.innerHTML = "";
|
|
61
|
+
document.body.append(...Array.from(pageContents));
|
|
62
|
+
return document.toString();
|
|
63
|
+
}
|
|
64
|
+
export async function renderPageForIndexing(args) {
|
|
65
|
+
const serverContext = ServerContext.main;
|
|
66
|
+
let responseInit = {};
|
|
67
|
+
const [{ appData }, response] = await Promise.all([
|
|
68
|
+
serverContext.fetchAppData({
|
|
69
|
+
newOrigin: args.newOrigin,
|
|
70
|
+
}),
|
|
71
|
+
serverContext.fetchRouteData({
|
|
72
|
+
pathname: args.pathname,
|
|
73
|
+
newOrigin: args.newOrigin,
|
|
74
|
+
}),
|
|
75
|
+
]);
|
|
76
|
+
let data = await response.json();
|
|
77
|
+
data.appData = appData;
|
|
78
|
+
if (args.propData) {
|
|
79
|
+
data = {
|
|
80
|
+
...data,
|
|
81
|
+
...args.propData,
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
responseInit.status = response.status;
|
|
85
|
+
if (data.redirect) {
|
|
86
|
+
return {
|
|
87
|
+
shouldIndex: false,
|
|
88
|
+
contents: "",
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
const headers = new Headers();
|
|
92
|
+
headers.set("Content-Type", "text/html; charset=utf-8");
|
|
93
|
+
responseInit.headers = headers;
|
|
94
|
+
const result = await getAiSsrStream({
|
|
95
|
+
...args,
|
|
96
|
+
initialData: data,
|
|
97
|
+
});
|
|
98
|
+
return {
|
|
99
|
+
shouldIndex: true,
|
|
100
|
+
contents: result,
|
|
101
|
+
};
|
|
102
|
+
}
|
|
@@ -1,21 +1,32 @@
|
|
|
1
|
-
import type { RouteDataWithTrackers } from "../lib/routing/types.js";
|
|
1
|
+
import type { ErrorRouteProps, RouteDataWithTrackers } from "../lib/routing/types.js";
|
|
2
2
|
type SSRArgs = {
|
|
3
3
|
pathname: string;
|
|
4
|
+
hostname?: string;
|
|
4
5
|
initialData: RouteDataWithTrackers;
|
|
6
|
+
nonce?: string;
|
|
5
7
|
};
|
|
6
|
-
export declare function getSsrStream(args: SSRArgs): Promise<ReadableStream<Uint8Array
|
|
8
|
+
export declare function getSsrStream(args: SSRArgs): Promise<ReadableStream<Uint8Array<ArrayBufferLike>>>;
|
|
7
9
|
type RenderArgs = {
|
|
8
10
|
pathname: string;
|
|
9
11
|
statusCode?: number;
|
|
10
12
|
newOrigin?: string;
|
|
13
|
+
hostname?: string;
|
|
14
|
+
propData?: Record<string, any>;
|
|
15
|
+
bypass?: boolean;
|
|
11
16
|
};
|
|
12
17
|
export declare function renderPage(args: RenderArgs): Promise<Response>;
|
|
13
18
|
type RenderErrorPageArgs = {
|
|
14
19
|
pathname: string;
|
|
15
|
-
|
|
16
|
-
title: string;
|
|
20
|
+
hostname?: string;
|
|
17
21
|
newOrigin?: string;
|
|
18
|
-
realError?:
|
|
19
|
-
};
|
|
22
|
+
realError?: any;
|
|
23
|
+
} & ErrorRouteProps;
|
|
20
24
|
export declare function renderErrorPage(args: RenderErrorPageArgs): Promise<Response>;
|
|
25
|
+
type Asset = {
|
|
26
|
+
tag: string;
|
|
27
|
+
attrs: Record<string, string | boolean>;
|
|
28
|
+
children?: string;
|
|
29
|
+
};
|
|
30
|
+
export declare function renderAsset({ tag, attrs, children }: Asset): string;
|
|
21
31
|
export {};
|
|
32
|
+
//# sourceMappingURL=render-ssr-page.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"render-ssr-page.d.ts","sourceRoot":"","sources":["../../../src/app/server/render-ssr-page.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAKrF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,qBAAqB,CAAA;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,OAAO,wDAyH/C;AAED,KAAK,UAAU,GAAG;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsGpE;AAED,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,GAAG,CAAA;CAChB,GAAG,eAAe,CAAA;AAEnB,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiBlF;AAED,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAA;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,KAAK,UA8B1D"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { jsx as _jsx, jsxs as _jsxs
|
|
2
|
-
import {
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { Suspense } from "react";
|
|
3
3
|
import { renderToPipeableStream, renderToString } from "react-dom/server";
|
|
4
4
|
import { Writable } from "stream";
|
|
5
5
|
import { MetaTags } from "../entry/MetaTags.js";
|
|
@@ -7,22 +7,16 @@ import { SSRRoot } from "../entry/ssr-root.js";
|
|
|
7
7
|
import { RouteLoader } from "../lib/routing/loader.js";
|
|
8
8
|
import { AssetCaptureContext } from "../utils/asset-capture.js";
|
|
9
9
|
import { ServerContext } from "./server-context.js";
|
|
10
|
+
import { SecureHeaderBuilder } from "./utils/content-security.js";
|
|
10
11
|
export async function getSsrStream(args) {
|
|
11
12
|
const clientManifest = ServerContext.main.runtime.getManifest("client");
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
// assets.filter((f) => (f as any).tag === "script"),
|
|
16
|
-
// clientManifest.inputs[clientManifest.handler],
|
|
17
|
-
// )
|
|
18
|
-
// for (let k in clientManifest.chunks) {
|
|
19
|
-
// console.log(k)
|
|
20
|
-
// }
|
|
21
|
-
const dynamicAssets = new Set([]);
|
|
22
|
-
const jsx = (_jsx(AssetCaptureContext.Provider, { value: dynamicAssets, children: _jsx(SSRRoot, { metaTags: args.initialData?.meta?.head || [], pathname: args.pathname, initialData: args.initialData, loader: new RouteLoader() }) }));
|
|
13
|
+
const preloadAssets = new Set([clientManifest.handler]);
|
|
14
|
+
const includedAssets = new Set();
|
|
15
|
+
const jsx = (_jsx(Suspense, { children: _jsx(AssetCaptureContext.Provider, { value: preloadAssets, children: _jsx(SSRRoot, { metaTags: args.initialData?.meta?.head || [], pathname: args.pathname, hostname: args.hostname, initialData: args.initialData, loader: new RouteLoader() }) }) }));
|
|
23
16
|
const stream = await new Promise(async (resolve, reject) => {
|
|
24
17
|
// console.log("Rendering to pipable")
|
|
25
18
|
const stream = renderToPipeableStream(jsx, {
|
|
19
|
+
identifierPrefix: "ed",
|
|
26
20
|
onShellReady() {
|
|
27
21
|
// console.log("Shell ready")
|
|
28
22
|
resolve(stream);
|
|
@@ -36,20 +30,22 @@ export async function getSsrStream(args) {
|
|
|
36
30
|
console.error(err);
|
|
37
31
|
},
|
|
38
32
|
bootstrapModules: [clientManifest.inputs[clientManifest.handler].output.path],
|
|
33
|
+
nonce: args.nonce,
|
|
39
34
|
bootstrapScriptContent: `\nwindow.manifest = ${JSON.stringify(await clientManifest.json())};\nwindow._PAGE_DATA = ${JSON.stringify({
|
|
40
35
|
...args.initialData,
|
|
41
36
|
trackers: undefined,
|
|
37
|
+
hostname: args.hostname,
|
|
42
38
|
})};\n`,
|
|
43
39
|
});
|
|
44
40
|
});
|
|
45
|
-
const [initial, middle, end] = renderToString(_jsxs("html", { lang: "en", children: [_jsxs("head", { children: [_jsx(MetaTags, { tags: args.initialData.meta?.head ?? [] }), "%%trackers_head%%"
|
|
41
|
+
const [initial, middle, end] = renderToString(_jsxs("html", { lang: "en", children: [_jsxs("head", { children: ["%%$%%", _jsx(MetaTags, { tags: args.initialData.meta?.head ?? [] }), "%%trackers_head%%"] }), _jsxs("body", { children: ["%%trackers_body%%", _jsx("div", { id: "root", children: "%%$%%" }), "%%trackers_footer%%"] })] }))
|
|
46
42
|
.replace(/%%trackers_(head|body|footer)%%/g, (_, name) => {
|
|
47
43
|
return args.initialData.trackers?.[name] || "";
|
|
48
44
|
})
|
|
49
45
|
.split("%%$%%");
|
|
50
46
|
return new ReadableStream({
|
|
51
47
|
async start(controller) {
|
|
52
|
-
controller.enqueue(new TextEncoder().encode(initial));
|
|
48
|
+
controller.enqueue(new TextEncoder().encode("<!doctype html>" + initial));
|
|
53
49
|
const inner = await new Promise((resolve, reject) => {
|
|
54
50
|
let buffer = [];
|
|
55
51
|
const writableStream = new Writable({
|
|
@@ -67,15 +63,30 @@ export async function getSsrStream(args) {
|
|
|
67
63
|
});
|
|
68
64
|
stream.pipe(writableStream);
|
|
69
65
|
});
|
|
70
|
-
for (const
|
|
71
|
-
const assets = await clientManifest.inputs[
|
|
72
|
-
//
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
66
|
+
for (const input of preloadAssets) {
|
|
67
|
+
const assets = await clientManifest.inputs[input].assets();
|
|
68
|
+
// controller.enqueue(new TextEncoder().encode(`\n<!-- for ${input} -->`))
|
|
69
|
+
for (const _asset of assets) {
|
|
70
|
+
const asset = _asset;
|
|
71
|
+
if (args.nonce)
|
|
72
|
+
asset.attrs.nonce = args.nonce;
|
|
73
|
+
// Ensure that each asset is only included once
|
|
74
|
+
const key = asset?.attrs?.key;
|
|
75
|
+
if (!key) {
|
|
76
|
+
throw new Error("Asset must have a key: " + JSON.stringify(asset));
|
|
77
|
+
}
|
|
78
|
+
if (includedAssets.has(key))
|
|
79
|
+
continue;
|
|
80
|
+
includedAssets.add(key);
|
|
81
|
+
// Render the asset
|
|
82
|
+
try {
|
|
83
|
+
const tag = renderAsset(asset);
|
|
84
|
+
controller.enqueue(new TextEncoder().encode(tag + "\n"));
|
|
85
|
+
}
|
|
86
|
+
catch (err) {
|
|
87
|
+
controller.enqueue(new TextEncoder().encode(`\n<!-- ${JSON.stringify(err)} -->\n`));
|
|
88
|
+
}
|
|
89
|
+
}
|
|
79
90
|
}
|
|
80
91
|
// console.log("ASSETS", await clientManifest)
|
|
81
92
|
controller.enqueue(new TextEncoder().encode(middle));
|
|
@@ -90,33 +101,57 @@ export async function getSsrStream(args) {
|
|
|
90
101
|
}
|
|
91
102
|
export async function renderPage(args) {
|
|
92
103
|
const serverContext = ServerContext.main;
|
|
93
|
-
|
|
104
|
+
const cspHeaders = new SecureHeaderBuilder(serverContext.config);
|
|
105
|
+
const responseHeaders = new Headers();
|
|
94
106
|
let responseInit = {
|
|
95
|
-
headers,
|
|
107
|
+
headers: responseHeaders,
|
|
96
108
|
};
|
|
97
109
|
try {
|
|
98
110
|
const [{ appData, trackers }, response] = await Promise.all([
|
|
99
|
-
serverContext.fetchAppData(),
|
|
111
|
+
serverContext.fetchAppData({ bypass: args.bypass, newOrigin: args.newOrigin }),
|
|
100
112
|
serverContext.fetchRouteData({
|
|
101
113
|
pathname: args.pathname,
|
|
102
114
|
newOrigin: args.newOrigin,
|
|
115
|
+
bypass: args.bypass,
|
|
103
116
|
}),
|
|
104
117
|
]);
|
|
118
|
+
if (trackers) {
|
|
119
|
+
cspHeaders.addTrackingTags(trackers);
|
|
120
|
+
}
|
|
105
121
|
let data;
|
|
106
122
|
try {
|
|
107
123
|
data = await response.json();
|
|
108
124
|
data.appData = appData;
|
|
109
|
-
data.trackers = trackers;
|
|
125
|
+
data.trackers = cspHeaders.addTrackingTags(trackers);
|
|
126
|
+
if (args.propData) {
|
|
127
|
+
data = {
|
|
128
|
+
...data,
|
|
129
|
+
...args.propData,
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
if (data.meta?.head)
|
|
133
|
+
data.meta.head = cspHeaders.addMetaTags(data.meta.head);
|
|
134
|
+
if (data.meta?.footer)
|
|
135
|
+
data.meta.footer = cspHeaders.addMetaTags(data.meta.footer);
|
|
110
136
|
responseInit.status = response.status;
|
|
137
|
+
response.headers.forEach((value, key) => {
|
|
138
|
+
if (key.toLowerCase().startsWith("x-ed-")) {
|
|
139
|
+
responseHeaders.set(key, value);
|
|
140
|
+
}
|
|
141
|
+
});
|
|
111
142
|
}
|
|
112
143
|
catch (err) {
|
|
144
|
+
console.log("Error rendering", err);
|
|
113
145
|
console.error(err);
|
|
114
146
|
return renderErrorPage({
|
|
115
147
|
pathname: args.pathname,
|
|
116
|
-
|
|
117
|
-
newOrigin: args.newOrigin,
|
|
118
|
-
realError: err,
|
|
148
|
+
statusCode: 500,
|
|
119
149
|
title: "Internal Server Error",
|
|
150
|
+
newOrigin: args.newOrigin,
|
|
151
|
+
report: {
|
|
152
|
+
details: err,
|
|
153
|
+
message: err.message,
|
|
154
|
+
},
|
|
120
155
|
});
|
|
121
156
|
}
|
|
122
157
|
if (data.redirect) {
|
|
@@ -127,10 +162,16 @@ export async function renderPage(args) {
|
|
|
127
162
|
},
|
|
128
163
|
});
|
|
129
164
|
}
|
|
130
|
-
|
|
165
|
+
cspHeaders.getHeaders().forEach((value, key) => {
|
|
166
|
+
responseHeaders.set(key, value);
|
|
167
|
+
});
|
|
168
|
+
responseHeaders.set("Content-Type", "text/html; charset=utf-8");
|
|
169
|
+
responseHeaders.set("X-Ed-Rendered-At", new Date().toUTCString());
|
|
131
170
|
const stream = await getSsrStream({
|
|
132
171
|
...args,
|
|
172
|
+
hostname: args.hostname,
|
|
133
173
|
initialData: data,
|
|
174
|
+
nonce: cspHeaders.nonce,
|
|
134
175
|
});
|
|
135
176
|
return new Response(stream, responseInit);
|
|
136
177
|
}
|
|
@@ -139,9 +180,9 @@ export async function renderPage(args) {
|
|
|
139
180
|
if (args.statusCode !== 500) {
|
|
140
181
|
return renderErrorPage({
|
|
141
182
|
pathname: args.pathname,
|
|
142
|
-
|
|
143
|
-
newOrigin: args.newOrigin,
|
|
183
|
+
statusCode: 500,
|
|
144
184
|
realError: err,
|
|
185
|
+
newOrigin: args.newOrigin,
|
|
145
186
|
title: "Internal Server Error",
|
|
146
187
|
});
|
|
147
188
|
}
|
|
@@ -157,9 +198,53 @@ export async function renderPage(args) {
|
|
|
157
198
|
}
|
|
158
199
|
}
|
|
159
200
|
export async function renderErrorPage(args) {
|
|
201
|
+
const props = {
|
|
202
|
+
statusCode: args.statusCode,
|
|
203
|
+
report: args.report ?? {
|
|
204
|
+
message: args.realError?.message,
|
|
205
|
+
details: args.realError,
|
|
206
|
+
},
|
|
207
|
+
title: args.title,
|
|
208
|
+
userMessage: args.userMessage,
|
|
209
|
+
};
|
|
160
210
|
return renderPage({
|
|
161
211
|
pathname: "/_error",
|
|
162
|
-
statusCode: args.
|
|
212
|
+
statusCode: args.statusCode,
|
|
163
213
|
newOrigin: args.newOrigin,
|
|
214
|
+
propData: props,
|
|
215
|
+
hostname: args.hostname,
|
|
164
216
|
});
|
|
165
217
|
}
|
|
218
|
+
export function renderAsset({ tag, attrs, children }) {
|
|
219
|
+
const formatAttributes = (attributes) => {
|
|
220
|
+
return Object.entries(attributes)
|
|
221
|
+
.map(([attr, value]) => {
|
|
222
|
+
if (value === true) {
|
|
223
|
+
return attr;
|
|
224
|
+
}
|
|
225
|
+
else if (value !== false && value != null) {
|
|
226
|
+
return `${attr}="${String(value).replace(/"/g, """)}"`;
|
|
227
|
+
}
|
|
228
|
+
return "";
|
|
229
|
+
})
|
|
230
|
+
.filter(Boolean)
|
|
231
|
+
.join(" ");
|
|
232
|
+
};
|
|
233
|
+
switch (tag) {
|
|
234
|
+
case "script":
|
|
235
|
+
if (attrs.src) {
|
|
236
|
+
return `<script ${formatAttributes(attrs)}></script>`;
|
|
237
|
+
}
|
|
238
|
+
else {
|
|
239
|
+
return `<script ${formatAttributes(attrs)}>${children ?? ""}</script>`;
|
|
240
|
+
}
|
|
241
|
+
case "link":
|
|
242
|
+
if (attrs.rel === "stylesheet" && !attrs.media)
|
|
243
|
+
attrs.media = "screen";
|
|
244
|
+
return `<link ${formatAttributes(attrs)} />`;
|
|
245
|
+
case "style":
|
|
246
|
+
return `<style ${formatAttributes(attrs)}>${children ?? ""}</style>`;
|
|
247
|
+
default:
|
|
248
|
+
return "";
|
|
249
|
+
}
|
|
250
|
+
}
|
package/dist/app/server/rpc.d.ts
CHANGED
|
@@ -1,56 +1,33 @@
|
|
|
1
1
|
import { AnyProcedure } from "@trpc/server";
|
|
2
2
|
import { FetchCreateContextFnOptions } from "@trpc/server/adapters/fetch";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
<TInput extends import("@trpc/server").RouterRecord>(input: TInput): import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
|
|
14
|
-
ctx: RPCContext;
|
|
15
|
-
meta: object;
|
|
16
|
-
errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
|
|
17
|
-
transformer: true;
|
|
18
|
-
}, TInput>;
|
|
19
|
-
<TInput extends import("@trpc/server/unstable-core-do-not-import").CreateRouterOptions>(input: TInput): import("@trpc/server/unstable-core-do-not-import").BuiltRouter<{
|
|
20
|
-
ctx: RPCContext;
|
|
21
|
-
meta: object;
|
|
22
|
-
errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
|
|
23
|
-
transformer: true;
|
|
24
|
-
}, import("@trpc/server/unstable-core-do-not-import").DecorateCreateRouterOptions<TInput>>;
|
|
25
|
-
};
|
|
26
|
-
mergeRouters: typeof import("@trpc/server/unstable-core-do-not-import").mergeRouters;
|
|
27
|
-
createCallerFactory: <TRecord extends import("@trpc/server").RouterRecord>(router: Pick<import("@trpc/server/unstable-core-do-not-import").Router<{
|
|
28
|
-
ctx: RPCContext;
|
|
29
|
-
meta: object;
|
|
30
|
-
errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
|
|
31
|
-
transformer: true;
|
|
32
|
-
}, TRecord>, "_def">) => import("@trpc/server/unstable-core-do-not-import").RouterCaller<{
|
|
33
|
-
ctx: RPCContext;
|
|
34
|
-
meta: object;
|
|
35
|
-
errorShape: import("@trpc/server/unstable-core-do-not-import").DefaultErrorShape;
|
|
36
|
-
transformer: true;
|
|
37
|
-
}, TRecord>;
|
|
38
|
-
};
|
|
3
|
+
import superjson from "superjson";
|
|
4
|
+
import { ServerContext } from "./server-context";
|
|
5
|
+
export declare const rpcApi: import("@trpc/server").TRPCRootObject<RPCContext, object, {
|
|
6
|
+
transformer: typeof superjson;
|
|
7
|
+
}, {
|
|
8
|
+
ctx: RPCContext;
|
|
9
|
+
meta: object;
|
|
10
|
+
errorShape: import("@trpc/server").TRPCDefaultErrorShape;
|
|
11
|
+
transformer: true;
|
|
12
|
+
}>;
|
|
39
13
|
type RouterSchema = Record<string, Record<string, AnyProcedure> | AnyProcedure>;
|
|
40
14
|
export declare const rpc: {
|
|
41
|
-
middleware: <$ContextOverrides>(fn: import("@trpc/server
|
|
42
|
-
procedure: import("@trpc/server
|
|
15
|
+
middleware: <$ContextOverrides>(fn: import("@trpc/server").TRPCMiddlewareFunction<RPCContext, object, object, $ContextOverrides, unknown>) => import("@trpc/server").TRPCMiddlewareBuilder<RPCContext, object, $ContextOverrides, unknown>;
|
|
16
|
+
procedure: import("@trpc/server").TRPCProcedureBuilder<RPCContext, object, object, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, false>;
|
|
43
17
|
router<T extends RouterSchema>(routes: T): T;
|
|
44
18
|
};
|
|
45
19
|
export declare function defineServerContext<T>(func: (opts: FetchCreateContextFnOptions) => T): (opts: FetchCreateContextFnOptions) => T;
|
|
46
|
-
export declare function instantiateRouter<T extends RouterSchema>(routes: T): import("@trpc/server
|
|
20
|
+
export declare function instantiateRouter<T extends RouterSchema>(routes: T): import("@trpc/server").TRPCBuiltRouter<{
|
|
47
21
|
ctx: RPCContext;
|
|
48
22
|
meta: object;
|
|
49
|
-
errorShape: import("@trpc/server
|
|
23
|
+
errorShape: import("@trpc/server").TRPCDefaultErrorShape;
|
|
50
24
|
transformer: true;
|
|
51
|
-
}, T
|
|
25
|
+
}, import("@trpc/server").TRPCDecorateCreateRouterOptions<T>>;
|
|
52
26
|
export type InferRPCServerContext<TFunc extends null | ((opts: FetchCreateContextFnOptions) => any)> = {
|
|
53
27
|
req: Request;
|
|
28
|
+
searchParams: URLSearchParams;
|
|
54
29
|
resHeaders: Headers;
|
|
30
|
+
server: ServerContext;
|
|
55
31
|
} & (TFunc extends (opts: FetchCreateContextFnOptions) => infer T ? T : {});
|
|
56
32
|
export {};
|
|
33
|
+
//# sourceMappingURL=rpc.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../../src/app/server/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,MAAM,cAAc,CAAA;AACrD,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,SAAS,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,eAAO,MAAM,MAAM;;;;;;;EAEjB,CAAA;AAEF,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,YAAY,CAAC,CAAA;AAE/E,eAAO,MAAM,GAAG;;;WAGP,CAAC,SAAS,YAAY,UAAU,CAAC,GAAG,CAAC;CAG7C,CAAA;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,IAAI,EAAE,CAAC,IAAI,EAAE,2BAA2B,KAAK,CAAC,GAC7C,CAAC,IAAI,EAAE,2BAA2B,KAAK,CAAC,CAE1C;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,YAAY,EAAE,MAAM,EAAE,CAAC;;;;;8DAElE;AAED,MAAM,MAAM,qBAAqB,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,2BAA2B,KAAK,GAAG,CAAC,IAAI;IACrG,GAAG,EAAE,OAAO,CAAA;IACZ,YAAY,EAAE,eAAe,CAAA;IAC7B,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,aAAa,CAAA;CACtB,GAAG,CAAC,KAAK,SAAS,CAAC,IAAI,EAAE,2BAA2B,KAAK,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAA"}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import { Manifest } from "vinxi/dist/types/types/manifest";
|
|
2
|
-
import { RequestHeaders } from "vinxi/http";
|
|
3
|
-
import type { EDConfig } from "../../node/project/config.js";
|
|
2
|
+
import { H3Event, RequestHeaders } from "vinxi/http";
|
|
3
|
+
import type { EDCacheConfig, EDConfig } from "../../node/project/config.js";
|
|
4
4
|
import { TrackerTags } from "../lib/routing/types.js";
|
|
5
5
|
import { UrlReplacerConf } from "./utils/replace-host.js";
|
|
6
|
+
import { QueryMonitor } from "../utils/query-monitor.js";
|
|
6
7
|
export type ServerContextArgs = {
|
|
7
8
|
dev: boolean;
|
|
8
9
|
origin: string;
|
|
9
10
|
replaceUrls?: UrlReplacerConf;
|
|
10
11
|
rpcBases?: string[];
|
|
11
12
|
config: EDConfig;
|
|
13
|
+
cacheConfig: EDCacheConfig;
|
|
12
14
|
};
|
|
13
15
|
export type ServerContextRuntime = {
|
|
14
16
|
getManifest: (name: string) => Manifest;
|
|
@@ -26,6 +28,7 @@ export declare class ServerContext {
|
|
|
26
28
|
_urlReplacer?: (text: string, origin?: string) => string;
|
|
27
29
|
rpcBases: string[];
|
|
28
30
|
config: EDConfig;
|
|
31
|
+
cacheConfig: EDCacheConfig;
|
|
29
32
|
static main: ServerContext;
|
|
30
33
|
constructor(conf: ServerContextArgs);
|
|
31
34
|
replaceUrls(text: string, origin?: string): string;
|
|
@@ -36,15 +39,21 @@ export declare class ServerContext {
|
|
|
36
39
|
replaceUrls?: boolean;
|
|
37
40
|
newOrigin?: string;
|
|
38
41
|
}): Promise<Response>;
|
|
42
|
+
debugLogQueryMonitor(kind: "props" | "mutation" | "query" | "app", uri: string, monitor: QueryMonitor.Entry[]): void;
|
|
39
43
|
fetchRouteData(req: {
|
|
40
44
|
pathname: string;
|
|
45
|
+
bypass?: boolean;
|
|
41
46
|
headers?: RequestHeaders;
|
|
42
47
|
newOrigin?: string;
|
|
43
48
|
}): Promise<Response>;
|
|
44
|
-
fetchAppData(
|
|
49
|
+
fetchAppData(args: {
|
|
50
|
+
bypass?: boolean;
|
|
51
|
+
newOrigin?: string;
|
|
52
|
+
}): Promise<ServerAppData>;
|
|
45
53
|
extractRequestHeaders(req?: RequestHeaders): Partial<Record<import("vinxi/http").HTTPHeaderName, string | undefined>>;
|
|
46
54
|
fetchNamedQuery(req: {
|
|
47
55
|
name: string;
|
|
56
|
+
bypass: boolean;
|
|
48
57
|
params: object;
|
|
49
58
|
headers: RequestHeaders;
|
|
50
59
|
}): Promise<Response>;
|
|
@@ -54,6 +63,7 @@ export declare class ServerContext {
|
|
|
54
63
|
headers: RequestHeaders;
|
|
55
64
|
}): Promise<Response>;
|
|
56
65
|
get allowedCorsOrigins(): string[];
|
|
66
|
+
shouldBypass(event: H3Event): boolean;
|
|
57
67
|
getCorsOrigin(originHeader: string): string | undefined;
|
|
58
68
|
getCorsHeaders(origin: string): {
|
|
59
69
|
"Access-Control-Allow-Methods"?: undefined;
|
|
@@ -70,3 +80,4 @@ export declare class ServerContext {
|
|
|
70
80
|
};
|
|
71
81
|
}
|
|
72
82
|
export {};
|
|
83
|
+
//# sourceMappingURL=server-context.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"server-context.d.ts","sourceRoot":"","sources":["../../../src/app/server/server-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,cAAc,EAAoC,MAAM,YAAY,CAAA;AACtF,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAE3E,OAAO,EAAiC,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAEpF,OAAO,EAAqB,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAE5E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAKxD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,eAAe,CAAA;IAC7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;IAChB,WAAW,EAAE,aAAa,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAA;CACxC,CAAA;AAkBD;;GAEG;AACH,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;CACtB,CAAA;AAED,qBAAa,aAAa;IACxB,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;IACxD,QAAQ,EAAE,MAAM,EAAE,CAAK;IACvB,MAAM,EAAE,QAAQ,CAAA;IAChB,WAAW,EAAE,aAAa,CAAA;IAE1B,MAAM,CAAC,IAAI,EAAE,aAAa,CAAA;gBAEd,IAAI,EAAE,iBAAiB;IAYnC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAOzC,IAAI,OAAO,yBAEV;IAED,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,oBAAoB;IAI1C,YAAY,CAAC,GAAG,EAAE,MAAM;IAQlB,WAAW,CACf,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,WAAW,GAAG;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GACjE,OAAO,CAAC,QAAQ,CAAC;IAgCpB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE;IAmFvG,cAAc,CAAC,GAAG,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,cAAc,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;IAqHxG,YAAY,CAAC,IAAI,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAuC1F,qBAAqB,CAAC,GAAG,CAAC,EAAE,cAAc;IAYpC,eAAe,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE;IAqE/F,aAAa,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE;IA0BhF,IAAI,kBAAkB,aAcrB;IAED,YAAY,CAAC,KAAK,EAAE,OAAO;IAc3B,aAAa,CAAC,YAAY,EAAE,MAAM;IAUlC,cAAc,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;;;;CAiD9B"}
|