Skip to content

Commit 74fea63

Browse files
author
naman-contentstack
committed
feat: export and import config and code cleanup
1 parent 67a35e0 commit 74fea63

43 files changed

Lines changed: 3308 additions & 3420 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.talismanrc

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,34 @@ fileignoreconfig:
5757
checksum: 77bc27f5217c6d69c21bac51afc94d677ad67374c1b39b0575646300eb0decd3
5858
- filename: packages/contentstack-seed/test/seed/contentstack/client.test.ts
5959
checksum: f1bc369c9c3c4a84ddd590864c0f3e8b13be956b8fb8891b6324f44cdcc7d568
60+
- filename: packages/contentstack-export/test/unit/export/modules/environments.test.ts
61+
checksum: 3f219e9ecb060cd590bdd4815cf31f2db81396be49d357eadc8d972e7e0d49a2
62+
- filename: packages/contentstack-import/test/unit/utils/backup-handler.test.ts
63+
checksum: 2743a1d7370a9c1a255549a0c1ad8615618bbe4d30645e18224dcfe813411fa0
64+
- filename: packages/contentstack-export/test/unit/export/modules/global-fields.test.ts
65+
checksum: 9f3577388677fa0fa36bf8b280c2137ec6255392cca784d650080d174444cf99
66+
- filename: packages/contentstack-export/test/unit/export/modules/content-types.test.ts
67+
checksum: 90edb36569d165e88f09c49f1989fc499081d61b8da4a56536e55f8a392ba748
68+
- filename: packages/contentstack-import/test/unit/import/module-importer.test.ts
69+
checksum: 383bd60e12028617e450e291c3d84f87b1990e9f14c0898f77b7f63fb3bd0957
70+
- filename: packages/contentstack-export/test/unit/export/modules/base-class.test.ts
71+
checksum: 8755d3c8a6b4f82780a24d1fa4804f90c6c10796b1fe6a0193ac612d14f8f6bb
72+
- filename: packages/contentstack-export/test/unit/export/modules/assets.test.ts
73+
checksum: 12d899d85de5852337a8df36830bb43829be335fb982629134027ede679357a5
74+
- filename: packages/contentstack-export/test/unit/export/modules/marketplace-apps.test.ts
75+
checksum: 886823929388a5b5e8f7e7e747380c81a6582957fe495563fbc313d9992182bc
76+
- filename: packages/contentstack-export/test/unit/export/modules/locales.test.ts
77+
checksum: cc1f1cebbfffb1c03f5f98268aec55656e60f5251154592e6234b7ce08b6918e
78+
- filename: packages/contentstack-export/test/unit/export/modules/entries.test.ts
79+
checksum: 12de03aa82ba2c7a58f3b6d39cdcadffc5108b6268d599f14c2c50a38ce1091a
80+
- filename: packages/contentstack-export/test/unit/export/modules/stack.test.ts
81+
checksum: dc28ecf8c9f7e9f4f20af1211d789924ee00e5ae33f0ce05c9caa80768b1a734
82+
- filename: packages/contentstack-export/test/unit/export/modules/taxonomies.test.ts
83+
checksum: f6175a8e89fb9dde4b0ff269d65a9e42c4374ef7efb1b828e54e2ebd7c4379fa
84+
- filename: packages/contentstack-export/test/unit/export/modules/workflows.test.ts
85+
checksum: 9da983731811064de04e60a7ddd05ea558661dd17ac4e0c7da5be6cca8b2749d
86+
- filename: packages/contentstack-export/test/unit/utils/export-config-handler.test.ts
87+
checksum: 0a4588401231be884781043314ad59e42c8896cb0a8cc288b1e10f6e4d79506a
88+
- filename: packages/contentstack-import/test/unit/import/modules/entries.test.ts
89+
checksum: 544e11881bc55ea7a1afc05e067d7b29fb2d165783ccd0ce3ff741ef7106b134
6090
version: '1.0'

packages/contentstack-export/example_config/auth_config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"contentVersion": 2,
32
"master_locale": {
43
"name": "English - United States",
54
"code": "en-us"

packages/contentstack-export/example_config/management_config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"contentVersion": 2,
32
"master_locale": {
43
"name": "English - United States",
54
"code": "en-us"

packages/contentstack-export/src/utils/export-config-handler.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const setupConfig = async (exportCmdFlags: any): Promise<ExportConfig> => {
1212
// Set progress supported module FIRST, before any log calls
1313
// This ensures the logger respects the showConsoleLogs setting correctly
1414
configHandler.set('log.progressSupportedModule', 'export');
15-
15+
1616
let config = merge({}, defaultConfig);
1717

1818
// Track authentication method
@@ -24,6 +24,19 @@ const setupConfig = async (exportCmdFlags: any): Promise<ExportConfig> => {
2424
if (exportCmdFlags['config']) {
2525
log.debug('Loading external configuration file...', { configFile: exportCmdFlags['config'] });
2626
const externalConfig = await readFile(exportCmdFlags['config']);
27+
28+
// Validate for deprecated JS compatibility properties
29+
const deprecatedProps = ['contentVersion'];
30+
const foundDeprecated = deprecatedProps.filter((prop) => externalConfig[prop] !== undefined);
31+
32+
if (foundDeprecated.length > 0) {
33+
throw new Error(
34+
`Unsupported configuration properties detected: ${foundDeprecated.join(', ')}. ` +
35+
`These properties are no longer supported in the beta version. ` +
36+
`TypeScript modules are now the default and only supported format.`,
37+
);
38+
}
39+
2740
config = merge.recursive(config, externalConfig);
2841
}
2942
config.exportDir = sanitizePath(
@@ -101,7 +114,7 @@ const setupConfig = async (exportCmdFlags: any): Promise<ExportConfig> => {
101114

102115
if (exportCmdFlags['branch-alias']) {
103116
config.branchAlias = exportCmdFlags['branch-alias'];
104-
}
117+
}
105118
if (exportCmdFlags['branch']) {
106119
config.branchName = exportCmdFlags['branch'];
107120
}

0 commit comments

Comments
 (0)