fiix: resolved merge conflicts

cs-raj · cs-raj · commit 2efdd38f2f06 · 2026-04-07T13:51:37.000+05:30
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
@@ -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
@@ -94,4 +94,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
@@ -15,7 +15,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",
@@ -90,4 +90,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
@@ -1,2 +1,5 @@
 packages:
   - 'packages/*'
+overrides:
+  picomatch: 4.0.4
+  brace-expansion: 5.0.5

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
`@@ -78,4 +78,4 @@`
`78`	`78`	`"cm:stacks:clone": "CLN"`
`79`	`79`	`}`
`80`	`80`	`}`
`81`		`-}`
	`81`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -94,4 +94,4 @@`
`94`	`94`	`}`
`95`	`95`	`},`
`96`	`96`	`"repository": "https://github.com/contentstack/cli"`
`97`		`-}`
	`97`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -71,4 +71,4 @@`
`71`	`71`	`"cm:stacks:migration": "MGRTN"`
`72`	`72`	`}`
`73`	`73`	`}`
`74`		`-}`
	`74`	`+}`