Merge branch 'v2-dev' into feat/DX-8625

Author: naman-contentstack

.github/workflows/release-v2-beta-plugins.yml

@@ -135,6 +135,14 @@ jobs:
           package: ./packages/contentstack-branches/package.json
           tag: beta
 
+      # Apps CLI
+      - name: Publishing apps-cli (Production)
+        uses: JS-DevTools/npm-publish@v3
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          package: ./packages/contentstack-apps-cli/package.json
+          tag: latest
+
       # Query Export
       - name: Publishing query-export (Beta)
         uses: JS-DevTools/npm-publish@v3
@@ -183,6 +191,22 @@ jobs:
           package: ./packages/contentstack-migrate-rte/package.json
           access: public
           tag: beta
+      # External Migrate
+      - name: Publishing external-migrate (Production)
+        uses: JS-DevTools/npm-publish@v3
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          package: ./packages/contentstack-external-migrate/package.json
+          tag: latest
+
+      - name: Create Production Release
+        id: create_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }}
+          VERSION: ${{ steps.publish-plugins.outputs.version }}
+        run: |
+          # Get the previous production release for comparison
+          PREVIOUS_PROD=$(gh release list --limit 10 | grep -v 'prerelease' | head -1 | cut -f1)
 
       # Bulk Operations
       - name: Publishing bulk-operations (Beta)

.talismanrc

@@ -1,10 +1,72 @@
 fileignoreconfig:
