Merge branch 'v2-dev' into feat/AM2.0

naman-contentstack · naman-contentstack · commit 101c368ca030 · 2026-04-14T12:22:56.000+05:30
diff --git a/.talismanrc b/.talismanrc
@@ -1,4 +1,6 @@
 fileignoreconfig:
   - filename: packages/contentstack-asset-management/src/import/spaces.ts
     checksum: e972d66f6a889f72d72ba48112a12f9447de39285cfb568d3b99a4969cf9f5f9
+  - filename: pnpm-lock.yaml
+    checksum: 8b36c85c5be8e48fb34f600b0e5631ab9c6640ad115825a11a7f2bd161141b74
 version: '1.0'
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
@@ -25,7 +25,7 @@
     "chalk": "^5.6.2",
     "fast-csv": "^4.3.6",
     "fs-extra": "^11.3.0",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "uuid": "^9.0.1",
     "winston": "^3.17.0"
   },
@@ -83,4 +83,4 @@
   "keywords": [
     "oclif"
   ]
-}
+}
diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json
@@ -73,4 +73,4 @@
     }
   },
   "repository": "contentstack/cli"
-}
+}
diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json
@@ -11,7 +11,7 @@
     "@contentstack/cli-utilities": "~2.0.0-beta.5",
     "chalk": "^5.6.2",
     "just-diff": "^6.0.2",
-    "lodash": "^4.17.23"
+    "lodash": "^4.18.1"
   },
   "devDependencies": {
     "@contentstack/cli-dev-dependencies": "~2.0.0-beta.0",
@@ -79,4 +79,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -14,7 +14,7 @@
     "@oclif/plugin-help": "^6.2.28",
     "chalk": "^5.6.2",
     "inquirer": "12.11.1",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "merge": "^2.1.1",
     "ora": "^5.4.1",
     "prompt": "^1.3.0",
@@ -78,4 +78,4 @@
       "cm:stacks:clone": "CLN"
     }
   }
-}
+}
diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json
@@ -73,4 +73,4 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\"",
     "version": "oclif readme && git add README.md"
   }
-}
+}
diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
@@ -14,7 +14,7 @@
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
     "chalk": "^5.6.2",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "merge": "^2.1.1",
     "mkdirp": "^1.0.4",
     "progress-stream": "^2.0.0",
@@ -95,4 +95,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}
diff --git a/packages/contentstack-import-setup/package.json b/packages/contentstack-import-setup/package.json
@@ -11,7 +11,7 @@
     "big-json": "^3.2.0",
     "chalk": "^5.6.2",
     "fs-extra": "^11.3.0",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "merge": "^2.1.1",
     "mkdirp": "^1.0.4",
     "winston": "^3.17.0"
@@ -85,4 +85,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}
diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -16,7 +16,7 @@
     "chalk": "^5.6.2",
     "debug": "^4.4.3",
     "fs-extra": "^11.3.3",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "marked": "^4.3.0",
     "merge": "^2.1.1",
     "mkdirp": "^1.0.4",
@@ -91,4 +91,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}
diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json
@@ -71,4 +71,4 @@
       "cm:stacks:migration": "MGRTN"
     }
   }
-}
+}
diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
@@ -71,4 +71,4 @@
     "compile": "tsc -b tsconfig.json",
     "build": "pnpm compile && oclif manifest && oclif readme"
   }
-}
+}
diff --git a/packages/contentstack-variants/package.json b/packages/contentstack-variants/package.json
@@ -31,8 +31,8 @@
     "@contentstack/cli-utilities": "~2.0.0-beta.5",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "mkdirp": "^1.0.4",
     "winston": "^3.17.0"
   }
-}
+}
diff --git a/packages/contentstack-variants/src/import/audiences.ts b/packages/contentstack-variants/src/import/audiences.ts
@@ -89,6 +89,12 @@ export default class Audiences extends PersonalizationAdapter<ImportConfig> {
         }
         log.debug(`Processing audience: ${name} (${uid})`, this.config.context);
 
+        // Skip Lytics audiences - they cannot be created via API (synced from Lytics)
+        if (audience.source?.toUpperCase() === 'LYTICS') {
+          log.debug(`Skipping Lytics audience: ${name} (${uid})`, this.config.context);
+          continue;
+        }
+
         try {
           //check whether reference attributes exists or not
           if (definition.rules?.length) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

Original file line number	Diff line number	Diff line change
`@@ -73,4 +73,4 @@`
`73`	`73`	`}`
`74`	`74`	`},`
`75`	`75`	`"repository": "contentstack/cli"`
`76`		`-}`
	`76`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"@oclif/plugin-help": "^6.2.28",`
`15`	`15`	`"chalk": "^5.6.2",`
`16`	`16`	`"inquirer": "12.11.1",`
`17`		`- "lodash": "^4.17.23",`
	`17`	`+ "lodash": "^4.18.1",`
`18`	`18`	`"merge": "^2.1.1",`
`19`	`19`	`"ora": "^5.4.1",`
`20`	`20`	`"prompt": "^1.3.0",`
`@@ -78,4 +78,4 @@`
`78`	`78`	`"cm:stacks:clone": "CLN"`
`79`	`79`	`}`
`80`	`80`	`}`
`81`		`-}`
	`81`	`+}`