diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1e45cf7549..5fb673798b 100755 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: - uses: pnpm/action-setup@v2.2.4 with: version: 7 - - uses: actions/setup-node@v3.7.0 + - uses: actions/setup-node@v1 with: node-version: '18.x' cache: 'pnpm' @@ -249,6 +249,10 @@ jobs: if: ${{env.release_releaseAll == 'true' || env.release_plugins_core == 'true'}} working-directory: ./packages/contentstack run: npm install + - name: Compiling core + if: ${{ steps.core-installation.conclusion == 'success' }} + working-directory: ./packages/contentstack + run: npm run prepack - name: Publishing core id: publish-core uses: JS-DevTools/npm-publish@v2.2.1 diff --git a/package-lock.json b/package-lock.json index c336e89ccc..c954e9e59c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20298,7 +20298,7 @@ }, "packages/contentstack": { "name": "@contentstack/cli", - "version": "1.8.2", + "version": "1.8.3", "license": "MIT", "dependencies": { "@contentstack/cli-auth": "~1.3.12", diff --git a/packages/contentstack-branches/src/utils/entry-create-script.ts b/packages/contentstack-branches/src/utils/entry-create-script.ts index 5739966094..682ffb8b0f 100644 --- a/packages/contentstack-branches/src/utils/entry-create-script.ts +++ b/packages/contentstack-branches/src/utils/entry-create-script.ts @@ -37,11 +37,11 @@ export function entryCreateScript(contentType) { return path.split('[').reduce((o, key) => o && o[key.replace(/\]$/, '')], obj); } - function updateValueByPath(obj, path, newValue, type, index) { + function updateValueByPath(obj, path, newValue, type, fileIndex) { path.split('[').reduce((o, key, index, arr) => { if (index === arr.length - 1) { if (type === 'file') { - o[key.replace(/]$/, '')][index] = newValue; + o[key.replace(/]$/, '')][fileIndex] = newValue; } else { o[key.replace(/]$/, '')][0].uid = newValue; } @@ -81,7 +81,7 @@ export function entryCreateScript(contentType) { for (const i in schema) { const currentPath = path ? path + '[' + schema[i].uid : schema[i].uid; if (schema[i].data_type === 'group' || schema[i].data_type === 'global_field') { - findAssets(schema[i].schema, entry, refPath, currentPath); + findAssets(schema[i].schema, entry, refPath, currentPath + '[0]'); } else if (schema[i].data_type === 'blocks') { for (const block in schema[i].blocks) { { @@ -386,6 +386,14 @@ export function entryCreateScript(contentType) { assetUrlMapper[asset.url] = res && res.url; } }; + + function handleErrorMsg(err) { + if (err?.errorMessage) { + console.log(err.errorMessage); + } else if (err?.message) { + console.log(err.message); + } + } const createEntryTask = () => { return { @@ -469,10 +477,12 @@ export function entryCreateScript(contentType) { let createdEntry = await stackSDKInstance.contentType('${contentType}').entry().create({ entry: entryDetails }).catch(error => { throw error; }); - if (flag.references) { - await updateReferences(entryDetails, createdEntry, references); + if(createdEntry){ + if (flag.references) { + await updateReferences(entryDetails, createdEntry, references); + } + await updateEntry(createdEntry, entryDetails); } - await updateEntry(createdEntry, entryDetails); }); } catch (error) { throw error; diff --git a/packages/contentstack-branches/src/utils/entry-create-update-script.ts b/packages/contentstack-branches/src/utils/entry-create-update-script.ts index 64b188d925..9926436dba 100644 --- a/packages/contentstack-branches/src/utils/entry-create-update-script.ts +++ b/packages/contentstack-branches/src/utils/entry-create-update-script.ts @@ -59,11 +59,11 @@ export function entryCreateUpdateScript(contentType) { return path.split('[').reduce((o, key) => o && o[key.replace(/\]$/, '')], obj); } - function updateValueByPath(obj, path, newValue, type, index) { + function updateValueByPath(obj, path, newValue, type, fileIndex) { path.split('[').reduce((o, key, index, arr) => { if (index === arr.length - 1) { if (type === 'file') { - o[key.replace(/]$/, '')][index] = newValue; + o[key.replace(/]$/, '')][fileIndex] = newValue; } else { o[key.replace(/]$/, '')][0].uid = newValue; } @@ -103,7 +103,7 @@ export function entryCreateUpdateScript(contentType) { for (const i in schema) { const currentPath = path ? path + '[' + schema[i].uid : schema[i].uid; if (schema[i].data_type === 'group' || schema[i].data_type === 'global_field') { - findAssets(schema[i].schema, entry, refPath, currentPath); + findAssets(schema[i].schema, entry, refPath, currentPath + '[0]'); } else if (schema[i].data_type === 'blocks') { for (const block in schema[i].blocks) { { diff --git a/packages/contentstack-branches/src/utils/entry-update-script.ts b/packages/contentstack-branches/src/utils/entry-update-script.ts index 0e085db968..1ee65bff4a 100644 --- a/packages/contentstack-branches/src/utils/entry-update-script.ts +++ b/packages/contentstack-branches/src/utils/entry-update-script.ts @@ -59,11 +59,11 @@ export function entryUpdateScript(contentType) { return path.split('[').reduce((o, key) => o && o[key.replace(/\]$/, '')], obj); } - function updateValueByPath(obj, path, newValue, type, index) { + function updateValueByPath(obj, path, newValue, type, fileIndex) { path.split('[').reduce((o, key, index, arr) => { if (index === arr.length - 1) { if (type === 'file') { - o[key.replace(/]$/, '')][index] = newValue; + o[key.replace(/]$/, '')][fileIndex] = newValue; } else { o[key.replace(/]$/, '')][0].uid = newValue; } @@ -103,7 +103,7 @@ export function entryUpdateScript(contentType) { for (const i in schema) { const currentPath = path ? path + '[' + schema[i].uid : schema[i].uid; if (schema[i].data_type === 'group' || schema[i].data_type === 'global_field') { - findAssets(schema[i].schema, entry, refPath, currentPath); + findAssets(schema[i].schema, entry, refPath, currentPath + '[0]'); } else if (schema[i].data_type === 'blocks') { for (const block in schema[i].blocks) { { diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index 8964ca5366..7a05409af2 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli", "description": "Command-line tool (CLI) to interact with Contentstack", - "version": "1.8.2", + "version": "1.8.3", "author": "Contentstack", "bin": { "csdx": "./bin/run"