Skip to content

Commit a50257d

Browse files
sunil-lakshmansunil-lakshman
committed
Fixed merge conflits
2 parents 5309da2 + d03658d commit a50257d

File tree

17 files changed

+167
-265
lines changed

17 files changed

+167
-265
lines changed

‎.github/workflows/release-v1-beta-plugins.yml‎

Lines changed: 7 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,14 @@ jobs:
2222
- name: Install pnpm
2323
run: corepack prepare pnpm@10.28.0 --activate
2424

25+
- name: Clean the repository
26+
run: pnpm run clean:all
27+
2528
- name: Install root dependencies
26-
run: pnpm install
29+
run: pnpm install --frozen-lockfile
30+
31+
- name: Build all plugins
32+
run: pnpm -r --sort run build
2733

2834
- name: Reading Configuration
2935
id: release_config
@@ -33,211 +39,106 @@ jobs:
3339
prefix: release
3440

3541
# Variants
36-
- name: Installing dependencies of variants
37-
id: variants-installation
38-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_utilities == 'true'}}
39-
working-directory: ./packages/contentstack-variants
40-
run: npm install
41-
- name: Compiling variants
42-
if: ${{ steps.variants-installation.conclusion == 'success' }}
43-
working-directory: ./packages/contentstack-variants
44-
run: npm run prepack
4542
- name: Publishing variants (Beta)
4643
uses: JS-DevTools/npm-publish@v3
47-
if: ${{ steps.variants-installation.conclusion == 'success' }}
4844
with:
4945
token: ${{ secrets.NPM_TOKEN }}
5046
package: ./packages/contentstack-variants/package.json
5147
access: public
5248
tag: beta
5349

5450
# Export
55-
- name: Installing dependencies of export
56-
id: export-installation
57-
if: ${{ env.release_releaseAll == 'true' || env.release_plugins_export == 'true'}}
58-
working-directory: ./packages/contentstack-export
59-
run: npm install
60-
- name: Compiling export
61-
if: ${{ steps.export-installation.conclusion == 'success' }}
62-
working-directory: ./packages/contentstack-export
63-
run: npm run prepack
6451
- name: Publishing export (Beta)
6552
uses: JS-DevTools/npm-publish@v3
66-
if: ${{ steps.export-installation.conclusion == 'success' }}
6753
with:
6854
token: ${{ secrets.NPM_TOKEN }}
6955
package: ./packages/contentstack-export/package.json
7056
tag: beta
7157

7258
# Audit
73-
- name: Installing dependencies of audit
74-
id: audit-installation
75-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_audit == 'true'}}
76-
working-directory: ./packages/contentstack-audit
77-
run: npm install
78-
- name: Compiling audit
79-
if: ${{ steps.audit-installation.conclusion == 'success' }}
80-
working-directory: ./packages/contentstack-audit
81-
run: npm run prepack
8259
- name: Publishing audit (Beta)
8360
uses: JS-DevTools/npm-publish@v3
84-
if: ${{ steps.audit-installation.conclusion == 'success' }}
8561
with:
8662
token: ${{ secrets.NPM_TOKEN }}
8763
package: ./packages/contentstack-audit/package.json
8864
access: public
8965
tag: beta
9066

9167
# Import
92-
- name: Installing dependencies of import
93-
id: import-installation
94-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_import == 'true'}}
95-
working-directory: ./packages/contentstack-import
96-
run: npm install
97-
- name: Compiling import
98-
if: ${{ steps.import-installation.conclusion == 'success' }}
99-
working-directory: ./packages/contentstack-import
100-
run: npm run prepack
10168
- name: Publishing import (Beta)
10269
uses: JS-DevTools/npm-publish@v3
103-
if: ${{ steps.import-installation.conclusion == 'success' }}
10470
with:
10571
token: ${{ secrets.NPM_TOKEN }}
10672
package: ./packages/contentstack-import/package.json
10773
tag: beta
10874

10975
# Clone
110-
- name: Installing dependencies of clone
111-
id: clone-installation
112-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_clone == 'true'}}
113-
working-directory: ./packages/contentstack-clone
114-
run: npm install
11576
- name: Publishing clone (Beta)
11677
uses: JS-DevTools/npm-publish@v3
117-
if: ${{ steps.clone-installation.conclusion == 'success' }}
11878
with:
11979
token: ${{ secrets.NPM_TOKEN }}
12080
package: ./packages/contentstack-clone/package.json
12181
tag: beta
12282

