Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Synch cli-use with master #81

Merged
merged 86 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
7dc8247
refactor: update all libraries [ECO-1121]
karantalapalli Jun 20, 2022
53ca99e
remove extra files
karantalapalli Jun 20, 2022
1a91628
refactor: update all libraries [ECO-1121]
karantalapalli Jun 22, 2022
1605c03
Merge pull request #38 from contentstack/feature/ECO-1121_upgrade_all…
karantalapalli Jun 27, 2022
cb32973
Merge pull request #39 from contentstack/staging
karantalapalli Jun 28, 2022
29539c2
Delete sca-monitor.yml
aravindbuilt Sep 15, 2022
5dc233c
codeql-analysis.yml
aravindbuilt Sep 15, 2022
baec492
sast-scan.yml
aravindbuilt Sep 15, 2022
1de817b
sca-scan.yml
aravindbuilt Sep 15, 2022
1056dd7
secrets-scan.yml
aravindbuilt Sep 15, 2022
48eb9c4
codeql-analysis.yml
aravindbuilt Sep 21, 2022
01257a0
sast-scan.yml
aravindbuilt Sep 21, 2022
f3830a1
sca-scan.yml
aravindbuilt Sep 21, 2022
3e49db5
secrets-scan.yml
aravindbuilt Sep 21, 2022
703c7db
jira.yml
aravindbuilt Oct 3, 2022
db9931b
jira.yml
aravindbuilt Oct 4, 2022
052753c
jira.yml
aravindbuilt Nov 4, 2022
9b01b02
added Live preview context
Nov 8, 2022
9497dec
error merged into one useeffect
Nov 8, 2022
5844979
added minor changes
Nov 9, 2022
3592068
removed unwanted types
Nov 9, 2022
f586a68
npm audit fix and removed unwanted imports
Nov 9, 2022
33c07f6
changed prettier config to double quotes
Nov 9, 2022
dbb6df7
Merge pull request #48 from contentstack/fix/react-starter-code-refactor
akashbhosale97 Nov 9, 2022
42862c5
fix npm install
Nov 10, 2022
559dac8
npm install fix
Nov 10, 2022
ba0af97
fix npm i
Nov 10, 2022
bd35919
Merge pull request #50 from contentstack/fix/react-starter-code-refactor
akashbhosale97 Nov 10, 2022
d6bcbbc
updated packages
Nov 10, 2022
cb20817
Merge pull request #51 from contentstack/fix/react-starter-code-refactor
akashbhosale97 Nov 10, 2022
b30a7d9
added changes for SRE
Nov 14, 2022
079989b
Merge pull request #52 from contentstack/fix/react-starter-code-refactor
akashbhosale97 Nov 14, 2022
aabb0bb
npm i fix
akashbhosale97 Nov 22, 2022
828372b
sdk and helper filename changed
akashbhosale97 Nov 22, 2022
9691b69
Merge pull request #55 from contentstack/fix/json-viewer
akashbhosale97 Nov 23, 2022
ee05678
Merge pull request #49 from contentstack/staging
akashbhosale97 Dec 1, 2022
d9eb7e1
sca-scan.yml
aravindbuilt Jan 24, 2023
4c900a3
jira.yml
aravindbuilt Jan 24, 2023
26df11b
codeql-analysis.yml
aravindbuilt Jan 24, 2023
1d1c25e
sast-scan.yml
aravindbuilt Jan 24, 2023
830264a
secrets-scan.yml
aravindbuilt Jan 24, 2023
2b93d22
added branch support
MaitriGurey1 May 3, 2023
3d73b06
addressed comments
MaitriGurey1 May 3, 2023
c404fe6
fixed synk issue
MaitriGurey1 May 4, 2023
1f6ab23
updated to latest packages
MaitriGurey1 May 4, 2023
8398726
updated env sample file
MaitriGurey1 May 4, 2023
2337d65
updated according to docs
MaitriGurey1 May 4, 2023
2709881
Merge pull request #65 from contentstack/feat/ECO-2743-branchSupport
MaitriGurey1 May 4, 2023
110c375
CODEOWNERS update
aravindbuilt May 6, 2023
5416475
fixed bugs for branch support
MaitriGurey1 May 8, 2023
4389ff3
updated env file to make branch and region optional
MaitriGurey1 May 8, 2023
dce4791
Merge pull request #66 from contentstack/feat/ECO-2743-branchSupport
MaitriGurey1 May 8, 2023
31a5414
updated packages to resolve vulnerabilities
MaitriGurey1 May 10, 2023
c800a7d
Merge pull request #67 from contentstack/fix/ECO-2828
MaitriGurey1 May 10, 2023
9547359
Merge branch 'master' into staging
aravindbuilt May 10, 2023
9afa741
Merge pull request #68 from contentstack/staging
MaitriGurey1 May 11, 2023
2af431f
fix:azure eu support [ECO-2950]
Amitkanswal May 24, 2023
72c2af9
Update LICENSE
Amitkanswal May 24, 2023
e6072c6
Merge pull request #69 from contentstack/fix/ECO-2950-custom-host
Amitkanswal May 24, 2023
951af23
fix: TS support for react starter app
Amitkanswal Jun 7, 2023
4b1a53e
Merge pull request #71 from contentstack/fix/ECO-3112-ts-fixes
Amitkanswal Jun 7, 2023
ff0981a
Merge pull request #70 from contentstack/staging
Amitkanswal Jun 9, 2023
59355f9
fix:updated env config [ECO-3412
Amitkanswal Jul 18, 2023
4e88ac2
Merge pull request #72 from contentstack/fix/ECO-3412-env-config
Amitkanswal Jul 18, 2023
fb8d943
chore: version bump and dependencies update
Amitkanswal Jul 18, 2023
3db24be
Merge pull request #73 from contentstack/fix/version-fixes
Amitkanswal Jul 18, 2023
5b3e975
Merge pull request #74 from contentstack/staging
Amitkanswal Jul 27, 2023
3acf266
sca-scan.yml
aravindbuilt Sep 5, 2023
885aeec
jira.yml
aravindbuilt Sep 5, 2023
fa224fc
Delete sast-scan.yml
aravindbuilt Sep 5, 2023
cfe5317
Delete secrets-scan.yml
aravindbuilt Sep 5, 2023
e005cee
codeql-analysis.yml
aravindbuilt Sep 5, 2023
22646fa
feat:Live preview 2.0 support
Amitkanswal Jan 17, 2024
68440ea
fix:remove unwanted code
Amitkanswal Jan 17, 2024
267c38b
fix:removed scans as not needed
Amitkanswal Jan 17, 2024
8e127e0
Merge pull request #75 from contentstack/feat/MKT-4704-lp-support
Amitkanswal Jan 17, 2024
ff02677
fix: for custom host api
Amitkanswal Jan 17, 2024
265baf7
Merge pull request #76 from contentstack/fix/custom-host-api
Amitkanswal Jan 17, 2024
ff4f8d2
fix:update env sample
Amitkanswal Jan 22, 2024
f9ae0c8
fix:update contentstack branch
Amitkanswal Jan 22, 2024
04f00b0
Merge pull request #77 from contentstack/fix/updated-env
Amitkanswal Jan 22, 2024
8c1601f
chore:updated sdk to latest
Amitkanswal Feb 5, 2024
f11572d
Merge pull request #79 from contentstack/chore/updatesd-sdk
Amitkanswal Feb 5, 2024
e482b0a
Merge branch 'master' into staging
Amitkanswal Feb 12, 2024
41e9974
Merge pull request #80 from contentstack/fix/master-synk-fix
Amitkanswal Feb 12, 2024
c700a87
Merge pull request #78 from contentstack/staging
Amitkanswal Feb 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,25 @@

REACT_APP_CONTENTSTACK_API_KEY=your_stack_api_key
REACT_APP_CONTENTSTACK_DELIVERY_TOKEN=your_delivery_token
REACT_APP_CONTENTSTACK_ENVIRONMENT=your_environment_token
REACT_APP_CONTENTSTACK_ENVIRONMENT=your_environment_name

# Below config options are for enabling live preview/live edit tags for the starter app

REACT_APP_CONTENTSTACK_API_HOST= api.contentstack.io
REACT_APP_CONTENTSTACK_MANAGEMENT_TOKEN = your_management_token
REACT_APP_CONTENTSTACK_PREVIEW_HOST=rest-preview.contentstack.com
REACT_APP_CONTENTSTACK_PREVIEW_TOKEN=your_live_preview_token
REACT_APP_CONTENTSTACK_APP_HOST=app.contentstack.com
REACT_APP_CONTENTSTACK_LIVE_PREVIEW= true
REACT_APP_CONTENTSTACK_LIVE_EDIT_TAGS= false
REACT_APP_CONTENTSTACK_LIVE_PREVIEW=true
REACT_APP_CONTENTSTACK_LIVE_EDIT_TAGS=false


# REACT_APP_CONTENTSTACK_LIVE_PREVIEW=true by default set REACT_APP_CONTENTSTACK_LIVE_PREVIEW=false to disable live preview
# For enabling live editing tags for this project set REACT_APP_CONTENTSTACK_LIVE_EDIT_TAGS=true by default it is set to false
# For EU region add REACT_APP_CONTENTSTACK_APP_HOST=eu.app.contentstack.com
# For setting custom api host add REACT_APP_CONTENTSTACK_API_HOST=for(NA: api.contentstack.io, EU: eu-api.contentstack.com)
# REACT_APP_CONTENTSTACK_API_HOST= api.contentstack.io
# REACT_APP_CONTENTSTACK_REGION=eu
# REACT_APP_CONTENTSTACK_BRANCH=main

SKIP_PREFLIGHT_CHECK=true
### NOTE:
# REACT_APP_CONTENTSTACK_API_HOST- For setting custom api host for contentstack sdk
# REACT_APP_CONTENTSTACK_REGION- For setting custom region for contentstack sdk default is us
# REACT_APP_CONTENTSTACK_BRANCH- For setting custom branch for contentstack sdk default is main

# Setting Live Preview URL's
# REACT_APP_CONTENTSTACK_PREVIEW_HOST- For eu region use eu-rest-preview.contentstack.com/azure-na-rest-preview.contentstack.com/azure-eu-rest-preview.contentstack.com
12 changes: 11 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@
],
"rules": {
"react/prop-types":0,
"no-undef":"off"
"no-undef":"off",
"@typescript-eslint/no-explicit-any":"off",
"@typescript-eslint/ban-types": [
"error",
{
"extendDefaults": true,
"types": {
"{}": false
}
}
]
}
}
2 changes: 0 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
name: "CodeQL"

