Skip to content

Commit de93a6f

Browse files
netrajpatelnetrajpatel
committed
Merge branch 'v1-dev' into fix/dx-5252
2 parents f66582b + bd50ebd commit de93a6f

23 files changed

Lines changed: 677 additions & 684 deletions

File tree

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

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
name: Release CLI Core (v1 Beta)
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches: [v1-beta]
6-
paths:
7-
- 'packages/contentstack/package.json'
7+
paths:
8+
- 'packages/contentstack/package.json'
89

910
jobs:
1011
build:
@@ -24,8 +25,8 @@ jobs:
2425
- name: Install pnpm
2526
run: corepack prepare pnpm@10.28.0 --activate
2627

27-
- name: Install root dependencies
28-
run: pnpm install
28+
- name: Clean the repository
29+
run: pnpm run clean:all
2930

3031
- name: Reading Configuration
3132
id: release_config
@@ -35,29 +36,26 @@ jobs:
3536
prefix: release
3637

3738
# Core CLI
38-
- name: Installing dependencies of core
39+
- name: Install all dependencies
3940
id: core-installation
4041
if: ${{env.release_releaseAll == 'true' || env.release_plugins_core == 'true'}}
41-
working-directory: ./packages/contentstack
42-
run: npm install
43-
- name: Compiling core
44-
if: ${{ steps.core-installation.conclusion == 'success' }}
45-
working-directory: ./packages/contentstack
46-
run: npm run prepack
42+
run: pnpm install --frozen-lockfile
43+
44+
- name: Build all packages
45+
run: pnpm -r --concurrency 1 run build
46+
4747
- name: Publishing core (Beta)
4848
id: publish-core
4949
uses: JS-DevTools/npm-publish@v3
50-
if: ${{ steps.core-installation.conclusion == 'success' }}
5150
with:
5251
token: ${{ secrets.NPM_TOKEN }}
5352
package: ./packages/contentstack/package.json
54-
tag: beta
53+
tag: v1-beta
5554

5655
- name: Create Core Beta Release
57-
if: ${{ steps.publish-core.conclusion == 'success' }}
5856
id: create_release
5957
env:
60-
GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }}
58+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6159
VERSION: ${{ steps.publish-core.outputs.version }}
6260
run: |
6361
TAG="core@v${VERSION}"

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

Lines changed: 9 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v4
1212
- uses: pnpm/action-setup@v4
1313
with:
14-
version: 7
14+
version: 10.28.0
1515
- uses: actions/setup-node@v4
1616
with:
1717
node-version: '22.x'
@@ -20,10 +20,16 @@ jobs:
2020
run: corepack enable
2121

2222
- name: Install pnpm
23-
run: corepack prepare pnpm@7 --activate
23+
run: corepack prepare pnpm@10.28.0 --activate
24+
25+
- name: Clean the repository
26+
run: pnpm run clean:all
2427

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,90 +39,40 @@ jobs:
3339
prefix: release
3440

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

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

7157
# Command
72-
- name: Installing dependencies of command
73-
id: command-installation
74-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_command == 'true'}}
75-
working-directory: ./packages/contentstack-command
76-
run: npm install
77-
- name: Compiling command
78-
if: ${{ steps.command-installation.conclusion == 'success' }}
79-
working-directory: ./packages/contentstack-command
80-
run: npm run prepack
8158
- name: Publishing command (Beta)
8259
uses: JS-DevTools/npm-publish@v3
83-
if: ${{ steps.command-installation.conclusion == 'success' }}
8460
with:
8561
token: ${{ secrets.NPM_TOKEN }}
8662
package: ./packages/contentstack-command/package.json
8763
tag: beta
8864

8965
# Config
90-
- name: Installing dependencies of config
91-
id: config-installation
92-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_config == 'true'}}
93-
working-directory: ./packages/contentstack-config
94-
run: npm install
95-
- name: Compiling config
96-
if: ${{ steps.config-installation.conclusion == 'success' }}
97-
working-directory: ./packages/contentstack-config
98-
run: npm run prepack
9966
- name: Publishing config (Beta)
10067
uses: JS-DevTools/npm-publish@v3
101-
if: ${{ steps.config-installation.conclusion == 'success' }}
10268
with:
10369
token: ${{ secrets.NPM_TOKEN }}
10470
package: ./packages/contentstack-config/package.json
10571
tag: beta
10672

10773
# Auth
108-
- name: Installing dependencies of auth
109-
id: auth-installation
110-
if: ${{env.release_releaseAll == 'true' || env.release_plugins_auth == 'true'}}
111-
working-directory: ./packages/contentstack-auth
112-
run: npm install
113-
- name: Compiling auth
114-
if: ${{ steps.auth-installation.conclusion == 'success' }}
115-
working-directory: ./packages/contentstack-auth
116-
run: npm run prepack
11774
- name: Publishing auth (Beta)
11875
uses: JS-DevTools/npm-publish@v3
119-
if: ${{ steps.auth-installation.conclusion == 'success' }}
12076
with:
12177
token: ${{ secrets.NPM_TOKEN }}
12278
package: ./packages/contentstack-auth/package.json

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ jobs:
1313
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
1414
with:
1515
args: --all-projects --fail-on=all
16+
json: true
17+
continue-on-error: true
18+
- uses: contentstack/sca-policy@main

