merged latest

contentstack · Sep 20, 2023 · 813b596 · 813b596
2 parents c5a1b15 + 7488c0a
commit 813b596
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-branches/README.md b/packages/contentstack-branches/README.md
@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-branches/1.0.12 darwin-arm64 node-v18.11.0
+@contentstack/cli-cm-branches/1.0.13 darwin-arm64 node-v18.11.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-branches",
   "description": "Contentstack CLI plugin to do branches operations",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

diff --git a/packages/contentstack-branches/src/utils/entry-create-script.ts b/packages/contentstack-branches/src/utils/entry-create-script.ts
@@ -465,7 +465,9 @@ export function entryCreateScript(contentType) {
                   .query({ query: { title: compareRefEntry.title } })
                   .find();
   
-                updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
+                  if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){
+                    updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
+                  }
               }
             }
           }

diff --git a/packages/contentstack-branches/src/utils/entry-create-update-script.ts b/packages/contentstack-branches/src/utils/entry-create-update-script.ts
@@ -484,7 +484,9 @@ export function entryCreateUpdateScript(contentType) {
                   .query({ query: { title: compareRefEntry.title } })
                   .find();
   
-                updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
+                  if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){
+                    updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
+                  }
               }
             }
           }

diff --git a/packages/contentstack-branches/src/utils/entry-update-script.ts b/packages/contentstack-branches/src/utils/entry-update-script.ts
@@ -483,7 +483,9 @@ export function entryUpdateScript(contentType) {
                   .query({ query: { title: compareRefEntry.title } })
                   .find();
   
-                updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
+                  if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){
+                    updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
+                  }
               }
             }
           }

diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
@@ -37,7 +37,7 @@
     "@contentstack/cli-migration": "~1.3.12",
     "@contentstack/cli-utilities": "~1.5.2",
     "@contentstack/management": "~1.10.0",
-    "@contentstack/cli-cm-branches": "~1.0.12",
+    "@contentstack/cli-cm-branches": "~1.0.13",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-not-found": "^2.4.0",
     "@oclif/plugin-plugins": "^3.3.2",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml