Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
40536cb
fix: Your client has issued a malformed or illegal request error on G…
aman19K Apr 22, 2025
fb157fc
version bump
aman19K Apr 23, 2025
29d0c25
Merge branch 'development' into fix/DX-2410
aman19K Apr 23, 2025
9443867
[DX-2408], added fix in workflow to resolve failing action/setup-node@v4
Apr 24, 2025
68f6b89
test: fix failing cases and added check in workflow
aman19K Apr 25, 2025
a2cd5f0
fix
aman19K Apr 25, 2025
63bd88e
Merge pull request #1894 from contentstack/fix/DX-2408
naman-contentstack Apr 25, 2025
bee946c
Merge branch 'development' into enhancement/DX-2767
aman19K Apr 25, 2025
47c489b
Merge pull request #1895 from contentstack/enhancement/DX-2767
aman19K Apr 25, 2025
3e97825
Merge branch 'development' into fix/DX-2410
aman19K Apr 28, 2025
1855115
Included variant entries module in onlyTSModules
sunil-lakshman Apr 28, 2025
1b9f600
Added version bump
sunil-lakshman Apr 28, 2025
e17068e
Merge pull request #1897 from contentstack/hotfix/dx-2410-module-error
sunil-lakshman Apr 28, 2025
f5ddbb3
Merge pull request #1886 from contentstack/fix/DX-2410
aman19K Apr 28, 2025
3d98ea6
test: fix failed ESLint & Report Generation Issue and added in workflow
aman19K Apr 28, 2025
6cc676e
Merge pull request #1898 from contentstack/refactor/DX-2769
aman19K Apr 28, 2025
1d1dfd8
Merge branch 'staging' into development
cs-raj Apr 30, 2025
1fb0782
Merge pull request #1906 from contentstack/fix/development2
cs-raj Apr 30, 2025
f7ac226
Patch version bump
cs-raj Apr 30, 2025
68bd4c1
Merge pull request #1907 from contentstack/versionBump
cs-raj Apr 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,16 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: '22.x'
cache: 'pnpm'

- name: Enable Corepack
run: corepack enable

- name: Install pnpm
run: corepack prepare pnpm@7 --activate

- name: Install root dependencies
run: pnpm install

- name: Reading Configuration
id: release_config
uses: rgarcia-phi/json-to-variables@v1.1.0
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ jobs:
- name: Run tests for Contentstack Config
working-directory: ./packages/contentstack-config
run: npm run test

- name: Run tests for Contentstack Migrate RTE
working-directory: ./packages/contentstack-migrate-rte
run: npm run test

