merge: upstream 264 commits by github-actions[bot] · Pull Request #313 · elasticpath/plasmic

github-actions · 2026-05-04T08:58:32Z

Upstream Merge

264 new commits from plasmicapp/plasmic master.

Review using the Files Changed tab. The commit list includes upstream history.

Conflicts to resolve

git fetch origin merge/upstream
git checkout merge/upstream
# Resolve conflicts, then:
git push origin merge/upstream

Conflicted files:

package.json
plasmicpkgs-dev/package.json
platform/canvas-packages/package.json
platform/canvas-packages/yarn.lock
platform/loader-bundle-env/package.json
platform/loader-bundle-env/yarn.lock
platform/wab/cypress/e2e/signup.spec.ts
platform/wab/package.json
platform/wab/src/wab/client/copilot/tests/bundles/starter-project-desktop-first.json
platform/wab/src/wab/server/AppServer.ts
platform/wab/src/wab/server/auth/routes.spec.ts
platform/wab/src/wab/server/db/op-hooks.ts
platform/wab/src/wab/server/loader/gen-code-bundle.ts
platform/wab/src/wab/server/loader/gen-html-bundle.ts
platform/wab/src/wab/server/routes/data-source.ts
platform/wab/src/wab/server/routes/loader.ts
platform/wab/src/wab/server/test/backend-util.ts
platform/wab/src/wab/server/util/apm-util.ts
platform/wab/src/wab/server/util/s3-util.ts
platform/wab/src/wab/server/workers/prefill-cloudfront.ts
platform/wab/src/wab/shared/urls.ts
platform/wab/yarn.lock
yarn.lock

Before merging

See Upstream Merge Runbook.

Conflicts resolved (if any)
EP integrity tests pass
yarn.lock regenerated for modified package.json
CI triggered (close/reopen PR to trigger checks)
Merge with "Create a merge commit" — do NOT squash

