@bleedingdev/modern-js-ultramodern-create 3.9.0-ultramodern.2 → 3.9.0-ultramodern.21

package/dist/cjs/ultramodern-workspace/delivery-unit-sync.cjs

@@ -45,8 +45,8 @@ const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const external_node_util_namespaceObject = require("node:util");
 const config_cjs_namespaceObject = require("../ultramodern-tooling/config.cjs");
+const external_delivery_unit_cjs_namespaceObject = require("./delivery-unit.cjs");
 const external_delivery_unit_stamp_cjs_namespaceObject = require("./delivery-unit-stamp.cjs");
-const external_descriptors_cjs_namespaceObject = require("./descriptors.cjs");
 const external_module_federation_cjs_namespaceObject = require("./module-federation.cjs");
 const REFERENCE_TOPOLOGY_PATH = 'topology/reference-topology.json';
 function writeTextIfChanged(absolutePath, content) {
@@ -82,8 +82,8 @@ function runSyncDeliveryUnit(args, context) {
 Backfills the per-delivery-unit identity blocks required by
 \`ultramodern validate\` onto an existing generated workspace, in place and
 through framework tooling only. For each delivery unit it writes the
-delivery-unit block into .modernjs/ultramodern.json topology.apps[] and
-topology/reference-topology.json verticals[] (plus backendFederation.deliveryUnit
+delivery-unit block into topology/reference-topology.json shell/verticals/shells
+(plus backendFederation.deliveryUnit
 and backendFederation.versionBoundary.identityRoot) and regenerates
 <app>/shared/ultramodern-build.{json,ts}. Idempotent: a second run writes
 nothing.
@@ -92,11 +92,23 @@ nothing.
     }
     const workspaceOverride = parsed.values.workspace;
     const workspaceRoot = workspaceOverride ? external_node_path_default().resolve(context.invocationCwd, workspaceOverride) : context.workspaceRoot;
-    const compactPath = external_node_path_default().join(workspaceRoot, external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH);
-    if (!external_node_fs_default().existsSync(compactPath)) throw new Error(`Missing ${external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH}. sync-delivery-unit needs the compact UltraModern config; run \`ultramodern-create ultramodern migrate-strict-effect\` first.`);
-    const config = (0, config_cjs_namespaceObject.readUltramodernConfig)(workspaceRoot);
-    const scope = config.workspace.packageScope;
-    const workspaceApps = (0, config_cjs_namespaceObject.workspaceAppsFromToolingConfig)(config);
+    const workspace = (0, config_cjs_namespaceObject.readUltramodernWorkspaceInputs)(workspaceRoot);
+    const scope = workspace.config.workspace.packageScope;
+    const packageVersions = new Map();
+    const workspaceApps = workspace.apps.map((app)=>{
+        const manifestPath = external_node_path_default().join(workspaceRoot, app.directory, 'package.json');
+        const manifest = JSON.parse(external_node_fs_default().readFileSync(manifestPath, 'utf-8'));
+        if ('string' != typeof manifest.version || !manifest.version) throw new Error(`${manifestPath} requires a package version for delivery-unit sync.`);
+        packageVersions.set(app.id, manifest.version);
+        return {
+            ...app,
+            deliveryUnit: {
+                ...app.deliveryUnit,
+                version: manifest.version,
+                buildMarker: (0, external_delivery_unit_cjs_namespaceObject.createBuildMarker)(scope, app, manifest.version)
+            }
+        };
+    });
     const written = [];
     const unchanged = [];
     const track = (relativePath, changed)=>{
@@ -106,24 +118,22 @@ nothing.
             app.id,
             app
         ]));