12383
# Import Setup
124-
- name: Installing dependencies of import-setup
125-
id: import-setup-installation
126-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_import_setup == 'true'}}
127-
working-directory: ./packages/contentstack-import-setup
128-
run: npm install
129-
- name: Compiling import-setup
130-
if: ${{ steps.import-setup-installation.conclusion == 'success' }}
131-
working-directory: ./packages/contentstack-import-setup
132-
run: npm run prepack
13384
- name: Publishing import-setup (Beta)
13485
uses: JS-DevTools/npm-publish@v3
135-
if: ${{ steps.import-setup-installation.conclusion == 'success' }}
13686
with:
13787
token: ${{ secrets.NPM_TOKEN }}
13888
package: ./packages/contentstack-import-setup/package.json
13989
access: public
14090
tag: beta
14191

14292
# Export to CSV
143-
- name: Installing dependencies of export to csv
144-
id: export-to-csv-installation
145-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_export-to-csv == 'true'}}
146-
working-directory: ./packages/contentstack-export-to-csv
147-
run: npm install
14893
- name: Publishing export to csv (Beta)
14994
uses: JS-DevTools/npm-publish@v3
150-
if: ${{ steps.export-to-csv-installation.conclusion == 'success' }}
15195
with:
15296
token: ${{ secrets.NPM_TOKEN }}
15397
package: ./packages/contentstack-export-to-csv/package.json
15498
tag: beta
15599

156100
# Migration
157-
- name: Installing dependencies of migration
158-
id: migration-installation
159-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_migration == 'true'}}
160-
working-directory: ./packages/contentstack-migration
161-
run: npm install
162101
- name: Publishing migration (Beta)
163102
uses: JS-DevTools/npm-publish@v3
164-
if: ${{ steps.migration-installation.conclusion == 'success' }}
165103
with:
166104
token: ${{ secrets.NPM_TOKEN }}
167105
package: ./packages/contentstack-migration/package.json
168106
tag: beta
169107

170108
# Seed
171-
- name: Installing dependencies of seed
172-
id: seed-installation
173-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_seed == 'true'}}
174-
working-directory: ./packages/contentstack-seed
175-
run: npm install
176-
- name: Compiling seed
177-
if: ${{ steps.seed-installation.conclusion == 'success' }}
178-
working-directory: ./packages/contentstack-seed
179-
run: npm run prepack
180109
- name: Publishing seed (Beta)
181110
uses: JS-DevTools/npm-publish@v3
182-
if: ${{ steps.seed-installation.conclusion == 'success' }}
183111
with:
184112
token: ${{ secrets.NPM_TOKEN }}
185113
package: ./packages/contentstack-seed/package.json
186114
tag: beta
187115

188116
# Bootstrap
189-
- name: Installing dependencies of bootstrap
190-
id: bootstrap-installation
191-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_bootstrap == 'true'}}
192-
working-directory: ./packages/contentstack-bootstrap
193-
run: npm install
194-
- name: Compiling bootstrap
195-
if: ${{ steps.bootstrap-installation.conclusion == 'success' }}
196-
working-directory: ./packages/contentstack-bootstrap
197-
run: npm run prepack
198117
- name: Publishing bootstrap (Beta)
199118
uses: JS-DevTools/npm-publish@v3
200-
if: ${{ steps.bootstrap-installation.conclusion == 'success' }}
201119
with:
202120
token: ${{ secrets.NPM_TOKEN }}
203121
package: ./packages/contentstack-bootstrap/package.json
204122
tag: beta
205123

206124
# Bulk Publish
207-
- name: Installing dependencies of bulk publish
208-
id: bulk-publish-installation
209-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_bulk-publish == 'true'}}
210-
working-directory: ./packages/contentstack-bulk-publish
211-
run: npm install
212125
- name: Publishing bulk publish (Beta)
213126
uses: JS-DevTools/npm-publish@v3
214-
if: ${{ steps.bulk-publish-installation.conclusion == 'success' }}
215127
with:
216128
token: ${{ secrets.NPM_TOKEN }}
217129
package: ./packages/contentstack-bulk-publish/package.json
218130
tag: beta
219131

