conflict resolved

Author: sayalijoshi27

.gitignore

@@ -356,10 +356,14 @@ upload-api/build
 ui/.env
 upload-api/sitecoreMigrationData
 upload-api/cmsMigrationData
-upload-api/extracted_files
+upload-api/extracted_files*
 *copy*
 .qodo
 .vscode
 app.json
 # Snyk Security Extension - AI Rules (auto-generated)
 .cursor/rules/snyk_rules.mdc
+*extracted_files*
+*MigrationData*
+*.zip
+app.json

api/.eslintrc.json

@@ -12,7 +12,6 @@
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "ecmaVersion": 2022,
-    "project": ["./tsconfig.json"],
     "sourceType": "module"
   },
   "plugins": ["@typescript-eslint"],

api/package-lock.json

@@ -25,16 +25,17 @@
   },
   "homepage": "https://github.com/contentstack/migration-v2.git#readme",
   "dependencies": {
-    "@contentstack/cli": "1.41.0",
-    "@contentstack/cli-utilities": "^1.12.0",
-    "@contentstack/json-rte-serializer": "^2.0.7",
-    "@contentstack/marketplace-sdk": "^1.2.4",
+    "@contentstack/cli": "^1.51.1",
+    "@contentstack/cli-utilities": "^1.14.2",
+    "@contentstack/json-rte-serializer": "^3.0.4",
+    "@contentstack/marketplace-sdk": "^1.4.0",
     "axios": "^1.12.0",
     "chokidar": "^3.6.0",
     "cors": "^2.8.5",
+    "dayjs": "^1.11.18",
     "dotenv": "^16.3.1",
     "express": "^4.21.0",
-    "express-validator": "^7.0.1",
+    "express-validator": "^7.3.0",
     "express-winston": "^4.2.0",
     "fs-extra": "^11.2.0",
     "fs-readdir-recursive": "^1.1.0",

api/package.json

@@ -4,13 +4,17 @@ export const devConfig = {
     EU: "https://stag-eu-api.csnonprod.com/v3",
     AZURE_NA: "https://stag-azure-na-api.csnonprod.com/v3",
     GCP_NA: "https://stag-gcp-na-api.csnonprod.com/v3",
+    AU:"https://stag-au-api.csnonprod.com/v3",
+    GCP_EU: "https://stag-gcp-eu-api.csnonprod.com/v3",
   },
   CS_URL: {
     NA: "https://app.contentstack.com/#!",
     EU: "https://eu-app.contentstack.com/#!",
     AZURE_NA: "https://azure-na-app.contentstack.com/#!",
     AZURE_EU: "https://azure-eu-app.contentstack.com/#!",
     GCP_NA: "https://gcp-na-app.contentstack.com/#!",
+    AU: "https://au-app.contentstack.com/#!",
+    GCP_EU: "https://gcp-eu-app.contentstack.com/#!",
   },
   LOG_FILE_PATH:
     process.platform === "win32" ? ".\\combine.log" : "./combine.log", // Replace with the actual path to your log file

api/src/config/dev.config.ts

@@ -27,13 +27,17 @@ export type ConfigType = {
     AZURE_NA: string;
     AZURE_EU?: string;
     GCP_NA?: string;
+    AU?: string;
+    GCP_EU?: string;
   };
   CS_URL: {
     NA: string;
     EU: string;
     AZURE_NA: string;
     AZURE_EU?: string;
     GCP_NA?: string;
+    AU?: string;
+    GCP_EU?: string;
   };
   LOG_FILE_PATH: string;
 };

api/src/config/index.ts

@@ -5,13 +5,17 @@ export const prodConfig = {
     AZURE_NA: "https://azure-na-api.contentstack.com/v3",
     AZURE_EU: "https://azure-eu-api.contentstack.com/v3",
     GCP_NA: "https://gcp-na-api.contentstack.com/v3",
+    AU: "https://au-api.contentstack.com/v3",
+    GCP_EU: "https://gcp-eu-api.contentstack.com/v3",
   },
   CS_URL: {
     NA: "https://app.contentstack.com/#!",
     EU: "https://eu-app.contentstack.com/#!",
     AZURE_NA: "https://azure-na-app.contentstack.com/#!",
     AZURE_EU: "https://azure-eu-app.contentstack.com/#!",
     GCP_NA: "https://gcp-na-app.contentstack.com/#!",
+    AU: "https://au-app.contentstack.com/#!",
+    GCP_EU: "https://gcp-eu-app.contentstack.com/#!",
   },
   LOG_FILE_PATH:
     process.platform === "win32" ? ".\\sample.log" : "./sample.log", // Replace with the actual path to your log file

api/src/config/prod.config.ts

@@ -1,10 +1,12 @@
-export const CS_REGIONS = ["NA", "EU", "AZURE_NA", "AZURE_EU", "GCP_NA"];
+export const CS_REGIONS = ["NA", "EU", "AZURE_NA", "AZURE_EU", "GCP_NA", "AU", "GCP_EU"];
 export const DEVURLS: any = {
   NA: "developerhub-api.contentstack.com",
   EU: "eu-developerhub-api.contentstack.com",
   AZURE_NA: "azure-na-developerhub-api.contentstack.com",
   AZURE_EU: "azure-eu-developerhub-api.contentstack.com",
   GCP_NA: "gcp-na-developerhub-api.contentstack.com",
+  AU: "au-developerhub-api.contentstack.com",
+  GCP_EU: "gcp-eu-developerhub-api.contentstack.com",
 };
 export const CMS = {
   CONTENTFUL: "contentful",
@@ -291,3 +293,8 @@ export const GET_AUDIT_DATA = {
   AUDIT_REPORT: "audit-report",
   FILTERALL: "all",
 }
+
+export const RESERVED_FIELD_MAPPINGS: Record<string, string> = {
+  'locale': 'cm_locale'
+  // Add other reserved fields if needed
+};