-    const compact = JSON.parse(external_node_fs_default().readFileSync(compactPath, 'utf-8'));
-    if ((0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(compact) && Array.isArray(compact.topology?.apps)) for (const entry of compact.topology.apps){
-        if (!(0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(entry)) continue;
-        const app = appById.get(String(entry.id));
-        if (app) (0, external_delivery_unit_stamp_cjs_namespaceObject.stampDeliveryUnitIdentity)(entry, scope, app);
-    }
-    track(external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH, writeJsonIfChanged(compactPath, compact));
     const topologyPath = external_node_path_default().join(workspaceRoot, REFERENCE_TOPOLOGY_PATH);
     if (external_node_fs_default().existsSync(topologyPath)) {
         const topology = JSON.parse(external_node_fs_default().readFileSync(topologyPath, 'utf-8'));
         if ((0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(topology) && Array.isArray(topology.verticals)) for (const entry of topology.verticals){
             if (!(0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(entry)) continue;
             const app = appById.get(String(entry.id));
-            if (app) (0, external_delivery_unit_stamp_cjs_namespaceObject.stampDeliveryUnitIdentity)(entry, scope, app);
+            if (app) (0, external_delivery_unit_stamp_cjs_namespaceObject.stampDeliveryUnitIdentity)(entry, scope, app, packageVersions.get(app.id));
+        }
+        if ((0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(topology) && Array.isArray(topology.shells)) for (const entry of topology.shells){
+            if (!(0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(entry)) continue;
+            const app = appById.get(String(entry.id));
+            if (app) (0, external_delivery_unit_stamp_cjs_namespaceObject.stampDeliveryUnitIdentity)(entry, scope, app, packageVersions.get(app.id));
         }
         if ((0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(topology) && (0, external_delivery_unit_stamp_cjs_namespaceObject.isPlainObject)(topology.shell)) {
             const shell = appById.get(String(topology.shell.id));
-            if (shell) (0, external_delivery_unit_stamp_cjs_namespaceObject.stampDeliveryUnitIdentity)(topology.shell, scope, shell);
+            if (shell) (0, external_delivery_unit_stamp_cjs_namespaceObject.stampDeliveryUnitIdentity)(topology.shell, scope, shell, packageVersions.get(shell.id));
         }
         track(REFERENCE_TOPOLOGY_PATH, writeJsonIfChanged(topologyPath, topology));
     }

package/dist/cjs/ultramodern-workspace/delivery-unit.cjs

@@ -39,27 +39,33 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     createBuildMarker: ()=>createBuildMarker,
     createDeliveryUnitRecord: ()=>createDeliveryUnitRecord,
-    deliveryUnitContractBlock: ()=>universal_namespaceObject.deliveryUnitContractBlock
+    deliveryUnitContractBlock: ()=>backend_federation_contracts_namespaceObject.deliveryUnitContractBlock
 });
 const external_node_crypto_namespaceObject = require("node:crypto");
 var external_node_crypto_default = /*#__PURE__*/ __webpack_require__.n(external_node_crypto_namespaceObject);
-const universal_namespaceObject = require("@modern-js/utils/universal");
+const backend_federation_contracts_namespaceObject = require("@modern-js/backend-federation-contracts");
 const external_naming_cjs_namespaceObject = require("./naming.cjs");
 const deliveryUnitGenerationSeed = 'ultramodern-delivery-unit-build-marker:v1';
-function createBuildMarker(scope, app) {
-    return external_node_crypto_default().createHash('sha256').update(`${deliveryUnitGenerationSeed}:${scope}:${app.packageSuffix}:${app.id}:0.1.0`).digest('hex').slice(0, 16);
+function createBuildMarker(scope, app, version = '0.1.0') {
+    return external_node_crypto_default().createHash('sha256').update(`${deliveryUnitGenerationSeed}:${scope}:${app.packageSuffix}:${app.id}:${version}`).digest('hex').slice(0, 16);
 }
-function createDeliveryUnitRecord(scope, app) {
+function createDeliveryUnitRecord(scope, app, version) {
+    const resolvedVersion = version ?? '0.1.0';
     return {
         appId: app.id,
-        buildMarker: createBuildMarker(scope, app),
-        deployProfile: universal_namespaceObject.DELIVERY_UNIT_DEPLOY_PROFILE,
-        kind: universal_namespaceObject.DELIVERY_UNIT_KIND,
+        buildMarker: createBuildMarker(scope, app, resolvedVersion),
+        deployProfile: backend_federation_contracts_namespaceObject.DELIVERY_UNIT_DEPLOY_PROFILE,
+        kind: backend_federation_contracts_namespaceObject.DELIVERY_UNIT_KIND,
         packageName: (0, external_naming_cjs_namespaceObject.packageName)(scope, app.packageSuffix),
-        schemaVersion: universal_namespaceObject.DELIVERY_UNIT_SCHEMA_VERSION,
+        schemaVersion: backend_federation_contracts_namespaceObject.DELIVERY_UNIT_SCHEMA_VERSION,
         sourceRevision: 'workspace',
         unitId: `${scope}/${app.domain ?? app.id}`,
-        version: '0.1.0'
+        version: resolvedVersion,
+        ...app.deliveryUnit,
+        ...void 0 === version ? {} : {
+            version,
+            buildMarker: createBuildMarker(scope, app, version)
+        }
     };
 }
 exports.createBuildMarker = __webpack_exports__.createBuildMarker;