-- filename: packages/contentstack-asset-management/src/export/base.ts
-  checksum: a74fe9f5b20f7c0636d571062bce1f12d4078a0354d23fb6879b13c316a2fa06
-- filename: packages/contentstack-asset-management/test/unit/export/assets.test.ts
-  checksum: bafd24cb0e809fd9510a876a8e9fe53ff616f1dbc9df49bb797f6bcff433ccb7
-- filename: packages/contentstack-asset-management/src/export/assets.ts
-  checksum: c4f129138b2b9f3130de8db2a937ce4ae1a2ab30c1b5d9c07652790f0996f757
-- filename: packages/contentstack-asset-management/src/utils/cs-assets-api-adapter.ts
-  checksum: 880c3661cc523c113779748b257386f5f18e6e556f11476150bd5f01f7461186
+- filename: pnpm-lock.yaml
+  checksum: 7ec6345eb15ed0be001753ee49733421a8a07096dc8a18465cdad1b82562fed8
+- filename: packages/contentstack-external-migrate/src/services/contentful/contentful.service.ts
+  checksum: e710b7fbad0a413403de9b937bcc98a9cc84a2d6a920a836ddfa78706b959822
+- filename: packages/contentstack-external-migrate/src/services/contentful/extension.service.ts
+  checksum: 1c0c95059828ccecc2e2f6bc5a377eb37a6e879a2bc2605943857a0bbfd37aad
+- filename: packages/contentstack-external-migrate/src/services/contentful/app/index.json
+  checksum: 508b3ef2dfcabcba03bb85b2716c1690a2a693254cf7605978d909006dd52028
+- filename: packages/contentstack-external-migrate/src/services/contentful/migration-contentful/utils/apps/appDetails.json
+  checksum: a80c6dfcb90b6a964e604b47699dee694b1dd93630e69859c04bdd41a0f4a7c0
+- filename: packages/contentstack-external-migrate/src/adapters/contentful/validator.ts
+  checksum: c42584ad1a31a2cc085871eb62cd29c41c350b4f5ec51153e95f1279097f9b59
+- filename: packages/contentstack-external-migrate/docs/phases/phase-3-import.md
+  checksum: 188c1a2b310f15b53608e97f4273e42296a87a20e3e03c0030c2140b873cc809
+- filename: packages/contentstack-external-migrate/docs/phases/phase-2-audit.md
+  checksum: 8aa4d20af2def7b9afec9f3be7cfa269095dd92be015c6dd16774a27b13f4a65
+- filename: packages/contentstack-external-migrate/src/services/contentful/migration-contentful/libs/createInitialMapper.js
+  checksum: 7431b4ea396ca3ad670c380108b4bf2061f45526fd36161096dd4dd46b4b6f8b
+- filename: packages/contentstack-content-type/README.md
+  checksum: 98d40148ee2170a2c420713d9af49f4076b6b9a1fbd2847856a31779edf6eb90
+- filename: packages/contentstack-external-migrate/docs/phases/phase-5-manifest-and-review.md
+  checksum: e7ea9d0095b38ed4722456d20560256eb9b7362e452929ba30925c5c66212415
+- filename: packages/contentstack-external-migrate/docs/phases/phase-4-export.md
+  checksum: afb2edadd487e28d2ecc4ff837703dd654394c0469bc70a848e98b07bb934141
+- filename: packages/contentstack-external-migrate/docs/manifest-schema.md
+  checksum: 96e188eb1cbb29d1ee3206634ac6a8cd4243c72cf42019cbb848e0e6e83c2b5f
+- filename: packages/contentstack-external-migrate/src/commands/migrate/status.ts
+  checksum: 316f723f0ec85b99f4b631f35e0acbbc1c80baec0cece8fc930243c4bb9ccbfd
+- filename: packages/contentstack-external-migrate/docs/implementation-principles.md
+  checksum: 2a96dfbe9270fd50c42f781a40cbdf674d12d7f00784d4bd8640f3064b0d319f
+- filename: packages/contentstack-external-migrate/src/services/contentful/contentful/roles.ts
+  checksum: 149d43d9348bf970339297b73bf66ead41efafc51ef1881b147845b4893976ad
+- filename: packages/contentstack-external-migrate/src/services/contentful/contentful/taxonomy.service.ts
+  checksum: 6bc4638c31b5e4a87f26033b5bbea7404594e4fabc25447c8e76ec3b8b7602bb
+- filename: packages/contentstack-external-migrate/src/services/contentful/utils/index.ts
+  checksum: cbc04052ad999e5a2ec6fbcbcd4e1df388d8c3575ffbd8370764934892477b0f
+- filename: packages/contentstack-external-migrate/test/commands/migrate/audit.test.ts
+  checksum: 0daa06c38f5b5879cf9e5854c96f5ee4976524b2de5ff3e62c64b0e28239e508
+- filename: packages/contentstack-external-migrate/test/commands/migrate/import.test.ts
+  checksum: e931a9cb89e9cb6ce384e0ae0218b5e9df3d8631caea5997cdab4e007b6d9d9a
+- filename: packages/contentstack-external-migrate/src/services/contentful/migration-contentful/libs/contentTypeMapper.js
+  checksum: 02e0f6cce67b4e070134b3908ce44c063e12133e88c373785bb414eb93e1a9ea
+- filename: packages/contentstack-external-migrate/src/services/contentful/marketplace.service.ts
+  checksum: 0f6b8c3bd68093b0e42bf2bf4345321f99e9dda7eafc233a79c296257641950a
+- filename: packages/contentstack-external-migrate/src/services/contentful/users.ts
+  checksum: 86dce671e996019419256dbb5ebd8d927392715cdecda3a44e2d2315ac13adbe
+- filename: packages/contentstack-external-migrate/test/lib/manifest.test.ts
+  checksum: 1e80e263e06653dfd967779696b243582fe2aefc89084a2d05499807fec49e37
+- filename: packages/contentstack-external-migrate/src/adapters/contentful/convert.ts
+  checksum: 0c7cd556f5a7104bfac80f5933f3ce8f61349648462aa80e456db0390cd8491d
+- filename: packages/contentstack-import/src/import/modules/webhooks.ts
+  checksum: 94fd7c4faaa39663300330341ca1b5680ad46299b0577819230654010c6436f3
+- filename: packages/contentstack-external-migrate/src/lib/manifest.ts
+  checksum: 6674d08800ae8b3a657f7506cf7e6906b8b952ea90b50240d0314b7cb82d7d47
+- filename: packages/contentstack-import/test/unit/import/modules/webhooks.test.ts
+  checksum: 678ffef4174ebc102878ac319990ab2d9b4168e5953e39441625dee2c11e7f53
+- filename: packages/contentstack-external-migrate/src/lib/conversion-summary.ts
+  checksum: 05303adaed06435152ff69f022b2282faec63b53b36c404555c806cc808d5efa
+- filename: packages/contentstack-external-migrate/src/services/contentful/content-type-creator.ts
+  checksum: 653a7e0443f6b9712ed91ad45aa4189864bee710ea4bd3ac40031225da4da5a5
+- filename: packages/contentstack-external-migrate/docs/architecture.md
+  checksum: 0c157fef081918197a1213c8dbb1f07fd0d1313eaf90d18ddee335c0685db7b1
+- filename: packages/contentstack-external-migrate/src/commands/migrate/import.ts
+  checksum: b1749716d8555d8a5af23c32a1b8ee8b39fa2b3dd0c51aff77f814e9766f8a92
+- filename: packages/contentstack-external-migrate/src/services/contentful/contentful/jsonRTE.ts
+  checksum: f19ae1132a29a93bb2e027366ab495ada1928afc9e7acd21fc7dc0cb774bc46e
+- filename: packages/contentstack-external-migrate/src/lib/create-stack.ts
+  checksum: e38b3286c9091a40d3f6ce24e2b0215c9c26457591d269f886a6a27cfbeca402
+- filename: packages/contentstack-external-migrate/src/commands/migrate/create.ts
+  checksum: 29dece984996d02fac42520335529071c619ee14d293a95a732c1811fe739f41
 version: '1.0'

packages/contentstack-apps-cli/src/util/common-utils.ts