…events (#2712) BaseAnalytics.track() was not passing this.baseEventProperties to mergeProperties, so properties like `production` and `host` set via appendBaseEventProperties were never included in events sent to PostHog (server-side). mergeSane (lodash mergeWith) mutates the first argument in place. All call sites pass class members as the first argument, so each call would permanently accumulate properties from subsequent calls. Merge into a fresh {} instead. Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> GitOrigin-RevId: 96f0f681abbce3f2f5e9b7079342f9785b84ea5d

Upgrade devDependency ranges across all `packages/` workspaces. ## devDependency ranges narrowed to latest **packages/cli** - `@babel/core` ^7.12.3 → ^7.29.0 - `@babel/generator` ^7.12.1 → ^7.29.1 - `@babel/parser` ^7.12.3 → ^7.29.2 - `@babel/preset-typescript` ^7.12.1 → ^7.28.5 - `@babel/traverse` ^7.12.1 → ^7.29.0 - `@babel/types` ^7.23.0 → ^7.29.0 - `@types/babel__core` ^7.20.3 → ^7.20.5 - `@types/babel__generator` ^7.6.6 → ^7.27.0 - `@types/babel__traverse` ^7.20.3 → ^7.28.0 - `@types/cli-progress` ^3.11.0 → ^3.11.6 - `@types/lodash` ^4.14.157 → ^4.17.24 - `@types/semver` ^7.3.1 → ^7.7.1 - `@types/tmp` ^0.2.0 → ^0.2.6 - `esbuild` 0.17.18 → 0.27.7 - `lodash` ^4.17.19 → ^4.18.1 - `prettier` ^3.6.2 → ^3.8.3 - `semver` ^7.3.2 → ^7.7.4 - `socket.io-client` ^4.1.2 → ^4.8.3 - `tmp` ^0.2.1 → ^0.2.5 - `ts-jest` ^29.1.1 → ^29.4.9 - `tsx` ^4.20.6 → ^4.21.0 - `utility-types` ^3.10.0 → ^3.11.0 - `winston` ^3.3.3 → ^3.19.0 **packages/create-plasmic-app** - `@types/lodash` ^4.14.168 → ^4.17.24 - `@types/semver` ^7.3.5 → ^7.7.1 - `tsx` ^4.20.6 → ^4.21.0 **packages/host** - `@rollup/plugin-json` ^6.0.0 → ^6.1.0 - `@types/classnames` ^2.3.0 → ^2.3.4 - `rollup-plugin-banner2` ^1.2.2 → ^1.3.1 **packages/loader-react** - `@types/pascalcase` ^1.0.0 → ^1.0.3 **packages/nextjs-app-router** - `@types/yargs` ^17.0.32 → ^17.0.35 **packages/react-web** - `@babel/core` ^7.14.6 → ^7.29.0 - `@babel/preset-env` ^7.22.15 → ^7.29.2 - `@babel/preset-react` ^7.22.15 → ^7.28.5 - `@babel/preset-typescript` ^7.22.15 → ^7.28.5 - `@rollup/plugin-json` ^6.0.0 → ^6.1.0 - `@types/classnames` ^2.3.1 → ^2.3.4 - `@types/clone` ^2.1.1 → ^2.1.4 - `@types/dlv` ^1.1.2 → ^1.1.5 **packages/react-web-runtime** - `rollup` ^4.1.4 → ^4.60.2 ## Lockfile deduplication - Ran `yarn-deduplicate --strategy fewer` after install — reduced from 729 to 470 duplicate entries vs master - Manually preserved two lockfile entries that dedup would incorrectly merge: - `@types/react@*` kept at 18.x (merging up to 19.x breaks `plasmicpkgs/react-slick` build — TS2786) - `@testing-library/user-event@^14.4.0` kept at 14.6.x (merging down to 14.5.2 breaks react-aria storybook focus tests) ## Skipped - `react-aria` / `@react-aria/*` / `@react-stately/*` / `@react-types/*` — blocked by PLA-12485 (focus regression on overlay dismiss) GitOrigin-RevId: 34942a8d48b026e372fe772a77752283cef420cf

- @plasmicapp/cli@0.1.361 - create-plasmic-app@0.0.142 - @plasmicapp/data-sources@1.0.3 - @plasmicapp/host@2.0.2 - @plasmicapp/loader-gatsby@2.0.3 - @plasmicapp/loader-nextjs@2.0.3 - @plasmicapp/loader-react@2.0.3 - @plasmicapp/nextjs-app-router@1.0.23 - @plasmicapp/react-web@1.0.3 - @plasmicapp/react-web-runtime@1.0.3 - plasmicpkgs-dev@0.0.62 - @plasmicpkgs/airtable@0.0.259 - @plasmicpkgs/antd@2.0.167 - @plasmicpkgs/antd5@0.0.340 - @plasmicpkgs/plasmic-chakra-ui@0.0.75 - @plasmicpkgs/cms@0.0.22 - @plasmicpkgs/commerce@0.0.243 - @plasmicpkgs/commerce-commercetools@0.0.193 - @plasmicpkgs/commerce-local@0.0.243 - @plasmicpkgs/commerce-saleor@0.0.207 - @plasmicpkgs/commerce-shopify@0.0.251 - @plasmicpkgs/commerce-swell@0.0.253 - @plasmicpkgs/contentful@0.0.17 - @plasmicpkgs/dnd-kit@0.0.22 - @plasmicpkgs/fetch@0.0.35 - @plasmicpkgs/framer-motion@0.0.243 - @plasmicpkgs/plasmic-google-maps@0.0.24 - @plasmicpkgs/graphql@0.0.29 - @plasmicpkgs/plasmic-keen-slider@0.0.88 - @plasmicpkgs/lottie-react@0.0.237 - @plasmicpkgs/plasmic-mailchimp@0.0.22 - @plasmicpkgs/plasmic-basic-components@0.0.274 - @plasmicpkgs/plasmic-calendly@0.0.91 - @plasmicpkgs/plasmic-cms@0.0.313 - @plasmicpkgs/plasmic-content-stack@0.0.199 - @plasmicpkgs/plasmic-contentful@0.0.193 - @plasmicpkgs/plasmic-embed-css@0.1.229 - @plasmicpkgs/plasmic-eventbrite@0.0.77 - @plasmicpkgs/plasmic-giphy@0.0.77 - @plasmicpkgs/plasmic-graphcms@0.0.216 - @plasmicpkgs/plasmic-hubspot@0.0.89 - @plasmicpkgs/plasmic-intercom@0.0.22 - @plasmicpkgs/plasmic-link-preview@1.0.147 - @plasmicpkgs/plasmic-nav@0.0.215 - @plasmicpkgs/plasmic-pigeon-maps@0.0.77 - @plasmicpkgs/plasmic-query@0.0.264 - @plasmicpkgs/plasmic-rich-components@1.0.246 - @plasmicpkgs/plasmic-sanity-io@1.0.224 - @plasmicpkgs/plasmic-soundcloud@0.0.89 - @plasmicpkgs/plasmic-strapi@0.1.201 - @plasmicpkgs/plasmic-tabs@0.0.86 - @plasmicpkgs/plasmic-typeform@0.0.89 - @plasmicpkgs/plasmic-wordpress@0.0.171 - @plasmicpkgs/plasmic-wordpress-graphql@0.0.161 - @plasmicpkgs/plasmic-yotpo@0.0.88 - @plasmicpkgs/radix-ui@0.0.103 - @plasmicpkgs/react-aria@0.0.177 - @plasmicpkgs/react-audio-player@0.0.72 - @plasmicpkgs/react-awesome-reveal@3.8.247 - @plasmicpkgs/react-chartjs-2@1.0.155 - @plasmicpkgs/react-parallax-tilt@0.0.245 - @plasmicpkgs/react-quill@1.0.108 - @plasmicpkgs/react-scroll-parallax@0.0.254 - @plasmicpkgs/react-slick@0.0.266 - @plasmicpkgs/react-twitter-widgets@0.0.243 - @plasmicpkgs/react-youtube@7.13.249 - @plasmicpkgs/rive@0.0.31 - @plasmicpkgs/plasmic-spotify@0.0.22 - @plasmicpkgs/strapi@0.0.20 - @plasmicpkgs/tiptap@0.0.28 - @plasmicpkgs/vanilla-cookieconsent@0.0.21 - @plasmicpkgs/wordpress@0.0.21 GitOrigin-RevId: f110feb3414bdfdcbd84167e91a951f8dcd4dd60

GitOrigin-RevId: be922d505cb61d4f6df699d002b4a3ba7540e0a3

Resolves critical/moderate audit vulnerabilities: - handlebars: JS injection via AST type confusion (CVE, patch >=4.7.9) - protobufjs: arbitrary code execution (patch >=7.5.5) - via posthog-js opentelemetry chain Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> GitOrigin-RevId: 29c254c6d581dd53094239218f0356e1a1c1ba2e

* fix: Choice prop codegen when options use object form * test: wabToTsType GitOrigin-RevId: 4b7d5bff4f86adc6f3917ecf1cd7a03e0af01a81

GitOrigin-RevId: 7e53e05781d6af6873315d1ad4eb4776e2e00697

GitOrigin-RevId: 13aad22bce0f9357d55549ead01d8b6df8d8733d

- plasmicpkgs-dev@0.0.63 - @plasmicpkgs/fetch@0.0.36 - @plasmicpkgs/graphql@0.0.30 GitOrigin-RevId: a9a1f69ead8f2aebcc4e9b5a63c040c271a92252

GitOrigin-RevId: 643a9d8dfb2d09c8a2c1bd5178ad47683220e0a4

Adds a `loader_bundle_cache_total` Prometheus counter that tracks S3 bundle cache hits and misses, labeled by source ("prefill" vs "live"), so we can measure how often a live CDN request triggers an esbuild run vs being served from a prefilled S3 cache. Adds cache miss log message with the cache key. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> GitOrigin-RevId: 29dd37be14bd3bab0922875ff51bf3f49b95a3b9

GitOrigin-RevId: 26a99ab7a4b47a43145712b8b0e4b68f8d7db9e8

GitOrigin-RevId: 8765cdc08085347514c193d541654af29c24d15a

GitOrigin-RevId: d781fb8e8a177f3cf7c58d0b632642c94c9bdebc

When setupNextJs throws, ctx stays undefined and afterAll still calls teardownNextJs, producing a spurious destructuring TypeError that hides the real failure. Accept undefined and return early. Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> GitOrigin-RevId: 98833dacfb6fabe628021d2be5517d87006025b3

GitOrigin-RevId: 7f5190aecaf43aa6bff6861576c184410a5e17a9

- @plasmicapp/data-sources@1.0.4 - @plasmicapp/react-web@1.0.4 - @plasmicapp/react-web-runtime@1.0.4 - @plasmicpkgs/antd5@0.0.341 - @plasmicpkgs/plasmic-link-preview@1.0.148 - @plasmicpkgs/plasmic-rich-components@1.0.247 - @plasmicpkgs/tiptap@0.0.29 GitOrigin-RevId: aed0870defb894a50985f5b656f3f50e167b835e

GitOrigin-RevId: 7eae933dda12ba7568558cf6c655ff3469057239

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> GitOrigin-RevId: bceffb3c803ec2ff99d904d524bac7ee3e0e4fb3

GitOrigin-RevId: 5dd48526aaa45495ecad498b3e8691d3d12dcbf3

* feat(insertHtml): added replace tpl capability in insertHtml tool * fix(insertHtml): ensure replace works within paste operation to do proper validation and fixups for removal and insertion * chore: variable name changes GitOrigin-RevId: f432c4a9e54a8be2d39052392cc96a3483224334

GitOrigin-RevId: 77ca6bb919834066819b050a1159b66ab7610418

GitOrigin-RevId: 048843f0301687df626e79619f98d5d51b652daa

- @plasmicapp/data-sources@1.0.5 - @plasmicapp/react-web@1.0.5 - @plasmicapp/react-web-runtime@1.0.5 - @plasmicpkgs/antd5@0.0.342 - @plasmicpkgs/plasmic-link-preview@1.0.149 - @plasmicpkgs/plasmic-rich-components@1.0.248 - @plasmicpkgs/tiptap@0.0.30 GitOrigin-RevId: 28870c80765c35a985b945cd9bbd976d92b88f63

GitOrigin-RevId: 6aaf9f1417a61ea248e222c7487991504efc83f5

GitOrigin-RevId: 0177a3ede7420189ceb29ab6574e69d9d6d98fe0

GitOrigin-RevId: fe8ccb93494bfcf0e1b1a8af63b0b63c40fd5453

…740) GitOrigin-RevId: 5e9e1ae1a3c0b03cb53b4f1877cc149ad63875b6

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> GitOrigin-RevId: 5e051fc7f85411902eb94aa5c29b92941e154021

