Merge remote-tracking branch 'origin/release/v2' into feat/configurable-header-branding
# Conflicts: # packages/onboarding/src/onboarding-wordmark.tsx
This commit is contained in:
commit
27decf209a
50 files changed
+2143
-944
No files matched your search
@@ -243,6 +243,7 @@ export const customApiRouter = createTRPCRouter({
|
||||
return {
|
||||
type: "customJsx" as const,
|
||||
template: resolved.definition.template,
|
||||
queryCacheKey: `${getCustomWidgetCacheVersion(resolved.stored)}:${hashRuntimeParams(resolved.configuration)}`,
|
||||
data: Object.fromEntries(entries.map(([id, result]) => [id, result.data])),
|
||||
status: Object.fromEntries(entries.map(([id, result]) => [id, result.status])),
|
||||
options: resolved.configuration,
|
||||
|
||||
Reference in new issue
Block a user