220132
# Branches
221-
- name: Installing dependencies of branches
222-
id: branches-installation
223-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_branches == 'true'}}
224-
working-directory: ./packages/contentstack-branches
225-
run: npm install
226-
- name: Compiling branches
227-
if: ${{ steps.branches-installation.conclusion == 'success' }}
228-
working-directory: ./packages/contentstack-branches
229-
run: npm run prepack
230133
- name: Publishing branches (Beta)
231134
uses: JS-DevTools/npm-publish@v3
232-
if: ${{ steps.branches-installation.conclusion == 'success' }}
233135
with:
234136
token: ${{ secrets.NPM_TOKEN }}
235137
package: ./packages/contentstack-branches/package.json
236138
access: public
237139
tag: beta
238140

239141
- name: Create Beta Release
240-
if: ${{ steps.publish-core.conclusion == 'success' }}
241142
id: create_release
242143
env:
243144
GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }}

‎.talismanrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ fileignoreconfig:
22
- filename: package-lock.json
33
checksum: c91b9e5fba1c84c0b6de15ad2f8cce698a5c781c9db31bebb7a3ad63ee88d9e1
44
- filename: pnpm-lock.yaml
5-
checksum: 1b80993eacbc8bf861883d3e5382e6c708e68d4c0b881e31251999285e772e9b
5+
checksum: f71f23aaad4ba997741b6c3cbc89822bd92e8b0c66c96bc30c199e2cbeaaad77
66
- filename: packages/contentstack-bootstrap/src/bootstrap/utils.ts
77
checksum: 6e6fb00bb11b03141e5ad27eeaa4af9718dc30520c3e73970bc208cc0ba2a7d2
88
- filename: .husky/pre-commit

