@bleedingdev/modern-js-ultramodern-create 3.9.0-ultramodern.24 → 3.9.0-ultramodern.26
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/package.json
CHANGED
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"engines": {
|
|
27
27
|
"node": ">=26.7.0"
|
|
28
28
|
},
|
|
29
|
-
"version": "3.9.0-ultramodern.
|
|
29
|
+
"version": "3.9.0-ultramodern.26",
|
|
30
30
|
"types": "./dist/types/index.d.ts",
|
|
31
31
|
"main": "./dist/esm-node/index.js",
|
|
32
32
|
"bin": {
|
|
@@ -83,11 +83,11 @@
|
|
|
83
83
|
],
|
|
84
84
|
"dependencies": {
|
|
85
85
|
"@babel/parser": "^8.0.6",
|
|
86
|
-
"@modern-js/app-tools-extensions": "npm:@bleedingdev/modern-js-app-tools-extensions@3.9.0-ultramodern.
|
|
87
|
-
"@modern-js/backend-federation-contracts": "npm:@bleedingdev/modern-js-backend-federation-contracts@3.9.0-ultramodern.
|
|
86
|
+
"@modern-js/app-tools-extensions": "npm:@bleedingdev/modern-js-app-tools-extensions@3.9.0-ultramodern.26",
|
|
87
|
+
"@modern-js/backend-federation-contracts": "npm:@bleedingdev/modern-js-backend-federation-contracts@3.9.0-ultramodern.26",
|
|
88
88
|
"@modern-js/codesmith": "2.6.9",
|
|
89
|
-
"@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.9.0-ultramodern.
|
|
90
|
-
"@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.
|
|
89
|
+
"@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.9.0-ultramodern.26",
|
|
90
|
+
"@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.26",
|
|
91
91
|
"esbuild": "^0.28.2",
|
|
92
92
|
"miniflare": "5.20260921.0-alpha",
|
|
93
93
|
"oxfmt": "0.66.0",
|
|
@@ -95,9 +95,9 @@
|
|
|
95
95
|
"ultracite": "7.12.0"
|
|
96
96
|
},
|
|
97
97
|
"devDependencies": {
|
|
98
|
-
"@modern-js/i18n-integration": "npm:@bleedingdev/modern-js-i18n-integration@3.9.0-ultramodern.
|
|
99
|
-
"@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.
|
|
100
|
-
"@modern-js/plugin-bff-build-extensions": "npm:@bleedingdev/modern-js-plugin-bff-build-extensions@3.9.0-ultramodern.
|
|
98
|
+
"@modern-js/i18n-integration": "npm:@bleedingdev/modern-js-i18n-integration@3.9.0-ultramodern.26",
|
|
99
|
+
"@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.26",
|
|
100
|
+
"@modern-js/plugin-bff-build-extensions": "npm:@bleedingdev/modern-js-plugin-bff-build-extensions@3.9.0-ultramodern.26",
|
|
101
101
|
"@rslib/core": "1.0.2",
|
|
102
102
|
"@scripts/rstest-config": "2.66.0",
|
|
103
103
|
"@types/node": "^26.6.2",
|
|
@@ -117,6 +117,6 @@
|
|
|
117
117
|
"type-check": "tsgo --noEmit -p tsconfig.json"
|
|
118
118
|
},
|
|
119
119
|
"ultramodern": {
|
|
120
|
-
"frameworkVersion": "3.9.0-ultramodern.
|
|
120
|
+
"frameworkVersion": "3.9.0-ultramodern.26"
|
|
121
121
|
}
|
|
122
122
|
}
|
package/release-cohort.json
CHANGED
|
@@ -51,242 +51,242 @@
|
|
|
51
51
|
{
|
|
52
52
|
"sourceName": "@modern-js/adapter-rstest",
|
|
53
53
|
"targetName": "@bleedingdev/modern-js-adapter-rstest",
|
|
54
|
-
"version": "3.9.0-ultramodern.
|
|
54
|
+
"version": "3.9.0-ultramodern.26"
|
|
55
55
|
},
|
|
56
56
|
{
|
|
57
57
|
"sourceName": "@modern-js/app-tools",
|
|
58
58
|
"targetName": "@bleedingdev/modern-js-app-tools",
|
|
59
|
-
"version": "3.9.0-ultramodern.
|
|
59
|
+
"version": "3.9.0-ultramodern.26"
|
|
60
60
|
},
|
|
61
61
|
{
|
|
62
62
|
"sourceName": "@modern-js/app-tools-extensions",
|
|
63
63
|
"targetName": "@bleedingdev/modern-js-app-tools-extensions",
|
|
64
|
-
"version": "3.9.0-ultramodern.
|
|
64
|
+
"version": "3.9.0-ultramodern.26"
|
|
65
65
|
},
|
|
66
66
|
{
|
|
67
67
|
"sourceName": "@modern-js/backend-federation-contracts",
|
|
68
68
|
"targetName": "@bleedingdev/modern-js-backend-federation-contracts",
|
|
69
|
-
"version": "3.9.0-ultramodern.
|
|
69
|
+
"version": "3.9.0-ultramodern.26"
|
|
70
70
|
},
|
|
71
71
|
{
|
|
72
72
|
"sourceName": "@modern-js/bff-core",
|
|
73
73
|
"targetName": "@bleedingdev/modern-js-bff-core",
|
|
74
|
-
"version": "3.9.0-ultramodern.
|
|
74
|
+
"version": "3.9.0-ultramodern.26"
|
|
75
75
|
},
|
|
76
76
|
{
|
|
77
77
|
"sourceName": "@modern-js/bff-effect",
|
|
78
78
|
"targetName": "@bleedingdev/modern-js-bff-effect",
|
|
79
|
-
"version": "3.9.0-ultramodern.
|
|
79
|
+
"version": "3.9.0-ultramodern.26"
|
|
80
80
|
},
|
|
81
81
|
{
|
|
82
82
|
"sourceName": "@modern-js/bff-runtime",
|
|
83
83
|
"targetName": "@bleedingdev/modern-js-bff-runtime",
|
|
84
|
-
"version": "3.9.0-ultramodern.
|
|
84
|
+
"version": "3.9.0-ultramodern.26"
|
|
85
85
|
},
|
|
86
86
|
{
|
|
87
87
|
"sourceName": "@modern-js/boundary-debugger",
|
|
88
88
|
"targetName": "@bleedingdev/modern-js-boundary-debugger",
|
|
89
|
-
"version": "3.9.0-ultramodern.
|
|
89
|
+
"version": "3.9.0-ultramodern.26"
|
|
90
90
|
},
|
|
91
91
|
{
|
|
92
92
|
"sourceName": "@modern-js/builder",
|
|
93
93
|
"targetName": "@bleedingdev/modern-js-builder",
|
|
94
|
-
"version": "3.9.0-ultramodern.
|
|
94
|
+
"version": "3.9.0-ultramodern.26"
|
|
95
95
|
},
|
|
96
96
|
{
|
|
97
97
|
"sourceName": "@modern-js/code-tools",
|
|
98
98
|
"targetName": "@bleedingdev/modern-js-code-tools",
|
|
99
|
-
"version": "3.9.0-ultramodern.
|
|
99
|
+
"version": "3.9.0-ultramodern.26"
|
|
100
100
|
},
|
|
101
101
|
{
|
|
102
102
|
"sourceName": "@modern-js/create-request",
|
|
103
103
|
"targetName": "@bleedingdev/modern-js-create-request",
|
|
104
|
-
"version": "3.9.0-ultramodern.
|
|
104
|
+
"version": "3.9.0-ultramodern.26"
|
|
105
105
|
},
|
|
106
106
|
{
|
|
107
107
|
"sourceName": "@modern-js/federation-runtime",
|
|
108
108
|
"targetName": "@bleedingdev/modern-js-federation-runtime",
|
|
109
|
-
"version": "3.9.0-ultramodern.
|
|
109
|
+
"version": "3.9.0-ultramodern.26"
|
|
110
110
|
},
|
|
111
111
|
{
|
|
112
112
|
"sourceName": "@modern-js/i18n-integration",
|
|
113
113
|
"targetName": "@bleedingdev/modern-js-i18n-integration",
|
|
114
|
-
"version": "3.9.0-ultramodern.
|
|
114
|
+
"version": "3.9.0-ultramodern.26"
|
|
115
115
|
},
|
|
116
116
|
{
|
|
117
117
|
"sourceName": "@modern-js/i18n-runtime-extensions",
|
|
118
118
|
"targetName": "@bleedingdev/modern-js-i18n-runtime-extensions",
|
|
119
|
-
"version": "3.9.0-ultramodern.
|
|
119
|
+
"version": "3.9.0-ultramodern.26"
|
|
120
120
|
},
|
|
121
121
|
{
|
|
122
122
|
"sourceName": "@modern-js/i18n-utils",
|
|
123
123
|
"targetName": "@bleedingdev/modern-js-i18n-utils",
|
|
124
|
-
"version": "3.9.0-ultramodern.
|
|
124
|
+
"version": "3.9.0-ultramodern.26"
|
|
125
125
|
},
|
|
126
126
|
{
|
|
127
127
|
"sourceName": "@modern-js/image",
|
|
128
128
|
"targetName": "@bleedingdev/modern-js-image",
|
|
129
|
-
"version": "3.9.0-ultramodern.
|
|
129
|
+
"version": "3.9.0-ultramodern.26"
|
|
130
130
|
},
|
|
131
131
|
{
|
|
132
132
|
"sourceName": "@modern-js/main-doc",
|
|
133
133
|
"targetName": "@bleedingdev/modern-js-main-doc",
|
|
134
|
-
"version": "3.9.0-ultramodern.
|
|
134
|
+
"version": "3.9.0-ultramodern.26"
|
|
135
135
|
},
|
|
136
136
|
{
|
|
137
137
|
"sourceName": "@modern-js/plugin",
|
|
138
138
|
"targetName": "@bleedingdev/modern-js-plugin",
|
|
139
|
-
"version": "3.9.0-ultramodern.
|
|
139
|
+
"version": "3.9.0-ultramodern.26"
|
|
140
140
|
},
|
|
141
141
|
{
|
|
142
142
|
"sourceName": "@modern-js/plugin-bff",
|
|
143
143
|
"targetName": "@bleedingdev/modern-js-plugin-bff",
|
|
144
|
-
"version": "3.9.0-ultramodern.
|
|
144
|
+
"version": "3.9.0-ultramodern.26"
|
|
145
145
|
},
|
|
146
146
|
{
|
|
147
147
|
"sourceName": "@modern-js/plugin-bff-build-extensions",
|
|
148
148
|
"targetName": "@bleedingdev/modern-js-plugin-bff-build-extensions",
|
|
149
|
-
"version": "3.9.0-ultramodern.
|
|
149
|
+
"version": "3.9.0-ultramodern.26"
|
|
150
150
|
},
|
|
151
151
|
{
|
|
152
152
|
"sourceName": "@modern-js/plugin-bff-extensions",
|
|
153
153
|
"targetName": "@bleedingdev/modern-js-plugin-bff-extensions",
|
|
154
|
-
"version": "3.9.0-ultramodern.
|
|
154
|
+
"version": "3.9.0-ultramodern.26"
|
|
155
155
|
},
|
|
156
156
|
{
|
|
157
157
|
"sourceName": "@modern-js/plugin-data-loader",
|
|
158
158
|
"targetName": "@bleedingdev/modern-js-plugin-data-loader",
|
|
159
|
-
"version": "3.9.0-ultramodern.
|
|
159
|
+
"version": "3.9.0-ultramodern.26"
|
|
160
160
|
},
|
|
161
161
|
{
|
|
162
162
|
"sourceName": "@modern-js/plugin-i18n",
|
|
163
163
|
"targetName": "@bleedingdev/modern-js-plugin-i18n",
|
|
164
|
-
"version": "3.9.0-ultramodern.
|
|
164
|
+
"version": "3.9.0-ultramodern.26"
|
|
165
165
|
},
|
|
166
166
|
{
|
|
167
167
|
"sourceName": "@modern-js/plugin-polyfill",
|
|
168
168
|
"targetName": "@bleedingdev/modern-js-plugin-polyfill",
|
|
169
|
-
"version": "3.9.0-ultramodern.
|
|
169
|
+
"version": "3.9.0-ultramodern.26"
|
|
170
170
|
},
|
|
171
171
|
{
|
|
172
172
|
"sourceName": "@modern-js/plugin-ssg",
|
|
173
173
|
"targetName": "@bleedingdev/modern-js-plugin-ssg",
|
|
174
|
-
"version": "3.9.0-ultramodern.
|
|
174
|
+
"version": "3.9.0-ultramodern.26"
|
|
175
175
|
},
|
|
176
176
|
{
|
|
177
177
|
"sourceName": "@modern-js/plugin-styled-components",
|
|
178
178
|
"targetName": "@bleedingdev/modern-js-plugin-styled-components",
|
|
179
|
-
"version": "3.9.0-ultramodern.
|
|
179
|
+
"version": "3.9.0-ultramodern.26"
|
|
180
180
|
},
|
|
181
181
|
{
|
|
182
182
|
"sourceName": "@modern-js/plugin-tanstack",
|
|
183
183
|
"targetName": "@bleedingdev/modern-js-plugin-tanstack",
|
|
184
|
-
"version": "3.9.0-ultramodern.
|
|
184
|
+
"version": "3.9.0-ultramodern.26"
|
|
185
185
|
},
|
|
186
186
|
{
|
|
187
187
|
"sourceName": "@modern-js/prod-server",
|
|
188
188
|
"targetName": "@bleedingdev/modern-js-prod-server",
|
|
189
|
-
"version": "3.9.0-ultramodern.
|
|
189
|
+
"version": "3.9.0-ultramodern.26"
|
|
190
190
|
},
|
|
191
191
|
{
|
|
192
192
|
"sourceName": "@modern-js/render",
|
|
193
193
|
"targetName": "@bleedingdev/modern-js-render",
|
|
194
|
-
"version": "3.9.0-ultramodern.
|
|
194
|
+
"version": "3.9.0-ultramodern.26"
|
|
195
195
|
},
|
|
196
196
|
{
|
|
197
197
|
"sourceName": "@modern-js/runtime",
|
|
198
198
|
"targetName": "@bleedingdev/modern-js-runtime",
|
|
199
|
-
"version": "3.9.0-ultramodern.
|
|
199
|
+
"version": "3.9.0-ultramodern.26"
|
|
200
200
|
},
|
|
201
201
|
{
|
|
202
202
|
"sourceName": "@modern-js/runtime-extensions",
|
|
203
203
|
"targetName": "@bleedingdev/modern-js-runtime-extensions",
|
|
204
|
-
"version": "3.9.0-ultramodern.
|
|
204
|
+
"version": "3.9.0-ultramodern.26"
|
|
205
205
|
},
|
|
206
206
|
{
|
|
207
207
|
"sourceName": "@modern-js/runtime-renderer-extensions",
|
|
208
208
|
"targetName": "@bleedingdev/modern-js-runtime-renderer-extensions",
|
|
209
|
-
"version": "3.9.0-ultramodern.
|
|
209
|
+
"version": "3.9.0-ultramodern.26"
|
|
210
210
|
},
|
|
211
211
|
{
|
|
212
212
|
"sourceName": "@modern-js/runtime-utils",
|
|
213
213
|
"targetName": "@bleedingdev/modern-js-runtime-utils",
|
|
214
|
-
"version": "3.9.0-ultramodern.
|
|
214
|
+
"version": "3.9.0-ultramodern.26"
|
|
215
215
|
},
|
|
216
216
|
{
|
|
217
217
|
"sourceName": "@modern-js/sandpack-react",
|
|
218
218
|
"targetName": "@bleedingdev/modern-js-sandpack-react",
|
|
219
|
-
"version": "3.9.0-ultramodern.
|
|
219
|
+
"version": "3.9.0-ultramodern.26"
|
|
220
220
|
},
|
|
221
221
|
{
|
|
222
222
|
"sourceName": "@modern-js/server",
|
|
223
223
|
"targetName": "@bleedingdev/modern-js-server",
|
|
224
|
-
"version": "3.9.0-ultramodern.
|
|
224
|
+
"version": "3.9.0-ultramodern.26"
|
|
225
225
|
},
|
|
226
226
|
{
|
|
227
227
|
"sourceName": "@modern-js/server-core",
|
|
228
228
|
"targetName": "@bleedingdev/modern-js-server-core",
|
|
229
|
-
"version": "3.9.0-ultramodern.
|
|
229
|
+
"version": "3.9.0-ultramodern.26"
|
|
230
230
|
},
|
|
231
231
|
{
|
|
232
232
|
"sourceName": "@modern-js/server-runtime",
|
|
233
233
|
"targetName": "@bleedingdev/modern-js-server-runtime",
|
|
234
|
-
"version": "3.9.0-ultramodern.
|
|
234
|
+
"version": "3.9.0-ultramodern.26"
|
|
235
235
|
},
|
|
236
236
|
{
|
|
237
237
|
"sourceName": "@modern-js/server-runtime-extensions",
|
|
238
238
|
"targetName": "@bleedingdev/modern-js-server-runtime-extensions",
|
|
239
|
-
"version": "3.9.0-ultramodern.
|
|
239
|
+
"version": "3.9.0-ultramodern.26"
|
|
240
240
|
},
|
|
241
241
|
{
|
|
242
242
|
"sourceName": "@modern-js/server-utils",
|
|
243
243
|
"targetName": "@bleedingdev/modern-js-server-utils",
|
|
244
|
-
"version": "3.9.0-ultramodern.
|
|
244
|
+
"version": "3.9.0-ultramodern.26"
|
|
245
245
|
},
|
|
246
246
|
{
|
|
247
247
|
"sourceName": "@modern-js/surface-resolution",
|
|
248
248
|
"targetName": "@bleedingdev/modern-js-surface-resolution",
|
|
249
|
-
"version": "3.9.0-ultramodern.
|
|
249
|
+
"version": "3.9.0-ultramodern.26"
|
|
250
250
|
},
|
|
251
251
|
{
|
|
252
252
|
"sourceName": "@modern-js/tsconfig",
|
|
253
253
|
"targetName": "@bleedingdev/modern-js-tsconfig",
|
|
254
|
-
"version": "3.9.0-ultramodern.
|
|
254
|
+
"version": "3.9.0-ultramodern.26"
|
|
255
255
|
},
|
|
256
256
|
{
|
|
257
257
|
"sourceName": "@modern-js/types",
|
|
258
258
|
"targetName": "@bleedingdev/modern-js-types",
|
|
259
|
-
"version": "3.9.0-ultramodern.
|
|
259
|
+
"version": "3.9.0-ultramodern.26"
|
|
260
260
|
},
|
|
261
261
|
{
|
|
262
262
|
"sourceName": "@modern-js/ultramodern-app-tools",
|
|
263
263
|
"targetName": "@bleedingdev/modern-js-ultramodern-app-tools",
|
|
264
|
-
"version": "3.9.0-ultramodern.
|
|
264
|
+
"version": "3.9.0-ultramodern.26"
|
|
265
265
|
},
|
|
266
266
|
{
|
|
267
267
|
"sourceName": "@modern-js/ultramodern-create",
|
|
268
268
|
"targetName": "@bleedingdev/modern-js-ultramodern-create",
|
|
269
|
-
"version": "3.9.0-ultramodern.
|
|
269
|
+
"version": "3.9.0-ultramodern.26"
|
|
270
270
|
},
|
|
271
271
|
{
|
|
272
272
|
"sourceName": "@modern-js/ultramodern-sandpack-profile",
|
|
273
273
|
"targetName": "@bleedingdev/modern-js-ultramodern-sandpack-profile",
|
|
274
|
-
"version": "3.9.0-ultramodern.
|
|
274
|
+
"version": "3.9.0-ultramodern.26"
|
|
275
275
|
},
|
|
276
276
|
{
|
|
277
277
|
"sourceName": "@modern-js/utils",
|
|
278
278
|
"targetName": "@bleedingdev/modern-js-utils",
|
|
279
|
-
"version": "3.9.0-ultramodern.
|
|
279
|
+
"version": "3.9.0-ultramodern.26"
|
|
280
280
|
}
|
|
281
281
|
],
|
|
282
282
|
"release": {
|
|
283
283
|
"tag": "latest",
|
|
284
|
-
"version": "3.9.0-ultramodern.
|
|
284
|
+
"version": "3.9.0-ultramodern.26"
|
|
285
285
|
},
|
|
286
286
|
"schema": "bleedingdev.ultramodern.release-cohort",
|
|
287
287
|
"schemaVersion": 1,
|
|
288
288
|
"source": {
|
|
289
|
-
"commit": "
|
|
289
|
+
"commit": "428503a57019eb41c02373541897fd129a22016b",
|
|
290
290
|
"repository": "BleedingDev/ultramodern.js"
|
|
291
291
|
}
|
|
292
292
|
}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import fs from 'node:fs';
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import { fileURLToPath } from 'node:url';
|
|
5
|
+
import { resolveUltramodernReleaseIdentity } from '@modern-js/app-tools-extensions/release-identity';
|
|
5
6
|
import { validateApp } from './ultramodern-cloudflare-proof.mjs';
|
|
6
7
|
import {
|
|
7
8
|
readGeneratedContractView as readPublicSurfaceView,
|
|
@@ -45,27 +46,36 @@ function appNamespace(app) {
|
|
|
45
46
|
return app.kind === 'shell' ? 'shell' : (app.domain ?? app.id);
|
|
46
47
|
}
|
|
47
48
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
// Deployed workers carry the release identity their build derived from the
|
|
50
|
+
// topology generation marker and the source revision, so the proof expects
|
|
51
|
+
// that same identity for the revision it is proving.
|
|
52
|
+
function releaseIdentityFor(app) {
|
|
53
|
+
const unitId = app.deliveryUnit?.unitId;
|
|
54
|
+
const generationBuildMarker = app.deliveryUnit?.buildMarker;
|
|
55
|
+
if (
|
|
56
|
+
typeof unitId !== 'string' ||
|
|
57
|
+
unitId.length === 0 ||
|
|
58
|
+
typeof generationBuildMarker !== 'string' ||
|
|
59
|
+
generationBuildMarker.length === 0
|
|
60
|
+
) {
|
|
51
61
|
throw new Error(
|
|
52
|
-
`${app.id} is missing its generated delivery-unit
|
|
62
|
+
`${app.id} is missing its generated delivery-unit identity`,
|
|
53
63
|
);
|
|
54
64
|
}
|
|
55
|
-
return
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
function createDeliveryUnit(app) {
|
|
59
|
-
const buildMarker = buildMarkerFor(app);
|
|
60
|
-
const unitId = app.deliveryUnit.unitId;
|
|
61
|
-
const identity = {
|
|
65
|
+
return {
|
|
62
66
|
unitId,
|
|
63
|
-
|
|
64
|
-
|
|
67
|
+
...resolveUltramodernReleaseIdentity({
|
|
68
|
+
generationBuildMarker,
|
|
69
|
+
unitId,
|
|
70
|
+
workspaceRoot,
|
|
71
|
+
}),
|
|
65
72
|
};
|
|
73
|
+
}
|
|
66
74
|
|
|
75
|
+
function createDeliveryUnit(app, identity) {
|
|
67
76
|
return {
|
|
68
77
|
...app.deliveryUnit,
|
|
78
|
+
...identity,
|
|
69
79
|
surfaces: {
|
|
70
80
|
...(app.emitsUi ? { ui: { ...identity, surface: 'ui' } } : {}),
|
|
71
81
|
...(app.api ? { api: { ...identity, surface: 'api' } } : {}),
|
|
@@ -116,7 +126,7 @@ function createProofTarget(app) {
|
|
|
116
126
|
};
|
|
117
127
|
}
|
|
118
128
|
|
|
119
|
-
function createShellServiceBindingProof(app, apps) {
|
|
129
|
+
function createShellServiceBindingProof(app, apps, identities) {
|
|
120
130
|
if (app.kind !== 'shell') {
|
|
121
131
|
return undefined;
|
|
122
132
|
}
|
|
@@ -133,7 +143,7 @@ function createShellServiceBindingProof(app, apps) {
|
|
|
133
143
|
interface: 'fetch',
|
|
134
144
|
...(rpc
|
|
135
145
|
? createRpcProbe(candidate)
|
|
136
|
-
: { expectedMarker:
|
|
146
|
+
: { expectedMarker: identities.get(candidate.id).buildMarker }),
|
|
137
147
|
};
|
|
138
148
|
});
|
|
139
149
|
|
|
@@ -148,14 +158,15 @@ async function readGeneratedContractView() {
|
|
|
148
158
|
}
|
|
149
159
|
const apps = [topology.shell, ...topology.verticals, ...(topology.shells ?? [])];
|
|
150
160
|
const publicApps = new Map((await readPublicSurfaceView()).apps.map(app => [app.id, app]));
|
|
161
|
+
const identities = new Map(apps.map(app => [app.id, releaseIdentityFor(app)]));
|
|
151
162
|
return {
|
|
152
163
|
sourcePath: topologyPath,
|
|
153
164
|
apps: await Promise.all(apps.map(async app => {
|
|
154
165
|
if (typeof app.path !== 'string' || !app.path || !app.cloudflare) {
|
|
155
166
|
throw new Error(`${app.id} is missing its topology path or Cloudflare contract`);
|
|
156
167
|
}
|
|
157
|
-
const
|
|
158
|
-
const serviceBindings = createShellServiceBindingProof(app, apps);
|
|
168
|
+
const identity = identities.get(app.id);
|
|
169
|
+
const serviceBindings = createShellServiceBindingProof(app, apps, identities);
|
|
159
170
|
return {
|
|
160
171
|
id: app.id,
|
|
161
172
|
deploy: {
|
|
@@ -165,11 +176,14 @@ async function readGeneratedContractView() {
|
|
|
165
176
|
},
|
|
166
177
|
},
|
|
167
178
|
i18n: { namespace: appNamespace(app) },
|
|
168
|
-
marker: { appId: app.id, build: buildMarker },
|
|
169
|
-
deliveryUnit: createDeliveryUnit(
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
179
|
+
marker: { appId: app.id, build: identity.buildMarker },
|
|
180
|
+
deliveryUnit: createDeliveryUnit(
|
|
181
|
+
{
|
|
182
|
+
...app,
|
|
183
|
+
emitsUi: app.kind === 'shell' || app.surfaceProfile !== 'api-only',
|
|
184
|
+
},
|
|
185
|
+
identity,
|
|
186
|
+
),
|
|
173
187
|
...(app.backendFederation ? { backendFederation: app.backendFederation } : {}),
|
|
174
188
|
...(localOverlay.serverExecution?.[app.id]
|
|
175
189
|
? { serverExecution: localOverlay.serverExecution[app.id] }
|
|
@@ -285,6 +285,29 @@ const workerName = (app) => {
|
|
|
285
285
|
return app.wrangler.name;
|
|
286
286
|
};
|
|
287
287
|
|
|
288
|
+
// Wrangler's local Hyperdrive convention: a binding's local PostgreSQL comes from
|
|
289
|
+
// CLOUDFLARE_HYPERDRIVE_LOCAL_CONNECTION_STRING_<BINDING> (the app's .dev.vars, then the proof's
|
|
290
|
+
// environment), else its `localConnectionString`.
|
|
291
|
+
const createLocalHyperdrives = (app) => {
|
|
292
|
+
const hyperdrive = Array.isArray(app.wrangler.hyperdrive) ? app.wrangler.hyperdrive : [];
|
|
293
|
+
return Object.fromEntries(
|
|
294
|
+
hyperdrive.map((entry) => {
|
|
295
|
+
assert(
|
|
296
|
+
typeof entry?.binding === "string" && entry.binding.length > 0,
|
|
297
|
+
`${app.id} has an invalid Hyperdrive binding`,
|
|
298
|
+
);
|
|
299
|
+
const variable = `CLOUDFLARE_HYPERDRIVE_LOCAL_CONNECTION_STRING_${entry.binding}`;
|
|
300
|
+
const connectionString =
|
|
301
|
+
app.devVars[variable] || process.env[variable] || entry.localConnectionString;
|
|
302
|
+
assert(
|
|
303
|
+
typeof connectionString === "string" && connectionString.length > 0,
|
|
304
|
+
`${app.id} Hyperdrive binding ${entry.binding} needs a local PostgreSQL connection string; set ${variable}`,
|
|
305
|
+
);
|
|
306
|
+
return [entry.binding, connectionString];
|
|
307
|
+
}),
|
|
308
|
+
);
|
|
309
|
+
};
|
|
310
|
+
|
|
288
311
|
const createWorkerOptions = (app, workspaceRoot, extra = {}) => {
|
|
289
312
|
const main = typeof app.wrangler.main === "string" ? app.wrangler.main : "server/index.mjs";
|
|
290
313
|
const assets =
|
|
@@ -356,6 +379,7 @@ const createWorkerOptions = (app, workspaceRoot, extra = {}) => {
|
|
|
356
379
|
compatibilityDate: app.wrangler.compatibility_date,
|
|
357
380
|
compatibilityFlags: app.wrangler.compatibility_flags,
|
|
358
381
|
bindings: { ...app.wrangler.vars, ...app.devVars },
|
|
382
|
+
hyperdrives: createLocalHyperdrives(app),
|
|
359
383
|
assets: {
|
|
360
384
|
binding: typeof assets.binding === "string" ? assets.binding : "ASSETS",
|
|
361
385
|
directory: path.resolve(app.outputRoot, directory),
|
|
@@ -735,22 +735,21 @@ function validateUiMarkerEvidence(evidence, app, ssr) {
|
|
|
735
735
|
assert(uiMarker === app.marker?.build, `${app.id} UI marker mismatch`);
|
|
736
736
|
|
|
737
737
|
if (app.deliveryUnit) {
|
|
738
|
+
const expectedUiMarker =
|
|
739
|
+
app.deliveryUnit.surfaces?.ui?.buildMarker ?? app.deliveryUnit.buildMarker;
|
|
738
740
|
evidence.assertions.push({
|
|
739
741
|
type: 'delivery-unit-ui-marker',
|
|
740
742
|
unitId: app.deliveryUnit.unitId,
|
|
741
|
-
expected:
|
|
743
|
+
expected: expectedUiMarker,
|
|
742
744
|
actual: uiMarker,
|
|
743
|
-
status:
|
|
744
|
-
uiMarker === (app.deliveryUnit.surfaces?.ui?.buildMarker ?? app.deliveryUnit.buildMarker)
|
|
745
|
-
? 'pass'
|
|
746
|
-
: 'fail',
|
|
745
|
+
status: uiMarker === expectedUiMarker ? 'pass' : 'fail',
|
|
747
746
|
});
|
|
748
747
|
assert(
|
|
749
748
|
uiMarker !== undefined,
|
|
750
749
|
`${app.id} delivery unit ${app.deliveryUnit.unitId} is declared but SSR response is missing its build marker`,
|
|
751
750
|
);
|
|
752
751
|
assert(
|
|
753
|
-
uiMarker ===
|
|
752
|
+
uiMarker === expectedUiMarker,
|
|
754
753
|
`${app.id} delivery unit ${app.deliveryUnit.unitId} UI surface build marker mismatch`,
|
|
755
754
|
);
|
|
756
755
|
}
|
|
@@ -926,20 +925,23 @@ async function validateReadinessEvidence(evidence, app, publicUrl, routes) {
|
|
|
926
925
|
assert(apiMarker === app.marker?.build, `${app.id} API marker mismatch`);
|
|
927
926
|
|
|
928
927
|
if (app.deliveryUnit) {
|
|
928
|
+
const expectedApiMarker =
|
|
929
|
+
app.deliveryUnit.surfaces?.api?.buildMarker ??
|
|
930
|
+
app.deliveryUnit.buildMarker;
|
|
929
931
|
evidence.assertions.push({
|
|
930
932
|
type: 'delivery-unit-api-marker',
|
|
931
933
|
route: routes.apiReadiness,
|
|
932
934
|
unitId: app.deliveryUnit.unitId,
|
|
933
|
-
expected:
|
|
935
|
+
expected: expectedApiMarker,
|
|
934
936
|
actual: apiMarker,
|
|
935
|
-
status: apiMarker ===
|
|
937
|
+
status: apiMarker === expectedApiMarker ? 'pass' : 'fail',
|
|
936
938
|
});
|
|
937
939
|
assert(
|
|
938
940
|
apiMarker !== undefined,
|
|
939
941
|
`${app.id} delivery unit ${app.deliveryUnit.unitId} is declared but readiness response is missing its build marker`,
|
|
940
942
|
);
|
|
941
943
|
assert(
|
|
942
|
-
apiMarker ===
|
|
944
|
+
apiMarker === expectedApiMarker,
|
|
943
945
|
`${app.id} delivery unit ${app.deliveryUnit.unitId} API surface build marker mismatch`,
|
|
944
946
|
);
|
|
945
947
|
}
|