Skip to content

Commit fd79840

Browse files
committed
fix: Removed Management SDK from seed, core and import
1 parent ff433d9 commit fd79840

File tree

11 files changed

+442
-398
lines changed

11 files changed

+442
-398
lines changed

package-lock.json

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

packages/contentstack-import/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"@contentstack/cli-audit": "~1.17.1",
99
"@contentstack/cli-command": "~1.7.2",
1010
"@contentstack/cli-utilities": "~1.17.2",
11-
"@contentstack/management": "~1.27.5",
1211
"@contentstack/cli-variants": "~1.3.7",
1312
"@oclif/core": "^4.3.0",
1413
"big-json": "^3.2.0",

packages/contentstack-import/src/import/modules/base-class.ts

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@ import isEmpty from 'lodash/isEmpty';
55
import entries from 'lodash/entries';
66
import isEqual from 'lodash/isEqual';
77
import omit from 'lodash/omit';
8-
import { Stack } from '@contentstack/management/types/stack';
9-
import { AssetData } from '@contentstack/management/types/stack/asset';
10-
import { LocaleData } from '@contentstack/management/types/stack/locale';
11-
import { PublishConfig } from '@contentstack/management/types/utility/publish';
12-
import { FolderData } from '@contentstack/management/types/stack/asset/folder';
13-
import { ExtensionData } from '@contentstack/management/types/stack/extension';
14-
import { EnvironmentData } from '@contentstack/management/types/stack/environment';
15-
import { LabelData } from '@contentstack/management/types/stack/label';
16-
import { WebhookData } from '@contentstack/management/types/stack/webhook';
17-
import { WorkflowData } from '@contentstack/management/types/stack/workflow';
18-
import { RoleData } from '@contentstack/management/types/stack/role';
19-
import { log } from '@contentstack/cli-utilities';
8+
import {
9+
log,
10+
ManagementStack,
11+
AssetData,
12+
LocaleData,
13+
PublishConfig,
14+
FolderData,
15+
ExtensionData,
16+
EnvironmentData,
17+
LabelData,
18+
WebhookData,
19+
WorkflowData,
20+
RoleData,
21+
} from '@contentstack/cli-utilities';
2022
import { ImportConfig, ModuleClassParams } from '../../types';
2123
import cloneDeep from 'lodash/cloneDeep';
2224

@@ -85,7 +87,7 @@ export type CustomPromiseHandlerInput = {
8587
export type CustomPromiseHandler = (input: CustomPromiseHandlerInput) => Promise<any>;
8688

8789
export default abstract class BaseClass {
88-
readonly client: Stack;
90+
readonly client: ManagementStack;
8991

9092
public importConfig: ImportConfig;
9193

@@ -97,7 +99,7 @@ export default abstract class BaseClass {
9799
this.modulesConfig = importConfig.modules;
98100
}
99101

100-
get stack(): Stack {
102+
get stack(): ManagementStack {
101103
return this.client;
102104
}
103105

packages/contentstack-import/src/import/modules/global-fields.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
import * as path from 'path';
99
import { isEmpty, cloneDeep } from 'lodash';
10-
import { cliux, sanitizePath, log, handleAndLogError } from '@contentstack/cli-utilities';
11-
import { GlobalFieldData, GlobalField } from '@contentstack/management/types/stack/globalField';
10+
import { cliux, sanitizePath, log, handleAndLogError, GlobalFieldData, GlobalField } from '@contentstack/cli-utilities';
1211
import { fsUtil,fileHelper, lookupExtension, removeReferenceFields } from '../../utils';
1312
import { ImportConfig, ModuleClassParams } from '../../types';
1413
import BaseClass, { ApiOptions } from './base-class';

packages/contentstack-import/src/import/modules/workflows.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ export default class ImportWorkflows extends BaseClass {
218218
workflow: Record<string, any>,
219219
newWorkflowStages: Record<string, any>[],
220220
oldWorkflowStages: Record<string, any>[],
221-
) {
221+
): Promise<any> {
222222
newWorkflowStages = map(newWorkflowStages, (newStage, index) => {
223223
const oldStage = oldWorkflowStages[index];
224224
if (!isEmpty(oldStage.next_available_stages)) {

packages/contentstack-seed/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"@contentstack/cli-cm-import": "~1.31.3",
99
"@contentstack/cli-command": "~1.7.2",
1010
"@contentstack/cli-utilities": "~1.17.2",
11-
"@contentstack/management": "~1.27.5",
1211
"inquirer": "8.2.7",
1312
"mkdirp": "^1.0.4",
1413
"tar": "^7.5.7",

packages/contentstack-seed/src/seed/contentstack/client.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import ContentstackError from './error';
2-
import { managementSDKClient, configHandler } from '@contentstack/cli-utilities';
3-
import * as ContentstackManagementSDK from '@contentstack/management';
2+
import { managementSDKClient, configHandler, ContentstackClient as ContentstackAPIClient } from '@contentstack/cli-utilities';
43

54
export interface Organization {
65
uid: string;
@@ -44,7 +43,7 @@ export interface createManagementTokenOptions{
4443
}
4544

4645
export default class ContentstackClient {
47-
instance: Promise<ContentstackManagementSDK.ContentstackClient>;
46+
instance: Promise<ContentstackAPIClient>;
4847

4948
limit: number;
5049

packages/contentstack-utilities/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export {
2121
ContentstackClient,
2222
ContentstackConfig,
2323
} from './contentstack-management-sdk';
24+
export * from './management-types';
2425
export { default as printFlagDeprecation } from './flag-deprecation-check';
2526
export * from './http-client';
2627
export * from './fs-utility';
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/**
2+
* Re-export of @contentstack/management types for CLI consumers.
3+
* Import these from @contentstack/cli-utilities instead of @contentstack/management.
4+
*/
5+
export type { Stack as ManagementStack } from '@contentstack/management/types/stack';
6+
export type { AssetData } from '@contentstack/management/types/stack/asset';
7+
export type { LocaleData } from '@contentstack/management/types/stack/locale';
8+
export type { PublishConfig } from '@contentstack/management/types/utility/publish';
9+
export type { FolderData } from '@contentstack/management/types/stack/asset/folder';
10+
export type { ExtensionData } from '@contentstack/management/types/stack/extension';
11+
export type { EnvironmentData } from '@contentstack/management/types/stack/environment';
12+
export type { LabelData } from '@contentstack/management/types/stack/label';
13+
export type { WebhookData } from '@contentstack/management/types/stack/webhook';
14+
export type { WorkflowData } from '@contentstack/management/types/stack/workflow';
15+
export type { RoleData } from '@contentstack/management/types/stack/role';
16+
export type { GlobalFieldData, GlobalField } from '@contentstack/management/types/stack/globalField';

packages/contentstack/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
"@contentstack/cli-migration": "~1.11.0",
4141
"@contentstack/cli-utilities": "~1.17.2",
4242
"@contentstack/cli-variants": "~1.3.7",
43-
"@contentstack/management": "~1.27.5",
4443
"@oclif/core": "^4.3.0",
4544
"@oclif/plugin-help": "^6.2.28",
4645
"@oclif/plugin-not-found": "^3.2.53",

0 commit comments

Comments
 (0)