GitOrigin-RevId: f508701c6a821bb50c6056885dab5747ee24362c

* fix: Misplaced Hide Component Templates crashes studio * chore: plasmic master GitOrigin-RevId: 9f4b334abdeae97120e35d3f0cdf7756ba5e6700

GitOrigin-RevId: 6a4a4ff6e99bdae1ebe85b32701cbbdbd0c92d5e

* fix: avoid referencing generateOnMutateForSpec in query execution * fix: address pr feedback and avoid props ref in query state * fix: set wab playwright workers back to 8 in CI GitOrigin-RevId: 0f180e1297f9445d96c619ff1c28ff927ec712ab

If a component's prop is linked to an internal component's prop, we should use the internal's prop type to know whether it's advanced. Use inferPropTypeFromParam, which is also used in PropEditorRow to compute whether to be highlighted or not. GitOrigin-RevId: a62624d7f917eb9fb4297dcfea71f9c0589b0c7e

Drive the advanced-prop highlight off an explicit reveal event instead of a static per-row check. highlightParams now holds multiple params and auto-clears via a self-disposing timer in ViewCtx; PropEditorRow blinks purely off membership, and ComponentPropsSection sets the highlight when the user expands "Show more". Scroll/focus is applied only for single-param navigations. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> GitOrigin-RevId: fbb0d2e6959ecb572aa551a2762ccee54bff7ec4

