Skip to content

Commit

Permalink
Merge pull request #1546 from contentstack/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
shafeeqd959 authored Sep 5, 2024
2 parents 4a66659 + ad14d3f commit b7d3593
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 12 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/contentstack-bootstrap/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-bootstrap/1.10.0 darwin-arm64 node-v22.2.0
@contentstack/cli-cm-bootstrap/1.11.0 darwin-arm64 node-v22.2.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-bootstrap/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@contentstack/cli-cm-bootstrap",
"description": "Bootstrap contentstack apps",
"version": "1.10.0",
"version": "1.11.0",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions packages/contentstack-bootstrap/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const config: Configuration = {
{ displayName: 'Vue JS', configKey: 'vue-starter' },
{ displayName: 'Stencil', configKey: 'stencil-starter' },
{ displayName: 'Nuxt3', configKey: 'nuxt3-starter' },
// { displayName: 'Compass App', configKey: 'compass-app' }
{ displayName: 'Compass App', configKey: 'compass-app' }
],
appLevelConfig: {
nextjs: {
Expand All @@ -50,8 +50,8 @@ const config: Configuration = {
stack: 'contentstack/stack-contentstack-angular-modularblock-example',
},
'compass-app': {
source: 'contentstack/contentstack-universal-demo',
stack: 'contentstack/stack-contentstack-universal-demo',
source: 'contentstack/compass-starter-app',
stack: 'contentstack/compass-starter-stack',
master_locale: 'en',
},
'nuxtjs-disabled': {
Expand Down
4 changes: 4 additions & 0 deletions packages/contentstack-import/src/import/modules/entries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,10 @@ export default class EntriesImport extends BaseClass {
apiOptions.apiData = null;
return apiOptions;
}
if(requestObject.environments.length === 0 || requestObject.locales.length === 0 ){
apiOptions.apiData = null;
return apiOptions;
}
apiOptions.apiData = requestObject;
return apiOptions;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"dependencies": {
"@contentstack/cli-audit": "~1.7.0",
"@contentstack/cli-auth": "~1.3.20",
"@contentstack/cli-cm-bootstrap": "~1.10.0",
"@contentstack/cli-cm-bootstrap": "~1.11.0",
"@contentstack/cli-cm-branches": "~1.1.2",
"@contentstack/cli-cm-bulk-publish": "~1.4.8",
"@contentstack/cli-cm-export": "~1.11.7",
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b7d3593

Please sign in to comment.