‎packages/contentstack-audit/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@contentstack/cli-audit",
3-
"version": "1.18.0",
3+
"version": "1.19.0-beta.0",
44
"description": "Contentstack audit plugin",
55
"author": "Contentstack CLI",
66
"homepage": "https://github.com/contentstack/cli",
@@ -18,8 +18,8 @@
1818
"/oclif.manifest.json"
1919
],
2020
"dependencies": {
21-
"@contentstack/cli-command": "~1.7.2",
22-
"@contentstack/cli-utilities": "~1.17.4",
21+
"@contentstack/cli-command": "~1.8.0-beta.0",
22+
"@contentstack/cli-utilities": "~1.18.0-beta.0",
2323
"@oclif/core": "^4.3.0",
2424
"@oclif/plugin-help": "^6.2.28",
2525
"@oclif/plugin-plugins": "^5.4.54",
@@ -66,7 +66,7 @@
6666
"repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-audit/<%- commandPath %>"
6767
},
6868
"scripts": {
69-
"build": "pnpm compile && oclif manifest",
69+
"build": "pnpm compile && oclif manifest && oclif readme",
7070
"lint": "eslint . --ext .ts --config .eslintrc",
7171
"postpack": "shx rm -f oclif.manifest.json",
7272
"posttest": "npm run lint",

‎packages/contentstack-bootstrap/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
1515
$ csdx COMMAND
1616
running command...
1717
$ csdx (--version)
18-
@contentstack/cli-cm-bootstrap/1.18.2 darwin-arm64 node-v24.13.0
18+
@contentstack/cli-cm-bootstrap/1.18.4 darwin-arm64 node-v22.14.0
1919
$ csdx --help [COMMAND]
2020
USAGE
2121
$ csdx COMMAND
@@ -44,14 +44,14 @@ Bootstrap contentstack apps
4444

4545
```
4646
USAGE
47-
$ csdx cm:bootstrap [--app-name <value>] [--project-dir <value>] [-k <value> | --org <value> | -n <value>] [-y
48-
<value>] [--run-dev-server] [-a <value>]
47+
$ csdx cm:bootstrap [--app-name <value>] [--project-dir <value>] [-k <value> | --org <value> | -n <value>] [-y]
48+
[--run-dev-server] [-a <value>]
4949
5050
FLAGS
5151
-a, --alias=<value> Alias of the management token
5252
-k, --stack-api-key=<value> Provide stack API key to seed content
5353
-n, --stack-name=<value> Name of the new stack that will be created.
54-
-y, --yes=<value> [Optional] Skip stack confirmation
54+
-y, --yes [Optional] Skip stack confirmation
5555
--app-name=<value> App name, kickstart-next, kickstart-next-ssr, kickstart-next-ssg, kickstart-next-graphql,
5656
kickstart-next-middleware, kickstart-nuxt, kickstart-nuxt-ssr
5757
--org=<value> Provide organization UID to create a new stack

‎packages/contentstack-bootstrap/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@contentstack/cli-cm-bootstrap",
33
"description": "Bootstrap contentstack apps",
4-
"version": "1.18.5",
4+
"version": "1.18.4",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"scripts": {
8-
"build": "pnpm compile && oclif manifest",
8+
"build": "pnpm compile && oclif manifest && oclif readme",
99
"clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
1010
"compile": "tsc -b tsconfig.json",
1111
"postpack": "rm -f oclif.manifest.json",
@@ -16,15 +16,15 @@
1616
"test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
1717
},
1818
"dependencies": {
19-
"@contentstack/cli-cm-seed": "~1.14.4",
19+
"@contentstack/cli-cm-seed": "~1.14.3",
2020
"@contentstack/cli-command": "~1.7.2",
2121
"@contentstack/cli-config": "~1.19.0",
2222
"@contentstack/cli-utilities": "~1.17.4",
2323
"@oclif/core": "^4.3.0",
2424
"@oclif/plugin-help": "^6.2.37",
2525
"inquirer": "8.2.7",
2626
"mkdirp": "^1.0.4",
27-
"tar": "^7.5.7"
27+
"tar": "^7.5.10"
2828
},
2929
"devDependencies": {
3030
"@oclif/test": "^4.1.13",

‎packages/contentstack-branches/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "@contentstack/cli-cm-branches",
33
"description": "Contentstack CLI plugin to do branches operations",
4-
"version": "1.6.3",
4+
"version": "1.7.0-beta.0",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
8-
"@contentstack/cli-command": "~1.7.2",
8+
"@contentstack/cli-command": "~1.8.0-beta.0",
99
"@oclif/core": "^4.3.0",
1010
"@oclif/plugin-help": "^6.2.28",
11-
"@contentstack/cli-utilities": "~1.17.4",
11+
"@contentstack/cli-utilities": "~1.18.0-beta.0",
1212
"chalk": "^4.1.2",
1313
"just-diff": "^6.0.2",
1414
"lodash": "^4.17.23"
@@ -30,7 +30,7 @@
3030
"typescript": "^4.9.5"
3131
},
3232
"scripts": {
33-
"build": "pnpm compile && oclif manifest",
33+
"build": "pnpm compile && oclif manifest && oclif readme",
3434
"clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
3535
"compile": "tsc -b tsconfig.json",
3636
"postpack": "rm -f oclif.manifest.json",

‎packages/contentstack-bulk-publish/package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@contentstack/cli-cm-bulk-publish",
33
"description": "Contentstack CLI plugin for bulk publish actions",
4-
"version": "1.10.7",
4+
"version": "1.11.0-beta.0",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
8-
"@contentstack/cli-command": "~1.7.2",
9-
"@contentstack/cli-config": "~1.19.0",
10-
"@contentstack/cli-utilities": "~1.17.4",
8+
"@contentstack/cli-command": "~1.8.0-beta.0",
9+
"@contentstack/cli-config": "~1.20.0-beta.0",
10+
"@contentstack/cli-utilities": "~1.18.0-beta.0",
1111
"@oclif/core": "^4.3.0",
1212
"@oclif/plugin-help": "^6.2.28",
1313
"chalk": "^4.1.2",
@@ -92,6 +92,7 @@
9292
"scripts": {
9393
"postpack": "rm -f oclif.manifest.json",
9494
"prepack": "oclif manifest && oclif readme",
95+
"build": "oclif manifest && oclif readme",
9596
"test:unit": "mocha --reporter spec --forbid-only \"test/unit/**/*.test.js\"",
9697
"posttest": "eslint .",
9798
"version": "oclif readme && git add README.md",

0 commit comments

Comments
 (0)