create-nextblock 0.16.4 → 0.17.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.
Files changed (196) hide show
  1. package/CLAUDE.md +22 -0
  2. package/docker-template/.env.docker.example +69 -69
  3. package/docker-template/docker/db/init/99-jwt.sql +6 -6
  4. package/docker-template/docker/db/init/99-roles.sql +25 -25
  5. package/docker-template/docker/kong/kong.yml +112 -112
  6. package/docker-template/scripts/docker-setup.mjs +310 -310
  7. package/package.json +1 -1
  8. package/templates/nextblock-template/.browserslistrc +11 -11
  9. package/templates/nextblock-template/.swcrc +30 -30
  10. package/templates/nextblock-template/CLAUDE.md +26 -0
  11. package/templates/nextblock-template/app/(auth-pages)/sign-up/page.tsx +46 -46
  12. package/templates/nextblock-template/app/(auth-pages)/two-factor/page.tsx +51 -51
  13. package/templates/nextblock-template/app/.well-known/ucp/route.ts +16 -16
  14. package/templates/nextblock-template/app/actions/consent.ts +57 -57
  15. package/templates/nextblock-template/app/actions/twoFactorEmail.ts +22 -22
  16. package/templates/nextblock-template/app/api/ai/cortex/build-widget/route.ts +153 -153
  17. package/templates/nextblock-template/app/api/ai/generate-blocks/route.ts +96 -96
  18. package/templates/nextblock-template/app/api/brand/email-logo/route.ts +48 -48
  19. package/templates/nextblock-template/app/api/checkout/freemius/sync/route.ts +29 -29
  20. package/templates/nextblock-template/app/api/cms/check-updates/route.ts +44 -44
  21. package/templates/nextblock-template/app/api/cms/full-backup/export/route.ts +33 -33
  22. package/templates/nextblock-template/app/api/cms/full-backup/restore/route.ts +63 -63
  23. package/templates/nextblock-template/app/api/cron/reset-sandbox/route.ts +270 -205
  24. package/templates/nextblock-template/app/api/cron/reset-sandbox/sandboxResetSql.ts +8096 -7198
  25. package/templates/nextblock-template/app/api/cron/sync-currencies/route.ts +39 -39
  26. package/templates/nextblock-template/app/api/custom-blocks/db-relations/route.ts +92 -92
  27. package/templates/nextblock-template/app/api/custom-blocks/editor-definitions/route.ts +43 -43
  28. package/templates/nextblock-template/app/api/media/library/route.ts +69 -69
  29. package/templates/nextblock-template/app/api/media/r2-presigned/route.ts +53 -53
  30. package/templates/nextblock-template/app/api/visual-editing/block-draft/route.ts +47 -47
  31. package/templates/nextblock-template/app/api/visual-editing/product-draft/route.ts +47 -47
  32. package/templates/nextblock-template/app/article/[slug]/PostClientContent.tsx +442 -441
  33. package/templates/nextblock-template/app/article/[slug]/page.utils.ts +4 -1
  34. package/templates/nextblock-template/app/checkout/UcpCartHydrator.tsx +20 -20
  35. package/templates/nextblock-template/app/cms/blocks/components/BlockEditorModal.tsx +241 -241
  36. package/templates/nextblock-template/app/cms/blocks/components/CustomBlockEditorPreview.tsx +160 -160
  37. package/templates/nextblock-template/app/cms/blocks/editors/DynamicCustomBlockEditor.tsx +167 -167
  38. package/templates/nextblock-template/app/cms/components/ConnectGitHubButton.tsx +122 -122
  39. package/templates/nextblock-template/app/cms/components/CortexAiActiveContext.tsx +23 -23
  40. package/templates/nextblock-template/app/cms/components/SeoScoreBadge.tsx +3 -3
  41. package/templates/nextblock-template/app/cms/components/SystemAlertsBanner.tsx +112 -112
  42. package/templates/nextblock-template/app/cms/components/TablePagination.tsx +136 -136
  43. package/templates/nextblock-template/app/cms/components/TwoFactorReminderBanner.tsx +45 -45
  44. package/templates/nextblock-template/app/cms/components/github-connect-actions.ts +102 -102
  45. package/templates/nextblock-template/app/cms/components/system-alerts-actions.ts +31 -31
  46. package/templates/nextblock-template/app/cms/coupons/[id]/edit/page.tsx +16 -16
  47. package/templates/nextblock-template/app/cms/coupons/page.tsx +16 -16
  48. package/templates/nextblock-template/app/cms/custom-blocks/[id]/edit/page.tsx +66 -66
  49. package/templates/nextblock-template/app/cms/custom-blocks/actions.ts +519 -519
  50. package/templates/nextblock-template/app/cms/custom-blocks/components/BlocksLibraryTransferControls.tsx +256 -256
  51. package/templates/nextblock-template/app/cms/custom-blocks/components/DBRelationSelect.tsx +384 -384
  52. package/templates/nextblock-template/app/cms/custom-blocks/components/ImageR2Picker.tsx +221 -221
  53. package/templates/nextblock-template/app/cms/custom-blocks/new/page.tsx +12 -12
  54. package/templates/nextblock-template/app/cms/custom-blocks/page.tsx +438 -438
  55. package/templates/nextblock-template/app/cms/dashboard/components/DashboardComponents.tsx +200 -200
  56. package/templates/nextblock-template/app/cms/dashboard/components/DashboardOnboarding.tsx +130 -130
  57. package/templates/nextblock-template/app/cms/import-export/actions.ts +226 -226
  58. package/templates/nextblock-template/app/cms/pages/page.tsx +273 -273
  59. package/templates/nextblock-template/app/cms/posts/page.tsx +251 -251
  60. package/templates/nextblock-template/app/cms/products/categories/page.tsx +12 -12
  61. package/templates/nextblock-template/app/cms/products/new/page.tsx +135 -135
  62. package/templates/nextblock-template/app/cms/promotions/PromotionsWorkspace.tsx +456 -456
  63. package/templates/nextblock-template/app/cms/promotions/actions.ts +115 -115
  64. package/templates/nextblock-template/app/cms/promotions/page.tsx +31 -31
  65. package/templates/nextblock-template/app/cms/settings/backup-restore/BackupRestoreWorkspace.tsx +1004 -1004
  66. package/templates/nextblock-template/app/cms/settings/backup-restore/page.tsx +29 -29
  67. package/templates/nextblock-template/app/cms/settings/bot-protection/page.tsx +24 -24
  68. package/templates/nextblock-template/app/cms/settings/email/page.tsx +28 -28
  69. package/templates/nextblock-template/app/cms/settings/extra-translations/actions.ts +276 -276
  70. package/templates/nextblock-template/app/cms/settings/google-analytics/page.tsx +26 -26
  71. package/templates/nextblock-template/app/cms/settings/logos/components/DeleteLogoButton.tsx +21 -21
  72. package/templates/nextblock-template/app/cms/settings/logos/components/SetActiveLogoButton.tsx +42 -42
  73. package/templates/nextblock-template/app/cms/settings/logos/components/SiteSeoSettingsForm.tsx +133 -133
  74. package/templates/nextblock-template/app/cms/settings/privacy/page.tsx +27 -27
  75. package/templates/nextblock-template/app/cms/settings/registration/page.tsx +27 -27
  76. package/templates/nextblock-template/app/cms/settings/security/page.tsx +33 -33
  77. package/templates/nextblock-template/app/lib/site-settings.ts +105 -105
  78. package/templates/nextblock-template/app/lib/ucp/protocol.ts +190 -190
  79. package/templates/nextblock-template/app/lib/ucp/server.test.ts +56 -56
  80. package/templates/nextblock-template/app/setup/SetupWizard.tsx +678 -678
  81. package/templates/nextblock-template/app/setup/layout.tsx +13 -13
  82. package/templates/nextblock-template/app/setup/page.tsx +111 -111
  83. package/templates/nextblock-template/app/ucp/v1/carts/[id]/cancel/route.ts +38 -38
  84. package/templates/nextblock-template/app/ucp/v1/carts/[id]/route.ts +68 -68
  85. package/templates/nextblock-template/app/ucp/v1/carts/route.ts +35 -35
  86. package/templates/nextblock-template/app/ucp/v1/catalog/lookup/route.ts +35 -35
  87. package/templates/nextblock-template/app/ucp/v1/catalog/product/route.ts +35 -35
  88. package/templates/nextblock-template/app/ucp/v1/catalog/search/route.ts +34 -34
  89. package/templates/nextblock-template/components/CartTranslator.tsx +210 -210
  90. package/templates/nextblock-template/components/DeferredCartTranslator.tsx +51 -51
  91. package/templates/nextblock-template/components/DeferredGlobalSearch.tsx +68 -68
  92. package/templates/nextblock-template/components/DeferredGoogleAnalytics.tsx +70 -70
  93. package/templates/nextblock-template/components/FeatureImageHero.tsx +47 -47
  94. package/templates/nextblock-template/components/GlobalSearch.tsx +557 -557
  95. package/templates/nextblock-template/components/Header.tsx +38 -38
  96. package/templates/nextblock-template/components/PublicEnvBootstrap.tsx +30 -30
  97. package/templates/nextblock-template/components/ResponsiveNav.tsx +14 -14
  98. package/templates/nextblock-template/components/auth/AuthBotProtection.tsx +182 -182
  99. package/templates/nextblock-template/components/blocks/PostsGridClient.tsx +48 -48
  100. package/templates/nextblock-template/components/blocks/TestimonialBlock.tsx +9 -9
  101. package/templates/nextblock-template/components/blocks/publicRendererLoaders.ts +25 -25
  102. package/templates/nextblock-template/components/blocks/renderers/ButtonBlockRenderer.tsx +92 -92
  103. package/templates/nextblock-template/components/blocks/renderers/ClientTextBlockRenderer.tsx +11 -0
  104. package/templates/nextblock-template/components/blocks/renderers/PostsGridBlockRenderer.tsx +24 -24
  105. package/templates/nextblock-template/components/blocks/renderers/TestimonialBlockRenderer.tsx +57 -57
  106. package/templates/nextblock-template/components/blocks/renderers/inline/AlertWidgetRenderer.tsx +2 -2
  107. package/templates/nextblock-template/components/blocks/renderers/inline/CtaWidgetRenderer.tsx +2 -2
  108. package/templates/nextblock-template/components/media/YouTubeFacade.tsx +105 -105
  109. package/templates/nextblock-template/components/media/youtube-embed-replace.tsx +32 -32
  110. package/templates/nextblock-template/components/privacy/ConsentBanner.tsx +170 -170
  111. package/templates/nextblock-template/components/privacy/ConsentGatedAnalytics.tsx +70 -70
  112. package/templates/nextblock-template/components/renderers/CachedDynamicLayoutEngine.tsx +28 -28
  113. package/templates/nextblock-template/components/renderers/DynamicLayoutEngine.test.tsx +166 -166
  114. package/templates/nextblock-template/components/renderers/DynamicLayoutEngine.tsx +471 -471
  115. package/templates/nextblock-template/components/visual-editing/DeferredVisualEditing.tsx +21 -21
  116. package/templates/nextblock-template/context/language-rest-client.ts +32 -32
  117. package/templates/nextblock-template/docker/db/init/99-jwt.sql +6 -6
  118. package/templates/nextblock-template/docker/db/init/99-roles.sql +25 -25
  119. package/templates/nextblock-template/docker/kong/kong.yml +112 -112
  120. package/templates/nextblock-template/docs/02-ECOMMERCE-CAPABILITIES.md +364 -364
  121. package/templates/nextblock-template/docs/04-DATABASE-AND-AUTH.md +11 -0
  122. package/templates/nextblock-template/docs/07-BLOCK-SDK-AND-EXTENSIBILITY.md +146 -146
  123. package/templates/nextblock-template/docs/08-NEXTBLOCK-CORTEX-AI-ARCHITECTURE.md +19 -0
  124. package/templates/nextblock-template/docs/10-CUSTOM-BLOCKS.md +222 -222
  125. package/templates/nextblock-template/lib/app-secrets.ts +39 -39
  126. package/templates/nextblock-template/lib/auth/cookies.ts +47 -47
  127. package/templates/nextblock-template/lib/auth/crypto.ts +45 -45
  128. package/templates/nextblock-template/lib/auth/trustedDevices.ts +92 -92
  129. package/templates/nextblock-template/lib/blocks/README.md +13 -13
  130. package/templates/nextblock-template/lib/botProtection/verify.ts +134 -134
  131. package/templates/nextblock-template/lib/cms/payments-reminder.test.ts +135 -135
  132. package/templates/nextblock-template/lib/cms/payments-reminder.ts +105 -105
  133. package/templates/nextblock-template/lib/cms-transfer/types.ts +145 -145
  134. package/templates/nextblock-template/lib/custom-block-definitions.ts +87 -87
  135. package/templates/nextblock-template/lib/custom-block-r2-upload-shared.ts +178 -178
  136. package/templates/nextblock-template/lib/custom-block-r2-upload.test.ts +140 -140
  137. package/templates/nextblock-template/lib/custom-block-r2-upload.ts +88 -88
  138. package/templates/nextblock-template/lib/custom-block-relations.test.ts +227 -227
  139. package/templates/nextblock-template/lib/custom-block-relations.ts +279 -279
  140. package/templates/nextblock-template/lib/custom-block-safelist.ts +14 -14
  141. package/templates/nextblock-template/lib/editor/dynamic-extension-core.test.ts +172 -172
  142. package/templates/nextblock-template/lib/editor/dynamic-extension-core.ts +213 -213
  143. package/templates/nextblock-template/lib/editor/dynamic-extension-loader.ts +22 -22
  144. package/templates/nextblock-template/lib/editor/dynamic-extensions.tsx +193 -193
  145. package/templates/nextblock-template/lib/email/branding-format.test.ts +133 -133
  146. package/templates/nextblock-template/lib/email/branding-format.ts +123 -123
  147. package/templates/nextblock-template/lib/email/branding.ts +76 -76
  148. package/templates/nextblock-template/lib/full-backup/manifest.test.ts +121 -121
  149. package/templates/nextblock-template/lib/full-backup/manifest.ts +206 -206
  150. package/templates/nextblock-template/lib/logos/active-logo.ts +53 -53
  151. package/templates/nextblock-template/lib/media/resolveMediaUrl.ts +56 -54
  152. package/templates/nextblock-template/lib/media/youtube.ts +99 -99
  153. package/templates/nextblock-template/lib/onboarding/actions.ts +31 -31
  154. package/templates/nextblock-template/lib/privacy/consent-client.ts +57 -57
  155. package/templates/nextblock-template/lib/privacy/contact-emails.ts +64 -64
  156. package/templates/nextblock-template/lib/privacy/settings.ts +115 -115
  157. package/templates/nextblock-template/lib/privacy/types.ts +69 -69
  158. package/templates/nextblock-template/lib/promotions/server.test.ts +74 -74
  159. package/templates/nextblock-template/lib/promotions/server.ts +741 -741
  160. package/templates/nextblock-template/lib/resolve-block-relations.test.ts +142 -142
  161. package/templates/nextblock-template/lib/resolve-block-relations.ts +255 -255
  162. package/templates/nextblock-template/lib/seo/page-document.ts +4 -4
  163. package/templates/nextblock-template/lib/setup/actions.ts +460 -460
  164. package/templates/nextblock-template/lib/setup/env-status.ts +125 -125
  165. package/templates/nextblock-template/lib/setup/env-write.ts +111 -111
  166. package/templates/nextblock-template/lib/setup/migrations-bundle.ts +42 -12
  167. package/templates/nextblock-template/lib/setup/provisioning.ts +59 -59
  168. package/templates/nextblock-template/lib/setup/schema-apply.ts +408 -408
  169. package/templates/nextblock-template/lib/setup/system-config.ts +105 -105
  170. package/templates/nextblock-template/lib/setup/types.ts +18 -18
  171. package/templates/nextblock-template/lib/storage/provider.ts +66 -66
  172. package/templates/nextblock-template/lib/storage/supabase-storage.ts +103 -103
  173. package/templates/nextblock-template/lib/updates/github-device.ts +206 -206
  174. package/templates/nextblock-template/lib/updates/repo-identity.ts +56 -56
  175. package/templates/nextblock-template/lib/visual-editing/draft-content.test.ts +105 -105
  176. package/templates/nextblock-template/lib/visual-editing/draft-route.test.ts +42 -42
  177. package/templates/nextblock-template/lib/visual-editing/edit-info.test.ts +143 -143
  178. package/templates/nextblock-template/lib/visual-editing/edit-info.ts +94 -94
  179. package/templates/nextblock-template/lib/visual-editing/product-drafts.test.ts +81 -81
  180. package/templates/nextblock-template/lib/zod-config.ts +5 -5
  181. package/templates/nextblock-template/next-env.d.ts +1 -0
  182. package/templates/nextblock-template/package.json +1 -1
  183. package/templates/nextblock-template/public/images/cortex_post.webp +0 -0
  184. package/templates/nextblock-template/public/images/update_nextblock.webp +0 -0
  185. package/templates/nextblock-template/scripts/docker-setup.mjs +310 -310
  186. package/templates/nextblock-template/scripts/validate-editor-block-schema.ts +112 -112
  187. package/templates/nextblock-template/scripts/verify-cortex-ai-build-widget.tsx +98 -98
  188. package/templates/nextblock-template/scripts/verify-cortex-ai-generate-blocks.ts +62 -62
  189. package/templates/nextblock-template/scripts/verify-cortex-ai-global-tools.ts +537 -537
  190. package/templates/nextblock-template/scripts/verify-cortex-ai-routing.ts +58 -58
  191. package/templates/nextblock-template/scripts/verify-custom-block-definitions.ts +188 -188
  192. package/templates/nextblock-template/scripts/verify-dynamic-custom-block-extensions.ts +123 -123
  193. package/templates/nextblock-template/scripts/verify-dynamic-layout-engine.tsx +133 -133
  194. package/templates/nextblock-template/scripts/verify-milestone-2-custom-blocks.ts +65 -65
  195. package/templates/nextblock-template/tools/deploy-supabase.js +159 -159
  196. package/templates/nextblock-template/types/jsdom.d.ts +6 -6
