Skip to content

Commit deba804

Browse files
Merge branch 'next' into feat/CS-44220-variants-support
2 parents e7a5011 + 470d7d5 commit deba804

File tree

16 files changed

+557
-116
lines changed

16 files changed

+557
-116
lines changed

.github/workflows/jira.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
pull_request:
44
types: [opened]
55
jobs:
6-
security:
6+
security-jira:
77
if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'snyk-bot' || contains(github.event.pull_request.head.ref, 'snyk-fix-') || contains(github.event.pull_request.head.ref, 'snyk-upgrade-')}}
88
runs-on: ubuntu-latest
99
steps:
@@ -26,3 +26,8 @@ jobs:
2626
PR: ${{ github.event.pull_request.html_url }}
2727
2828
fields: "${{ secrets.JIRA_FIELDS }}"
29+
- name: Transition issue
30+
uses: atlassian/gajira-transition@v3
31+
with:
32+
issue: ${{ steps.create.outputs.issue }}
33+
transition: ${{ secrets.JIRA_TRANSITION }}

.github/workflows/npm-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ jobs:
3131
- run: npm ci
3232
- run: npm publish
3333
env:
34-
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34+
NODE_AUTH_TOKEN: ${{ secrets.PAT_TOKEN }}

.github/workflows/sast-scan.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: SAST Scan
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened]
5+
jobs:
6+
security-sast:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Semgrep Scan
11+
run: docker run -v /var/run/docker.sock:/var/run/docker.sock -v "${PWD}:/src" returntocorp/semgrep semgrep scan --config auto

.github/workflows/sca-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
pull_request:
44
types: [opened, synchronize, reopened]
55
jobs:
6-
security:
6+
security-sca:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@master

.talismanrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fileignoreconfig:
22
- filename: package-lock.json
3-
checksum: 4ddadcdbbd39ead729f20a58ce15fbbf2c71b17edf300df82f51f4f73489e96c
3+
checksum: 28f8e6d0e7856b4a568fd260dcc4deb531bcdbebbbff956b008ce7dd26a0475d
44
- filename: test/typescript/taxonomy.test.ts
55
checksum: e4bdf633e147fd60d929d379f20c814eed5f68b11421d7b53ec8826e9142de37
66
- filename: src/core/modules/taxonomy.js
@@ -11,4 +11,6 @@ fileignoreconfig:
1111
checksum: c88b336f9a271397ffedcf8c5085941ceb0bd1cd7e25ed9ada3acd8ce4f8970c
1212
- filename: test/typescript/stack.test.ts
1313
checksum: bbb3c425f8e1a63d4793f69ee9eaba9559294ff53f163a28f70ae54b1792276a
14+
- filename: src/core/contentstack.js
15+
checksum: 90a3b07300155a34f67dc3df87363107eec202123a21bc0cefda324e477a676d
1416
version: ""

CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,43 @@
11
## Change log
22

3+
34
### Version: 3.20.0
45
#### Date: March-12-2024
56
##### New Features:
67
- Variants Feature support added
78

9+
10+
### Version: 3.20.4
11+
#### Date: August-14-2024
12+
##### Fix:
13+
- Fix file upload function in sanity report file
14+
15+
### Version: 3.20.3
16+
#### Date: August-02-2024
17+
##### HotFix:
18+
- Removed encode for query params
19+
20+
### Version: 3.20.1
21+
#### Date: July-09-2024
22+
##### Fix:
23+
- Type support for LivePreviewQuery method params
24+
25+
### Version: 3.20.0
26+
#### Date: May-31-2024
27+
##### Enhanncement:
28+
- Adds Timeline Preview changes
29+
30+
### Version: 3.19.3
31+
#### Date: May-17-2024
32+
##### Enhanncement:
33+
- Update Asset URL method added
34+
35+
### Version: 3.19.2
36+
#### Date: April-17-2024
37+
##### Dependency:
38+
- Hotfix moving slack/bolt to devDependency
39+
40+
841
### Version: 3.19.1
942
#### Date: March-06-2024
1043
##### Dependency:

index.d.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ export interface LivePreviewConfigWithPreviewToken {
9292
export interface LivePreviewQuery {
9393
live_preview: string
9494
content_type_uid: string
95+
preview_timestamp: string
96+
release_id: string
9597
}
9698

9799
export interface RetryDelayOption {
@@ -161,6 +163,7 @@ export function Stack(config: Config): Stack;
161163
*/
162164
export function Stack(api_key: string, access_token: string, environment_name: string, region?: string, fetchOptions?: FetchOptions): Stack;
163165

166+
export function updateAssetURL(entry: object): object;
164167
export class ContentType {
165168
constructor();
166169
content_type_uid: string

0 commit comments

Comments
 (0)