Skip to content

Commit

Permalink
Merge branch 'staging' into stag-to-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
aman19K committed Jan 12, 2024
2 parents f02e024 + e87f8aa commit 562bded
Show file tree
Hide file tree
Showing 29 changed files with 82 additions and 76 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,22 @@ jobs:
with:
token: ${{ secrets.NPM_TOKEN }}
package: ./packages/contentstack-export/package.json
- name: Installing dependencies of audit
id: audit-installation
if: ${{env.release_releaseAll == 'true' || env.release_plugins_audit == 'true'}}
working-directory: ./packages/contentstack-audit
run: npm install
- name: Compiling audit
if: ${{ steps.audit-installation.conclusion == 'success' }}
working-directory: ./packages/contentstack-audit
run: npm run prepack
- name: Publishing audit
uses: JS-DevTools/[email protected]
if: ${{ steps.audit-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
package: ./packages/contentstack-audit/package.json
access: public
- name: Installing dependencies of import
id: import-installation
if: ${{env.release_releaseAll == 'true' || env.release_plugins_import == 'true'}}
Expand Down Expand Up @@ -249,22 +265,6 @@ jobs:
if: ${{env.release_releaseAll == 'true' || env.release_plugins_core == 'true'}}
working-directory: ./packages/contentstack
run: npm install
- name: Installing dependencies of audit
id: audit-installation
if: ${{env.release_releaseAll == 'true' || env.release_plugins_audit == 'true'}}
working-directory: ./packages/contentstack-audit
run: npm install
- name: Compiling audit
if: ${{ steps.audit-installation.conclusion == 'success' }}
working-directory: ./packages/contentstack-audit
run: npm run prepack
- name: Publishing audit
uses: JS-DevTools/[email protected]
if: ${{ steps.audit-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
package: ./packages/contentstack-audit/package.json
access: public
- name: Compiling core
if: ${{ steps.core-installation.conclusion == 'success' }}
working-directory: ./packages/contentstack
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ $ csdx --help
```

## Namespaces
**auth**: To perform [authentication-related](/packages/auth) activities
**auth**: To perform [authentication-related](/packages/contentstack-auth) activities

**cm**: To perform content management activities such as [bulk publish](/packages/contentstack-bulk-publish), [import](/packages/contentstack-import), and [export](/packages/contentstack-export), [export-to-csv] (/packages/contentstack-export-to-csv), [seed] (/packages/contentstack-seed)

Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-audit/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-auth/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-bootstrap/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-branches/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-bulk-publish/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-clone/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 3 additions & 1 deletion packages/contentstack-clone/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-clone
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-clone/1.8.0 darwin-arm64 node-v20.8.0
@contentstack/cli-cm-clone/1.9.0 darwin-arm64 node-v20.8.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down Expand Up @@ -57,6 +57,7 @@ FLAGS
--destination-stack-api-key=<value> Destination stack API Key
--import-webhook-status=<option> [default: disable] [Optional] Webhook state
<options: disable|current>
--skip-audit Skips the audit fix.
--source-branch=<value> Branch of the source stack.
--source-management-token-alias=<value> Source API key of the target stack token alias.
--source-stack-api-key=<value> Source stack API Key
Expand Down Expand Up @@ -106,6 +107,7 @@ FLAGS
--destination-stack-api-key=<value> Destination stack API Key
--import-webhook-status=<option> [default: disable] [Optional] Webhook state
<options: disable|current>
--skip-audit Skips the audit fix.
--source-branch=<value> Branch of the source stack.
--source-management-token-alias=<value> Source API key of the target stack token alias.
--source-stack-api-key=<value> Source stack API Key
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-command/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-config/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
24 changes: 12 additions & 12 deletions packages/contentstack-config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ _See code: [src/commands/config/get/base-branch.ts](https://github.com/contentst

## `csdx config:get:ea-header`

Display Early Access Program headers
Display Early Access headers

```
USAGE
$ csdx config:get:ea-header
DESCRIPTION
Display Early Access Program headers
Display Early Access headers
ALIASES
$ csdx config:get:ea-header
Expand All @@ -78,14 +78,14 @@ EXAMPLES

## `csdx config:get:early-access-header`

Display Early Access Program headers
Display Early Access headers

```
USAGE
$ csdx config:get:early-access-header
DESCRIPTION
Display Early Access Program headers
Display Early Access headers
ALIASES
$ csdx config:get:ea-header
Expand Down Expand Up @@ -138,7 +138,7 @@ _See code: [src/commands/config/remove/base-branch.ts](https://github.com/conten

## `csdx config:remove:ea-header`

Remove Early Access Program header
Remove Early Access header

```
USAGE
Expand All @@ -149,7 +149,7 @@ FLAGS
--header-alias=<value> Early access header alias
DESCRIPTION
Remove Early Access Program header
Remove Early Access header
ALIASES
$ csdx config:remove:ea-header
Expand All @@ -162,7 +162,7 @@ EXAMPLES

## `csdx config:remove:early-access-header`

Remove Early Access Program header
Remove Early Access header

```
USAGE
Expand All @@ -173,7 +173,7 @@ FLAGS
--header-alias=<value> Early access header alias
DESCRIPTION
Remove Early Access Program header
Remove Early Access header
ALIASES
$ csdx config:remove:ea-header
Expand Down Expand Up @@ -211,7 +211,7 @@ _See code: [src/commands/config/set/base-branch.ts](https://github.com/contentst

## `csdx config:set:ea-header`

Set Early Access Program header
Set Early Access header

```
USAGE
Expand All @@ -222,7 +222,7 @@ FLAGS
--header-alias=<value> Early access header alias
DESCRIPTION
Set Early Access Program header
Set Early Access header
ALIASES
$ csdx config:set:ea-header
Expand All @@ -235,7 +235,7 @@ EXAMPLES

## `csdx config:set:early-access-header`

Set Early Access Program header
Set Early Access header

```
USAGE
Expand All @@ -246,7 +246,7 @@ FLAGS
--header-alias=<value> Early access header alias
DESCRIPTION
Set Early Access Program header
Set Early Access header
ALIASES
$ csdx config:set:ea-header
Expand Down
4 changes: 2 additions & 2 deletions packages/contentstack-config/messages/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"CLI_CONFIG_INQUIRE_API_KEY": "Enter stack api key",
"CLI_CONFIG_INQUIRE_BASE_BRANCH": "Enter base branch",
"CLI_CONFIG_BRANCH_LIST_NO_BRANCHES": "No branches are added. Use config:set:base-branch command to add base branch.",
"CLI_CONFIG_INQUIRE_EARLY_ACCESS_HEADER_VALUE": "Please enter Early Access Program header value",
"CLI_CONFIG_INQUIRE_EARLY_ACCESS_HEADER_ALIAS": "Please enter Early Access Program header alias",
"CLI_CONFIG_INQUIRE_EARLY_ACCESS_HEADER_VALUE": "Please enter Early Access header value",
"CLI_CONFIG_INQUIRE_EARLY_ACCESS_HEADER_ALIAS": "Please enter Early Access header alias",
"CLI_BRANCH_REQUIRED_FIELD": "Please enter the required field details"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { cliux, configHandler } from '@contentstack/cli-utilities';
import { Command } from '@contentstack/cli-command';

export default class GetEarlyAccessHeaderCommand extends Command {
static description = 'Display Early Access Program headers';
static description = 'Display Early Access headers';
static aliases: string[] = ['config:get:ea-header'];
static examples = ['$ <%= config.bin %> <%= command.id %>'];

Expand All @@ -29,10 +29,10 @@ export default class GetEarlyAccessHeaderCommand extends Command {
},
);
} else {
cliux.print(`No Early Access Program header found!`, { color: 'red' });
cliux.print(`No Early Access header found!`, { color: 'red' });
}
} catch (error) {
this.log('Unable to retrieve the Early Access Program header config', error instanceof Error ? error.message : error);
this.log('Unable to retrieve the Early Access header config', error instanceof Error ? error.message : error);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { interactive } from '../../../utils';
import { Command } from '@contentstack/cli-command';

export default class RemoveEarlyAccessHeader extends Command {
static description = 'Remove Early Access Program header';
static description = 'Remove Early Access header';
static aliases: string[] = ['config:remove:ea-header'];
static flags: FlagInput = {
'header-alias': flags.string({ description: 'Early access header alias' }),
Expand All @@ -23,7 +23,7 @@ export default class RemoveEarlyAccessHeader extends Command {
earlyAccessHeaderAlias = await interactive.askEarlyAccessHeaderAlias();
}
if (configHandler.get(`earlyAccessHeaders.${earlyAccessHeaderAlias}`) === undefined) {
cliux.error(`Early Access Program header not configured for alias: ${earlyAccessHeaderAlias}`);
cliux.error(`Early Access header not configured for alias: ${earlyAccessHeaderAlias}`);
return;
}
if (!skipConfirmation) {
Expand All @@ -33,9 +33,9 @@ export default class RemoveEarlyAccessHeader extends Command {
}
}
configHandler.delete(`earlyAccessHeaders.${earlyAccessHeaderAlias}`);
cliux.success(`Early Access Program header '${earlyAccessHeaderAlias}' has been successfully removed`);
cliux.success(`Early Access header has been successfully removed`);
} catch (error) {
this.log('Unable to remove the Early Access Program header config', error instanceof Error ? error.message : error);
this.log('Unable to remove the Early Access header config', error instanceof Error ? error.message : error);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { interactive } from '../../../utils';
import { Command } from '@contentstack/cli-command';

export default class SetEarlyAccessHeaderCommand extends Command {
static description = 'Set Early Access Program header';
static description = 'Set Early Access header';
static aliases: string[] = ['config:set:ea-header'];
static flags: FlagInput = {
'header-alias': flags.string({ description: 'Early access header alias' }),
Expand All @@ -27,10 +27,10 @@ export default class SetEarlyAccessHeaderCommand extends Command {
}
configHandler.set(`earlyAccessHeaders.${earlyAccessHeaderAlias}`, earlyAccessHeader);
cliux.success(
`Early access header '${earlyAccessHeader}' with alias '${earlyAccessHeaderAlias}' has been successfully set `,
`Early Access header has been successfully set`,
);
} catch (error) {
this.log('Unable to set the Early Access Program header config', error instanceof Error ? error.message : error);
this.log('Unable to set the Early Access header config', error instanceof Error ? error.message : error);
}
}
}
2 changes: 1 addition & 1 deletion packages/contentstack-dev-dependencies/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-export-to-csv/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-export/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-import/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
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.12.2 darwin-arm64 node-v20.10.0
@contentstack/cli-cm-import/1.13.0 darwin-arm64 node-v20.8.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-launch/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-migrate-rte/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit 562bded

Please sign in to comment.