… regression (#2940) The floating node:24-alpine tag silently pulled in Node 24.17.0, whose http.Agent keep-alive change (nodejs/node#63989) broke node-fetch outbound requests with ERR_STREAM_PREMATURE_CLOSE across all upstreams in the integrations/codegen services (which run this image). Pin to the last known-good patch (24.16.0) for both builder and runner stages so rebuilds are reproducible; bump deliberately once a fixed 24.17.x+ is verified. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> GitOrigin-RevId: 361b41ab6f7e010106c885e0031267d0b2b84257

GitOrigin-RevId: dcd24634bfbda5a6790840444b6b2c6647d676a5

GitOrigin-RevId: 3513ea7e4d4df39dbaf26f9e8b783f30b5e4678a

GitOrigin-RevId: e6c62b44d77834a337a3f0b7c10cc5b7337434ee

* feat: add waitForStudioReady helper for MCP agents * refactor: wait for studio to load in identify GitOrigin-RevId: 90b6b1a16be7867b6bfdbdf00a761513ca2e1534

* fix: reenable plasmic-website test and delete old auth test * fix: use new headless mode in playwright * chore: update snapshots for plasmic-website ci GitOrigin-RevId: 92fdfd6cc8361921012d47a66b1e21771ed73cf6

* feat: include functions in delete project warning * refactor: dynamic remove text and remove hackyCast GitOrigin-RevId: 792d8f7e5f5265231ed1c71a75c7a2617f0b72c1

* mount otel instrumentation folder * add trace carrier to propagate trace to sandboxed loader * propagate trace id to workerpool because it was creating new traces for a single request everytime. * wrap upsertS3CacheEntry calls to put this calls inside the same trace because it was creating a new trace for every call on this function here * move instrumentation from gen-code-bundle.ts to worker.js because it not worked * Reverting this change on workers. We will do this in next PR. * Reverting unwanted change * Added x-plasmic-trace-id to help clients get support in case of a problem * [wab] harden sandboxed loader env passthrough for OTel tracing Build the bwrap argv as an array instead of one whitespace-split string so env values containing spaces survive intact - notably NODE_OPTIONS (--require .../autoinstrumentation.js) and OTEL_RESOURCE_ATTRIBUTES, which the previous string+split approach would have shredded. - Restore --clearenv so the sandboxed render does not inherit the parent process's secrets, and explicitly allowlist the env it needs: CODEGEN_HOST/CODEGEN_ORIGIN_HOST, plus NODE_OPTIONS and OTEL_* to activate and configure the operator-injected auto-instrumentation. - Forward every propagation field inject() wrote (traceparent and, when present, tracestate/baggage) by iterating the carrier, which also avoids emitting a literal "undefined" when there is no active span. - Only --ro-bind the auto-instrumentation dir when it exists, so bwrap doesn't fail in local/test environments without the OTel operator. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * chore(app): add carrier catcher back in things declared at worker.js file * chore(codegen): extracted some variables and renamed kv variables * inline and improve formatting * chore(codegen): create a new type for TraceCarrier and use it * chore(codegen): use same name for traceCarrier * chore(codegen): Create a function to extract trace context fields from env and use it on gen-html-bundle.ts * chore(codegen): Remove x-plasmic-trace-id * chore(codegen): Add baggage to trace carrier --------- Co-authored-by: Jason Long <j@jaslong.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> GitOrigin-RevId: 2153e61818ca6d863071209224d02e330f673023

GitOrigin-RevId: 6e6293abd232fae548255183e4196843254bbc62

* refactor: migrate packages and plasmicpkgs to pnpm * fix: type issues in commerce packages * fix: ci build issues * fix: docs and ci updates * fix: storybook issue and further yarn to pnpm * fix: lottie version pinning GitOrigin-RevId: 65847c89a1ee0fdd2df67913baa0c26f1be24d40

- @plasmicapp/auth-api@0.0.18 - @plasmicapp/auth-react@0.0.28 - @plasmicapp/cli@0.1.365 - create-plasmic-app@0.0.155 - @plasmicapp/data-sources@1.0.15 - @plasmicapp/data-sources-context@0.1.24 - @plasmicapp/host@2.0.7 - @plasmicapp/loader-core@2.0.1 - @plasmicapp/loader-edge@1.0.77 - @plasmicapp/loader-fetcher@2.0.1 - @plasmicapp/loader-gatsby@2.0.10 - @plasmicapp/loader-nextjs@2.0.9 - @plasmicapp/loader-react@2.0.9 - @plasmicapp/loader-splits@1.0.71 - @plasmicapp/nextjs-app-router@1.0.24 - @plasmicapp/prepass@1.0.25 - @plasmicapp/query@0.1.85 - @plasmicapp/react-web@1.0.16 - @plasmicapp/react-web-runtime@1.0.16 - @plasmicapp/watcher@1.0.85 - plasmicpkgs-dev@0.0.70 - @plasmicpkgs/airtable@0.0.264 - @plasmicpkgs/antd@2.0.172 - @plasmicpkgs/antd5@0.0.353 - @plasmicpkgs/plasmic-chakra-ui@0.0.80 - @plasmicpkgs/cms@0.0.28 - @plasmicpkgs/commerce@0.0.248 - @plasmicpkgs/commerce-commercetools@0.0.198 - @plasmicpkgs/commerce-local@0.0.248 - @plasmicpkgs/commerce-saleor@0.0.212 - @plasmicpkgs/commerce-shopify@0.0.256 - @plasmicpkgs/commerce-swell@0.0.258 - @plasmicpkgs/contentful@0.0.22 - @plasmicpkgs/dnd-kit@0.0.28 - @plasmicpkgs/fetch@0.0.42 - @plasmicpkgs/framer-motion@0.0.248 - @plasmicpkgs/plasmic-google-maps@0.0.29 - @plasmicpkgs/graphql@0.0.36 - @plasmicpkgs/plasmic-keen-slider@0.0.93 - @plasmicpkgs/lottie-react@0.0.242 - @plasmicpkgs/plasmic-mailchimp@0.0.27 - @plasmicpkgs/plasmic-basic-components@0.0.279 - @plasmicpkgs/plasmic-calendly@0.0.96 - @plasmicpkgs/plasmic-cms@0.0.319 - @plasmicpkgs/plasmic-content-stack@0.0.204 - @plasmicpkgs/plasmic-contentful@0.0.198 - @plasmicpkgs/plasmic-embed-css@0.1.234 - @plasmicpkgs/plasmic-eventbrite@0.0.82 - @plasmicpkgs/plasmic-giphy@0.0.82 - @plasmicpkgs/plasmic-graphcms@0.0.221 - @plasmicpkgs/plasmic-hubspot@0.0.94 - @plasmicpkgs/plasmic-intercom@0.0.27 - @plasmicpkgs/plasmic-link-preview@1.0.159 - @plasmicpkgs/plasmic-nav@0.0.220 - @plasmicpkgs/plasmic-pigeon-maps@0.0.82 - @plasmicpkgs/plasmic-query@0.0.269 - @plasmicpkgs/plasmic-rich-components@1.0.259 - @plasmicpkgs/plasmic-sanity-io@1.0.229 - @plasmicpkgs/plasmic-soundcloud@0.0.94 - @plasmicpkgs/plasmic-strapi@0.1.207 - @plasmicpkgs/plasmic-tabs@0.0.91 - @plasmicpkgs/plasmic-typeform@0.0.94 - @plasmicpkgs/plasmic-wordpress@0.0.177 - @plasmicpkgs/plasmic-wordpress-graphql@0.0.166 - @plasmicpkgs/plasmic-yotpo@0.0.93 - @plasmicpkgs/radix-ui@0.0.108 - @plasmicpkgs/react-aria@0.0.184 - @plasmicpkgs/react-audio-player@0.0.77 - @plasmicpkgs/react-awesome-reveal@3.8.252 - @plasmicpkgs/react-chartjs-2@1.0.160 - @plasmicpkgs/react-parallax-tilt@0.0.250 - @plasmicpkgs/react-quill@1.0.113 - @plasmicpkgs/react-scroll-parallax@0.0.259 - @plasmicpkgs/react-slick@0.0.271 - @plasmicpkgs/react-twitter-widgets@0.0.248 - @plasmicpkgs/react-youtube@7.13.254 - @plasmicpkgs/rive@0.0.36 - @plasmicpkgs/plasmic-spotify@0.0.27 - @plasmicpkgs/strapi@0.0.26 - @plasmicpkgs/tiptap@0.0.40 - @plasmicpkgs/vanilla-cookieconsent@0.0.26 - @plasmicpkgs/wordpress@0.0.27 GitOrigin-RevId: 6087f1621240c66b20d4a8fcf02c8bf889c554aa

GitOrigin-RevId: 49d59a764f38f11d287571a791b34dcf7dbfec15

GitOrigin-RevId: c1ac8bb014d0e943b15b40d79733fb1ae862ff2a

- @plasmicapp/loader-nextjs@2.0.10 - @plasmicapp/nextjs-app-router@1.0.25 - @plasmicapp/react-web@1.0.17 - @plasmicapp/react-web-runtime@1.0.17 - plasmicpkgs-dev@0.0.71 - @plasmicpkgs/antd5@0.0.354 - @plasmicpkgs/react-aria@0.0.185 GitOrigin-RevId: ff7171136453b094d87c56ff90e078d930f99b29

GitOrigin-RevId: 97675182f4edc00a9d5fe982ae14ef13366b5ebe

GitOrigin-RevId: 9ddb12a5fb7c4aee826ae7ff98f12865bcfa2623

- @plasmicapp/loader-gatsby@2.0.11 GitOrigin-RevId: 6ab84d350e954dba0fde7da06340c177fb480847

GitOrigin-RevId: a42a268be10298840536e83a88a41ec8b3ab4b00

- Extract stringifyPublishment helper to deduplicate combo identifier JSON - Move try/catch inside each combo callback for per-combo error logging - Log success and error per combo; surface the previously silent catch GitOrigin-RevId: 84dbf5a5edf12d176f677680c57218deb5b805d5

Users can currently type in the same name for repetition item name and index name. ``` render__comp123.tsx:263:12: ERROR: The symbol "currentIndex" has already been declared render__comp123.tsx:387:12: ERROR: The symbol "currentIndex" has already been declared ``` Fix: - Use uniqueName - Fix uniqueName with separator: "" case GitOrigin-RevId: a92de8ae0d8a920b2fb903e915b71ca1deb41022

jaslong and others added 14 commits April 29, 2026 19:09

upgrade-internal

52d7049

GitOrigin-RevId: be922d505cb61d4f6df699d002b4a3ba7540e0a3

[PLA-13020] Choice prop codegen when options use object form (#2718)

7879fab

* fix: Choice prop codegen when options use object form * test: wabToTsType GitOrigin-RevId: 4b7d5bff4f86adc6f3917ecf1cd7a03e0af01a81

fix: add PATCH HEAD OPTIONS to fetch

1194acc

GitOrigin-RevId: 7e53e05781d6af6873315d1ad4eb4776e2e00697

fix: http header array const type

f761420

GitOrigin-RevId: 13aad22bce0f9357d55549ead01d8b6df8d8733d

Publish

3a44ce3

- plasmicpkgs-dev@0.0.63 - @plasmicpkgs/fetch@0.0.36 - @plasmicpkgs/graphql@0.0.30 GitOrigin-RevId: a9a1f69ead8f2aebcc4e9b5a63c040c271a92252

upgrade-internal

963f9e4

GitOrigin-RevId: 643a9d8dfb2d09c8a2c1bd5178ad47683220e0a4

fix: improve searchParams app router codegen handling

611db91

GitOrigin-RevId: 26a99ab7a4b47a43145712b8b0e4b68f8d7db9e8

fix: use makeAppRouterPageCtx in app router for searchParams

4a2bd43

GitOrigin-RevId: 8765cdc08085347514c193d541654af29c24d15a

test: add unit tests for searchParams await in codegen

9e32349

GitOrigin-RevId: d781fb8e8a177f3cf7c58d0b632642c94c9bdebc

github-actions Bot added the upstream-merge label May 4, 2026

jaslong and others added 15 commits May 4, 2026 17:07

feat: export QueryExecutionContext from data-sources

e65de67

GitOrigin-RevId: 7f5190aecaf43aa6bff6861576c184410a5e17a9

upgrade-internal

1b85fa9

GitOrigin-RevId: 7eae933dda12ba7568558cf6c655ff3469057239

[wab] serialize prefilling of loader publishment combos (#2732)

ca56b79

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> GitOrigin-RevId: bceffb3c803ec2ff99d904d524bac7ee3e0e4fb3

upgrade-internal

f333462

GitOrigin-RevId: 5dd48526aaa45495ecad498b3e8691d3d12dcbf3

fix: pass codegen origin env to subprocess

8614f13

GitOrigin-RevId: 77ca6bb919834066819b050a1159b66ab7610418

refactor: add data-sources helper for query error rethrow

3ad8dbc

GitOrigin-RevId: 048843f0301687df626e79619f98d5d51b652daa

upgrade-internal

a848dd0

GitOrigin-RevId: 6aaf9f1417a61ea248e222c7487991504efc83f5

fix: custom code fn render against dep snapshots

0d77163

GitOrigin-RevId: 0177a3ede7420189ceb29ab6574e69d9d6d98fe0

refactor: use new throwIfPlasmicUndefinedDataError

c131548

GitOrigin-RevId: fe8ccb93494bfcf0e1b1a8af63b0b63c40fd5453

fix(paste): copy/paste should retain the global variant overrides (#2…

299cee7

…740) GitOrigin-RevId: 5e9e1ae1a3c0b03cb53b4f1877cc149ad63875b6

[wab] log finished/failed differently in withSpan (#2736)

3fa0df0

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> GitOrigin-RevId: 5e051fc7f85411902eb94aa5c29b92941e154021

github-actions Bot changed the title ~~merge: upstream 223 commits~~ merge: upstream 238 commits Jun 22, 2026

sarahsga and others added 27 commits June 22, 2026 11:02

fix: image-slots.spec.ts test causes CI failure (#2932)

4483fa8

GitOrigin-RevId: f508701c6a821bb50c6056885dab5747ee24362c

[PLA-13142] Misplaced Hide Component Templates crashes studio (#2927)

453bf1e

* fix: Misplaced Hide Component Templates crashes studio * chore: plasmic master GitOrigin-RevId: 9f4b334abdeae97120e35d3f0cdf7756ba5e6700

fix: Can't scroll content in Popover Frame (#2929)

d50938b

GitOrigin-RevId: 6a4a4ff6e99bdae1ebe85b32701cbbdbd0c92d5e

fix: guard ViewCtx.renderState against post-dispose reads (#2935)

44a1c49

GitOrigin-RevId: dcd24634bfbda5a6790840444b6b2c6647d676a5

fix: reenable skipped playwright tests (#2903)

c38a491

GitOrigin-RevId: 3513ea7e4d4df39dbaf26f9e8b783f30b5e4678a

fix: enterprise copybara copilot stub (#2926)

7f44b67

GitOrigin-RevId: e6c62b44d77834a337a3f0b7c10cc5b7337434ee

MCP wait helper (#2922)

2a78f5b

* feat: add waitForStudioReady helper for MCP agents * refactor: wait for studio to load in identify GitOrigin-RevId: 90b6b1a16be7867b6bfdbdf00a761513ca2e1534

Re-enable plasmic-website test and delete old auth test (#2904)

772dbcc

* fix: reenable plasmic-website test and delete old auth test * fix: use new headless mode in playwright * chore: update snapshots for plasmic-website ci GitOrigin-RevId: 92fdfd6cc8361921012d47a66b1e21771ed73cf6

Include functions in delete project warning (#2890)

ca4e963

* feat: include functions in delete project warning * refactor: dynamic remove text and remove hackyCast GitOrigin-RevId: 792d8f7e5f5265231ed1c71a75c7a2617f0b72c1

[wab] rename deprecated data queries label to "legacy" (#2938)

38a770c

GitOrigin-RevId: 6e6293abd232fae548255183e4196843254bbc62

fix: CMS color field hides hex input in entry editor (#2953)

69f6dc5

GitOrigin-RevId: 49d59a764f38f11d287571a791b34dcf7dbfec15

fix: remove unused prepare step (#2955)

f457a14

GitOrigin-RevId: c1ac8bb014d0e943b15b40d79733fb1ae862ff2a

upgrade-internal

e1fdbf4

GitOrigin-RevId: 97675182f4edc00a9d5fe982ae14ef13366b5ebe

fix: bump package version to test deploy (#2956)

be77c07

GitOrigin-RevId: 9ddb12a5fb7c4aee826ae7ff98f12865bcfa2623

Publish

a4846d6

- @plasmicapp/loader-gatsby@2.0.11 GitOrigin-RevId: 6ab84d350e954dba0fde7da06340c177fb480847

upgrade-internal

40748fd

GitOrigin-RevId: a42a268be10298840536e83a88a41ec8b3ab4b00

merge: upstream (conflicts to resolve)

560ff08

github-actions Bot force-pushed the merge/upstream branch from 63ed9a2 to 560ff08 Compare June 29, 2026 09:44

github-actions Bot changed the title ~~merge: upstream 238 commits~~ merge: upstream 264 commits Jun 29, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

merge: upstream 264 commits#313

merge: upstream 264 commits#313
github-actions[bot] wants to merge 265 commits into
masterfrom
merge/upstream

github-actions Bot commented May 4, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

github-actions Bot commented May 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Upstream Merge

Conflicts to resolve

Before merging

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

github-actions Bot commented May 4, 2026 •

edited

Loading