on:
push:
branches: '*'
pull_request:
# The branches below must be a subset of the branches above
branches: '*'
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/jira.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Create JIRA ISSUE
on:
pull_request:
types: [opened]
jobs:
security:
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-')}}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Login into JIRA
uses: atlassian/gajira-login@master
env:
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
- name: Create a JIRA Issue
id: create
uses: atlassian/gajira-create@master
with:
project: ${{ secrets.JIRA_PROJECT }}
issuetype: ${{ secrets.JIRA_ISSUE_TYPE }}
summary: |
${{ github.event.pull_request.title }}
description: |
PR: ${{ github.event.pull_request.html_url }}

fields: "${{ secrets.JIRA_FIELDS }}"
- name: Transition issue
uses: atlassian/gajira-transition@v3
with:
issue: ${{ steps.create.outputs.issue }}
transition: ${{ secrets.JIRA_TRANSITION }}
14 changes: 0 additions & 14 deletions .github/workflows/sast-scan.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/sca-monitor.yml

This file was deleted.

5 changes: 2 additions & 3 deletions .github/workflows/sca-scan.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
name: Source Composition Analysis Scan
on:
push:
branches:
- master
pull_request:
types: [opened, synchronize, reopened]
jobs:
Expand All @@ -14,3 +11,5 @@ jobs:
uses: snyk/actions/node@master
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
with:
args: --all-projects --fail-on=all
14 changes: 0 additions & 14 deletions .github/workflows/secrets-scan.yml

This file was deleted.

2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @contentstack/security-admin @contentstack/ecosystem-admin
* @contentstack/security-admin
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 Contentstack
Copyright (c) 2024 Contentstack

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading