Skip to content

Commit 2822f5d

Browse files
authored
Merge pull request #2679 from contentstack/v1-back-merge
V1 back merge
2 parents caf9ae0 + 9b73b6f commit 2822f5d

11 files changed

Lines changed: 1153 additions & 1881 deletions

File tree

‎.github/workflows/sca-scan.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
jobs:
66
security-sca:
77
runs-on: ubuntu-latest
8+
permissions:
9+
contents: read
10+
pull-requests: write
811
steps:
912
- uses: actions/checkout@master
1013
- name: Run Snyk to check for vulnerabilities

‎.talismanrc‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
fileignoreconfig:
2-
- filename: pnpm-lock.yaml
3-
checksum: 117b66122d3f3043f48724ff9755ec2d4a9dff3c156ceedef753df3014cafee6
4-
- filename: packages/contentstack/src/hooks/init/opt-in-plugin-guide.ts
5-
checksum: 2b079a93988e2439a03c401f75695fcdbfeb138a75c84707e4bc892536680e9f
6-
- filename: MIGRATION.md
7-
checksum: 1f60cc104771b74b43bf1ed107606d2a54264687a0a5e4b229cda813b829dc45
8-
version: '1.0'
2+
3+
- filename: pnpm-lock.yaml
4+
checksum: 3d5920821aca485d93dc90dc2006bb81b077344b5f5fd6487002d8b4222cff09
5+
version: '1.0'

‎packages/contentstack-auth/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
1818
$ csdx COMMAND
1919
running command...
2020
$ csdx (--version)
21-
@contentstack/cli-auth/2.0.0-beta.15 darwin-arm64 node-v22.21.1
21+
@contentstack/cli-auth/2.0.0-beta.17 darwin-arm64 node-v24.18.0
2222
$ csdx --help [COMMAND]
2323
USAGE
2424
$ csdx COMMAND

‎packages/contentstack-auth/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@
8080
"url": "git+https://github.com/contentstack/cli.git",
8181
"directory": "packages/contentstack-auth"
8282
}
83-
}
83+
}

‎packages/contentstack-config/README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-config
1818
$ csdx COMMAND
1919
running command...
2020
$ csdx (--version)
21-
@contentstack/cli-config/2.0.0-beta.13 darwin-arm64 node-v22.21.1
21+
@contentstack/cli-config/2.0.0-beta.15 darwin-arm64 node-v24.18.0
2222
$ csdx --help [COMMAND]
2323
USAGE
2424
$ csdx COMMAND
@@ -457,12 +457,13 @@ Set region for CLI
457457
```
458458
USAGE
459459
$ csdx config:set:region [REGION] [--cda <value> --cma <value> --ui-host <value> --name <value>] [--developer-hub
460-
<value>] [--personalize <value>] [--launch <value>] [--studio <value>] [--cs-assets <value>]
460+
<value>] [--personalize <value>] [--launch <value>] [--studio <value>] [--cs-assets <value>] [--auth-api <value>]
461461
462462
ARGUMENTS
463463
[REGION] Name for the region
464464
465465
FLAGS
466+
--auth-api=<value> Custom host to set for Auth API
466467
--cda=<value> Custom host to set for content delivery API, if this flag is added then cma, ui-host and name
467468
flags are required
468469
--cma=<value> Custom host to set for content management API, , if this flag is added then cda, ui-host and
@@ -508,7 +509,7 @@ EXAMPLES
508509
509510
$ csdx config:set:region --cma <custom_cma_host_url> --cda <custom_cda_host_url> --ui-host <custom_ui_host_url> --name "India" --cs-assets <cs_assets_url>
510511
511-
$ csdx config:set:region --cda <custom_cda_host_url> --cma <custom_cma_host_url> --ui-host <custom_ui_host_url> --name "India" --developer-hub <custom_developer_hub_url> --launch <custom_launch_url> --personalize <custom_personalize_url> --studio <custom_studio_url>
512+
$ csdx config:set:region --cda <custom_cda_host_url> --cma <custom_cma_host_url> --ui-host <custom_ui_host_url> --name "India" --developer-hub <custom_developer_hub_url> --launch <custom_launch_url> --personalize <custom_personalize_url> --studio <custom_studio_url> --cs-assets <cs_assets_url>
512513
```
513514

514515
_See code: [src/commands/config/set/region.ts](https://github.com/contentstack/cli/blob/main/packages/contentstack-config/src/commands/config/set/region.ts)_

‎packages/contentstack-config/src/interfaces/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ export interface SetRateLimitConfig {
4444

4545
export interface RegionsMap {
4646
[key: string]: Region;
47-
}
47+
}

‎packages/contentstack-utilities/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export {
8888
PrimaryProcessStrategy,
8989
ProgressStrategyRegistry,
9090
CustomProgressStrategy,
91-
DefaultProgressStrategy
91+
DefaultProgressStrategy,
9292
} from './progress-summary';
9393

9494
export * from './feature-status';

0 commit comments

Comments
 (0)