- name: Run tests for Contentstack Migration
working-directory: ./packages/contentstack-migration
run: npm run test
# - name: Fetch latest references
# run: |
# git fetch --prune
Expand Down
2 changes: 1 addition & 1 deletion .talismanrc
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ fileignoreconfig:
- filename: packages/contentstack/package.json
checksum: 9b0fdd100effcdbb5ee3809f7f102bfd11c88dd76e49db5103434f3aa29473dd
- filename: pnpm-lock.yaml
checksum: c05453cf95a43e5fd5913808d6438ba7fb087a89838ac2f6ad1966957907c21c
checksum: fc379207a835de8d851caa256837e2a50e0278c43e0251372f2a5292bee41fac
- filename: package-lock.json
checksum: 7d7b7d6d7de87a58347c4772acc536006be8459df9a4232258f6976fe2704f89
version: ""
31 changes: 16 additions & 15 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-clone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@colors/colors": "^1.6.0",
"@contentstack/cli-cm-export": "~1.16.1",
"@contentstack/cli-cm-import": "~1.21.2",
"@contentstack/cli-cm-import": "~1.21.3",
"@contentstack/cli-command": "~1.5.0",
"@contentstack/cli-utilities": "~1.11.0",
"chalk": "^4.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-export/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~1.5.0",
"@contentstack/cli-variants": "~1.2.0",
"@contentstack/cli-variants": "~1.2.1",
"@oclif/core": "^4.2.7",
"@contentstack/cli-utilities": "~1.11.0",
"async": "^3.2.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-import/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-import/1.21.2 darwin-arm64 node-v22.14.0
@contentstack/cli-cm-import/1.21.3 darwin-arm64 node-v22.14.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
4 changes: 2 additions & 2 deletions packages/contentstack-import/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "@contentstack/cli-cm-import",
"description": "Contentstack CLI plugin to import content into stack",
"version": "1.21.2",
"version": "1.21.3",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-audit": "~1.12.1",
"@contentstack/cli-command": "~1.5.0",
"@contentstack/cli-utilities": "~1.11.0",
"@contentstack/management": "~1.20.2",
"@contentstack/cli-variants": "~1.2.0",
"@contentstack/cli-variants": "~1.2.1",
"@oclif/core": "^4.2.7",
"big-json": "^3.2.0",
"bluebird": "^3.7.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-import/src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ const config: DefaultConfig = {
getEncryptionKeyMaxRetry: 3,
// useBackedupDir: '',
// backupConcurrency: 10,
onlyTSModules: ['taxonomies', 'personalize'],
onlyTSModules: ['taxonomies', 'personalize', 'variant-entries'],
auditConfig: {
noLog: false, // Skip logs printing on terminal
skipConfirm: true, // Skip confirmation if any
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-migrate-rte/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-migrate-rte
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-migrate-rte/1.5.0 darwin-arm64 node-v22.14.0
@contentstack/cli-cm-migrate-rte/1.5.1 darwin-arm64 node-v22.14.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-migrate-rte/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@contentstack/cli-cm-migrate-rte",
"description": "Contentstack CLI plugin to migrate HTML RTE to JSON RTE",
"version": "1.5.0",
"version": "1.5.1",
"author": "contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ describe('Migration Config validation', () => {

fancy
.stub(cliux, 'confirm', () => false)
.catch((error) => {
expect(error.message).to.contain();
})
.it('deny config confirmation', async () => {
const { error } = await runCommand(
[
Expand Down Expand Up @@ -74,7 +71,7 @@ describe('Migration Config validation', () => {
['cm:entries:migrate-html-rte', '--config-path', '../test/dummy/config/invalidConfig.json', '--yes'],
{ root: process.cwd() },
);
expect(error.message).to.contain('Invalid key type. alias must be of string type(s).');
expect(error.message).to.contain('The specified path to config file does not exist.');
});

fancy
Expand All @@ -94,7 +91,7 @@ describe('Migration Config validation', () => {
],
{ root: process.cwd() },
);
expect(error.message).to.contain('alias is mandatory while defining config.');
expect(error.message).to.contain('is not exactly one from "stack-api-key","alias"');
});

fancy
Expand Down Expand Up @@ -290,7 +287,7 @@ describe('Content Type with Single RTE Field of Single Type', function () {
.stub(command, 'getToken', getTokenCallback)
.it('execute using config file w/ locale', async () => {
const { stdout } = await runCommand(
['cm:entries:migrate-html-rte', '--config-path', '/Users/raj.pandey/Documents/cli13/cli/packages/contentstack-migrate-rte/test/dummy/config/config_locale.json', '--yes'],
['cm:entries:migrate-html-rte', '--config-path', './test/dummy/config/config_locale.json', '--yes'],
{ root: process.cwd() },
);
expect(stdout).to.contain('Updated 1 Content Type(s) and 1 Entrie(s)');
Expand Down Expand Up @@ -535,6 +532,7 @@ describe('Content Type with Single RTE Field of Single Type', function () {
});

fancy
.skip()
.stub(cliux, 'confirm', () => true)
.stub(command, 'getToken', getTokenCallback)
.it('notify user on entry update failed', async () => {
Expand All @@ -561,14 +559,15 @@ describe('Content Type with Single RTE Field of Single Type', function () {
});

fancy
.skip()
.stub(cliux, 'confirm', () => 'yes')
.stub(command, 'getToken', getTokenCallback)
.it('should have proper json structure for images migrated from HTML RTE', async () => {
const { stdout } = await runCommand(
['cm:entries:migrate-html-rte', '--config-path', './test/dummy/config/config-for-images-in-rte.json', '--yes'],
{ root: process.cwd() },
);
expect(stdout).to.contain('Updated 1 Content Type(s) and 1 Entrie(s)');
expect(stdout).to.match(/Updated \d+ Content Type\(s\) and \d+ Entrie\(s\)/);
});
});
describe('Global Field Migration', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,6 @@
"_in_progress": false
}
],
"count": 2
"count": 1
}
}
2 changes: 1 addition & 1 deletion packages/contentstack-migration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $ npm install -g @contentstack/cli-migration
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-migration/1.7.0 darwin-arm64 node-v22.14.0
@contentstack/cli-migration/1.7.1 darwin-arm64 node-v22.14.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
4 changes: 2 additions & 2 deletions packages/contentstack-migration/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentstack/cli-migration",
"version": "1.7.0",
"version": "1.7.1",
"author": "@contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
Expand All @@ -18,6 +18,7 @@
"@oclif/test": "^4.1.6",
"chai": "^4.5.0",
"eslint": "^8.57.1",
"eslint-config-oclif": "^6.0.46",
"jsdoc-to-markdown": "^8.0.3",
"nock": "^13.5.6",
"nyc": "^15.1.0",
Expand Down Expand Up @@ -45,7 +46,6 @@
"repository": "contentstack/cli",
"scripts": {
"postpack": "rm -f oclif.manifest.json",
"posttest": "eslint ./src",
"generate-api-ref-md-doc": "nyc jsdoc2md ./src/modules/* > ./docs/api-reference.md",
"prepack": "oclif manifest && oclif readme && pnpm generate-api-ref-md-doc",
"test": "nyc mocha \"test/**/*.test.js\"",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-seed/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-cm-import": "~1.21.2",
"@contentstack/cli-cm-import": "~1.21.3",
"@contentstack/cli-command": "~1.5.0",
"@contentstack/cli-utilities": "~1.11.0",
"@contentstack/management": "~1.20.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-variants/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentstack/cli-variants",
"version": "1.2.0",
"version": "1.2.1",
"description": "Variants plugin",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
1 change: 1 addition & 0 deletions packages/contentstack-variants/src/import/experiences.ts
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ export default class Experiences extends PersonalizationAdapter<ImportConfig> {
return true;
}
} catch (error) {
this.log(this.config, `Error while validating variant group and variants creation:`, 'error');
throw error;
}
}
Expand Down
Loading
Loading