@funnelsgrove/cli 0.1.157 → 0.1.163
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/funnel-contract-compatibility.json +37 -37
- package/package.json +4 -4
- package/template_docs/.funnelsgrove-docs.json +6 -6
- package/template_docs/docs/funnelsgrove/contracts/payments.md +1 -1
- package/template_docs/docs/funnelsgrove/migrations/step-contract-v3.md +1 -1
- package/template_docs/docs/funnelsgrove/qa/paywall-checkout.md +1 -1
- package/template_docs/docs/funnelsgrove/steps/paywall_offer.md +2 -2
- package/template_docs/funnel-docs.config.json +1 -1
- package/template_scaffold/.funnelsgrove-docs.json +6 -6
- package/template_scaffold/.funnelsgrove-scaffold.json +11 -11
- package/template_scaffold/docs/funnelsgrove/contracts/payments.md +1 -1
- package/template_scaffold/docs/funnelsgrove/migrations/step-contract-v3.md +1 -1
- package/template_scaffold/docs/funnelsgrove/qa/paywall-checkout.md +1 -1
- package/template_scaffold/docs/funnelsgrove/steps/paywall_offer.md +2 -2
- package/template_scaffold/funnel-docs.config.json +1 -1
- package/template_scaffold/package-lock.json +15 -15
- package/template_scaffold/package.json +3 -3
- package/template_scaffold/src/steps/step-32-paywall.tsx +31 -5
|
@@ -4,10 +4,10 @@
|
|
|
4
4
|
"minimumCliVersion": "0.1.20",
|
|
5
5
|
"entries": [
|
|
6
6
|
{
|
|
7
|
-
"repositoryCliVersion": "0.1.
|
|
7
|
+
"repositoryCliVersion": "0.1.163",
|
|
8
8
|
"manifest": {
|
|
9
9
|
"schemaVersion": 1,
|
|
10
|
-
"bundleVersion": "2.0.
|
|
10
|
+
"bundleVersion": "2.0.154",
|
|
11
11
|
"stepContractVersion": 3,
|
|
12
12
|
"contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
|
|
13
13
|
"managedFiles": [
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
},
|
|
38
38
|
{
|
|
39
39
|
"path": "docs/funnelsgrove/contracts/payments.md",
|
|
40
|
-
"sha256": "
|
|
40
|
+
"sha256": "f1422b3651a5f3a4207203791b95fe61d7be491ea28556d70039f2e1f103aae0"
|
|
41
41
|
},
|
|
42
42
|
{
|
|
43
43
|
"path": "docs/funnelsgrove/contracts/step-metadata.md",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
},
|
|
46
46
|
{
|
|
47
47
|
"path": "docs/funnelsgrove/migrations/step-contract-v3.md",
|
|
48
|
-
"sha256": "
|
|
48
|
+
"sha256": "cf6e4c283e7f58d652cc3e60ba96e6fbba37d66fa3d551c4ee391d97611543e0"
|
|
49
49
|
},
|
|
50
50
|
{
|
|
51
51
|
"path": "docs/funnelsgrove/qa/analytics.md",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
},
|
|
58
58
|
{
|
|
59
59
|
"path": "docs/funnelsgrove/qa/paywall-checkout.md",
|
|
60
|
-
"sha256": "
|
|
60
|
+
"sha256": "73a55f2723c0ae4729466297f975b767f718b93614a947b1c0f002ba05b57e88"
|
|
61
61
|
},
|
|
62
62
|
{
|
|
63
63
|
"path": "docs/funnelsgrove/qa/publish.md",
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
},
|
|
102
102
|
{
|
|
103
103
|
"path": "docs/funnelsgrove/steps/paywall_offer.md",
|
|
104
|
-
"sha256": "
|
|
104
|
+
"sha256": "0cf35f69c7d7bfaf3a53ef41cbb833393231ac5dab779f8ace5c529ed3a5d2e8"
|
|
105
105
|
},
|
|
106
106
|
{
|
|
107
107
|
"path": "docs/funnelsgrove/steps/progress_interstitial.md",
|
|
@@ -145,16 +145,16 @@
|
|
|
145
145
|
},
|
|
146
146
|
{
|
|
147
147
|
"path": "funnel-docs.config.json",
|
|
148
|
-
"sha256": "
|
|
148
|
+
"sha256": "74ce5972ef02799de47a7a5b8eb13e33605d286f58e5a9dd7348cea2c8e2b764"
|
|
149
149
|
}
|
|
150
150
|
]
|
|
151
151
|
}
|
|
152
152
|
},
|
|
153
153
|
{
|
|
154
|
-
"repositoryCliVersion": "0.1.
|
|
154
|
+
"repositoryCliVersion": "0.1.162",
|
|
155
155
|
"manifest": {
|
|
156
156
|
"schemaVersion": 1,
|
|
157
|
-
"bundleVersion": "2.0.
|
|
157
|
+
"bundleVersion": "2.0.153",
|
|
158
158
|
"stepContractVersion": 3,
|
|
159
159
|
"contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
|
|
160
160
|
"managedFiles": [
|
|
@@ -184,7 +184,7 @@
|
|
|
184
184
|
},
|
|
185
185
|
{
|
|
186
186
|
"path": "docs/funnelsgrove/contracts/payments.md",
|
|
187
|
-
"sha256": "
|
|
187
|
+
"sha256": "f1422b3651a5f3a4207203791b95fe61d7be491ea28556d70039f2e1f103aae0"
|
|
188
188
|
},
|
|
189
189
|
{
|
|
190
190
|
"path": "docs/funnelsgrove/contracts/step-metadata.md",
|
|
@@ -192,7 +192,7 @@
|
|
|
192
192
|
},
|
|
193
193
|
{
|
|
194
194
|
"path": "docs/funnelsgrove/migrations/step-contract-v3.md",
|
|
195
|
-
"sha256": "
|
|
195
|
+
"sha256": "2daa198043f2c83556b10b70285d1d69eb4a4bcc897ca9fe5391e53d31ccc51e"
|
|
196
196
|
},
|
|
197
197
|
{
|
|
198
198
|
"path": "docs/funnelsgrove/qa/analytics.md",
|
|
@@ -204,7 +204,7 @@
|
|
|
204
204
|
},
|
|
205
205
|
{
|
|
206
206
|
"path": "docs/funnelsgrove/qa/paywall-checkout.md",
|
|
207
|
-
"sha256": "
|
|
207
|
+
"sha256": "73a55f2723c0ae4729466297f975b767f718b93614a947b1c0f002ba05b57e88"
|
|
208
208
|
},
|
|
209
209
|
{
|
|
210
210
|
"path": "docs/funnelsgrove/qa/publish.md",
|
|
@@ -248,7 +248,7 @@
|
|
|
248
248
|
},
|
|
249
249
|
{
|
|
250
250
|
"path": "docs/funnelsgrove/steps/paywall_offer.md",
|
|
251
|
-
"sha256": "
|
|
251
|
+
"sha256": "0cf35f69c7d7bfaf3a53ef41cbb833393231ac5dab779f8ace5c529ed3a5d2e8"
|
|
252
252
|
},
|
|
253
253
|
{
|
|
254
254
|
"path": "docs/funnelsgrove/steps/progress_interstitial.md",
|
|
@@ -292,16 +292,16 @@
|
|
|
292
292
|
},
|
|
293
293
|
{
|
|
294
294
|
"path": "funnel-docs.config.json",
|
|
295
|
-
"sha256": "
|
|
295
|
+
"sha256": "0c74ea380f8ecb8d33db827799b5e135fa274814cea68d0a3573c31fb639c4ab"
|
|
296
296
|
}
|
|
297
297
|
]
|
|
298
298
|
}
|
|
299
299
|
},
|
|
300
300
|
{
|
|
301
|
-
"repositoryCliVersion": "0.1.
|
|
301
|
+
"repositoryCliVersion": "0.1.161",
|
|
302
302
|
"manifest": {
|
|
303
303
|
"schemaVersion": 1,
|
|
304
|
-
"bundleVersion": "2.0.
|
|
304
|
+
"bundleVersion": "2.0.152",
|
|
305
305
|
"stepContractVersion": 3,
|
|
306
306
|
"contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
|
|
307
307
|
"managedFiles": [
|
|
@@ -331,7 +331,7 @@
|
|
|
331
331
|
},
|
|
332
332
|
{
|
|
333
333
|
"path": "docs/funnelsgrove/contracts/payments.md",
|
|
334
|
-
"sha256": "
|
|
334
|
+
"sha256": "f1422b3651a5f3a4207203791b95fe61d7be491ea28556d70039f2e1f103aae0"
|
|
335
335
|
},
|
|
336
336
|
{
|
|
337
337
|
"path": "docs/funnelsgrove/contracts/step-metadata.md",
|
|
@@ -339,7 +339,7 @@
|
|
|
339
339
|
},
|
|
340
340
|
{
|
|
341
341
|
"path": "docs/funnelsgrove/migrations/step-contract-v3.md",
|
|
342
|
-
"sha256": "
|
|
342
|
+
"sha256": "50f7badea548c53011111f6af408fc1597b7bc0f6a3c45b9461d8b41e282c4b0"
|
|
343
343
|
},
|
|
344
344
|
{
|
|
345
345
|
"path": "docs/funnelsgrove/qa/analytics.md",
|
|
@@ -351,7 +351,7 @@
|
|
|
351
351
|
},
|
|
352
352
|
{
|
|
353
353
|
"path": "docs/funnelsgrove/qa/paywall-checkout.md",
|
|
354
|
-
"sha256": "
|
|
354
|
+
"sha256": "73a55f2723c0ae4729466297f975b767f718b93614a947b1c0f002ba05b57e88"
|
|
355
355
|
},
|
|
356
356
|
{
|
|
357
357
|
"path": "docs/funnelsgrove/qa/publish.md",
|
|
@@ -395,7 +395,7 @@
|
|
|
395
395
|
},
|
|
396
396
|
{
|
|
397
397
|
"path": "docs/funnelsgrove/steps/paywall_offer.md",
|
|
398
|
-
"sha256": "
|
|
398
|
+
"sha256": "0cf35f69c7d7bfaf3a53ef41cbb833393231ac5dab779f8ace5c529ed3a5d2e8"
|
|
399
399
|
},
|
|
400
400
|
{
|
|
401
401
|
"path": "docs/funnelsgrove/steps/progress_interstitial.md",
|
|
@@ -439,16 +439,16 @@
|
|
|
439
439
|
},
|
|
440
440
|
{
|
|
441
441
|
"path": "funnel-docs.config.json",
|
|
442
|
-
"sha256": "
|
|
442
|
+
"sha256": "c3c5f40cbf36f50789192af33a24dc3afff4a1983d5e477e08007b54eb2836e1"
|
|
443
443
|
}
|
|
444
444
|
]
|
|
445
445
|
}
|
|
446
446
|
},
|
|
447
447
|
{
|
|
448
|
-
"repositoryCliVersion": "0.1.
|
|
448
|
+
"repositoryCliVersion": "0.1.160",
|
|
449
449
|
"manifest": {
|
|
450
450
|
"schemaVersion": 1,
|
|
451
|
-
"bundleVersion": "2.0.
|
|
451
|
+
"bundleVersion": "2.0.151",
|
|
452
452
|
"stepContractVersion": 3,
|
|
453
453
|
"contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
|
|
454
454
|
"managedFiles": [
|
|
@@ -486,7 +486,7 @@
|
|
|
486
486
|
},
|
|
487
487
|
{
|
|
488
488
|
"path": "docs/funnelsgrove/migrations/step-contract-v3.md",
|
|
489
|
-
"sha256": "
|
|
489
|
+
"sha256": "7931d72733f40afe34a8ea32618d1daecec9cdefe898bb830a22d5d6f130cb9d"
|
|
490
490
|
},
|
|
491
491
|
{
|
|
492
492
|
"path": "docs/funnelsgrove/qa/analytics.md",
|
|
@@ -586,16 +586,16 @@
|
|
|
586
586
|
},
|
|
587
587
|
{
|
|
588
588
|
"path": "funnel-docs.config.json",
|
|
589
|
-
"sha256": "
|
|
589
|
+
"sha256": "b22cae1581ff4e5910d99cb970f50b0874c5dfb066e5f3e8f23e9b7a78dd3ce5"
|
|
590
590
|
}
|
|
591
591
|
]
|
|
592
592
|
}
|
|
593
593
|
},
|
|
594
594
|
{
|
|
595
|
-
"repositoryCliVersion": "0.1.
|
|
595
|
+
"repositoryCliVersion": "0.1.159",
|
|
596
596
|
"manifest": {
|
|
597
597
|
"schemaVersion": 1,
|
|
598
|
-
"bundleVersion": "2.0.
|
|
598
|
+
"bundleVersion": "2.0.149",
|
|
599
599
|
"stepContractVersion": 3,
|
|
600
600
|
"contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
|
|
601
601
|
"managedFiles": [
|
|
@@ -633,7 +633,7 @@
|
|
|
633
633
|
},
|
|
634
634
|
{
|
|
635
635
|
"path": "docs/funnelsgrove/migrations/step-contract-v3.md",
|
|
636
|
-
"sha256": "
|
|
636
|
+
"sha256": "6e52eb1353390147be78cc3d3653c25a831bc0d18bfc7f7ef80b1559b11b6068"
|
|
637
637
|
},
|
|
638
638
|
{
|
|
639
639
|
"path": "docs/funnelsgrove/qa/analytics.md",
|
|
@@ -733,16 +733,16 @@
|
|
|
733
733
|
},
|
|
734
734
|
{
|
|
735
735
|
"path": "funnel-docs.config.json",
|
|
736
|
-
"sha256": "
|
|
736
|
+
"sha256": "3a4014ffceb45bc158109d34afbcd31c0497ca1885dc1db85af3aa46f50769a1"
|
|
737
737
|
}
|
|
738
738
|
]
|
|
739
739
|
}
|
|
740
740
|
},
|
|
741
741
|
{
|
|
742
|
-
"repositoryCliVersion": "0.1.
|
|
742
|
+
"repositoryCliVersion": "0.1.158",
|
|
743
743
|
"manifest": {
|
|
744
744
|
"schemaVersion": 1,
|
|
745
|
-
"bundleVersion": "2.0.
|
|
745
|
+
"bundleVersion": "2.0.148",
|
|
746
746
|
"stepContractVersion": 3,
|
|
747
747
|
"contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
|
|
748
748
|
"managedFiles": [
|
|
@@ -780,7 +780,7 @@
|
|
|
780
780
|
},
|
|
781
781
|
{
|
|
782
782
|
"path": "docs/funnelsgrove/migrations/step-contract-v3.md",
|
|
783
|
-
"sha256": "
|
|
783
|
+
"sha256": "a21348978d4642a5464815068fae3a6bd96c3a394e51e5c1ba90b3d00ab4708c"
|
|
784
784
|
},
|
|
785
785
|
{
|
|
786
786
|
"path": "docs/funnelsgrove/qa/analytics.md",
|
|
@@ -880,16 +880,16 @@
|
|
|
880
880
|
},
|
|
881
881
|
{
|
|
882
882
|
"path": "funnel-docs.config.json",
|
|
883
|
-
"sha256": "
|
|
883
|
+
"sha256": "528bb076f11c7466876f30d1b438301f953edb291a339822fe75f633afc38ba8"
|
|
884
884
|
}
|
|
885
885
|
]
|
|
886
886
|
}
|
|
887
887
|
},
|
|
888
888
|
{
|
|
889
|
-
"repositoryCliVersion": "0.1.
|
|
889
|
+
"repositoryCliVersion": "0.1.157",
|
|
890
890
|
"manifest": {
|
|
891
891
|
"schemaVersion": 1,
|
|
892
|
-
"bundleVersion": "2.0.
|
|
892
|
+
"bundleVersion": "2.0.147",
|
|
893
893
|
"stepContractVersion": 3,
|
|
894
894
|
"contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
|
|
895
895
|
"managedFiles": [
|
|
@@ -927,7 +927,7 @@
|
|
|
927
927
|
},
|
|
928
928
|
{
|
|
929
929
|
"path": "docs/funnelsgrove/migrations/step-contract-v3.md",
|
|
930
|
-
"sha256": "
|
|
930
|
+
"sha256": "89613b9ce40d257a90436833d3e852a77f2680bf9ec7cd23cf9b4eb2d760267e"
|
|
931
931
|
},
|
|
932
932
|
{
|
|
933
933
|
"path": "docs/funnelsgrove/qa/analytics.md",
|
|
@@ -1027,7 +1027,7 @@
|
|
|
1027
1027
|
},
|
|
1028
1028
|
{
|
|
1029
1029
|
"path": "funnel-docs.config.json",
|
|
1030
|
-
"sha256": "
|
|
1030
|
+
"sha256": "5c1285eeb0761b07f559899336ea7a9e502f178d9b93c58c2a033af07473c509"
|
|
1031
1031
|
}
|
|
1032
1032
|
]
|
|
1033
1033
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@funnelsgrove/cli",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.163",
|
|
4
4
|
"description": "FunnelsGrove command-line tools for editing, syncing, and publishing funnels",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -34,13 +34,13 @@
|
|
|
34
34
|
"test": "vitest run"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@funnelsgrove/runtime": "0.
|
|
37
|
+
"@funnelsgrove/runtime": "0.10.0",
|
|
38
38
|
"commander": "^12.0.0",
|
|
39
39
|
"typescript": "^5.8.3"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@funnelsgrove/analytics": "0.1.
|
|
43
|
-
"@funnelsgrove/payments": "0.
|
|
42
|
+
"@funnelsgrove/analytics": "0.1.83",
|
|
43
|
+
"@funnelsgrove/payments": "0.10.0",
|
|
44
44
|
"vitest": "^3.0.0"
|
|
45
45
|
}
|
|
46
46
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schemaVersion": 1,
|
|
3
|
-
"bundleVersion": "2.0.
|
|
3
|
+
"bundleVersion": "2.0.154",
|
|
4
4
|
"stepContractVersion": 3,
|
|
5
5
|
"contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
|
|
6
6
|
"managedFiles": [
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
},
|
|
31
31
|
{
|
|
32
32
|
"path": "docs/funnelsgrove/contracts/payments.md",
|
|
33
|
-
"sha256": "
|
|
33
|
+
"sha256": "f1422b3651a5f3a4207203791b95fe61d7be491ea28556d70039f2e1f103aae0"
|
|
34
34
|
},
|
|
35
35
|
{
|
|
36
36
|
"path": "docs/funnelsgrove/contracts/step-metadata.md",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
},
|
|
39
39
|
{
|
|
40
40
|
"path": "docs/funnelsgrove/migrations/step-contract-v3.md",
|
|
41
|
-
"sha256": "
|
|
41
|
+
"sha256": "cf6e4c283e7f58d652cc3e60ba96e6fbba37d66fa3d551c4ee391d97611543e0"
|
|
42
42
|
},
|
|
43
43
|
{
|
|
44
44
|
"path": "docs/funnelsgrove/qa/analytics.md",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
},
|
|
51
51
|
{
|
|
52
52
|
"path": "docs/funnelsgrove/qa/paywall-checkout.md",
|
|
53
|
-
"sha256": "
|
|
53
|
+
"sha256": "73a55f2723c0ae4729466297f975b767f718b93614a947b1c0f002ba05b57e88"
|
|
54
54
|
},
|
|
55
55
|
{
|
|
56
56
|
"path": "docs/funnelsgrove/qa/publish.md",
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
},
|
|
95
95
|
{
|
|
96
96
|
"path": "docs/funnelsgrove/steps/paywall_offer.md",
|
|
97
|
-
"sha256": "
|
|
97
|
+
"sha256": "0cf35f69c7d7bfaf3a53ef41cbb833393231ac5dab779f8ace5c529ed3a5d2e8"
|
|
98
98
|
},
|
|
99
99
|
{
|
|
100
100
|
"path": "docs/funnelsgrove/steps/progress_interstitial.md",
|
|
@@ -138,7 +138,7 @@
|
|
|
138
138
|
},
|
|
139
139
|
{
|
|
140
140
|
"path": "funnel-docs.config.json",
|
|
141
|
-
"sha256": "
|
|
141
|
+
"sha256": "74ce5972ef02799de47a7a5b8eb13e33605d286f58e5a9dd7348cea2c8e2b764"
|
|
142
142
|
}
|
|
143
143
|
]
|
|
144
144
|
}
|
|
@@ -30,7 +30,7 @@ A paywall presents purchasable plans. A reveal, loading state, calculation, or
|
|
|
30
30
|
## Payment rules
|
|
31
31
|
|
|
32
32
|
- Resolve plans, prices, discounts, currencies, provider IDs, and payment mode from shared configuration.
|
|
33
|
-
- Use `SharedStripeCheckoutV2Dialog` for card checkout
|
|
33
|
+
- Use `SharedStripeCheckoutV2Dialog` for card checkout. Render one `StripeSubscriptionWalletSurface` per simultaneously visible subscription wallet placement and one `StripeOneTimeWalletSurface` per one-time placement. Never share a checkout hook result between card and wallet surfaces or between two visible wallet placements.
|
|
34
34
|
- Pass `checkoutAnalytics` to every shared dialog and wallet surface. The payments package owns `checkout_started`, `add_payment_info`, and verified `checkout_completed`; do not call the corresponding `publicAnalyticsSdk` methods in funnel components.
|
|
35
35
|
- Treat `onSuccess` as the first valid place to call `completeStep` for a purchase flow. Payment-info submission, dialog open, session creation, browser return, and provider-pending state are not lifecycle completion.
|
|
36
36
|
- Use `completeStripeOneClickPayment` for one-click upsells. Do not duplicate the public one-click endpoint, Stripe loader, or `confirmPayment` inside a funnel.
|
|
@@ -17,7 +17,7 @@ Supported read versions: `1`, `2`, `3`. Authoring and publish target version `3`
|
|
|
17
17
|
|
|
18
18
|
### Package release order
|
|
19
19
|
|
|
20
|
-
Release `@funnelsgrove/runtime` `0.
|
|
20
|
+
Release `@funnelsgrove/runtime` `0.10.0` first, then `@funnelsgrove/analytics` `0.1.83`, then `@funnelsgrove/payments` `0.10.0`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.163`, and only then promotes the candidate to production traffic. The serving API must never advertise an unpublished preferred CLI. Publishing packages and deploying production remain separately approved operational actions.
|
|
21
21
|
<!-- funnelsgrove:generated:end contract-v3/migration/step-contract-v3 -->
|
|
22
22
|
|
|
23
23
|
## Version-last policy
|
|
@@ -48,7 +48,7 @@ _Not a choice type._
|
|
|
48
48
|
|
|
49
49
|
- Verify every plan, price, currency, discount, and eligibility rule.
|
|
50
50
|
- Test card and every enabled wallet.
|
|
51
|
-
- Confirm every visible wallet placement
|
|
51
|
+
- Confirm every visible wallet placement uses the shared wallet surface matching its payment mode, owns its own Checkout Session, and remains isolated from the card dialog session.
|
|
52
52
|
- Test validation, decline, retry, cancel, double-submit, and provider delay.
|
|
53
53
|
- Verify named checkout events, complete metadata, one event ID, and retry deduplication.
|
|
54
54
|
- Verify payment-info submission does not call `completeStep`; verified `onSuccess` does.
|
|
@@ -85,11 +85,11 @@ The controller owns view/start/completion/exit lifecycle. Closing or leaving wit
|
|
|
85
85
|
|
|
86
86
|
## Required semantic conversions
|
|
87
87
|
|
|
88
|
-
Pass `checkoutAnalytics` into `SharedStripeCheckoutV2Dialog` and every `StripeSubscriptionWalletSurface`. Those shared components emit checkout started, payment info, and verified checkout completed with the real Checkout Session identity. Do not call the analytics SDK methods directly.
|
|
88
|
+
Pass `checkoutAnalytics` into `SharedStripeCheckoutV2Dialog` and every `StripeSubscriptionWalletSurface` or `StripeOneTimeWalletSurface`. Those shared components emit checkout started, payment info, and verified checkout completed with the real Checkout Session identity. Do not call the analytics SDK methods directly.
|
|
89
89
|
|
|
90
90
|
## Approved shared helpers
|
|
91
91
|
|
|
92
|
-
Use shared plan resolution,
|
|
92
|
+
Use shared plan resolution, the checkout hook matching the resolved payment mode for the card dialog, `SharedStripeCheckoutV2Dialog`, and one private-session wallet surface matching that payment mode per visible placement. Call `completeStep` only from `onSuccess`.
|
|
93
93
|
|
|
94
94
|
## MUST rules
|
|
95
95
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schemaVersion": 1,
|
|
3
|
-
"bundleVersion": "2.0.
|
|
3
|
+
"bundleVersion": "2.0.154",
|
|
4
4
|
"stepContractVersion": 3,
|
|
5
5
|
"contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
|
|
6
6
|
"managedFiles": [
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
},
|
|
31
31
|
{
|
|
32
32
|
"path": "docs/funnelsgrove/contracts/payments.md",
|
|
33
|
-
"sha256": "
|
|
33
|
+
"sha256": "f1422b3651a5f3a4207203791b95fe61d7be491ea28556d70039f2e1f103aae0"
|
|
34
34
|
},
|
|
35
35
|
{
|
|
36
36
|
"path": "docs/funnelsgrove/contracts/step-metadata.md",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
},
|
|
39
39
|
{
|
|
40
40
|
"path": "docs/funnelsgrove/migrations/step-contract-v3.md",
|
|
41
|
-
"sha256": "
|
|
41
|
+
"sha256": "cf6e4c283e7f58d652cc3e60ba96e6fbba37d66fa3d551c4ee391d97611543e0"
|
|
42
42
|
},
|
|
43
43
|
{
|
|
44
44
|
"path": "docs/funnelsgrove/qa/analytics.md",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
},
|
|
51
51
|
{
|
|
52
52
|
"path": "docs/funnelsgrove/qa/paywall-checkout.md",
|
|
53
|
-
"sha256": "
|
|
53
|
+
"sha256": "73a55f2723c0ae4729466297f975b767f718b93614a947b1c0f002ba05b57e88"
|
|
54
54
|
},
|
|
55
55
|
{
|
|
56
56
|
"path": "docs/funnelsgrove/qa/publish.md",
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
},
|
|
95
95
|
{
|
|
96
96
|
"path": "docs/funnelsgrove/steps/paywall_offer.md",
|
|
97
|
-
"sha256": "
|
|
97
|
+
"sha256": "0cf35f69c7d7bfaf3a53ef41cbb833393231ac5dab779f8ace5c529ed3a5d2e8"
|
|
98
98
|
},
|
|
99
99
|
{
|
|
100
100
|
"path": "docs/funnelsgrove/steps/progress_interstitial.md",
|
|
@@ -138,7 +138,7 @@
|
|
|
138
138
|
},
|
|
139
139
|
{
|
|
140
140
|
"path": "funnel-docs.config.json",
|
|
141
|
-
"sha256": "
|
|
141
|
+
"sha256": "74ce5972ef02799de47a7a5b8eb13e33605d286f58e5a9dd7348cea2c8e2b764"
|
|
142
142
|
}
|
|
143
143
|
]
|
|
144
144
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schemaVersion": 1,
|
|
3
|
-
"sourceTreeHash": "
|
|
3
|
+
"sourceTreeHash": "de7842c56cf328b47126780ea9a5ecf8738805beff644884dd88bc0db0f9737b",
|
|
4
4
|
"stepContractVersion": 3,
|
|
5
|
-
"docsBundleVersion": "2.0.
|
|
5
|
+
"docsBundleVersion": "2.0.154",
|
|
6
6
|
"files": [
|
|
7
7
|
{
|
|
8
8
|
"path": ".env.example",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
},
|
|
17
17
|
{
|
|
18
18
|
"path": ".funnelsgrove-docs.json",
|
|
19
|
-
"sha256": "
|
|
19
|
+
"sha256": "32babe53260db021faa61a35ec64fab5fbc9bc1aa4c1c858768205d82bc5988f",
|
|
20
20
|
"mode": "100644"
|
|
21
21
|
},
|
|
22
22
|
{
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
},
|
|
92
92
|
{
|
|
93
93
|
"path": "docs/funnelsgrove/contracts/payments.md",
|
|
94
|
-
"sha256": "
|
|
94
|
+
"sha256": "f1422b3651a5f3a4207203791b95fe61d7be491ea28556d70039f2e1f103aae0",
|
|
95
95
|
"mode": "100644"
|
|
96
96
|
},
|
|
97
97
|
{
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
},
|
|
102
102
|
{
|
|
103
103
|
"path": "docs/funnelsgrove/migrations/step-contract-v3.md",
|
|
104
|
-
"sha256": "
|
|
104
|
+
"sha256": "cf6e4c283e7f58d652cc3e60ba96e6fbba37d66fa3d551c4ee391d97611543e0",
|
|
105
105
|
"mode": "100644"
|
|
106
106
|
},
|
|
107
107
|
{
|
|
@@ -116,7 +116,7 @@
|
|
|
116
116
|
},
|
|
117
117
|
{
|
|
118
118
|
"path": "docs/funnelsgrove/qa/paywall-checkout.md",
|
|
119
|
-
"sha256": "
|
|
119
|
+
"sha256": "73a55f2723c0ae4729466297f975b767f718b93614a947b1c0f002ba05b57e88",
|
|
120
120
|
"mode": "100644"
|
|
121
121
|
},
|
|
122
122
|
{
|
|
@@ -171,7 +171,7 @@
|
|
|
171
171
|
},
|
|
172
172
|
{
|
|
173
173
|
"path": "docs/funnelsgrove/steps/paywall_offer.md",
|
|
174
|
-
"sha256": "
|
|
174
|
+
"sha256": "0cf35f69c7d7bfaf3a53ef41cbb833393231ac5dab779f8ace5c529ed3a5d2e8",
|
|
175
175
|
"mode": "100644"
|
|
176
176
|
},
|
|
177
177
|
{
|
|
@@ -236,7 +236,7 @@
|
|
|
236
236
|
},
|
|
237
237
|
{
|
|
238
238
|
"path": "funnel-docs.config.json",
|
|
239
|
-
"sha256": "
|
|
239
|
+
"sha256": "74ce5972ef02799de47a7a5b8eb13e33605d286f58e5a9dd7348cea2c8e2b764",
|
|
240
240
|
"mode": "100644"
|
|
241
241
|
},
|
|
242
242
|
{
|
|
@@ -261,12 +261,12 @@
|
|
|
261
261
|
},
|
|
262
262
|
{
|
|
263
263
|
"path": "package-lock.json",
|
|
264
|
-
"sha256": "
|
|
264
|
+
"sha256": "53cdac63493dafb3a94ba0780820745d1380fd3d2c391d7ffb58d16980406d4f",
|
|
265
265
|
"mode": "100644"
|
|
266
266
|
},
|
|
267
267
|
{
|
|
268
268
|
"path": "package.json",
|
|
269
|
-
"sha256": "
|
|
269
|
+
"sha256": "d8aa1aa52569c7210bf297493ba5dc0a873d17ab769b7a19ee7c0c449d8ce79c",
|
|
270
270
|
"mode": "100644"
|
|
271
271
|
},
|
|
272
272
|
{
|
|
@@ -551,7 +551,7 @@
|
|
|
551
551
|
},
|
|
552
552
|
{
|
|
553
553
|
"path": "src/steps/step-32-paywall.tsx",
|
|
554
|
-
"sha256": "
|
|
554
|
+
"sha256": "7ff79178da7f72b1fedb384268d2686facf8f88d4d036aea496ac94b79c7876d",
|
|
555
555
|
"mode": "100644"
|
|
556
556
|
},
|
|
557
557
|
{
|
|
@@ -30,7 +30,7 @@ A paywall presents purchasable plans. A reveal, loading state, calculation, or
|
|
|
30
30
|
## Payment rules
|
|
31
31
|
|
|
32
32
|
- Resolve plans, prices, discounts, currencies, provider IDs, and payment mode from shared configuration.
|
|
33
|
-
- Use `SharedStripeCheckoutV2Dialog` for card checkout
|
|
33
|
+
- Use `SharedStripeCheckoutV2Dialog` for card checkout. Render one `StripeSubscriptionWalletSurface` per simultaneously visible subscription wallet placement and one `StripeOneTimeWalletSurface` per one-time placement. Never share a checkout hook result between card and wallet surfaces or between two visible wallet placements.
|
|
34
34
|
- Pass `checkoutAnalytics` to every shared dialog and wallet surface. The payments package owns `checkout_started`, `add_payment_info`, and verified `checkout_completed`; do not call the corresponding `publicAnalyticsSdk` methods in funnel components.
|
|
35
35
|
- Treat `onSuccess` as the first valid place to call `completeStep` for a purchase flow. Payment-info submission, dialog open, session creation, browser return, and provider-pending state are not lifecycle completion.
|
|
36
36
|
- Use `completeStripeOneClickPayment` for one-click upsells. Do not duplicate the public one-click endpoint, Stripe loader, or `confirmPayment` inside a funnel.
|
|
@@ -17,7 +17,7 @@ Supported read versions: `1`, `2`, `3`. Authoring and publish target version `3`
|
|
|
17
17
|
|
|
18
18
|
### Package release order
|
|
19
19
|
|
|
20
|
-
Release `@funnelsgrove/runtime` `0.
|
|
20
|
+
Release `@funnelsgrove/runtime` `0.10.0` first, then `@funnelsgrove/analytics` `0.1.83`, then `@funnelsgrove/payments` `0.10.0`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.163`, and only then promotes the candidate to production traffic. The serving API must never advertise an unpublished preferred CLI. Publishing packages and deploying production remain separately approved operational actions.
|
|
21
21
|
<!-- funnelsgrove:generated:end contract-v3/migration/step-contract-v3 -->
|
|
22
22
|
|
|
23
23
|
## Version-last policy
|
|
@@ -48,7 +48,7 @@ _Not a choice type._
|
|
|
48
48
|
|
|
49
49
|
- Verify every plan, price, currency, discount, and eligibility rule.
|
|
50
50
|
- Test card and every enabled wallet.
|
|
51
|
-
- Confirm every visible wallet placement
|
|
51
|
+
- Confirm every visible wallet placement uses the shared wallet surface matching its payment mode, owns its own Checkout Session, and remains isolated from the card dialog session.
|
|
52
52
|
- Test validation, decline, retry, cancel, double-submit, and provider delay.
|
|
53
53
|
- Verify named checkout events, complete metadata, one event ID, and retry deduplication.
|
|
54
54
|
- Verify payment-info submission does not call `completeStep`; verified `onSuccess` does.
|
|
@@ -85,11 +85,11 @@ The controller owns view/start/completion/exit lifecycle. Closing or leaving wit
|
|
|
85
85
|
|
|
86
86
|
## Required semantic conversions
|
|
87
87
|
|
|
88
|
-
Pass `checkoutAnalytics` into `SharedStripeCheckoutV2Dialog` and every `StripeSubscriptionWalletSurface`. Those shared components emit checkout started, payment info, and verified checkout completed with the real Checkout Session identity. Do not call the analytics SDK methods directly.
|
|
88
|
+
Pass `checkoutAnalytics` into `SharedStripeCheckoutV2Dialog` and every `StripeSubscriptionWalletSurface` or `StripeOneTimeWalletSurface`. Those shared components emit checkout started, payment info, and verified checkout completed with the real Checkout Session identity. Do not call the analytics SDK methods directly.
|
|
89
89
|
|
|
90
90
|
## Approved shared helpers
|
|
91
91
|
|
|
92
|
-
Use shared plan resolution,
|
|
92
|
+
Use shared plan resolution, the checkout hook matching the resolved payment mode for the card dialog, `SharedStripeCheckoutV2Dialog`, and one private-session wallet surface matching that payment mode per visible placement. Call `completeStep` only from `onSuccess`.
|
|
93
93
|
|
|
94
94
|
## MUST rules
|
|
95
95
|
|
|
@@ -8,9 +8,9 @@
|
|
|
8
8
|
"name": "funnel-template",
|
|
9
9
|
"version": "0.1.0",
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"@funnelsgrove/analytics": "^0.1.
|
|
12
|
-
"@funnelsgrove/payments": "^0.
|
|
13
|
-
"@funnelsgrove/runtime": "^0.
|
|
11
|
+
"@funnelsgrove/analytics": "^0.1.83",
|
|
12
|
+
"@funnelsgrove/payments": "^0.10.0",
|
|
13
|
+
"@funnelsgrove/runtime": "^0.10.0",
|
|
14
14
|
"@stripe/react-stripe-js": "^5.6.0",
|
|
15
15
|
"@stripe/stripe-js": "^8.7.0",
|
|
16
16
|
"lucide-react": "^0.553.0",
|
|
@@ -938,20 +938,20 @@
|
|
|
938
938
|
}
|
|
939
939
|
},
|
|
940
940
|
"node_modules/@funnelsgrove/analytics": {
|
|
941
|
-
"version": "0.1.
|
|
942
|
-
"resolved": "https://registry.npmjs.org/@funnelsgrove/analytics/-/analytics-0.1.
|
|
943
|
-
"integrity": "sha512-
|
|
941
|
+
"version": "0.1.83",
|
|
942
|
+
"resolved": "https://registry.npmjs.org/@funnelsgrove/analytics/-/analytics-0.1.83.tgz",
|
|
943
|
+
"integrity": "sha512-KQPGCMxb+jcRjmCJ1Qd8WiWvc4hWAbdaCkAjVDnK0IxR06RSwDzMCUo9XcOFykGQr6Oar0V4FTFJhW2pHC5XFw==",
|
|
944
944
|
"dependencies": {
|
|
945
|
-
"@funnelsgrove/runtime": "0.
|
|
945
|
+
"@funnelsgrove/runtime": "0.10.0"
|
|
946
946
|
}
|
|
947
947
|
},
|
|
948
948
|
"node_modules/@funnelsgrove/payments": {
|
|
949
|
-
"version": "0.
|
|
950
|
-
"resolved": "https://registry.npmjs.org/@funnelsgrove/payments/-/payments-0.
|
|
951
|
-
"integrity": "sha512-
|
|
949
|
+
"version": "0.10.0",
|
|
950
|
+
"resolved": "https://registry.npmjs.org/@funnelsgrove/payments/-/payments-0.10.0.tgz",
|
|
951
|
+
"integrity": "sha512-mv7CmawJb+AS83MbNvg48zO+FFU1LFyDSYzW6kD+f41oA3zz3d297o6jdjxYmkriVo6J/CHJ/xoI6ELnisks/g==",
|
|
952
952
|
"dependencies": {
|
|
953
|
-
"@funnelsgrove/analytics": "^0.1.
|
|
954
|
-
"@funnelsgrove/runtime": "^0.
|
|
953
|
+
"@funnelsgrove/analytics": "^0.1.83",
|
|
954
|
+
"@funnelsgrove/runtime": "^0.10.0",
|
|
955
955
|
"@solidgate/react-sdk": "1.34.0",
|
|
956
956
|
"@stripe/react-stripe-js": "^5.6.0",
|
|
957
957
|
"@stripe/stripe-js": "^8.7.0",
|
|
@@ -961,9 +961,9 @@
|
|
|
961
961
|
}
|
|
962
962
|
},
|
|
963
963
|
"node_modules/@funnelsgrove/runtime": {
|
|
964
|
-
"version": "0.
|
|
965
|
-
"resolved": "https://registry.npmjs.org/@funnelsgrove/runtime/-/runtime-0.
|
|
966
|
-
"integrity": "sha512-
|
|
964
|
+
"version": "0.10.0",
|
|
965
|
+
"resolved": "https://registry.npmjs.org/@funnelsgrove/runtime/-/runtime-0.10.0.tgz",
|
|
966
|
+
"integrity": "sha512-YPJJtpKUbg/kHZzqgncCwYPMXPjxzYvlk+t/KCcM6YEhuL4fvGbjUqeScxjwTzAWYolD6xEZPX00/WgSWABcIw==",
|
|
967
967
|
"dependencies": {
|
|
968
968
|
"posthog-js": "^1.369.2",
|
|
969
969
|
"react": "19.2.3",
|
|
@@ -12,9 +12,9 @@
|
|
|
12
12
|
"validate:funnel": "vite-node --config src/contract/funnel-validator.vite.config.ts src/contract/validate-funnel.cli.ts"
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@funnelsgrove/analytics": "^0.1.
|
|
16
|
-
"@funnelsgrove/payments": "^0.
|
|
17
|
-
"@funnelsgrove/runtime": "^0.
|
|
15
|
+
"@funnelsgrove/analytics": "^0.1.83",
|
|
16
|
+
"@funnelsgrove/payments": "^0.10.0",
|
|
17
|
+
"@funnelsgrove/runtime": "^0.10.0",
|
|
18
18
|
"@stripe/react-stripe-js": "^5.6.0",
|
|
19
19
|
"@stripe/stripe-js": "^8.7.0",
|
|
20
20
|
"lucide-react": "^0.553.0",
|
|
@@ -159,6 +159,15 @@ function StepPaywallRuntime({
|
|
|
159
159
|
}),
|
|
160
160
|
[checkoutMode, featureFlags, publishedRuntime.config],
|
|
161
161
|
);
|
|
162
|
+
const activeCheckoutRuntimeConfig = useMemo(() => ({
|
|
163
|
+
...checkoutRuntimeConfig,
|
|
164
|
+
funnelVersionId: publishedRuntime.config?.sourceVersionId ?? null,
|
|
165
|
+
paymentsApiVersion: activeBillingRuntime.paymentsApiVersion,
|
|
166
|
+
}), [
|
|
167
|
+
activeBillingRuntime.paymentsApiVersion,
|
|
168
|
+
checkoutRuntimeConfig,
|
|
169
|
+
publishedRuntime.config?.sourceVersionId,
|
|
170
|
+
]);
|
|
162
171
|
const activeBillingDiscounts = useMemo(
|
|
163
172
|
() => activeBillingRuntime.discounts ?? (
|
|
164
173
|
activeBillingRuntime.provider === 'stripe'
|
|
@@ -323,13 +332,20 @@ function StepPaywallRuntime({
|
|
|
323
332
|
environment: checkoutMode,
|
|
324
333
|
featureFlags,
|
|
325
334
|
metadata: checkoutAnalyticsMetadata,
|
|
326
|
-
runtimeConfig:
|
|
335
|
+
runtimeConfig: activeCheckoutRuntimeConfig,
|
|
327
336
|
stepId: analyticsStepId,
|
|
328
337
|
stepName: analyticsStepName,
|
|
329
338
|
stepType: stepPaywall.type,
|
|
330
339
|
stepContractVersion: funnelManifest.stepContractVersion,
|
|
331
340
|
};
|
|
332
|
-
}, [
|
|
341
|
+
}, [
|
|
342
|
+
activeCheckoutRuntimeConfig,
|
|
343
|
+
analyticsStepId,
|
|
344
|
+
analyticsStepName,
|
|
345
|
+
checkoutAnalyticsMetadata,
|
|
346
|
+
checkoutMode,
|
|
347
|
+
featureFlags,
|
|
348
|
+
]);
|
|
333
349
|
const successReturnUrl = useMemo(() => {
|
|
334
350
|
if (typeof window === 'undefined') {
|
|
335
351
|
return '';
|
|
@@ -359,7 +375,10 @@ function StepPaywallRuntime({
|
|
|
359
375
|
onError: setError,
|
|
360
376
|
plan: checkoutProvider === 'stripe' ? selectedPlan : null,
|
|
361
377
|
returnUrl: successReturnUrl,
|
|
362
|
-
runtimeConfig:
|
|
378
|
+
runtimeConfig: activeCheckoutRuntimeConfig,
|
|
379
|
+
runtimeConfigRevisionId: activeBillingRuntime.revisionId,
|
|
380
|
+
paymentProfileId: activeBillingRuntime.paymentProfileId,
|
|
381
|
+
provider: checkoutProvider === 'stripe' ? 'stripe' : null,
|
|
363
382
|
stripePublishableKey: activeBillingRuntime.stripePublishableKey,
|
|
364
383
|
userId: user.id,
|
|
365
384
|
});
|
|
@@ -376,7 +395,10 @@ function StepPaywallRuntime({
|
|
|
376
395
|
displayPlan: selectedDisplayPlan,
|
|
377
396
|
plan: selectedPlan,
|
|
378
397
|
returnUrl: successReturnUrl,
|
|
379
|
-
runtimeConfig:
|
|
398
|
+
runtimeConfig: activeCheckoutRuntimeConfig,
|
|
399
|
+
runtimeConfigRevisionId: activeBillingRuntime.revisionId,
|
|
400
|
+
paymentProfileId: activeBillingRuntime.paymentProfileId,
|
|
401
|
+
provider: checkoutProvider === 'stripe' ? 'stripe' : null,
|
|
380
402
|
stripePublishableKey: activeBillingRuntime.stripePublishableKey,
|
|
381
403
|
userId: user.id,
|
|
382
404
|
}),
|
|
@@ -386,6 +408,10 @@ function StepPaywallRuntime({
|
|
|
386
408
|
checkoutMode,
|
|
387
409
|
checkoutPromoActive,
|
|
388
410
|
activeBillingRuntime.stripePublishableKey,
|
|
411
|
+
activeBillingRuntime.paymentProfileId,
|
|
412
|
+
activeBillingRuntime.revisionId,
|
|
413
|
+
activeCheckoutRuntimeConfig,
|
|
414
|
+
checkoutProvider,
|
|
389
415
|
selectedDisplayPlan,
|
|
390
416
|
selectedPlan,
|
|
391
417
|
successReturnUrl,
|
|
@@ -721,7 +747,7 @@ function StepPaywallRuntime({
|
|
|
721
747
|
offerSetId: activeBillingRuntime.offerSetId,
|
|
722
748
|
funnelPlanKey: selectedPlan.funnelPlanKey,
|
|
723
749
|
returnUrl: checkoutPageUrl,
|
|
724
|
-
runtimeConfig:
|
|
750
|
+
runtimeConfig: activeCheckoutRuntimeConfig,
|
|
725
751
|
successUrl: successReturnUrl,
|
|
726
752
|
}}
|
|
727
753
|
onClose={closeCheckoutDialog}
|