@bleedingdev/modern-js-ultramodern-create 3.9.0-ultramodern.11 → 3.9.0-ultramodern.13
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/README.md +32 -36
- package/dist/cjs/ultramodern-release-cohort.cjs +6 -21
- package/dist/cjs/ultramodern-tooling/commands/cloudflare-output-verify.cjs +29 -53
- package/dist/cjs/ultramodern-tooling/commands/context.cjs +1 -27
- package/dist/cjs/ultramodern-tooling/commands/routes-generate-app.cjs +60 -0
- package/dist/cjs/ultramodern-tooling/commands/routes-generate.cjs +12 -48
- package/dist/cjs/ultramodern-tooling/commands/validate.cjs +5 -58
- package/dist/cjs/ultramodern-tooling/commands.cjs +13 -3
- package/dist/cjs/ultramodern-tooling/config/index.cjs +11 -4
- package/dist/cjs/ultramodern-tooling/config/load.cjs +4 -17
- package/dist/cjs/ultramodern-tooling/config/metadata.cjs +41 -2
- package/dist/cjs/ultramodern-tooling/config/normalize.cjs +121 -198
- package/dist/cjs/ultramodern-workspace/add-shell.cjs +103 -147
- package/dist/cjs/ultramodern-workspace/add-vertical/execute.cjs +61 -94
- package/dist/cjs/ultramodern-workspace/add-vertical/plan.cjs +14 -160
- package/dist/cjs/ultramodern-workspace/add-vertical/preflight.cjs +8 -13
- package/dist/cjs/ultramodern-workspace/add-vertical/preview.cjs +78 -0
- package/dist/cjs/ultramodern-workspace/add-vertical/topology.cjs +0 -32
- package/dist/cjs/ultramodern-workspace/add-vertical/transaction.cjs +2 -2
- package/dist/cjs/ultramodern-workspace/add-vertical/workspace-state.cjs +19 -42
- package/dist/cjs/ultramodern-workspace/add-vertical.cjs +0 -9
- package/dist/cjs/ultramodern-workspace/api/contracts.cjs +2 -2
- package/dist/cjs/ultramodern-workspace/api/rpc.cjs +16 -14
- package/dist/cjs/ultramodern-workspace/api/service.cjs +4 -8
- package/dist/cjs/ultramodern-workspace/api/shared.cjs +1 -1
- package/dist/cjs/ultramodern-workspace/backend-federation.cjs +3 -3
- package/dist/cjs/ultramodern-workspace/contracts.cjs +14 -183
- package/dist/cjs/ultramodern-workspace/delivery-unit-stamp.cjs +10 -5
- package/dist/cjs/ultramodern-workspace/delivery-unit-sync.cjs +27 -17
- package/dist/cjs/ultramodern-workspace/delivery-unit.cjs +11 -6
- package/dist/cjs/ultramodern-workspace/demo-components.cjs +62 -115
- package/dist/cjs/ultramodern-workspace/descriptors.cjs +0 -4
- package/dist/cjs/ultramodern-workspace/generation-result.cjs +1 -1
- package/dist/cjs/ultramodern-workspace/index.cjs +2 -5
- package/dist/cjs/ultramodern-workspace/mf-validation/constants.cjs +0 -6
- package/dist/cjs/ultramodern-workspace/mf-validation/discovery.cjs +6 -6
- package/dist/cjs/ultramodern-workspace/mf-validation/path-utils.cjs +37 -38
- package/dist/cjs/ultramodern-workspace/module-federation/config.cjs +9 -16
- package/dist/cjs/ultramodern-workspace/module-federation/remote-refs.cjs +1 -43
- package/dist/cjs/ultramodern-workspace/package-json.cjs +47 -54
- package/dist/cjs/ultramodern-workspace/patch-inventory.cjs +122 -0
- package/dist/cjs/ultramodern-workspace/policy.cjs +6 -380
- package/dist/cjs/ultramodern-workspace/public-surface.cjs +2 -2
- package/dist/cjs/ultramodern-workspace/routes.cjs +11 -7
- package/dist/cjs/ultramodern-workspace/shared-patches.cjs +12 -2
- package/dist/cjs/ultramodern-workspace/shells.cjs +0 -70
- package/dist/cjs/ultramodern-workspace/tooling-command-catalog.cjs +6 -43
- package/dist/cjs/ultramodern-workspace/tsconfigs.cjs +3 -1
- package/dist/cjs/ultramodern-workspace/validation/architecture.cjs +397 -0
- package/dist/cjs/ultramodern-workspace/validation/assertions.cjs +140 -0
- package/dist/cjs/ultramodern-workspace/validation/types.cjs +18 -0
- package/dist/cjs/ultramodern-workspace/validation/workspace.cjs +343 -0
- package/dist/cjs/ultramodern-workspace/versions.cjs +25 -41
- package/dist/cjs/ultramodern-workspace/workspace-artifact-ownership.cjs +71 -31
- package/dist/cjs/ultramodern-workspace/workspace-script-plan.cjs +7 -7
- package/dist/cjs/ultramodern-workspace/workspace-scripts.cjs +17 -143
- package/dist/cjs/ultramodern-workspace/workspace-validation-contract.cjs +62 -371
- package/dist/cjs/ultramodern-workspace/write-app.cjs +5 -4
- package/dist/cjs/ultramodern-workspace/write-workspace.cjs +10 -50
- package/dist/esm/ultramodern-release-cohort.js +5 -14
- package/dist/esm/ultramodern-tooling/commands/cloudflare-output-verify.js +29 -53
- package/dist/esm/ultramodern-tooling/commands/context.js +3 -24
- package/dist/esm/ultramodern-tooling/commands/routes-generate-app.js +28 -0
- package/dist/esm/ultramodern-tooling/commands/routes-generate.js +13 -49
- package/dist/esm/ultramodern-tooling/commands/validate.js +6 -49
- package/dist/esm/ultramodern-tooling/commands.js +12 -3
- package/dist/esm/ultramodern-tooling/config/index.js +1 -0
- package/dist/esm/ultramodern-tooling/config/load.js +5 -17
- package/dist/esm/ultramodern-tooling/config/metadata.js +36 -1
- package/dist/esm/ultramodern-tooling/config/normalize.js +125 -191
- package/dist/esm/ultramodern-workspace/add-shell.js +110 -153
- package/dist/esm/ultramodern-workspace/add-vertical/execute.js +61 -98
- package/dist/esm/ultramodern-workspace/add-vertical/plan.js +16 -150
- package/dist/esm/ultramodern-workspace/add-vertical/preflight.js +6 -11
- package/dist/esm/ultramodern-workspace/add-vertical/preview.js +40 -0
- package/dist/esm/ultramodern-workspace/add-vertical/topology.js +1 -30
- package/dist/esm/ultramodern-workspace/add-vertical/transaction.js +2 -2
- package/dist/esm/ultramodern-workspace/add-vertical/workspace-state.js +15 -32
- package/dist/esm/ultramodern-workspace/add-vertical.js +1 -1
- package/dist/esm/ultramodern-workspace/api/contracts.js +2 -2
- package/dist/esm/ultramodern-workspace/api/rpc.js +16 -14
- package/dist/esm/ultramodern-workspace/api/service.js +4 -8
- package/dist/esm/ultramodern-workspace/api/shared.js +1 -1
- package/dist/esm/ultramodern-workspace/backend-federation.js +3 -3
- package/dist/esm/ultramodern-workspace/contracts.js +14 -180
- package/dist/esm/ultramodern-workspace/delivery-unit-stamp.js +10 -5
- package/dist/esm/ultramodern-workspace/delivery-unit-sync.js +28 -18
- package/dist/esm/ultramodern-workspace/delivery-unit.js +11 -6
- package/dist/esm/ultramodern-workspace/demo-components.js +62 -115
- package/dist/esm/ultramodern-workspace/descriptors.js +1 -2
- package/dist/esm/ultramodern-workspace/generation-result.js +2 -2
- package/dist/esm/ultramodern-workspace/index.js +1 -1
- package/dist/esm/ultramodern-workspace/mf-validation/constants.js +1 -4
- package/dist/esm/ultramodern-workspace/mf-validation/discovery.js +7 -7
- package/dist/esm/ultramodern-workspace/mf-validation/path-utils.js +36 -34
- package/dist/esm/ultramodern-workspace/module-federation/config.js +10 -17
- package/dist/esm/ultramodern-workspace/module-federation/remote-refs.js +1 -43
- package/dist/esm/ultramodern-workspace/package-json.js +48 -55
- package/dist/esm/ultramodern-workspace/patch-inventory.js +84 -0
- package/dist/esm/ultramodern-workspace/policy.js +6 -371
- package/dist/esm/ultramodern-workspace/public-surface.js +2 -2
- package/dist/esm/ultramodern-workspace/routes.js +11 -7
- package/dist/esm/ultramodern-workspace/shared-patches.js +2 -2
- package/dist/esm/ultramodern-workspace/shells.js +3 -67
- package/dist/esm/ultramodern-workspace/tooling-command-catalog.js +7 -41
- package/dist/esm/ultramodern-workspace/tsconfigs.js +4 -2
- package/dist/esm/ultramodern-workspace/validation/architecture.js +348 -0
- package/dist/esm/ultramodern-workspace/validation/assertions.js +65 -0
- package/dist/esm/ultramodern-workspace/validation/types.js +0 -0
- package/dist/esm/ultramodern-workspace/validation/workspace.js +285 -0
- package/dist/esm/ultramodern-workspace/versions.js +24 -28
- package/dist/esm/ultramodern-workspace/workspace-artifact-ownership.js +64 -30
- package/dist/esm/ultramodern-workspace/workspace-script-plan.js +7 -7
- package/dist/esm/ultramodern-workspace/workspace-scripts.js +19 -136
- package/dist/esm/ultramodern-workspace/workspace-validation-contract.js +64 -373
- package/dist/esm/ultramodern-workspace/write-app.js +4 -3
- package/dist/esm/ultramodern-workspace/write-workspace.js +16 -53
- package/dist/esm-node/ultramodern-release-cohort.js +5 -14
- package/dist/esm-node/ultramodern-tooling/commands/cloudflare-output-verify.js +29 -53
- package/dist/esm-node/ultramodern-tooling/commands/context.js +3 -24
- package/dist/esm-node/ultramodern-tooling/commands/routes-generate-app.js +29 -0
- package/dist/esm-node/ultramodern-tooling/commands/routes-generate.js +13 -49
- package/dist/esm-node/ultramodern-tooling/commands/validate.js +6 -49
- package/dist/esm-node/ultramodern-tooling/commands.js +12 -3
- package/dist/esm-node/ultramodern-tooling/config/index.js +1 -0
- package/dist/esm-node/ultramodern-tooling/config/load.js +5 -17
- package/dist/esm-node/ultramodern-tooling/config/metadata.js +36 -1
- package/dist/esm-node/ultramodern-tooling/config/normalize.js +125 -191
- package/dist/esm-node/ultramodern-workspace/add-shell.js +110 -153
- package/dist/esm-node/ultramodern-workspace/add-vertical/execute.js +61 -98
- package/dist/esm-node/ultramodern-workspace/add-vertical/plan.js +16 -150
- package/dist/esm-node/ultramodern-workspace/add-vertical/preflight.js +6 -11
- package/dist/esm-node/ultramodern-workspace/add-vertical/preview.js +41 -0
- package/dist/esm-node/ultramodern-workspace/add-vertical/topology.js +1 -30
- package/dist/esm-node/ultramodern-workspace/add-vertical/transaction.js +2 -2
- package/dist/esm-node/ultramodern-workspace/add-vertical/workspace-state.js +15 -32
- package/dist/esm-node/ultramodern-workspace/add-vertical.js +1 -1
- package/dist/esm-node/ultramodern-workspace/api/contracts.js +2 -2
- package/dist/esm-node/ultramodern-workspace/api/rpc.js +16 -14
- package/dist/esm-node/ultramodern-workspace/api/service.js +4 -8
- package/dist/esm-node/ultramodern-workspace/api/shared.js +1 -1
- package/dist/esm-node/ultramodern-workspace/backend-federation.js +3 -3
- package/dist/esm-node/ultramodern-workspace/contracts.js +14 -180
- package/dist/esm-node/ultramodern-workspace/delivery-unit-stamp.js +10 -5
- package/dist/esm-node/ultramodern-workspace/delivery-unit-sync.js +28 -18
- package/dist/esm-node/ultramodern-workspace/delivery-unit.js +11 -6
- package/dist/esm-node/ultramodern-workspace/demo-components.js +62 -115
- package/dist/esm-node/ultramodern-workspace/descriptors.js +1 -2
- package/dist/esm-node/ultramodern-workspace/generation-result.js +2 -2
- package/dist/esm-node/ultramodern-workspace/index.js +1 -1
- package/dist/esm-node/ultramodern-workspace/mf-validation/constants.js +1 -4
- package/dist/esm-node/ultramodern-workspace/mf-validation/discovery.js +7 -7
- package/dist/esm-node/ultramodern-workspace/mf-validation/path-utils.js +36 -34
- package/dist/esm-node/ultramodern-workspace/module-federation/config.js +10 -17
- package/dist/esm-node/ultramodern-workspace/module-federation/remote-refs.js +1 -43
- package/dist/esm-node/ultramodern-workspace/package-json.js +48 -55
- package/dist/esm-node/ultramodern-workspace/patch-inventory.js +85 -0
- package/dist/esm-node/ultramodern-workspace/policy.js +6 -371
- package/dist/esm-node/ultramodern-workspace/public-surface.js +2 -2
- package/dist/esm-node/ultramodern-workspace/routes.js +11 -7
- package/dist/esm-node/ultramodern-workspace/shared-patches.js +2 -2
- package/dist/esm-node/ultramodern-workspace/shells.js +3 -67
- package/dist/esm-node/ultramodern-workspace/tooling-command-catalog.js +7 -41
- package/dist/esm-node/ultramodern-workspace/tsconfigs.js +4 -2
- package/dist/esm-node/ultramodern-workspace/validation/architecture.js +349 -0
- package/dist/esm-node/ultramodern-workspace/validation/assertions.js +66 -0
- package/dist/esm-node/ultramodern-workspace/validation/types.js +1 -0
- package/dist/esm-node/ultramodern-workspace/validation/workspace.js +286 -0
- package/dist/esm-node/ultramodern-workspace/versions.js +24 -28
- package/dist/esm-node/ultramodern-workspace/workspace-artifact-ownership.js +64 -30
- package/dist/esm-node/ultramodern-workspace/workspace-script-plan.js +7 -7
- package/dist/esm-node/ultramodern-workspace/workspace-scripts.js +19 -136
- package/dist/esm-node/ultramodern-workspace/workspace-validation-contract.js +64 -373
- package/dist/esm-node/ultramodern-workspace/write-app.js +4 -3
- package/dist/esm-node/ultramodern-workspace/write-workspace.js +16 -53
- package/dist/types/ultramodern-release-cohort.d.ts +1 -3
- package/dist/types/ultramodern-tooling/commands/cloudflare-output-verify.d.ts +2 -2
- package/dist/types/ultramodern-tooling/commands/context.d.ts +0 -1
- package/dist/types/ultramodern-tooling/commands/routes-generate-app.d.ts +1 -0
- package/dist/types/ultramodern-tooling/commands/routes-generate.d.ts +1 -1
- package/dist/types/ultramodern-tooling/commands/validate.d.ts +1 -1
- package/dist/types/ultramodern-tooling/config/index.d.ts +1 -0
- package/dist/types/ultramodern-tooling/config/load.d.ts +6 -58
- package/dist/types/ultramodern-tooling/config/metadata.d.ts +3 -0
- package/dist/types/ultramodern-tooling/config/normalize.d.ts +9 -88
- package/dist/types/ultramodern-tooling/config/types.d.ts +1 -9
- package/dist/types/ultramodern-workspace/add-shell.d.ts +1 -1
- package/dist/types/ultramodern-workspace/add-vertical/execute.d.ts +1 -0
- package/dist/types/ultramodern-workspace/add-vertical/preflight.d.ts +4 -3
- package/dist/types/ultramodern-workspace/add-vertical/preview.d.ts +4 -0
- package/dist/types/ultramodern-workspace/add-vertical/topology.d.ts +0 -1
- package/dist/types/ultramodern-workspace/add-vertical/transaction.d.ts +4 -1
- package/dist/types/ultramodern-workspace/add-vertical/workspace-state.d.ts +8 -5
- package/dist/types/ultramodern-workspace/add-vertical.d.ts +1 -1
- package/dist/types/ultramodern-workspace/api/rpc.d.ts +1 -1
- package/dist/types/ultramodern-workspace/contracts.d.ts +1 -3
- package/dist/types/ultramodern-workspace/delivery-unit-stamp.d.ts +2 -2
- package/dist/types/ultramodern-workspace/delivery-unit.d.ts +2 -2
- package/dist/types/ultramodern-workspace/descriptors.d.ts +0 -1
- package/dist/types/ultramodern-workspace/index.d.ts +1 -1
- package/dist/types/ultramodern-workspace/mf-validation/constants.d.ts +0 -1
- package/dist/types/ultramodern-workspace/mf-validation/path-utils.d.ts +2 -3
- package/dist/types/ultramodern-workspace/module-federation/config.d.ts +1 -1
- package/dist/types/ultramodern-workspace/patch-inventory.d.ts +10 -0
- package/dist/types/ultramodern-workspace/policy.d.ts +60 -182
- package/dist/types/ultramodern-workspace/shells.d.ts +1 -14
- package/dist/types/ultramodern-workspace/tooling-command-catalog.d.ts +1 -6
- package/dist/types/ultramodern-workspace/validation/architecture.d.ts +2 -0
- package/dist/types/ultramodern-workspace/validation/assertions.d.ts +14 -0
- package/dist/types/ultramodern-workspace/validation/types.d.ts +9 -0
- package/dist/types/ultramodern-workspace/validation/workspace.d.ts +6 -0
- package/dist/types/ultramodern-workspace/versions.d.ts +23 -27
- package/dist/types/ultramodern-workspace/workspace-artifact-ownership.d.ts +5 -0
- package/dist/types/ultramodern-workspace/workspace-script-plan.d.ts +1 -1
- package/dist/types/ultramodern-workspace/workspace-scripts.d.ts +7 -19
- package/dist/types/ultramodern-workspace/workspace-validation-contract.d.ts +22 -188
- package/dist/types/ultramodern-workspace/write-workspace.d.ts +1 -3
- package/package.json +17 -16
- package/{template-workspace/.modernjs/release-cohort.json → release-cohort.json} +48 -48
- package/template-workspace/README.md.handlebars +9 -16
- package/template-workspace/pnpm-workspace.yaml.handlebars +0 -24
- package/templates/workspace/apps/modern.config.ts.handlebars +6 -6
- package/templates/workspace/apps/shared/src/routes/ultramodern-route-metadata.ts.handlebars +8 -21
- package/templates/workspace/apps/shell-super-app/src/routes/[lang]/page.tsx.handlebars +20 -20
- package/templates/workspace/apps/shell-super-app/src/routes/vertical-components.helpers.tsx.handlebars +1 -1
- package/templates/workspace/apps/shell-super-app/src/routes/vertical-components.tsx.handlebars +11 -11
- package/templates/workspace/apps/shell-super-app/src/routes/vertical-components.worker.helpers.tsx.handlebars +1 -1
- package/templates/workspace-scripts/generate-node-backend-federation.mjs +39 -49
- package/templates/workspace-scripts/generate-public-surface-assets.mjs +142 -206
- package/templates/workspace-scripts/materialize-zerops-runtime.mjs +3 -11
- package/templates/workspace-scripts/proof-cloudflare-version.mjs +53 -444
- package/templates/workspace-scripts/proof-node-backend-federation.mjs +193 -39
- package/templates/workspace-scripts/proof-workerd-ssr.mjs +126 -66
- package/templates/workspace-scripts/ultramodern-performance-readiness.mjs +45 -147
- package/dist/cjs/ultramodern-workspace/cohort-parity.cjs +0 -129
- package/dist/cjs/ultramodern-workspace/patch-parity.cjs +0 -163
- package/dist/esm/ultramodern-workspace/cohort-parity.js +0 -74
- package/dist/esm/ultramodern-workspace/patch-parity.js +0 -99
- package/dist/esm-node/ultramodern-workspace/cohort-parity.js +0 -75
- package/dist/esm-node/ultramodern-workspace/patch-parity.js +0 -100
- package/dist/types/ultramodern-workspace/cohort-parity.d.ts +0 -31
- package/dist/types/ultramodern-workspace/patch-parity.d.ts +0 -39
- package/template-workspace/patches/@module-federation__bridge-react@2.9.0.patch +0 -47
- package/template-workspace/patches/@module-federation__dts-plugin@2.9.0.patch +0 -100
- package/template-workspace/patches/@module-federation__modern-js-v3@2.9.0.patch +0 -268
- package/template-workspace/patches/@module-federation__runtime-core@2.9.0.patch +0 -13
- package/template-workspace/patches/drizzle-orm-ts7-strict-declarations.patch +0 -471
- package/template-workspace/patches/msgpackr@2.1.0.patch +0 -30
- package/template-workspace/patches/zod@4.5.4.patch +0 -56
- package/templates/packages/effect-bff-runtime.ts +0 -2
- package/templates/workspace-scripts/validate-ultramodern-workspace.mjs.handlebars +0 -4046
|
@@ -74,7 +74,9 @@ export const ${itemSchema}: Schema.Codec<${pascalStem}RpcItem> = Schema.Struct({
|
|
|
74
74
|
title: Schema.String,
|
|
75
75
|
});
|
|
76
76
|
|
|
77
|
-
|
|
77
|
+
const taggedErrorSchema = Schema.TaggedError;
|
|
78
|
+
|
|
79
|
+
export class ${notFound} extends taggedErrorSchema<${notFound}>()(
|
|
78
80
|
'${notFound}',
|
|
79
81
|
{
|
|
80
82
|
id: Schema.String,
|
|
@@ -85,13 +87,13 @@ export class ${notFound} extends Schema.TaggedError<${notFound}>()(
|
|
|
85
87
|
// (mirrors the shapes Effect BFF's RpcServer/RpcClient runtime accepts).
|
|
86
88
|
export const ${groupExport} = RpcGroup.make(
|
|
87
89
|
Rpc.make('list', {
|
|
88
|
-
success: Schema.Struct({ items: Schema.Array(${itemSchema}) }),
|
|
89
90
|
payload: { limit: Schema.optional(Schema.Number) },
|
|
91
|
+
success: Schema.Struct({ items: Schema.Array(${itemSchema}) }),
|
|
90
92
|
}),
|
|
91
93
|
Rpc.make('get', {
|
|
92
|
-
success: ${itemSchema},
|
|
93
94
|
error: ${notFound},
|
|
94
95
|
payload: { id: Schema.String },
|
|
96
|
+
success: ${itemSchema},
|
|
95
97
|
}),
|
|
96
98
|
);
|
|
97
99
|
|
|
@@ -117,6 +119,12 @@ function rpcServiceEntryWiring(service) {
|
|
|
117
119
|
const layer = `
|
|
118
120
|
const ${groupName}RpcLayer = ${groupExport}.toLayer(
|
|
119
121
|
${groupExport}.of({
|
|
122
|
+
get: ({ id }) => {
|
|
123
|
+
const matched = ${groupName}Items.find(candidate => candidate.id === id);
|
|
124
|
+
return matched === undefined
|
|
125
|
+
? Effect.fail(new ${notFound}({ id }))
|
|
126
|
+
: Effect.succeed({ id: matched.id, title: matched.title });
|
|
127
|
+
},
|
|
120
128
|
list: ({ limit }) =>
|
|
121
129
|
Effect.succeed({
|
|
122
130
|
items:
|
|
@@ -130,12 +138,6 @@ const ${groupName}RpcLayer = ${groupExport}.toLayer(
|
|
|
130
138
|
title: item.title,
|
|
131
139
|
})),
|
|
132
140
|
}),
|
|
133
|
-
get: ({ id }) => {
|
|
134
|
-
const matched = ${groupName}Items.find(candidate => candidate.id === id);
|
|
135
|
-
return matched === undefined
|
|
136
|
-
? Effect.fail(new ${notFound}({ id }))
|
|
137
|
-
: Effect.succeed({ id: matched.id, title: matched.title });
|
|
138
|
-
},
|
|
139
141
|
}),
|
|
140
142
|
);
|
|
141
143
|
`;
|
|
@@ -186,11 +188,11 @@ const apiRuntime = defineEffectBff({
|
|
|
186
188
|
${rpc.field}
|
|
187
189
|
});
|
|
188
190
|
|
|
189
|
-
export { ${groupExport} };
|
|
191
|
+
export { ${groupExport} } from '../shared/rpc.ts';
|
|
190
192
|
export default apiRuntime;
|
|
191
193
|
`;
|
|
192
194
|
}
|
|
193
|
-
function createRpcClientFile(service) {
|
|
195
|
+
function createRpcClientFile(service, contractImportPath = '../../shared/rpc.ts') {
|
|
194
196
|
const groupExport = verticalRpcGroupExport(service);
|
|
195
197
|
const contractExport = verticalRpcContractExport(service);
|
|
196
198
|
const stem = (0, external_descriptors_cjs_namespaceObject.resolveApiStem)(service);
|
|
@@ -202,11 +204,11 @@ function createRpcClientFile(service) {
|
|
|
202
204
|
import {
|
|
203
205
|
${contractExport},
|
|
204
206
|
${groupExport},
|
|
205
|
-
} from '
|
|
207
|
+
} from '${contractImportPath}';
|
|
206
208
|
|
|
207
209
|
export { Effect } from '@modern-js/bff-effect/effect-client';
|
|
208
210
|
|
|
209
|
-
export
|
|
211
|
+
export { ${contractExport} as ${pascalStem}RpcContract } from '${contractImportPath}';
|
|
210
212
|
|
|
211
213
|
export interface ${pascalStem}RpcClientOptions {
|
|
212
214
|
url?: string | URL;
|
|
@@ -216,8 +218,8 @@ export const make${pascalStem}RpcClient = (
|
|
|
216
218
|
options: ${pascalStem}RpcClientOptions = {},
|
|
217
219
|
) =>
|
|
218
220
|
makeEffectRpcClient(${groupExport}, {
|
|
219
|
-
url: String(options.url ?? ${contractExport}.path),
|
|
220
221
|
serialization: 'json',
|
|
222
|
+
url: String(options.url ?? ${contractExport}.path),
|
|
221
223
|
});
|
|
222
224
|
|
|
223
225
|
export const list${pascalStem}Rpc = (
|
|
@@ -43,7 +43,7 @@ function createApiServiceEntry(service, contractImportPath, options) {
|
|
|
43
43
|
const groupName = (0, external_names_cjs_namespaceObject.verticalApiGroupName)(service);
|
|
44
44
|
const notFoundErrorExport = (0, external_names_cjs_namespaceObject.verticalApiNotFoundErrorExport)(service);
|
|
45
45
|
const stem = (0, external_descriptors_cjs_namespaceObject.resolveApiStem)(service);
|
|
46
|
-
const assemblyImport = options ?
|
|
46
|
+
const assemblyImport = options ? "import { assembleEffectBffRuntime } from '@modern-js/bff-effect/assembly';\n" : '';
|
|
47
47
|
return `${assemblyImport}import {
|
|
48
48
|
${options ? '' : 'defineEffectBff,'}
|
|
49
49
|
Effect,
|
|
@@ -202,12 +202,8 @@ export default apiRuntime;
|
|
|
202
202
|
function createBackendEffectApiExpose(scope, service) {
|
|
203
203
|
if ((service.api?.protocol ?? 'rest') === 'rpc') {
|
|
204
204
|
const groupExport = (0, external_rpc_cjs_namespaceObject.verticalRpcGroupExport)(service);
|
|
205
|
-
const contractExport = (0, external_rpc_cjs_namespaceObject.verticalRpcContractExport)(service);
|
|
206
205
|
return `import { ultramodernApiMarker } from '../shared/ultramodern-build.ts';
|
|
207
|
-
import {
|
|
208
|
-
${contractExport},
|
|
209
|
-
${groupExport},
|
|
210
|
-
} from '../shared/rpc.ts';
|
|
206
|
+
import { ${groupExport} } from '../shared/rpc.ts';
|
|
211
207
|
|
|
212
208
|
export const backendFederationContract = {
|
|
213
209
|
compatibility: {
|
|
@@ -221,16 +217,16 @@ export const backendFederationContract = {
|
|
|
221
217
|
executionSurfaces: ['node-mf-runtime'],
|
|
222
218
|
exposes: ['./effect-api'],
|
|
223
219
|
name: '${(0, external_descriptors_cjs_namespaceObject.createBackendFederationName)(service)}',
|
|
220
|
+
role: 'microvertical-server',
|
|
224
221
|
rpcPath: '${(0, external_rpc_cjs_namespaceObject.rpcPath)(service)}',
|
|
225
222
|
rpcSerialization: 'json',
|
|
226
|
-
role: 'microvertical-server',
|
|
227
223
|
runtimeFramework: 'effect',
|
|
228
224
|
strictEffectApproach: true,
|
|
229
225
|
} as const;
|
|
230
226
|
|
|
231
227
|
export { default, default as runtime } from './index.ts';
|
|
232
228
|
export {
|
|
233
|
-
${
|
|
229
|
+
${(0, external_rpc_cjs_namespaceObject.verticalRpcContractExport)(service)} as contract,
|
|
234
230
|
${groupExport} as rpc,
|
|
235
231
|
} from '../shared/rpc.ts';
|
|
236
232
|
export const api: unknown = ${groupExport};
|
|
@@ -66,14 +66,14 @@ function createEffectExpose(app) {
|
|
|
66
66
|
if ('rpc' === (0, external_descriptors_cjs_namespaceObject.resolveApiProtocol)(app)) return {
|
|
67
67
|
contract: `${app.directory}/shared/rpc.ts`,
|
|
68
68
|
runtime: `${app.directory}/api/index.ts`,
|
|
69
|
-
client: `${app.directory}
|
|
69
|
+
client: `${app.directory}/${'api-only' === app.surfaceProfile ? 'shared' : 'src/api'}/${app.api.stem}-rpc-client.ts`,
|
|
70
70
|
rpc: (0, rpc_cjs_namespaceObject.rpcPath)(app),
|
|
71
71
|
serialization: 'json'
|
|
72
72
|
};
|
|
73
73
|
return {
|
|
74
74
|
contract: `${app.directory}/shared/api.ts`,
|
|
75
75
|
runtime: `${app.directory}/api/index.ts`,
|
|
76
|
-
client: `${app.directory}
|
|
76
|
+
client: `${app.directory}/${'api-only' === app.surfaceProfile ? 'shared' : 'src/api'}/${app.api.stem}-client.ts`,
|
|
77
77
|
openapi: `${app.api.prefix}/openapi.json`,
|
|
78
78
|
readiness: `${app.api.prefix}/${apiStem}/readiness`
|
|
79
79
|
};
|
|
@@ -262,9 +262,9 @@ export const backendFederationContract = {
|
|
|
262
262
|
exposes: ['${backend_federation_contracts_namespaceObject.BACKEND_FEDERATION_EFFECT_EXPOSE}'],
|
|
263
263
|
name: '${(0, external_descriptors_cjs_namespaceObject.createBackendFederationName)(app)}',
|
|
264
264
|
nodeAdapterVersion: '${backend_federation_contracts_namespaceObject.BACKEND_FEDERATION_NODE_ADAPTER_VERSION}',
|
|
265
|
+
role: 'microvertical-server',
|
|
265
266
|
rpcPath: '${(0, rpc_cjs_namespaceObject.rpcPath)(app)}',
|
|
266
267
|
rpcSerialization: 'json',
|
|
267
|
-
role: 'microvertical-server',
|
|
268
268
|
runtimeFramework: 'effect',
|
|
269
269
|
strictEffectApproach: true,
|
|
270
270
|
} as const;
|
|
@@ -30,21 +30,15 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
30
30
|
__webpack_require__.d(__webpack_exports__, {
|
|
31
31
|
createDevelopmentOverlay: ()=>createDevelopmentOverlay,
|
|
32
32
|
createOwnership: ()=>createOwnership,
|
|
33
|
-
createTopology: ()=>createTopology
|
|
34
|
-
createUltramodernConfig: ()=>createUltramodernConfig
|
|
33
|
+
createTopology: ()=>createTopology
|
|
35
34
|
});
|
|
36
|
-
const external_ultramodern_package_source_cjs_namespaceObject = require("../ultramodern-package-source.cjs");
|
|
37
35
|
const external_api_cjs_namespaceObject = require("./api.cjs");
|
|
38
36
|
const rpc_cjs_namespaceObject = require("./api/rpc.cjs");
|
|
39
37
|
const external_backend_federation_cjs_namespaceObject = require("./backend-federation.cjs");
|
|
40
|
-
const defaults_cjs_namespaceObject = require("./bridge-config/defaults.cjs");
|
|
41
38
|
const external_delivery_unit_cjs_namespaceObject = require("./delivery-unit.cjs");
|
|
42
39
|
const external_descriptors_cjs_namespaceObject = require("./descriptors.cjs");
|
|
43
40
|
const external_naming_cjs_namespaceObject = require("./naming.cjs");
|
|
44
41
|
const external_policy_cjs_namespaceObject = require("./policy.cjs");
|
|
45
|
-
const external_shells_cjs_namespaceObject = require("./shells.cjs");
|
|
46
|
-
const external_tooling_command_catalog_cjs_namespaceObject = require("./tooling-command-catalog.cjs");
|
|
47
|
-
const external_versions_cjs_namespaceObject = require("./versions.cjs");
|
|
48
42
|
function isJsonValue(value) {
|
|
49
43
|
return void 0 !== value;
|
|
50
44
|
}
|
|
@@ -56,9 +50,6 @@ function optionalJsonEntry(key, value) {
|
|
|
56
50
|
function jsonEntries(entries) {
|
|
57
51
|
return Object.fromEntries(entries.filter((entry)=>isJsonValue(entry[1])));
|
|
58
52
|
}
|
|
59
|
-
function presentJsonValues(values) {
|
|
60
|
-
return values.filter(isJsonValue);
|
|
61
|
-
}
|
|
62
53
|
function createReferenceRemoteContracts(app, remotes) {
|
|
63
54
|
return (0, external_descriptors_cjs_namespaceObject.createModuleFederationRemoteContracts)(app, remotes).map((remote)=>({
|
|
64
55
|
id: remote.id,
|
|
@@ -74,20 +65,23 @@ function createTopology(scope, remotes = [], primaryShell) {
|
|
|
74
65
|
description: 'Generated UltraModern SuperApp shell that can grow by adding full-stack verticals.',
|
|
75
66
|
preset: 'presetUltramodern',
|
|
76
67
|
shell: {
|
|
77
|
-
id:
|
|
68
|
+
id: shellHost.id,
|
|
78
69
|
kind: 'shell',
|
|
79
|
-
package: (0, external_naming_cjs_namespaceObject.packageName)(scope,
|
|
70
|
+
package: (0, external_naming_cjs_namespaceObject.packageName)(scope, shellHost.packageSuffix),
|
|
71
|
+
path: shellHost.directory,
|
|
72
|
+
displayName: shellHost.displayName,
|
|
73
|
+
portEnv: shellHost.portEnv,
|
|
80
74
|
verticalRefs: shellHost.verticalRefs ?? [],
|
|
81
75
|
moduleFederation: {
|
|
82
76
|
role: 'host',
|
|
83
|
-
name:
|
|
77
|
+
name: shellHost.mfName,
|
|
84
78
|
remotes: createReferenceRemoteContracts(shellHost, remotes),
|
|
85
79
|
ssr: true,
|
|
86
80
|
sharedContractVersion: 'mf-ssr-contract-v1'
|
|
87
81
|
},
|
|
88
|
-
deliveryUnit: (0, external_delivery_unit_cjs_namespaceObject.deliveryUnitContractBlock)((0, external_delivery_unit_cjs_namespaceObject.createDeliveryUnitRecord)(scope,
|
|
89
|
-
cloudflare: (0, external_policy_cjs_namespaceObject.createCloudflareDeployContract)(scope,
|
|
90
|
-
ownership:
|
|
82
|
+
deliveryUnit: (0, external_delivery_unit_cjs_namespaceObject.deliveryUnitContractBlock)((0, external_delivery_unit_cjs_namespaceObject.createDeliveryUnitRecord)(scope, shellHost)),
|
|
83
|
+
cloudflare: (0, external_policy_cjs_namespaceObject.createCloudflareDeployContract)(scope, shellHost),
|
|
84
|
+
ownership: shellHost.ownership
|
|
91
85
|
},
|
|
92
86
|
verticals: remotes.map((vertical)=>({
|
|
93
87
|
id: vertical.id,
|
|
@@ -103,6 +97,8 @@ function createTopology(scope, remotes = [], primaryShell) {
|
|
|
103
97
|
} : {},
|
|
104
98
|
package: (0, external_naming_cjs_namespaceObject.packageName)(scope, vertical.packageSuffix),
|
|
105
99
|
path: vertical.directory,
|
|
100
|
+
displayName: vertical.displayName,
|
|
101
|
+
portEnv: vertical.portEnv,
|
|
106
102
|
moduleFederation: {
|
|
107
103
|
role: 'remote',
|
|
108
104
|
name: vertical.mfName,
|
|
@@ -126,15 +122,7 @@ function createTopology(scope, remotes = [], primaryShell) {
|
|
|
126
122
|
package: (0, external_naming_cjs_namespaceObject.packageName)(scope, sharedPackage.id),
|
|
127
123
|
path: sharedPackage.directory,
|
|
128
124
|
description: sharedPackage.description
|
|
129
|
-
}))
|
|
130
|
-
validation: {
|
|
131
|
-
script: "scripts/validate-ultramodern-workspace.mts",
|
|
132
|
-
commands: [
|
|
133
|
-
'pnpm i18n:boundaries',
|
|
134
|
-
'pnpm api:check',
|
|
135
|
-
'pnpm contract:check'
|
|
136
|
-
]
|
|
137
|
-
}
|
|
125
|
+
}))
|
|
138
126
|
};
|
|
139
127
|
}
|
|
140
128
|
function createOwnership(scope, remotes = []) {
|
|
@@ -196,170 +184,13 @@ function createDevelopmentOverlay(scope, remotes = []) {
|
|
|
196
184
|
]))
|
|
197
185
|
};
|
|
198
186
|
}
|
|
199
|
-
function createUltramodernConfig(scope, modernVersion, packageSource, apps = [
|
|
200
|
-
(0, external_descriptors_cjs_namespaceObject.createShellHost)()
|
|
201
|
-
], enableTailwind = true, bridge, additionalShells = [], primaryShell, effectiveRemotes) {
|
|
202
|
-
const remotes = effectiveRemotes ?? apps.filter((app)=>'shell' !== app.kind);
|
|
203
|
-
const shellHost = primaryShell ?? (0, external_descriptors_cjs_namespaceObject.createShellHost)(remotes);
|
|
204
|
-
return {
|
|
205
|
-
schemaVersion: 1,
|
|
206
|
-
profile: 'cloudflare-ssr-mf-effect-v1',
|
|
207
|
-
generator: {
|
|
208
|
-
package: external_ultramodern_package_source_cjs_namespaceObject.ULTRAMODERN_CREATE_PACKAGE,
|
|
209
|
-
version: modernVersion
|
|
210
|
-
},
|
|
211
|
-
workspace: {
|
|
212
|
-
packageScope: scope,
|
|
213
|
-
packageManager: {
|
|
214
|
-
name: 'pnpm',
|
|
215
|
-
version: external_versions_cjs_namespaceObject.PNPM_VERSION
|
|
216
|
-
},
|
|
217
|
-
node: {
|
|
218
|
-
version: external_versions_cjs_namespaceObject.NODE_VERSION,
|
|
219
|
-
engineRange: '>=26'
|
|
220
|
-
}
|
|
221
|
-
},
|
|
222
|
-
packageSource: {
|
|
223
|
-
strategy: packageSource.strategy,
|
|
224
|
-
modernPackageVersion: packageSource.modernPackageVersion,
|
|
225
|
-
...packageSource.registry ? {
|
|
226
|
-
registry: packageSource.registry
|
|
227
|
-
} : {},
|
|
228
|
-
...packageSource.aliasScope ? {
|
|
229
|
-
aliasScope: packageSource.aliasScope
|
|
230
|
-
} : {},
|
|
231
|
-
...packageSource.aliasPackageNamePrefix ? {
|
|
232
|
-
aliasPackageNamePrefix: packageSource.aliasPackageNamePrefix
|
|
233
|
-
} : {}
|
|
234
|
-
},
|
|
235
|
-
features: {
|
|
236
|
-
tailwind: enableTailwind
|
|
237
|
-
},
|
|
238
|
-
topology: {
|
|
239
|
-
source: './topology/reference-topology.json',
|
|
240
|
-
apps: apps.map((app)=>({
|
|
241
|
-
id: app.id,
|
|
242
|
-
kind: app.kind,
|
|
243
|
-
package: (0, external_naming_cjs_namespaceObject.packageName)(scope, app.packageSuffix),
|
|
244
|
-
packageSuffix: app.packageSuffix,
|
|
245
|
-
displayName: app.displayName,
|
|
246
|
-
path: app.directory,
|
|
247
|
-
...app.domain ? {
|
|
248
|
-
domain: app.domain
|
|
249
|
-
} : {},
|
|
250
|
-
...app.surfaceProfile ? {
|
|
251
|
-
surfaceProfile: app.surfaceProfile
|
|
252
|
-
} : {},
|
|
253
|
-
...app.deliveryUnitKind ? {
|
|
254
|
-
deliveryUnitKind: app.deliveryUnitKind
|
|
255
|
-
} : {},
|
|
256
|
-
port: app.port,
|
|
257
|
-
portEnv: app.portEnv,
|
|
258
|
-
moduleFederation: {
|
|
259
|
-
role: 'shell' === app.kind ? 'host' : 'remote',
|
|
260
|
-
name: app.mfName,
|
|
261
|
-
exposes: Object.keys(app.exposes ?? {}),
|
|
262
|
-
...'shell' === app.kind ? {
|
|
263
|
-
verticalRefs: shellHost.verticalRefs ?? [],
|
|
264
|
-
remotes: (0, external_descriptors_cjs_namespaceObject.createModuleFederationRemoteContracts)(shellHost, remotes)
|
|
265
|
-
} : app.verticalRefs?.length ? {
|
|
266
|
-
verticalRefs: app.verticalRefs,
|
|
267
|
-
remotes: (0, external_descriptors_cjs_namespaceObject.createModuleFederationRemoteContracts)(app, remotes)
|
|
268
|
-
} : {},
|
|
269
|
-
ssr: true,
|
|
270
|
-
dts: {
|
|
271
|
-
compilerInstance: 'effect-tsgo',
|
|
272
|
-
tsConfigPath: './tsconfig.mf-types.json'
|
|
273
|
-
}
|
|
274
|
-
},
|
|
275
|
-
...optionalJsonEntry('backendFederation', (0, external_backend_federation_cjs_namespaceObject.createBackendFederationContract)(scope, remotes.find((remote)=>remote.id === app.id) ?? app)),
|
|
276
|
-
deliveryUnit: (0, external_delivery_unit_cjs_namespaceObject.deliveryUnitContractBlock)((0, external_delivery_unit_cjs_namespaceObject.createDeliveryUnitRecord)(scope, app)),
|
|
277
|
-
...app.api ? {
|
|
278
|
-
api: {
|
|
279
|
-
runtime: 'effect',
|
|
280
|
-
stem: app.api.stem,
|
|
281
|
-
prefix: app.api.prefix,
|
|
282
|
-
consumedBy: app.api.consumedBy,
|
|
283
|
-
serverEntry: `${app.directory}/api/index.ts`,
|
|
284
|
-
...void 0 === app.api.protocol ? {} : {
|
|
285
|
-
protocol: app.api.protocol
|
|
286
|
-
}
|
|
287
|
-
}
|
|
288
|
-
} : {},
|
|
289
|
-
deploy: {
|
|
290
|
-
cloudflare: (0, external_policy_cjs_namespaceObject.createCloudflareDeployContract)(scope, app)
|
|
291
|
-
}
|
|
292
|
-
}))
|
|
293
|
-
},
|
|
294
|
-
...additionalShells.length > 0 ? {
|
|
295
|
-
shells: additionalShells.map((shell)=>(0, external_shells_cjs_namespaceObject.createAdditionalShellConfigEntry)(scope, shell, remotes))
|
|
296
|
-
} : {},
|
|
297
|
-
bridge: bridge ?? {
|
|
298
|
-
enabled: false,
|
|
299
|
-
workspacePackages: [],
|
|
300
|
-
dependencies: [],
|
|
301
|
-
lockfilePolicy: 'nested',
|
|
302
|
-
gates: [],
|
|
303
|
-
reactSingletons: [
|
|
304
|
-
...defaults_cjs_namespaceObject.defaultReactSingletons
|
|
305
|
-
]
|
|
306
|
-
},
|
|
307
|
-
deploy: {
|
|
308
|
-
worker: {
|
|
309
|
-
wrangler: {
|
|
310
|
-
compatibility_date: external_versions_cjs_namespaceObject.CLOUDFLARE_COMPATIBILITY_DATE,
|
|
311
|
-
compatibility_flags: [
|
|
312
|
-
'nodejs_compat',
|
|
313
|
-
'global_fetch_strictly_public'
|
|
314
|
-
]
|
|
315
|
-
},
|
|
316
|
-
artifacts: [],
|
|
317
|
-
publicAssetExcludes: []
|
|
318
|
-
}
|
|
319
|
-
},
|
|
320
|
-
moduleFederation: {
|
|
321
|
-
apps: apps.map((app)=>({
|
|
322
|
-
id: app.id,
|
|
323
|
-
path: app.directory,
|
|
324
|
-
role: 'shell' === app.kind ? 'host' : 'remote',
|
|
325
|
-
name: app.mfName,
|
|
326
|
-
exposes: Object.keys(app.exposes ?? {}),
|
|
327
|
-
hostOnly: 'shell' === app.kind && 0 === Object.keys(app.exposes ?? {}).length
|
|
328
|
-
}))
|
|
329
|
-
},
|
|
330
|
-
backendFederation: {
|
|
331
|
-
apps: presentJsonValues((0, external_descriptors_cjs_namespaceObject.verticalApiApps)(remotes).map((app)=>(0, external_backend_federation_cjs_namespaceObject.createBackendFederationSummary)(scope, app)))
|
|
332
|
-
},
|
|
333
|
-
agentSkills: {
|
|
334
|
-
target: 'codex',
|
|
335
|
-
lockfile: './.codex/skills-lock.json',
|
|
336
|
-
installDir: './.codex/skills',
|
|
337
|
-
mode: 'repo-owned-default-on',
|
|
338
|
-
selfContainedVendoring: true,
|
|
339
|
-
optOutEnv: [
|
|
340
|
-
'ULTRAMODERN_SKIP_CODEX_SKILLS=1',
|
|
341
|
-
'ULTRAMODERN_CODEX_SKILLS=0'
|
|
342
|
-
]
|
|
343
|
-
},
|
|
344
|
-
tooling: {
|
|
345
|
-
command: 'ultramodern-create ultramodern',
|
|
346
|
-
wrappers: {
|
|
347
|
-
...(0, external_tooling_command_catalog_cjs_namespaceObject.createGeneratedToolingWrapperMap)(),
|
|
348
|
-
apiBoundaries: 'modern-api-check',
|
|
349
|
-
skills: "scripts/bootstrap-agent-skills.mts"
|
|
350
|
-
}
|
|
351
|
-
}
|
|
352
|
-
};
|
|
353
|
-
}
|
|
354
187
|
exports.createDevelopmentOverlay = __webpack_exports__.createDevelopmentOverlay;
|
|
355
188
|
exports.createOwnership = __webpack_exports__.createOwnership;
|
|
356
189
|
exports.createTopology = __webpack_exports__.createTopology;
|
|
357
|
-
exports.createUltramodernConfig = __webpack_exports__.createUltramodernConfig;
|
|
358
190
|
for(var __rspack_i in __webpack_exports__)if (-1 === [
|
|
359
191
|
"createDevelopmentOverlay",
|
|
360
192
|
"createOwnership",
|
|
361
|
-
"createTopology"
|
|
362
|
-
"createUltramodernConfig"
|
|
193
|
+
"createTopology"
|
|
363
194
|
].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
|
|
364
195
|
Object.defineProperty(exports, '__esModule', {
|
|
365
196
|
value: true
|
|
@@ -36,11 +36,10 @@ const external_delivery_unit_cjs_namespaceObject = require("./delivery-unit.cjs"
|
|
|
36
36
|
function isPlainObject(value) {
|
|
37
37
|
return 'object' == typeof value && null !== value && !Array.isArray(value);
|
|
38
38
|
}
|
|
39
|
-
function stampDeliveryUnitIdentity(entry, scope, app) {
|
|
39
|
+
function stampDeliveryUnitIdentity(entry, scope, app, version) {
|
|
40
40
|
const block = {
|
|
41
|
-
...(
|
|
42
|
-
...
|
|
43
|
-
...isPlainObject(entry.deliveryUnit) ? entry.deliveryUnit : {}
|
|
41
|
+
...isPlainObject(entry.deliveryUnit) ? entry.deliveryUnit : {},
|
|
42
|
+
...(0, external_delivery_unit_cjs_namespaceObject.deliveryUnitContractBlock)((0, external_delivery_unit_cjs_namespaceObject.createDeliveryUnitRecord)(scope, app, version))
|
|
44
43
|
};
|
|
45
44
|
entry.deliveryUnit = block;
|
|
46
45
|
if (isPlainObject(entry.backendFederation)) {
|
|
@@ -52,7 +51,13 @@ function stampDeliveryUnitIdentity(entry, scope, app) {
|
|
|
52
51
|
entry.backendFederation.versionBoundary.identityRoot = 'deliveryUnit';
|
|
53
52
|
return;
|
|
54
53
|
}
|
|
55
|
-
const contract = (0, external_backend_federation_cjs_namespaceObject.createBackendFederationContract)(scope,
|
|
54
|
+
const contract = (0, external_backend_federation_cjs_namespaceObject.createBackendFederationContract)(scope, {
|
|
55
|
+
...app,
|
|
56
|
+
deliveryUnit: {
|
|
57
|
+
...app.deliveryUnit,
|
|
58
|
+
...block
|
|
59
|
+
}
|
|
60
|
+
});
|
|
56
61
|
if (void 0 !== contract) entry.backendFederation = contract;
|
|
57
62
|
}
|
|
58
63
|
exports.isPlainObject = __webpack_exports__.isPlainObject;
|
|
@@ -45,8 +45,8 @@ const external_node_path_namespaceObject = require("node:path");
|
|
|
45
45
|
var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
|
|
46
46
|
const external_node_util_namespaceObject = require("node:util");
|
|
47
47
|
const config_cjs_namespaceObject = require("../ultramodern-tooling/config.cjs");
|
|
48
|
+
const external_delivery_unit_cjs_namespaceObject = require("./delivery-unit.cjs");
|
|
48
49
|
const external_delivery_unit_stamp_cjs_namespaceObject = require("./delivery-unit-stamp.cjs");
|
|
49
|
-
const external_descriptors_cjs_namespaceObject = require("./descriptors.cjs");
|
|
50
50
|
const external_module_federation_cjs_namespaceObject = require("./module-federation.cjs");
|
|
51
51
|
const REFERENCE_TOPOLOGY_PATH = 'topology/reference-topology.json';
|
|
52
52
|
function writeTextIfChanged(absolutePath, content) {
|
|
@@ -82,8 +82,8 @@ function runSyncDeliveryUnit(args, context) {
|
|
|
82
82
|
Backfills the per-delivery-unit identity blocks required by
|
|
83
83
|
\`ultramodern validate\` onto an existing generated workspace, in place and
|
|
84
84
|
through framework tooling only. For each delivery unit it writes the
|
|
85
|
-
delivery-unit block into
|
|
86
|
-
|
|
85
|
+
delivery-unit block into topology/reference-topology.json shell/verticals/shells
|
|
86
|
+
(plus backendFederation.deliveryUnit
|
|
87
87
|
and backendFederation.versionBoundary.identityRoot) and regenerates
|
|
88
88
|
<app>/shared/ultramodern-build.{json,ts}. Idempotent: a second run writes
|
|
89
89
|
nothing.
|
|
@@ -92,11 +92,23 @@ nothing.
|
|
|
92
92
|
}
|
|
93
93
|
const workspaceOverride = parsed.values.workspace;
|
|
94
94
|
const workspaceRoot = workspaceOverride ? external_node_path_default().resolve(context.invocationCwd, workspaceOverride) : context.workspaceRoot;
|
|
95
|
-
const
|
|
96
|
-
|
|
97
|
-
const
|
|
98
|
-
const
|
|
99
|
-
|
|
95
|
+
const workspace = (0, config_cjs_namespaceObject.readUltramodernWorkspaceInputs)(workspaceRoot);
|
|
96
|
+
const scope = workspace.config.workspace.packageScope;
|
|
97
|
+
const packageVersions = new Map();
|
|
98
|
+
const workspaceApps = workspace.apps.map((app)=>{
|
|
99
|
+
const manifestPath = external_node_path_default().join(workspaceRoot, app.directory, 'package.json');
|
|
100
|
+
const manifest = JSON.parse(external_node_fs_default().readFileSync(manifestPath, 'utf-8'));
|
|
101
|
+
if ('string' != typeof manifest.version || !manifest.version) throw new Error(`${manifestPath} requires a package version for delivery-unit sync.`);
|
|
102
|
+
packageVersions.set(app.id, manifest.version);
|
|
103
|
+
return {
|
|
104
|
+
...app,
|
|
105
|
+
deliveryUnit: {
|
|
106
|
+
...app.deliveryUnit,
|
|
107
|
+
version: manifest.version,
|
|
108
|
+
buildMarker: (0, external_delivery_unit_cjs_namespaceObject.createBuildMarker)(scope, app, manifest.version)
|
|
109
|
+
}
|
|
110
|
+
};
|
|
111
|
+
});
|
|
100
112
|
const written = [];
|
|
101
113
|
const unchanged = [];
|
|
102
114
|
const track = (relativePath, changed)=>{
|
|
@@ -106,24 +118,22 @@ nothing.
|
|
|
106
118
|
app.id,
|
|
107
119
|
app
|
|
108
120
|
]));
|
|
109
|
-
const compact = JSON.parse(external_node_fs_default().readFileSync(compactPath, 'utf-8'));
|
|
110
|
-
if ((0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(compact) && Array.isArray(compact.topology?.apps)) for (const entry of compact.topology.apps){
|
|
111
|
-
if (!(0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(entry)) continue;
|
|
112
|
-
const app = appById.get(String(entry.id));
|
|
113
|
-
if (app) (0, external_delivery_unit_stamp_cjs_namespaceObject.stampDeliveryUnitIdentity)(entry, scope, app);
|
|
114
|
-
}
|
|
115
|
-
track(external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH, writeJsonIfChanged(compactPath, compact));
|
|
116
121
|
const topologyPath = external_node_path_default().join(workspaceRoot, REFERENCE_TOPOLOGY_PATH);
|
|
117
122
|
if (external_node_fs_default().existsSync(topologyPath)) {
|
|
118
123
|
const topology = JSON.parse(external_node_fs_default().readFileSync(topologyPath, 'utf-8'));
|
|
119
124
|
if ((0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(topology) && Array.isArray(topology.verticals)) for (const entry of topology.verticals){
|
|
120
125
|
if (!(0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(entry)) continue;
|
|
121
126
|
const app = appById.get(String(entry.id));
|
|
122
|
-
if (app) (0, external_delivery_unit_stamp_cjs_namespaceObject.stampDeliveryUnitIdentity)(entry, scope, app);
|
|
127
|
+
if (app) (0, external_delivery_unit_stamp_cjs_namespaceObject.stampDeliveryUnitIdentity)(entry, scope, app, packageVersions.get(app.id));
|
|
128
|
+
}
|
|
129
|
+
if ((0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(topology) && Array.isArray(topology.shells)) for (const entry of topology.shells){
|
|
130
|
+
if (!(0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(entry)) continue;
|
|
131
|
+
const app = appById.get(String(entry.id));
|
|
132
|
+
if (app) (0, external_delivery_unit_stamp_cjs_namespaceObject.stampDeliveryUnitIdentity)(entry, scope, app, packageVersions.get(app.id));
|
|
123
133
|
}
|
|
124
134
|
if ((0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(topology) && (0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(topology.shell)) {
|
|
125
135
|
const shell = appById.get(String(topology.shell.id));
|
|
126
|
-
if (shell) (0, external_delivery_unit_stamp_cjs_namespaceObject.stampDeliveryUnitIdentity)(topology.shell, scope, shell);
|
|
136
|
+
if (shell) (0, external_delivery_unit_stamp_cjs_namespaceObject.stampDeliveryUnitIdentity)(topology.shell, scope, shell, packageVersions.get(shell.id));
|
|
127
137
|
}
|
|
128
138
|
track(REFERENCE_TOPOLOGY_PATH, writeJsonIfChanged(topologyPath, topology));
|
|
129
139
|
}
|
|
@@ -46,21 +46,26 @@ var external_node_crypto_default = /*#__PURE__*/ __webpack_require__.n(external_
|
|
|
46
46
|
const backend_federation_contracts_namespaceObject = require("@modern-js/backend-federation-contracts");
|
|
47
47
|
const external_naming_cjs_namespaceObject = require("./naming.cjs");
|
|
48
48
|
const deliveryUnitGenerationSeed = 'ultramodern-delivery-unit-build-marker:v1';
|
|
49
|
-
function createBuildMarker(scope, app) {
|
|
50
|
-
return external_node_crypto_default().createHash('sha256').update(`${deliveryUnitGenerationSeed}:${scope}:${app.packageSuffix}:${app.id}
|
|
49
|
+
function createBuildMarker(scope, app, version = '0.1.0') {
|
|
50
|
+
return external_node_crypto_default().createHash('sha256').update(`${deliveryUnitGenerationSeed}:${scope}:${app.packageSuffix}:${app.id}:${version}`).digest('hex').slice(0, 16);
|
|
51
51
|
}
|
|
52
|
-
function createDeliveryUnitRecord(scope, app) {
|
|
52
|
+
function createDeliveryUnitRecord(scope, app, version) {
|
|
53
|
+
const resolvedVersion = version ?? '0.1.0';
|
|
53
54
|
return {
|
|
54
55
|
appId: app.id,
|
|
55
|
-
buildMarker: createBuildMarker(scope, app),
|
|
56
|
+
buildMarker: createBuildMarker(scope, app, resolvedVersion),
|
|
56
57
|
deployProfile: backend_federation_contracts_namespaceObject.DELIVERY_UNIT_DEPLOY_PROFILE,
|
|
57
58
|
kind: backend_federation_contracts_namespaceObject.DELIVERY_UNIT_KIND,
|
|
58
59
|
packageName: (0, external_naming_cjs_namespaceObject.packageName)(scope, app.packageSuffix),
|
|
59
60
|
schemaVersion: backend_federation_contracts_namespaceObject.DELIVERY_UNIT_SCHEMA_VERSION,
|
|
60
61
|
sourceRevision: 'workspace',
|
|
61
62
|
unitId: `${scope}/${app.domain ?? app.id}`,
|
|
62
|
-
version:
|
|
63
|
-
...app.deliveryUnit
|
|
63
|
+
version: resolvedVersion,
|
|
64
|
+
...app.deliveryUnit,
|
|
65
|
+
...void 0 === version ? {} : {
|
|
66
|
+
version,
|
|
67
|
+
buildMarker: createBuildMarker(scope, app, version)
|
|
68
|
+
}
|
|
64
69
|
};
|
|
65
70
|
}
|
|
66
71
|
exports.createBuildMarker = __webpack_exports__.createBuildMarker;
|