‎.github/workflows/unit-test.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ jobs:
2222
node-version: '22.x'
2323
cache: 'pnpm' # optional but recommended
2424

25-
- name: Temporarily disable contentstack package
26-
run: mv packages/contentstack/package.json packages/contentstack/package.json.disabled || true
25+
# - name: Temporarily disable contentstack package
26+
# run: mv packages/contentstack/package.json packages/contentstack/package.json.disabled || true
2727

2828
- name: Install Dependencies (Excluding Contentstack)
29-
run: npm run bootstrap
29+
run: pnpm install --frozen-lockfile
3030

3131
- name: Build all plugins (Excluding Contentstack)
3232
run: |
33-
npm run build
33+
NODE_ENV=PREPACK_MODE pnpm -r --sort run build
3434
35-
- name: Restore contentstack package
36-
run: mv packages/contentstack/package.json.disabled packages/contentstack/package.json || true
35+
# - name: Restore contentstack package
36+
# run: mv packages/contentstack/package.json.disabled packages/contentstack/package.json || true
3737

3838
- name: Run tests for Contentstack Command
3939
working-directory: ./packages/contentstack-command
@@ -45,4 +45,4 @@ jobs:
4545

4646
- name: Run tests for Contentstack Auth
4747
working-directory: ./packages/contentstack-auth
48-
run: NODE_ENV=PREPACK_MODE npm run test
48+
run: NODE_ENV=PREPACK_MODE npm run test:unit

‎.talismanrc‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
fileignoreconfig:
2-
- filename: package-lock.json
3-
checksum: c91b9e5fba1c84c0b6de15ad2f8cce698a5c781c9db31bebb7a3ad63ee88d9e1
42
- filename: pnpm-lock.yaml
5-
checksum: 1380b1195e4397c7eec83affd988ba5393db884943714b852b30dc89e73be736
6-
- filename: packages/contentstack-bootstrap/src/bootstrap/utils.ts
7-
checksum: 6e6fb00bb11b03141e5ad27eeaa4af9718dc30520c3e73970bc208cc0ba2a7d2
3+
checksum: 00d2cba7fffe932f86c5835d3dd23056a2055e6fa60d86175ca73710505b0d1d
4+
- filename: packages/contentstack-auth/src/commands/auth/logout.ts
5+
checksum: 20ff708d5a0ee56eb8786b19df07b49dacaddfa1deafe99c0397716c7865726d
86
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/1.7.2 darwin-arm64 node-v24.13.0
21+
@contentstack/cli-auth/1.8.0-beta.0 darwin-arm64 node-v22.13.1
2222
$ csdx --help [COMMAND]
2323
USAGE
2424
$ csdx COMMAND

‎packages/contentstack-auth/messages/index.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"CLI_AUTH_LOGOUT_DESCRIPTION": "User session logout",
1919
"CLI_AUTH_LOGOUT_FLAG_FORCE": "Force logging out for skipping the confirmation",
2020
"CLI_AUTH_LOGOUT_ALREADY": "You're already logged out",
21+
"CLI_AUTH_LOGOUT_CANCELLED": "Log out cancelled",
2122
"CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS": "No authorizations found",
2223
"CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS_USER": "No authorizations found for current user",
2324
"CLI_AUTH_WHOAMI_LOGGED_IN_AS": "You are currently logged in with email:",

‎packages/contentstack-auth/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-auth",
33
"description": "Contentstack CLI plugin for authentication activities",
4-
"version": "1.7.3",
4+
"version": "1.8.0-beta.0",
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",
@@ -22,8 +22,8 @@
2222
"test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
2323
},
2424
"dependencies": {
25-
"@contentstack/cli-command": "~1.7.2",
26-
"@contentstack/cli-utilities": "~1.17.4",
25+
"@contentstack/cli-command": "~1.8.0-beta.0",
26+
"@contentstack/cli-utilities": "~1.18.0-beta.0",
2727
"@oclif/core": "^4.3.0",
2828
"@oclif/plugin-help": "^6.2.28",
2929
"otplib": "^12.0.1"

‎packages/contentstack-auth/src/commands/auth/logout.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,10 @@ export default class LogoutCommand extends BaseCommand<typeof LogoutCommand> {
9393
confirm,
9494
isAuthenticated: oauthHandler.isAuthenticated(),
9595
});
96-
log.success(messageHandler.parse('CLI_AUTH_LOGOUT_ALREADY'), this.contextDetails);
96+
const messageKey = confirm === false && oauthHandler.isAuthenticated()
97+
? 'CLI_AUTH_LOGOUT_CANCELLED'
98+
: 'CLI_AUTH_LOGOUT_ALREADY';
99+
log.success(messageHandler.parse(messageKey), this.contextDetails);
97100
}
98101
} catch (error) {
99102
log.debug('Logout failed.', { ...this.contextDetails, error: error.message });

‎packages/contentstack-command/.mocharc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": [
33
"test/helpers/init.js",
4-
"ts-node/register",
4+
"ts-node/register/transpile-only",
55
"source-map-support/register"
66
],
77
"watch-extensions": [

0 commit comments

Comments
 (0)