@@ -120,7 +120,7 @@ function fetchAppInstallations(
   flags: FlagInput,
   orgUid: string,
   options: MarketPlaceOptions
-) {
+): Promise<any> {
   const { marketplaceSdk } = options;
   const app: any = flags["app-uid"];
   return marketplaceSdk
@@ -218,7 +218,7 @@ function uninstallApp(
   orgUid: string,
   options: MarketPlaceOptions,
   installationUid: string
-) {
+): Promise<any> {
   const { marketplaceSdk } = options;
   // const app: any = flags["app-uid"];
   return marketplaceSdk

packages/contentstack-asset-management/README.md

@@ -0,0 +1,49 @@
+# @contentstack/cli-asset-management
+
+Asset Management 2.0 API adapter for Contentstack CLI export and import. Used by the export and import plugins when Asset Management (AM 2.0) is enabled. To learn how to export and import content in Contentstack, refer to the [Migration guide](https://www.contentstack.com/docs/developers/cli/migration/).
+
+[![License](https://img.shields.io/npm/l/@contentstack/cli)](https://github.com/contentstack/cli/blob/main/LICENSE)
+
+<!-- toc -->
+* [@contentstack/cli-asset-management](#contentstackcli-asset-management)
+* [Overview](#overview)
+* [Usage](#usage)
+* [Exports](#exports)
+<!-- tocstop -->
+
+# Overview
+
+This package provides:
+
+- **AssetManagementAdapter** – HTTP client for the Asset Management API (spaces, assets, folders, fields, asset types).
+- **exportSpaceStructure** – Exports space metadata and full workspace structure (metadata, folders, assets, fields, asset types) for linked workspaces.
+- **Types** – `AssetManagementExportOptions`, `LinkedWorkspace`, `IAssetManagementAdapter`, and related types for export/import integration.
+
+# Usage
+
+This package is consumed by the export and import plugins. When using the export CLI with the `--asset-management` flag (or when the host app enables AM 2.0), the export plugin calls `exportSpaceStructure` with linked workspaces and options:
+
+```ts
+import { exportSpaceStructure } from '@contentstack/cli-asset-management';
+
+await exportSpaceStructure({
+  linkedWorkspaces,
+  exportDir,
+  branchName: 'main',
+  assetManagementUrl,
+  org_uid,
+  context,
+  progressManager,
+  progressProcessName,
+  updateStatus,
+  downloadAsset, // optional
+});
+```
+
+# Exports
+
+| Export | Description |
+|--------|-------------|
+| `exportSpaceStructure` | Async function to export space structure for given linked workspaces. |
+| `AssetManagementAdapter` | Class to call the Asset Management API (getSpace, getWorkspaceFields, getWorkspaceAssets, etc.). |
+| Types from `./types` | `AssetManagementExportOptions`, `ExportSpaceOptions`, `ChunkedJsonWriteOptions`, `LinkedWorkspace`, `SpaceResponse`, `FieldsResponse`, `AssetTypesResponse`, and related API types. |

packages/contentstack-asset-management/src/import/workspaces.ts

@@ -66,20 +66,6 @@ export default class ImportWorkspace extends CSAssetsImportAdapter {
       assetsImporter.setProcessName(spaceProcessName);
     }
 
-    // Map source default space → existing target default space (cross-org migration).
-    // The caller supplies the uid of the pre-existing target default space; we upload
-    // source assets into it instead of creating a new space.
-    if (isDefault && targetDefaultSpaceUid) {
-      const newSpaceUid = targetDefaultSpaceUid;
-      const resolvedWorkspaceUid = targetDefaultWorkspaceUid ?? workspaceUid;
-      log.info(
-        `Source default space "${oldSpaceUid}" mapped to existing target default space "${newSpaceUid}".`,
-        this.importContext.context,
-      );
-      const { uidMap, urlMap } = await assetsImporter.start(newSpaceUid, spaceDir);
-      return { oldSpaceUid, newSpaceUid, workspaceUid: resolvedWorkspaceUid, isDefault: true, uidMap, urlMap };
-    }
-
     // Reuse: target org already has a space with the same uid as the export directory.
     if (existingSpaceUids.has(oldSpaceUid)) {
       log.info(
@@ -100,6 +86,20 @@ export default class ImportWorkspace extends CSAssetsImportAdapter {
         urlMap,
       };
     }
+    
+    // Map source default space → existing target default space (cross-org migration).
+    // The caller supplies the uid of the pre-existing target default space; we upload
+    // source assets into it instead of creating a new space.
+    if (isDefault && targetDefaultSpaceUid) {
+      const newSpaceUid = targetDefaultSpaceUid;
+      const resolvedWorkspaceUid = targetDefaultWorkspaceUid ?? workspaceUid;
+      log.info(
+        `Source default space "${oldSpaceUid}" mapped to existing target default space "${newSpaceUid}".`,
+        this.importContext.context,
+      );
+      const { uidMap, urlMap } = await assetsImporter.start(newSpaceUid, spaceDir);
+      return { oldSpaceUid, newSpaceUid, workspaceUid: resolvedWorkspaceUid, isDefault: true, uidMap, urlMap };
+    }
 
     // Create new space with exact exported title
     log.debug(`Creating space "${exportedTitle}" (old uid: ${oldSpaceUid})`, this.importContext.context);