PromucFlow_constructor/app/client
Ankita Kinger c7c7625384
fix: Resolving merge conflict (#38528)
## Description

Resolving merge conflict

Fixes #`Issue Number`  
_or_  
Fixes `Issue URL`
> [!WARNING]  
> _If no issue exists, please create an issue first, and check with the
maintainers if the issue is valid._

## Automation

/ok-to-test tags="@tag.IDE"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/12666175355>
> Commit: 639f92ac62fb0c633099c4ecfdfef514288a3561
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=12666175355&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Sanity`
> Spec:
> <hr>Wed, 08 Jan 2025 08:25:59 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No

---------

Co-authored-by: Aparna Ramachandran <101863839+btsgh@users.noreply.github.com>
Co-authored-by: Abhijeet <41686026+abhvsn@users.noreply.github.com>
Co-authored-by: yatinappsmith <84702014+yatinappsmith@users.noreply.github.com>
Co-authored-by: Nidhi <nidhi@appsmith.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: “sneha122” <“sneha@appsmith.com”>
Co-authored-by: Nidhi <nidhi.nair93@gmail.com>
Co-authored-by: Rudraprasad Das <rudra@appsmith.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Trisha Anand <trisha1990@gmail.com>
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Rahul Barwal <rahul.barwal@appsmith.com>
2025-01-08 13:58:56 +05:30
..
.husky
.yarn
cypress chore: fix form widgets bugs (#38492) 2025-01-07 17:34:15 +05:30
docker/templates chore: add grafana faro sdk (CE) (#38301) 2024-12-26 10:37:41 +05:30
generators
packages fix: Resolving merge conflict (#38528) 2025-01-08 13:58:56 +05:30
public chore: add grafana faro sdk (CE) (#38301) 2024-12-26 10:37:41 +05:30
src fix: external saas redirection when api created and navigated (#38518) 2025-01-08 13:40:04 +05:30
test feat: paragon frontend ds creation implementation added (#38456) 2025-01-07 11:51:08 +05:30
typings
.babelrc
.dockerignore
.editorconfig
.eslintrc.base.json feat: add react-compiler eslint plugin (#37139) 2024-10-31 16:40:18 +01:00
.eslintrc.js
.fork-ts-checkerrc
.gitignore
.lintstagedrc.json
.nvmrc
.prettierignore
.prettierrc
.sentryclirc
.yarnrc.yml
build.sh chore: increase craco --max-old-space-size to 10240 (#38494) 2025-01-06 14:59:05 +05:30
craco.build.config.js chore: add grafana faro sdk (CE) (#38301) 2024-12-26 10:37:41 +05:30
craco.common.config.js
craco.dev.config.js
cypress_ci_custom.config.ts
cypress_ci_hosted.config.ts
cypress_ci.config.ts
cypress-add-tags.js
cypress.config.ts
download-assets.js
jest.config.js chore: add grafana faro sdk (CE) (#38301) 2024-12-26 10:37:41 +05:30
knip.json chore: add grafana faro sdk (CE) (#38301) 2024-12-26 10:37:41 +05:30
package.json feat: custom eslint rule infra (#38345) 2025-01-02 17:41:55 +05:30
README.md
README.old.md
start-caddy.sh
start-https.sh chore: Find version after backend is ready (#37861) 2024-11-29 18:57:57 +05:30
tailwind.config.js
tsconfig.json
tsconfig.path.json
vercel.json
yarn.lock feat: custom eslint rule infra (#38345) 2025-01-02 17:41:55 +05:30

Appsmith Client

This project was bootstrapped with Create React App.

For details on setting up your development machine, please refer to the Setup Guide