Skip to content

Commit 2a770db

Browse files
committed
Merge branch 'main' into v2-beta
2 parents 2b1f20a + 8169a26 commit 2a770db

File tree

5 files changed

+53
-48
lines changed

5 files changed

+53
-48
lines changed

.github/workflows/unit-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ jobs:
3333
# Commented out in v2-beta production
3434
# - name: Test contentstack-utilities
3535
# working-directory: ./packages/contentstack-utilities
36-
# run: pnpm test
36+
# run: pnpm test

packages/contentstack-config/.mocharc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
],
1010
"recursive": true,
1111
"timeout": 10000
12-
}
12+
}

packages/contentstack/README.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ USAGE
4343
* [`csdx cm:branches:merge [-k <value>][--compare-branch <value>] [--no-revert] [--export-summary-path <value>] [--use-merge-summary <value>] [--comment <value>] [--base-branch <value>]`](#csdx-cmbranchesmerge--k-value--compare-branch-value---no-revert---export-summary-path-value---use-merge-summary-value---comment-value---base-branch-value)
4444
* [`csdx cm:export-to-csv`](#csdx-cmexport-to-csv)
4545
* [`csdx cm:stacks:migration [-k <value>] [-a <value>] [--file-path <value>] [--branch <value>] [--config-file <value>] [--config <value>] [--multiple]`](#csdx-cmstacksmigration--k-value--a-value---file-path-value---branch-value---config-file-value---config-value---multiple)
46-
* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y-value--s-value---locale-value)
46+
* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y--s-value---locale-value)
4747
* [`csdx cm:stacks:clone [--source-branch <value>] [--target-branch <value>] [--source-management-token-alias <value>] [--destination-management-token-alias <value>] [-n <value>] [--type a|b] [--source-stack-api-key <value>] [--destination-stack-api-key <value>] [--import-webhook-status disable|current]`](#csdx-cmstacksclone---source-branch-value---target-branch-value---source-management-token-alias-value---destination-management-token-alias-value--n-value---type-ab---source-stack-api-key-value---destination-stack-api-key-value---import-webhook-status-disablecurrent)
4848
* [`csdx cm:stacks:audit`](#csdx-cmstacksaudit)
4949
* [`csdx cm:stacks:audit:fix`](#csdx-cmstacksauditfix)
@@ -58,7 +58,7 @@ USAGE
5858
* [`csdx cm:stacks:publish-clear-logs`](#csdx-cmstackspublish-clear-logs)
5959
* [`csdx cm:stacks:publish-configure`](#csdx-cmstackspublish-configure)
6060
* [`csdx cm:stacks:publish-revert`](#csdx-cmstackspublish-revert)
61-
* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y-value--s-value---locale-value)
61+
* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y--s-value---locale-value)
6262
* [`csdx csdx cm:stacks:unpublish [-a <value>] [-e <value>] [-c <value>] [-y] [--locale <value>] [--branch <value>] [--retry-failed <value>] [--bulk-unpublish <value>] [--content-type <value>] [--delivery-token <value>] [--only-assets] [--only-entries]`](#csdx-csdx-cmstacksunpublish--a-value--e-value--c-value--y---locale-value---branch-value---retry-failed-value---bulk-unpublish-value---content-type-value---delivery-token-value---only-assets---only-entries)
6363
* [`csdx config:get:base-branch`](#csdx-configgetbase-branch)
6464
* [`csdx config:get:ea-header`](#csdx-configgetea-header)
@@ -634,14 +634,14 @@ EXAMPLES
634634
$ csdx cm:migration --alias --file-path <migration/script/file/path> -k <api-key>
635635
```
636636

637-
## `csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]`
637+
## `csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]`
638638

639639
Create a stack from existing content types, entries, assets, etc
640640

641641
```
642642
USAGE
643-
$ csdx cm:seed cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s
644-
<value>] [--locale <value>]
643+
$ csdx cm:seed cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>]
644+
[--locale <value>]
645645
646646
FLAGS
647647
-a, --alias=<value> Alias of the management token
@@ -650,7 +650,7 @@ FLAGS
650650
-o, --org=<value> Provide Organization UID to create a new stack
651651
-r, --repo=<value> GitHub organization name or GitHub user name/repository name.
652652
-s, --stack=<value> Provide the stack UID to seed content.
653-
-y, --yes=<value> [Optional] Skip the stack confirmation.
653+
-y, --yes [Optional] Skip the stack confirmation.
654654
655655
DESCRIPTION
656656
Create a stack from existing content types, entries, assets, etc
@@ -1258,7 +1258,7 @@ EXAMPLES
12581258
$ csdx cm:migration --alias --file-path <migration/script/file/path> -k <api-key>
12591259
```
12601260

1261-
_See code: [@contentstack/cli-migration](https://github.com/contentstack/cli/blob/main/packages/contentstack-migration/src/commands/cm/stacks/migration.js)_
1261+
_See code: [@contentstack/cli-migration](https://github.com/contentstack/cli/blob/main/packages/contentstack-migration/src/commands/cm/stacks/migration.ts)_
12621262

12631263
## `csdx cm:stacks:publish`
12641264

@@ -1349,14 +1349,14 @@ EXAMPLES
13491349

13501350
_See code: [@contentstack/cli-cm-bulk-publish](https://github.com/contentstack/cli/blob/main/packages/contentstack-bulk-publish/src/commands/cm/stacks/publish-revert.js)_
13511351

1352-
## `csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]`
1352+
## `csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]`
13531353

13541354
Create a stack from existing content types, entries, assets, etc
13551355

13561356
```
13571357
USAGE
1358-
$ csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>]
1359-
[--locale <value>]
1358+
$ csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale
1359+
<value>]
13601360
13611361
FLAGS
13621362
-a, --alias=<value> Alias of the management token
@@ -1365,7 +1365,7 @@ FLAGS
13651365
-o, --org=<value> Provide Organization UID to create a new stack
13661366
-r, --repo=<value> GitHub organization name or GitHub user name/repository name.
13671367
-s, --stack=<value> Provide the stack UID to seed content.
1368-
-y, --yes=<value> [Optional] Skip the stack confirmation.
1368+
-y, --yes [Optional] Skip the stack confirmation.
13691369
13701370
DESCRIPTION
13711371
Create a stack from existing content types, entries, assets, etc
@@ -2186,7 +2186,7 @@ EXAMPLES
21862186
$ csdx plugins
21872187
```
21882188

2189-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.55/src/commands/plugins/index.ts)_
2189+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/index.ts)_
21902190

21912191
## `csdx plugins:add PLUGIN`
21922192

@@ -2260,7 +2260,7 @@ EXAMPLES
22602260
$ csdx plugins:inspect myplugin
22612261
```
22622262