@@ -1,193 +1,193 @@
1
- 'use client';
2
-
3
- import { ReactNodeViewRenderer, NodeViewContent, NodeViewWrapper, type NodeViewProps } from '@tiptap/react';
4
- import { Textarea } from '@nextblock-cms/ui';
5
- import { Input } from '@nextblock-cms/ui';
6
- import { Label } from '@nextblock-cms/ui';
7
- import type { CustomBlockField } from '@nextblock-cms/utils';
8
-
9
- import {
10
- createDynamicCustomBlockExtension,
11
- createDynamicCustomBlockExtensions as createDynamicCustomBlockCoreExtensions,
12
- type DynamicCustomBlockEditorDefinition,
13
- } from './dynamic-extension-core';
14
- import {
15
- DBRelationSelect,
16
- type DBRelationValue,
17
- } from '../../app/cms/custom-blocks/components/DBRelationSelect';
18
- import {
19
- ImageR2Picker,
20
- type ImageR2Value,
21
- } from '../../app/cms/custom-blocks/components/ImageR2Picker';
22
-
23
- export type { DynamicCustomBlockEditorDefinition } from './dynamic-extension-core';
24
- export {
25
- buildDynamicCustomBlockInsertContent,
26
- getDynamicCustomBlockAttributeNames,
27
- getDynamicCustomBlockNodeName,
28
- } from './dynamic-extension-core';
29
-
30
- function isImageR2Value(value: unknown): ImageR2Value | null {
31
- if (!value || typeof value !== 'object') {
32
- return null;
33
- }
34
-
35
- const candidate = value as Partial<ImageR2Value>;
36
- return typeof candidate.url === 'string' && typeof candidate.object_key === 'string'
37
- ? (candidate as ImageR2Value)
38
- : null;
39
- }
40
-
41
- function getStringValue(value: unknown) {
42
- return typeof value === 'string' ? value : '';
43
- }
44
-
45
- function getRelationValue(value: unknown, multiple?: boolean): DBRelationValue {
46
- if (multiple) {
47
- return Array.isArray(value) ? value.map((entry) => String(entry)) : [];
48
- }
49
-
50
- return value === null || value === undefined || value === '' ? null : String(value);
51
- }
52
-
53
- function FieldControl({
54
- field,
55
- node,
56
- updateAttributes,
57
- }: {
58
- field: CustomBlockField;
59
- node: NodeViewProps['node'];
60
- updateAttributes: NodeViewProps['updateAttributes'];
61
- }) {
62
- const fieldValue = node.attrs[field.key];
63
- const fieldId = `dynamic-custom-block-${node.attrs.customBlockSlug}-${field.key}`;
64
-
65
- if (field.type === 'rich-text') {
66
- return (
67
- <div className="space-y-1">
68
- <Label htmlFor={fieldId} className="text-xs font-medium">
69
- {field.label}
70
- </Label>
71
- <Textarea
72
- id={fieldId}
73
- value={getStringValue(fieldValue)}
74
- onChange={(event) => updateAttributes({ [field.key]: event.target.value })}
75
- placeholder={field.placeholder}
76
- className="min-h-24 text-sm"
77
- />
78
- </div>
79
- );
80
- }
81
-
82
- if (field.type === 'image_r2') {
83
- return (
84
- <div className="space-y-1">
85
- <Label className="text-xs font-medium">{field.label}</Label>
86
- <ImageR2Picker
87
- accept={field.accept}
88
- maxBytes={field.max_bytes}
89
- value={isImageR2Value(fieldValue)}
90
- onChange={(value) => updateAttributes({ [field.key]: value })}
91
- />
92
- </div>
93
- );
94
- }
95
-
96
- if (field.type === 'db_relation') {
97
- return (
98
- <div className="space-y-1">
99
- <Label className="text-xs font-medium">{field.label}</Label>
100
- <DBRelationSelect
101
- displayColumn={field.display_column}
102
- filters={field.filters}
103
- multiple={field.multiple}
104
- onChange={(value) => updateAttributes({ [field.key]: value })}
105
- table={field.table}
106
- value={getRelationValue(fieldValue, field.multiple)}
107
- valueColumn={field.value_column}
108
- />
109
- </div>
110
- );
111
- }
112
-
113
- return (
114
- <div className="space-y-1">
115
- <Label htmlFor={fieldId} className="text-xs font-medium">
116
- {field.label}
117
- </Label>
118
- <Input
119
- id={fieldId}
120
- value={getStringValue(fieldValue)}
121
- onChange={(event) => updateAttributes({ [field.key]: event.target.value })}
122
- placeholder={field.placeholder}
123
- className="h-9"
124
- />
125
- </div>
126
- );
127
- }
128
-
129
- function DynamicCustomBlockNodeView({
130
- definition,
131
- node,
132
- selected,
133
- updateAttributes,
134
- }: NodeViewProps & { definition: DynamicCustomBlockEditorDefinition }) {
135
- return (
136
- <NodeViewWrapper
137
- data-drag-handle
138
- className={[
139
- 'my-4 rounded-md border bg-background text-foreground shadow-sm',
140
- selected ? 'ring-2 ring-primary ring-offset-2' : '',
141
- ].join(' ')}
142
- >
143
- <div contentEditable={false} className="border-b bg-muted/40 px-3 py-2">
144
- <div className="flex flex-wrap items-center justify-between gap-2">
145
- <div className="min-w-0">
146
- <p className="truncate text-sm font-semibold">{definition.name}</p>
147
- <p className="truncate font-mono text-[11px] text-muted-foreground">
148
- {node.attrs.customBlockSlug}
149
- </p>
150
- </div>
151
- <span className="rounded border bg-background px-2 py-1 text-[11px] uppercase text-muted-foreground">
152
- Custom block
153
- </span>
154
- </div>
155
- </div>
156
-
157
- <div contentEditable={false} className="grid gap-3 p-3 md:grid-cols-2">
158
- {definition.fields.map((field) => (
159
- <FieldControl
160
- key={field.key}
161
- field={field}
162
- node={node}
163
- updateAttributes={updateAttributes}
164
- />
165
- ))}
166
- </div>
167
-
168
- <NodeViewContent className="min-h-12 border-t px-3 py-3 [&>*:first-child]:mt-0 [&>*:last-child]:mb-0" />
169
- </NodeViewWrapper>
170
- );
171
- }
172
-
173
- export function createDynamicCustomBlockExtensions(
174
- definitions: DynamicCustomBlockEditorDefinition[]
175
- ) {
176
- return createDynamicCustomBlockCoreExtensions(definitions, {
177
- nodeViewRenderer: (definition) =>
178
- ReactNodeViewRenderer((props) => (
179
- <DynamicCustomBlockNodeView {...props} definition={definition} />
180
- )),
181
- });
182
- }
183
-
184
- export function createDynamicCustomBlockExtensionWithNodeView(
185
- definition: DynamicCustomBlockEditorDefinition
186
- ) {
187
- return createDynamicCustomBlockExtension(definition, {
188
- nodeViewRenderer: () =>
189
- ReactNodeViewRenderer((props) => (
190
- <DynamicCustomBlockNodeView {...props} definition={definition} />
191
- )),
192
- });
193
- }
1
+ 'use client';
2
+
3
+ import { ReactNodeViewRenderer, NodeViewContent, NodeViewWrapper, type NodeViewProps } from '@tiptap/react';
4
+ import { Textarea } from '@nextblock-cms/ui';
5
+ import { Input } from '@nextblock-cms/ui';
6
+ import { Label } from '@nextblock-cms/ui';
7
+ import type { CustomBlockField } from '@nextblock-cms/utils';
8
+
9
+ import {
10
+ createDynamicCustomBlockExtension,
11
+ createDynamicCustomBlockExtensions as createDynamicCustomBlockCoreExtensions,
12
+ type DynamicCustomBlockEditorDefinition,
13
+ } from './dynamic-extension-core';
14
+ import {
15
+ DBRelationSelect,
16
+ type DBRelationValue,
17
+ } from '../../app/cms/custom-blocks/components/DBRelationSelect';
18
+ import {
19
+ ImageR2Picker,
20
+ type ImageR2Value,
21
+ } from '../../app/cms/custom-blocks/components/ImageR2Picker';
22
+
23
+ export type { DynamicCustomBlockEditorDefinition } from './dynamic-extension-core';
24
+ export {
25
+ buildDynamicCustomBlockInsertContent,
26
+ getDynamicCustomBlockAttributeNames,
27
+ getDynamicCustomBlockNodeName,
28
+ } from './dynamic-extension-core';
29
+
30
+ function isImageR2Value(value: unknown): ImageR2Value | null {
31
+ if (!value || typeof value !== 'object') {
32
+ return null;
33
+ }
34
+
35
+ const candidate = value as Partial<ImageR2Value>;
36
+ return typeof candidate.url === 'string' && typeof candidate.object_key === 'string'
37
+ ? (candidate as ImageR2Value)
38
+ : null;
39
+ }
40
+
41
+ function getStringValue(value: unknown) {
42
+ return typeof value === 'string' ? value : '';
43
+ }
44
+
45
+ function getRelationValue(value: unknown, multiple?: boolean): DBRelationValue {
46
+ if (multiple) {
47
+ return Array.isArray(value) ? value.map((entry) => String(entry)) : [];
48
+ }
49
+
50
+ return value === null || value === undefined || value === '' ? null : String(value);
51
+ }
52
+
53
+ function FieldControl({
54
+ field,
55
+ node,
56
+ updateAttributes,
57
+ }: {
58
+ field: CustomBlockField;
59
+ node: NodeViewProps['node'];
60
+ updateAttributes: NodeViewProps['updateAttributes'];
61
+ }) {
62
+ const fieldValue = node.attrs[field.key];
63
+ const fieldId = `dynamic-custom-block-${node.attrs.customBlockSlug}-${field.key}`;
64
+
65
+ if (field.type === 'rich-text') {
66
+ return (
67
+ <div className="space-y-1">
68
+ <Label htmlFor={fieldId} className="text-xs font-medium">
69
+ {field.label}
70
+ </Label>
71
+ <Textarea
72
+ id={fieldId}
73
+ value={getStringValue(fieldValue)}
74
+ onChange={(event) => updateAttributes({ [field.key]: event.target.value })}
75
+ placeholder={field.placeholder}
76
+ className="min-h-24 text-sm"
77
+ />
78
+ </div>
79
+ );
80
+ }
81
+
82
+ if (field.type === 'image_r2') {
83
+ return (
84
+ <div className="space-y-1">
85
+ <Label className="text-xs font-medium">{field.label}</Label>
86
+ <ImageR2Picker
87
+ accept={field.accept}
88
+ maxBytes={field.max_bytes}
89
+ value={isImageR2Value(fieldValue)}
90
+ onChange={(value) => updateAttributes({ [field.key]: value })}
91
+ />
92
+ </div>
93
+ );
94
+ }
95
+
96
+ if (field.type === 'db_relation') {
97
+ return (
98
+ <div className="space-y-1">
99
+ <Label className="text-xs font-medium">{field.label}</Label>
100
+ <DBRelationSelect
101
+ displayColumn={field.display_column}
102
+ filters={field.filters}
103
+ multiple={field.multiple}
104
+ onChange={(value) => updateAttributes({ [field.key]: value })}
105
+ table={field.table}
106
+ value={getRelationValue(fieldValue, field.multiple)}
107
+ valueColumn={field.value_column}
108
+ />
109
+ </div>
110
+ );
111
+ }
112
+
113
+ return (
114
+ <div className="space-y-1">
115
+ <Label htmlFor={fieldId} className="text-xs font-medium">
116
+ {field.label}
117
+ </Label>
118
+ <Input
119
+ id={fieldId}
120
+ value={getStringValue(fieldValue)}
121
+ onChange={(event) => updateAttributes({ [field.key]: event.target.value })}
122
+ placeholder={field.placeholder}
123
+ className="h-9"
124
+ />
125
+ </div>
126
+ );
127
+ }
128
+
129
+ function DynamicCustomBlockNodeView({
130
+ definition,
131
+ node,
132
+ selected,
133
+ updateAttributes,
134
+ }: NodeViewProps & { definition: DynamicCustomBlockEditorDefinition }) {
135
+ return (
136
+ <NodeViewWrapper
137
+ data-drag-handle
138
+ className={[
139
+ 'my-4 rounded-md border bg-background text-foreground shadow-sm',
140
+ selected ? 'ring-2 ring-primary ring-offset-2' : '',
141
+ ].join(' ')}
142
+ >
143
+ <div contentEditable={false} className="border-b bg-muted/40 px-3 py-2">
144
+ <div className="flex flex-wrap items-center justify-between gap-2">
145
+ <div className="min-w-0">
146
+ <p className="truncate text-sm font-semibold">{definition.name}</p>
147
+ <p className="truncate font-mono text-[11px] text-muted-foreground">
148
+ {node.attrs.customBlockSlug}
149
+ </p>
150
+ </div>
151
+ <span className="rounded border bg-background px-2 py-1 text-[11px] uppercase text-muted-foreground">
152
+ Custom block
153
+ </span>
154
+ </div>
155
+ </div>
156
+
157
+ <div contentEditable={false} className="grid gap-3 p-3 md:grid-cols-2">
158
+ {definition.fields.map((field) => (
159
+ <FieldControl
160
+ key={field.key}
161
+ field={field}
162
+ node={node}
163
+ updateAttributes={updateAttributes}
164
+ />
165
+ ))}
166
+ </div>
167
+
168
+ <NodeViewContent className="min-h-12 border-t px-3 py-3 [&>*:first-child]:mt-0 [&>*:last-child]:mb-0" />
169
+ </NodeViewWrapper>
170
+ );
171
+ }
172
+
173
+ export function createDynamicCustomBlockExtensions(
174
+ definitions: DynamicCustomBlockEditorDefinition[]
175
+ ) {
176
+ return createDynamicCustomBlockCoreExtensions(definitions, {
177
+ nodeViewRenderer: (definition) =>
178
+ ReactNodeViewRenderer((props) => (
179
+ <DynamicCustomBlockNodeView {...props} definition={definition} />
180
+ )),
181
+ });
182
+ }
183
+
184
+ export function createDynamicCustomBlockExtensionWithNodeView(
185
+ definition: DynamicCustomBlockEditorDefinition
186
+ ) {
187
+ return createDynamicCustomBlockExtension(definition, {
188
+ nodeViewRenderer: () =>
189
+ ReactNodeViewRenderer((props) => (
190
+ <DynamicCustomBlockNodeView {...props} definition={definition} />
191
+ )),
192
+ });
193
+ }
@@ -1,133 +1,133 @@
1
- import { describe, expect, it } from 'vitest';
2
-
3
- import {
4
- EMAIL_BRAND_HEADER_TOKEN,
5
- applyEmailBranding,
6
- pickEmailLogoObjectKey,
7
- renderEmailBrandHeader,
8
- } from './branding-format';
9
-
10
- describe('renderEmailBrandHeader', () => {
11
- it('renders an email-safe logo img capped at width 150 when a logo is set', () => {
12
- const html = renderEmailBrandHeader({
13
- logoUrl: 'https://cdn.example.com/logo.png',
14
- siteName: 'Acme Co',
15
- });
16
- expect(html).toContain('<img');
17
- expect(html).toContain('src="https://cdn.example.com/logo.png"');
18
- expect(html).toContain('width="150"');
19
- expect(html).toContain('alt="Acme Co"');
20
- // width is also pinned in the inline style so clients that ignore the attribute obey it.
21
- expect(html).toContain('width:150px');
22
- });
23
-
24
- it('falls back to a text banner with the site name and no image when logo is null', () => {
25
- const html = renderEmailBrandHeader({ logoUrl: null, siteName: 'Acme Co' });
26
- expect(html).not.toContain('<img');
27
- expect(html).toContain('Acme Co');
28
- });
29
-
30
- it('falls back to the text banner when the logo url is an empty string', () => {
31
- const html = renderEmailBrandHeader({ logoUrl: '', siteName: 'Acme Co' });
32
- expect(html).not.toContain('<img');
33
- expect(html).toContain('Acme Co');
34
- });
35
-
36
- it('html-escapes the site name and logo url to prevent attribute/markup breakout', () => {
37
- const html = renderEmailBrandHeader({
38
- logoUrl: 'https://x.test/a"onerror="alert(1)',
39
- siteName: 'A & B "Co" <script>',
40
- });
41
- expect(html).toContain('A &amp; B &quot;Co&quot; &lt;script&gt;');
42
- expect(html).not.toContain('onerror="alert(1)"');
43
- expect(html).toContain('&quot;onerror=&quot;');
44
- });
45
- });
46
-
47
- describe('applyEmailBranding', () => {
48
- it('replaces the brand-header token with the rendered logo header', () => {
49
- const out = applyEmailBranding(`<div>${EMAIL_BRAND_HEADER_TOKEN}<p>Hi</p></div>`, {
50
- logoUrl: 'https://cdn.example.com/logo.png',
51
- siteName: 'Acme Co',
52
- });
53
- expect(out).not.toContain(EMAIL_BRAND_HEADER_TOKEN);
54
- expect(out).toContain('src="https://cdn.example.com/logo.png"');
55
- expect(out).toContain('<p>Hi</p>');
56
- });
57
-
58
- it('replaces every occurrence of the token', () => {
59
- const out = applyEmailBranding(
60
- `${EMAIL_BRAND_HEADER_TOKEN}|${EMAIL_BRAND_HEADER_TOKEN}`,
61
- { logoUrl: null, siteName: 'Acme Co' },
62
- );
63
- expect(out).not.toContain(EMAIL_BRAND_HEADER_TOKEN);
64
- expect(out.match(/Acme Co/g)?.length).toBe(2);
65
- });
66
-
67
- it('defensively swaps a stray hardcoded legacy NextBlock logo img for the tenant header', () => {
68
- const legacy =
69
- '<img src="https://nextblock.dev/images/nextblock-logo-small.webp" alt="Site logo" width="88" />';
70
- const out = applyEmailBranding(`<td>${legacy}</td>`, {
71
- logoUrl: 'https://cdn.example.com/logo.png',
72
- siteName: 'Acme Co',
73
- });
74
- expect(out).not.toContain('nextblock-logo-small.webp');
75
- expect(out).toContain('src="https://cdn.example.com/logo.png"');
76
- });
77
-
78
- it('swaps a stray legacy logo for the text banner when no tenant logo is set', () => {
79
- const legacy =
80
- '<img src="https://nextblock.dev/images/nextblock-logo-small.webp" alt="Site logo" width="88" />';
81
- const out = applyEmailBranding(legacy, { logoUrl: null, siteName: 'Acme Co' });
82
- expect(out).not.toContain('<img');
83
- expect(out).toContain('Acme Co');
84
- });
85
-
86
- it('leaves an unrelated body untouched', () => {
87
- const body = '<h2>New Form Submission</h2>';
88
- expect(applyEmailBranding(body, { logoUrl: null, siteName: 'Acme Co' })).toBe(body);
89
- });
90
- });
91
-
92
- describe('pickEmailLogoObjectKey', () => {
93
- it('prefers the original_uploaded variant over the AVIF object_key', () => {
94
- const media = {
95
- object_key: 'uploads/logo_original.avif',
96
- file_path: 'uploads/logo_original.avif',
97
- variants: [
98
- { objectKey: 'uploads/logo_large.avif', variantLabel: 'large_avif', fileType: 'image/avif' },
99
- { objectKey: 'uploads/logo.png', variantLabel: 'original_uploaded', fileType: 'image/png' },
100
- { objectKey: 'uploads/logo_original.avif', variantLabel: 'original_avif', fileType: 'image/avif' },
101
- ],
102
- };
103
- expect(pickEmailLogoObjectKey(media)).toBe('uploads/logo.png');
104
- });
105
-
106
- it('falls back to object_key when there is no original_uploaded variant (seeded default)', () => {
107
- const media = {
108
- object_key: 'images/nextblock-logo-small.webp',
109
- file_path: null,
110
- variants: null,
111
- };
112
- expect(pickEmailLogoObjectKey(media)).toBe('images/nextblock-logo-small.webp');
113
- });
114
-
115
- it('falls back to file_path when object_key is missing', () => {
116
- expect(
117
- pickEmailLogoObjectKey({ object_key: null, file_path: 'uploads/legacy.png', variants: [] }),
118
- ).toBe('uploads/legacy.png');
119
- });
120
-
121
- it('ignores an original_uploaded entry with a blank key and falls back', () => {
122
- const media = {
123
- object_key: 'uploads/logo_original.avif',
124
- variants: [{ objectKey: '', variantLabel: 'original_uploaded' }],
125
- };
126
- expect(pickEmailLogoObjectKey(media)).toBe('uploads/logo_original.avif');
127
- });
128
-
129
- it('returns null when there is no media', () => {
130
- expect(pickEmailLogoObjectKey(null)).toBeNull();
131
- expect(pickEmailLogoObjectKey(undefined)).toBeNull();
132
- });
133
- });
1
+ import { describe, expect, it } from 'vitest';
2
+
3
+ import {
4
+ EMAIL_BRAND_HEADER_TOKEN,
5
+ applyEmailBranding,
6
+ pickEmailLogoObjectKey,
7
+ renderEmailBrandHeader,
8
+ } from './branding-format';
9
+
10
+ describe('renderEmailBrandHeader', () => {
11
+ it('renders an email-safe logo img capped at width 150 when a logo is set', () => {
12
+ const html = renderEmailBrandHeader({
13
+ logoUrl: 'https://cdn.example.com/logo.png',
14
+ siteName: 'Acme Co',
15
+ });
16
+ expect(html).toContain('<img');
17
+ expect(html).toContain('src="https://cdn.example.com/logo.png"');
18
+ expect(html).toContain('width="150"');
19
+ expect(html).toContain('alt="Acme Co"');
20
+ // width is also pinned in the inline style so clients that ignore the attribute obey it.
21
+ expect(html).toContain('width:150px');
22
+ });
23
+
24
+ it('falls back to a text banner with the site name and no image when logo is null', () => {
25
+ const html = renderEmailBrandHeader({ logoUrl: null, siteName: 'Acme Co' });
26
+ expect(html).not.toContain('<img');
27
+ expect(html).toContain('Acme Co');
28
+ });
29
+
30
+ it('falls back to the text banner when the logo url is an empty string', () => {
31
+ const html = renderEmailBrandHeader({ logoUrl: '', siteName: 'Acme Co' });
32
+ expect(html).not.toContain('<img');
33
+ expect(html).toContain('Acme Co');
34
+ });
35
+
36
+ it('html-escapes the site name and logo url to prevent attribute/markup breakout', () => {
37
+ const html = renderEmailBrandHeader({
38
+ logoUrl: 'https://x.test/a"onerror="alert(1)',
39
+ siteName: 'A & B "Co" <script>',
40
+ });
41
+ expect(html).toContain('A &amp; B &quot;Co&quot; &lt;script&gt;');
42
+ expect(html).not.toContain('onerror="alert(1)"');
43
+ expect(html).toContain('&quot;onerror=&quot;');
44
+ });
45
+ });
46
+
47
+ describe('applyEmailBranding', () => {
48
+ it('replaces the brand-header token with the rendered logo header', () => {
49
+ const out = applyEmailBranding(`<div>${EMAIL_BRAND_HEADER_TOKEN}<p>Hi</p></div>`, {
50
+ logoUrl: 'https://cdn.example.com/logo.png',
51
+ siteName: 'Acme Co',
52
+ });
53
+ expect(out).not.toContain(EMAIL_BRAND_HEADER_TOKEN);
54
+ expect(out).toContain('src="https://cdn.example.com/logo.png"');
55
+ expect(out).toContain('<p>Hi</p>');
56
+ });
57
+
58
+ it('replaces every occurrence of the token', () => {
59
+ const out = applyEmailBranding(
60
+ `${EMAIL_BRAND_HEADER_TOKEN}|${EMAIL_BRAND_HEADER_TOKEN}`,
61
+ { logoUrl: null, siteName: 'Acme Co' },
62
+ );
63
+ expect(out).not.toContain(EMAIL_BRAND_HEADER_TOKEN);
64
+ expect(out.match(/Acme Co/g)?.length).toBe(2);
65
+ });
66
+
67
+ it('defensively swaps a stray hardcoded legacy NextBlock logo img for the tenant header', () => {
68
+ const legacy =
69
+ '<img src="https://nextblock.dev/images/nextblock-logo-small.webp" alt="Site logo" width="88" />';
70
+ const out = applyEmailBranding(`<td>${legacy}</td>`, {
71
+ logoUrl: 'https://cdn.example.com/logo.png',
72
+ siteName: 'Acme Co',
73
+ });
74
+ expect(out).not.toContain('nextblock-logo-small.webp');
75
+ expect(out).toContain('src="https://cdn.example.com/logo.png"');
76
+ });
77
+
78
+ it('swaps a stray legacy logo for the text banner when no tenant logo is set', () => {
79
+ const legacy =
80
+ '<img src="https://nextblock.dev/images/nextblock-logo-small.webp" alt="Site logo" width="88" />';
81
+ const out = applyEmailBranding(legacy, { logoUrl: null, siteName: 'Acme Co' });
82
+ expect(out).not.toContain('<img');
83
+ expect(out).toContain('Acme Co');
84
+ });
85
+
86
+ it('leaves an unrelated body untouched', () => {
87
+ const body = '<h2>New Form Submission</h2>';
88
+ expect(applyEmailBranding(body, { logoUrl: null, siteName: 'Acme Co' })).toBe(body);
89
+ });
90
+ });
91
+
92
+ describe('pickEmailLogoObjectKey', () => {
93
+ it('prefers the original_uploaded variant over the AVIF object_key', () => {
94
+ const media = {
95
+ object_key: 'uploads/logo_original.avif',
96
+ file_path: 'uploads/logo_original.avif',
97
+ variants: [
98
+ { objectKey: 'uploads/logo_large.avif', variantLabel: 'large_avif', fileType: 'image/avif' },
99
+ { objectKey: 'uploads/logo.png', variantLabel: 'original_uploaded', fileType: 'image/png' },
100
+ { objectKey: 'uploads/logo_original.avif', variantLabel: 'original_avif', fileType: 'image/avif' },
101
+ ],
102
+ };
103
+ expect(pickEmailLogoObjectKey(media)).toBe('uploads/logo.png');
104
+ });
105
+
106
+ it('falls back to object_key when there is no original_uploaded variant (seeded default)', () => {
107
+ const media = {
108
+ object_key: 'images/nextblock-logo-small.webp',
109
+ file_path: null,
110
+ variants: null,
111
+ };
112
+ expect(pickEmailLogoObjectKey(media)).toBe('images/nextblock-logo-small.webp');
113
+ });
114
+
115
+ it('falls back to file_path when object_key is missing', () => {
116
+ expect(
117
+ pickEmailLogoObjectKey({ object_key: null, file_path: 'uploads/legacy.png', variants: [] }),
118
+ ).toBe('uploads/legacy.png');
119
+ });
120
+
121
+ it('ignores an original_uploaded entry with a blank key and falls back', () => {
122
+ const media = {
123
+ object_key: 'uploads/logo_original.avif',
124
+ variants: [{ objectKey: '', variantLabel: 'original_uploaded' }],
125
+ };
126
+ expect(pickEmailLogoObjectKey(media)).toBe('uploads/logo_original.avif');
127
+ });
128
+
129
+ it('returns null when there is no media', () => {
130
+ expect(pickEmailLogoObjectKey(null)).toBeNull();
131
+ expect(pickEmailLogoObjectKey(undefined)).toBeNull();
132
+ });
133
+ });