Skip to content

Commit f40871e

Browse files
authored
Merge pull request #2031 from contentstack/fix/DX-3111
DX - 3111 - Fix: Added new modules in import for auditing
2 parents 87cc721 + 2384684 commit f40871e

File tree

8 files changed

+1428
-3719
lines changed

8 files changed

+1428
-3719
lines changed

.talismanrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
fileignoreconfig:
22
- filename: pnpm-lock.yaml
3-
checksum: 0c320557538f6b52f375b13221323d8700692a45e744128788785f27e7c72f73
3+
checksum: 2118f054aad8a4d379b03bb7eb9c5861b3337c35b9b9636e8f8ee82603aac878
44
- filename: packages/contentstack-import/test/integration/auth-token-modules/environments.test.js
55
checksum: bc6f06b75d082aaf99e2f2f4b932b143765e2f14086967fb8973fe1b2ca6c03e
66
- filename: packages/contentstack-import/test/integration/environments.test.js
77
checksum: e71f033dad8944ffeafdf22d0514bda1d20c43e8fea0d62c96e774f3414beb31
88
- filename: package-lock.json
9-
checksum: 7260d9647ed789f09e454d63f9bdd0393e6dfd93f69d4dd2a1505c1c2a60b194
9+
checksum: 3c50b4797d81213e2edc965c51a854482c1502204d60d4dfbce8d2fe2173e1f2
1010
- filename: packages/contentstack-auth/test/unit/tokens-validation.test.ts
1111
checksum: 1fbf278675767ed828f5c83f32d088284410f2d687365bfa759728e3b9b7fa8b
1212
- filename: packages/contentstack-import/test/integration/auth-token.test.js

package-lock.json

Lines changed: 1164 additions & 3702 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/contentstack-clone/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dependencies": {
88
"@colors/colors": "^1.6.0",
99
"@contentstack/cli-cm-export": "~1.18.0",
10-
"@contentstack/cli-cm-import": "~1.26.0",
10+
"@contentstack/cli-cm-import": "~1.26.1",
1111
"@contentstack/cli-command": "~1.6.0",
1212
"@contentstack/cli-utilities": "~1.13.1",
1313
"@oclif/core": "^4.3.0",

packages/contentstack-import/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@contentstack/cli-cm-import",
33
"description": "Contentstack CLI plugin to import content into stack",
4-
"version": "1.26.0",
4+
"version": "1.26.1",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
@@ -36,7 +36,7 @@
3636
"@types/uuid": "^9.0.8",
3737
"@typescript-eslint/eslint-plugin": "^5.62.0",
3838
"eslint": "^8.57.1",
39-
"eslint-config-oclif": "^6.0.62",
39+
"eslint-config-oclif": "^6.0.89",
4040
"mocha": "^10.8.2",
4141
"nyc": "^15.1.0",
4242
"oclif": "^4.17.46",

packages/contentstack-import/src/import/module-importer.ts

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,14 @@ class ModuleImporter {
5050
if (
5151
!this.importConfig.skipAudit &&
5252
(!this.importConfig.moduleName ||
53-
['content-types', 'global-fields', 'entries', 'extensions', 'workflows', 'custom-roles'].includes(
54-
this.importConfig.moduleName,
55-
))
53+
[
54+
'content-types',
55+
'global-fields',
56+
'entries',
57+
'extensions',
58+
'workflows',
59+
'custom-roles',
60+
].includes(this.importConfig.moduleName))
5661
) {
5762
if (!(await this.auditImportData(logger))) {
5863
return { noSuccessMsg: true };
@@ -144,13 +149,21 @@ class ModuleImporter {
144149
} else if (this.importConfig.modules.types.length) {
145150
this.importConfig.modules.types
146151
.filter((val) =>
147-
['content-types', 'global-fields', 'entries', 'extensions', 'workflows', 'custom-roles'].includes(val),
152+
[
153+
'content-types',
154+
'global-fields',
155+
'entries',
156+
'extensions',
157+
'workflows',
158+
'custom-roles',
159+
'assets'
160+
].includes(val),
148161
)
149162
.forEach((val) => {
150163
args.push('--modules', val);
151164
});
152165
}
153-
166+
args.push('--modules', 'field-rules');
154167
log(this.importConfig, 'Starting audit process', 'info');
155168
const result = await AuditFix.run(args);
156169
log(this.importConfig, 'Audit process completed', 'info');

packages/contentstack-seed/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
8-
"@contentstack/cli-cm-import": "~1.26.0",
8+
"@contentstack/cli-cm-import": "~1.26.1",
99
"@contentstack/cli-command": "~1.6.0",
1010
"@contentstack/cli-utilities": "~1.13.1",
1111
"@contentstack/management": "~1.22.0",

packages/contentstack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@contentstack/cli-cm-clone": "~1.15.0",
3131
"@contentstack/cli-cm-export": "~1.18.0",
3232
"@contentstack/cli-cm-export-to-csv": "~1.9.0",
33-
"@contentstack/cli-cm-import": "~1.26.0",
33+
"@contentstack/cli-cm-import": "~1.26.1",
3434
"@contentstack/cli-cm-import-setup": "1.4.0",
3535
"@contentstack/cli-cm-migrate-rte": "~1.6.0",
3636
"@contentstack/cli-cm-seed": "~1.12.0",

0 commit comments

Comments
 (0)