2263-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.55/src/commands/plugins/inspect.ts)_
2263+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/inspect.ts)_
22642264

22652265
## `csdx plugins:install PLUGIN`
22662266

@@ -2309,7 +2309,7 @@ EXAMPLES
23092309
$ csdx plugins:install someuser/someplugin
23102310
```
23112311

2312-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.55/src/commands/plugins/install.ts)_
2312+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/install.ts)_
23132313

23142314
## `csdx plugins:link PATH`
23152315

@@ -2340,7 +2340,7 @@ EXAMPLES
23402340
$ csdx plugins:link myplugin
23412341
```
23422342

2343-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.55/src/commands/plugins/link.ts)_
2343+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/link.ts)_
23442344

23452345
## `csdx plugins:remove [PLUGIN]`
23462346

@@ -2381,7 +2381,7 @@ FLAGS
23812381
--reinstall Reinstall all plugins after uninstalling.
23822382
```
23832383

2384-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.55/src/commands/plugins/reset.ts)_
2384+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/reset.ts)_
23852385

23862386
## `csdx plugins:uninstall [PLUGIN]`
23872387

@@ -2409,7 +2409,7 @@ EXAMPLES
24092409
$ csdx plugins:uninstall myplugin
24102410
```
24112411

2412-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.55/src/commands/plugins/uninstall.ts)_
2412+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/uninstall.ts)_
24132413

24142414
## `csdx plugins:unlink [PLUGIN]`
24152415

@@ -2453,7 +2453,7 @@ DESCRIPTION
24532453
Update installed plugins.
24542454
```
24552455

2456-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.55/src/commands/plugins/update.ts)_
2456+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/update.ts)_
24572457

24582458
## `csdx tokens`
24592459

packages/contentstack/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
"uuid": "^9.0.1",
5656
"winston": "^3.19.0"
5757
},
58+
"overrides": {
59+
"@oclif/core": {
60+
"picomatch": "^4.0.4"
61+
}
62+
},
5863
"devDependencies": {
5964
"@oclif/test": "^4.1.16",
6065
"@types/chai": "^4.3.20",

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)