Skip to content

conflicts - #160

Closed
shaharbano893 wants to merge 36 commits into
plasmicapp:masterfrom
AiheApp:master
Closed

conflicts#160
shaharbano893 wants to merge 36 commits into
plasmicapp:masterfrom
AiheApp:master

Conversation

@shaharbano893

Copy link
Copy Markdown

No description provided.

bcsf14a546 and others added 30 commits January 1, 2026 16:36
- Add git safe.directory /plasmic to Dockerfile to fix rsbuild config loading
- Change NODE_ENV from production to development to skip analytics API key requirements

Co-Authored-By: Claude Opus 4.5 <[email protected]>
…t runtime

- Update dev.bash to skip yarn if node_modules exists (avoids yarn cache issues)
- Update Dockerfile to explicitly install deps for all sub-packages used by dev server

Co-Authored-By: Claude Opus 4.5 <[email protected]>
- Add git config at container startup since container runs as root
- Remove obsolete version field from compose.yml

Co-Authored-By: Claude Opus 4.5 <[email protected]>
rsbuild.config.ts reads PUBLIC_URL directly, not REACT_APP_PUBLIC_URL

Co-Authored-By: Claude Opus 4.5 <[email protected]>
The script was overriding container env vars with localhost defaults.
Now it respects PUBLIC_URL, REACT_APP_PUBLIC_URL, and DEFAULT_HOST_URL if set.

Co-Authored-By: Claude Opus 4.5 <[email protected]>
Allows yarn to resolve dependencies even if lockfiles are slightly out of sync.

Co-Authored-By: Claude Opus 4.5 <[email protected]>
@github-actions

Copy link
Copy Markdown

Thank you for your submission, we really appreciate it! ❤️

Like many open-source projects, we ask that you sign our Individual Contributor License Agreement before we can accept your contribution. If you are contributing on behalf of a company, please contact us at [email protected] to sign a Corporate Contributor License Agreement.

You can sign the individual CLA by posting a comment with the below text.


I have read, agree to, and hereby sign Plasmic's Individual Contributor License Agreement


You can retrigger this bot by commenting recheck in this Pull Request. Posted by the CLA Assistant Lite bot.

@vercel

vercel Bot commented Jan 31, 2026

Copy link
Copy Markdown

@bcsf14a546 is attempting to deploy a commit to the Plasmic Team on Vercel.

A member of the Team first needs to authorize it.

@github-actions github-actions Bot locked and limited conversation to collaborators Jan 31, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants