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

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

Upstream Merge

238 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:

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/playwright/playwright.config.ts
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

GitOrigin-RevId: 94e25c0ea7431f3ce71d7fd63e8d42141ae5506e

GitOrigin-RevId: 41fbc3889b46cf8091bfa1fd2f2420128eb69b36

* feat: Highlight advanced props * refactor / feedback GitOrigin-RevId: 9edeb0b183b9fd6b373fd34a2e5cc27046d47426

GitOrigin-RevId: 68a5104052a763fd2c26fe4594fcd2e25a3cf54a

GitOrigin-RevId: 2f0f105d5b68cde85f24d6cacd93403dc92ad08f

GitOrigin-RevId: a845a88dda6b07356a3f321bf96d1c957653695f

GitOrigin-RevId: 3a101dcff4b6b5f6ce7db7752de7ac2c9901ab70

GitOrigin-RevId: a28317aef02a2eb91feb92387f2d0399cdbae87e

GitOrigin-RevId: fb745d5933efe7bfbbdb86d5e21383c51efcc73f

GitOrigin-RevId: 17782c920adf9f475363e16224f6f997b0d52154

Upgraded minor and patch versions across all platform workspaces. Skipped version upgrades will be documented in a separate PR. GitOrigin-RevId: a209f961d539ef5e67a72607eff1a7f74e038009

GitOrigin-RevId: 3fa1e141dd7097621f0de65f1fc610062248d23b

…(#2713) @octokit/app bumped 16.1.1 -> 16.1.2 and @octokit/auth-unauthenticated bumped 7.0.2 -> 7.0.3; rename patch files to silence version mismatch warnings on yarn install. Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> GitOrigin-RevId: 8eb7d2aa0b8aa95e78238e83466edf147bbd6970

@ai-sdk/react bumped from 3.0.80 to 3.0.170 as a transitive dependency of @ai-sdk/google-vertex v4. In that range, addToolOutput changed its return type from Promise<void> to void | PromiseLike<void>. Widening spawn's parameter type accommodates this without forcing every call site to cast. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> GitOrigin-RevId: cebf1df3da538c25819eb5d24c3100927f7de897

GitOrigin-RevId: 0e2dbc3d49d6dd874fa88fedc881de96fc42e8e9

…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

A decoupled action bus that lets disparate UI components communicate without tight coupling. Components register handlers (or listeners) by UiId; callers dispatch "blink"/"jump" actions. Dispatches to an unmounted handler are buffered as pending (with a timeout) so listeners can render the target handler in response. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> GitOrigin-RevId: a727a8b3ec5d65544e6a900ae5deac08a945abc5

Adds a "go to source" link button to the dynamic value picker: hovering a row whose value has an editable source shows a link icon; clicking it closes the picker and jumps to where that value is defined (built on UiActionBus). Wired for every data type: - $queries (data query) and $q (server query) -> query modal - $props -> component param editor modal - $state -> variable config modal (nested/repeated paths via getStateVarNameParts) - $dataTokens -> token editor (gated on showDataTokens; local editable tokens) - $ctx page path/route/params/query -> Page data tab Studio wires UiActionBus into StudioCtx and registers UI via studio-ui-ids / studio-ui-actions; getSourceUiId maps a picker row's itemPath to its UiId. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> [wab] PLA-13069 address review comments - Simplify getAncestorNodeKeys by making search operate on a node list - Expand ancestor prop folders when a UI action targets a param, so jump-to-source works for props inside collapsed folders Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> GitOrigin-RevId: aebca27f6b7d854c58d8ed7dafe1fce701c1ca33

* feat: allow ComponentServerQuery in QueryRef.ref * migration: bump bundle version for QueryRef.ref widening * feat: refresh server queries ($q) via function in interactions * refactor: move customFunctionId into its own file so we can avoid duplicating it * fix: refresh queries by function in interactions modal * refactor: comment cleanup and minor refactoring * fix: address code quality pr feedback * refactor: update query cache keys to help avoid collision * fix: useServerQueryOp custom code query invalidation bug * refactor: move query id helpers to leaf file * revert: bump bundle version for QueryRef.ref widening This reverts commit 865590648ab326beba3635a338d38fa48ed1455d. GitOrigin-RevId: 8559ee9ecf8a35cad6bdb90eca49202edf03d9dc

- @plasmicapp/data-sources@1.0.11 - @plasmicapp/react-web@1.0.12 - @plasmicapp/react-web-runtime@1.0.12 - @plasmicpkgs/antd5@0.0.349 - @plasmicpkgs/plasmic-link-preview@1.0.155 - @plasmicpkgs/plasmic-rich-components@1.0.255 - @plasmicpkgs/tiptap@0.0.36 GitOrigin-RevId: 4fd172dfdf85553db9b3cf0d9b35c4d6ae942d6d

GitOrigin-RevId: cfb6869370bf8ec835e9829bf322d2cf296e40cf

* chore: update playwright * fix: attempt to stabilize playwright tests on macos * chore: ci playwright optimizations GitOrigin-RevId: 4df9d7f6781caa92ea78b0ffd07e5f22a0d72421

GitOrigin-RevId: c357d928bb604d67a06af8df72f42bf8861e9f1e

… (#2888) * [plasmic-ai-mcp]: expose copilot tools meta information for AI to access at runtime * [plasmic-ai-mcp]: requested changes for code improvements and format consistency GitOrigin-RevId: 24e94434eb838a3b5c772262070b076e73cdd8fd

Also reject filters so that they're always built on the server from stored templates GitOrigin-RevId: 6d43e189389b82b8b2573ed5108adfecc8c70ec6

* [copilot-tools]: add support for overriding style tokens for imported projects * [copilot-tools]: add separate tool for overriding style tokens * [ai-read-serialization]: flattened imported project resources in the serializeProject * [component-exporter]: update snapshot test to reflect new bundle project ids * [copilot-tools-tests]: use toMatchObject for readability * [override-style-token-tool]: rename to overrideImportedStyleTokens * [copilot-tool-test-utils]: rename utils name for better readability GitOrigin-RevId: 99cba210a2c7dd1447cbc8072fba3a61a12ca375

…(#2902) GitOrigin-RevId: 4dbb006222c6da583d10dcd0852194f817615e92

- create-plasmic-app@0.0.154 GitOrigin-RevId: 0298c004ffbb3e047c5ed214fa29cfebda7ec3b6

…th (#2913) GitOrigin-RevId: 879719a61acaf11623832a41daabf37b3f49c9ca

* feat: export isPlasmicUndefinedDataErrorPromise from data-sources * refactor: use exported isPlasmicUndefinedDataErrorPromise in canvas-error GitOrigin-RevId: d3e5f4adab01febdd5ec9218af1738e711ae29a5

- @plasmicapp/data-sources@1.0.12 - @plasmicapp/react-web@1.0.13 - @plasmicapp/react-web-runtime@1.0.13 - @plasmicpkgs/antd5@0.0.350 - @plasmicpkgs/plasmic-link-preview@1.0.156 - @plasmicpkgs/plasmic-rich-components@1.0.256 - @plasmicpkgs/tiptap@0.0.37 GitOrigin-RevId: f93de51b8e0416acfdfb1f78c98c94505ff0125d

GitOrigin-RevId: d0f3d70cab6ae2f156ab72ee2b17e9d305f22941

…899) User-facing changes: - Custom function registration params (including fields of flattened object params) can be marked `required` - A server query is not run while any required param/field is nullish; the Studio sidebar preview and query modal show a "Fix validation errors" warning instead of executing, and prop editor rows flag the missing params - Built-in plasmicpkgs query functions (cms, contentful, fetch, graphql, strapi, wordpress) now declare their required params Internal refactorings: - host: hoist `required` from component PropTypeBase up to the shared CommonTypeBase so component props and function params share one declaration - wab: add normalizeCustomFunctionParams() and getInvalidFunctionArgs() to validate evaluated args against registered param metadata - wab: extract InvalidArg/InvalidArgMeta/ValidationType out of val-nodes.ts into shared/core/invalid-arg.ts; PropValueEditorContextData now carries an invalidArgs record keyed by control path - wab: rework useServerQueryOp to fetch through studioCtx.executeServerQuery (one shared cache entry per query across preview/modal/canvas) and to substitute a stable NOOP query when args are missing or invalid GitOrigin-RevId: 1815cc21b18c9795b16c969b0049c088b1ae7c80

- @plasmicapp/data-sources@1.0.13 - @plasmicapp/host@2.0.6 - @plasmicapp/loader-gatsby@2.0.9 - @plasmicapp/loader-nextjs@2.0.8 - @plasmicapp/loader-react@2.0.8 - @plasmicapp/react-web@1.0.14 - @plasmicapp/react-web-runtime@1.0.14 - plasmicpkgs-dev@0.0.69 - @plasmicpkgs/airtable@0.0.263 - @plasmicpkgs/antd@2.0.171 - @plasmicpkgs/antd5@0.0.351 - @plasmicpkgs/plasmic-chakra-ui@0.0.79 - @plasmicpkgs/cms@0.0.27 - @plasmicpkgs/commerce@0.0.247 - @plasmicpkgs/commerce-commercetools@0.0.197 - @plasmicpkgs/commerce-local@0.0.247 - @plasmicpkgs/commerce-saleor@0.0.211 - @plasmicpkgs/commerce-shopify@0.0.255 - @plasmicpkgs/commerce-swell@0.0.257 - @plasmicpkgs/contentful@0.0.21 - @plasmicpkgs/dnd-kit@0.0.27 - @plasmicpkgs/fetch@0.0.41 - @plasmicpkgs/framer-motion@0.0.247 - @plasmicpkgs/plasmic-google-maps@0.0.28 - @plasmicpkgs/graphql@0.0.35 - @plasmicpkgs/plasmic-keen-slider@0.0.92 - @plasmicpkgs/lottie-react@0.0.241 - @plasmicpkgs/plasmic-mailchimp@0.0.26 - @plasmicpkgs/plasmic-basic-components@0.0.278 - @plasmicpkgs/plasmic-calendly@0.0.95 - @plasmicpkgs/plasmic-cms@0.0.318 - @plasmicpkgs/plasmic-content-stack@0.0.203 - @plasmicpkgs/plasmic-contentful@0.0.197 - @plasmicpkgs/plasmic-embed-css@0.1.233 - @plasmicpkgs/plasmic-eventbrite@0.0.81 - @plasmicpkgs/plasmic-giphy@0.0.81 - @plasmicpkgs/plasmic-graphcms@0.0.220 - @plasmicpkgs/plasmic-hubspot@0.0.93 - @plasmicpkgs/plasmic-intercom@0.0.26 - @plasmicpkgs/plasmic-link-preview@1.0.157 - @plasmicpkgs/plasmic-nav@0.0.219 - @plasmicpkgs/plasmic-pigeon-maps@0.0.81 - @plasmicpkgs/plasmic-query@0.0.268 - @plasmicpkgs/plasmic-rich-components@1.0.257 - @plasmicpkgs/plasmic-sanity-io@1.0.228 - @plasmicpkgs/plasmic-soundcloud@0.0.93 - @plasmicpkgs/plasmic-strapi@0.1.206 - @plasmicpkgs/plasmic-tabs@0.0.90 - @plasmicpkgs/plasmic-typeform@0.0.93 - @plasmicpkgs/plasmic-wordpress@0.0.176 - @plasmicpkgs/plasmic-wordpress-graphql@0.0.165 - @plasmicpkgs/plasmic-yotpo@0.0.92 - @plasmicpkgs/radix-ui@0.0.107 - @plasmicpkgs/react-aria@0.0.183 - @plasmicpkgs/react-audio-player@0.0.76 - @plasmicpkgs/react-awesome-reveal@3.8.251 - @plasmicpkgs/react-chartjs-2@1.0.159 - @plasmicpkgs/react-parallax-tilt@0.0.249 - @plasmicpkgs/react-quill@1.0.112 - @plasmicpkgs/react-scroll-parallax@0.0.258 - @plasmicpkgs/react-slick@0.0.270 - @plasmicpkgs/react-twitter-widgets@0.0.247 - @plasmicpkgs/react-youtube@7.13.253 - @plasmicpkgs/rive@0.0.35 - @plasmicpkgs/plasmic-spotify@0.0.26 - @plasmicpkgs/strapi@0.0.25 - @plasmicpkgs/tiptap@0.0.38 - @plasmicpkgs/vanilla-cookieconsent@0.0.25 - @plasmicpkgs/wordpress@0.0.26 GitOrigin-RevId: baa35758ccd16c32259942faebbcbd62d5f174a4

GitOrigin-RevId: 02f05fcb51b1cb67b47515cb6b01567e08a76a08

* [copilot-tools]: add tool to change tpl component props and variant selection * [copilot-tools]: fixed null value consideration for unsetting props, added unsetProps field * [copilot-tools]: moved the batch operation logic to tools implementation; keep the operations single-prop * [copilot-tools-utils]: extract common logic for getting component variant combo * [component-props-html-parsing]: refactored to support img, href, target, and choice type, throw on unsupported prop types * [component-props-html-parsing]: add support for date and date range prop type * [copilot-tools]: consider changing props within the changeElement tool by merging attrs and props in a single field GitOrigin-RevId: 52a36fc58cf0fcc85012c0b21b44269026e5e770

GitOrigin-RevId: 8c18989c72d0485f0e597ae192d4df240bafb7c0

* feat: export _safeExecResult and add error getter to query results * fix: remove unused error getter GitOrigin-RevId: 109000017c223337f4b7abdbd47b527c22edd361

- @plasmicapp/data-sources@1.0.14 - @plasmicapp/react-web@1.0.15 - @plasmicapp/react-web-runtime@1.0.15 - @plasmicpkgs/antd5@0.0.352 - @plasmicpkgs/plasmic-link-preview@1.0.158 - @plasmicpkgs/plasmic-rich-components@1.0.258 - @plasmicpkgs/tiptap@0.0.39 GitOrigin-RevId: da8b62e5312e2ba8e771e607aeb2f6c3ca5b73f1

GitOrigin-RevId: 1e2994e70b32cf5d43b3fde7106f7c1d36a07d87

GitOrigin-RevId: e6749719c735166b8e7be46a9b01169876be9abe

sampullman and others added 29 commits April 28, 2026 03:06

fix: reject versioned api request without projectId

3ded6f8

GitOrigin-RevId: 94e25c0ea7431f3ce71d7fd63e8d42141ae5506e

fix: set isQuery true for test bundle fetch

eddf4f8

GitOrigin-RevId: 41fbc3889b46cf8091bfa1fd2f2420128eb69b36

[PLA-12979] Highlight Advanced Props (#2669)

ab263a2

* feat: Highlight advanced props * refactor / feedback GitOrigin-RevId: 9edeb0b183b9fd6b373fd34a2e5cc27046d47426

fix: set headers for x-plasmic-uptime-check response

84525ba

GitOrigin-RevId: 68a5104052a763fd2c26fe4594fcd2e25a3cf54a

fix: make q reactive in canvas ctx to show preview after loading

d01849f

GitOrigin-RevId: 2f0f105d5b68cde85f24d6cacd93403dc92ad08f

fix: use listeners instead of proxies for q in canvas ctx

ed1dc15

GitOrigin-RevId: a845a88dda6b07356a3f321bf96d1c957653695f

fix: simplify and refactor canvas query republish

15199a7

GitOrigin-RevId: 3a101dcff4b6b5f6ce7db7752de7ac2c9901ab70

fix: avoid stale props on every rerender

f4fe920

GitOrigin-RevId: a28317aef02a2eb91feb92387f2d0399cdbae87e

fix: update data context on query rename

8424304

GitOrigin-RevId: fb745d5933efe7bfbbdb86d5e21383c51efcc73f

fix: reduce serverQueryTree key duplication per feedback

34ff123

GitOrigin-RevId: 17782c920adf9f475363e16224f6f997b0d52154

[platform] upgrade deps (#2660)

243fa54

Upgraded minor and patch versions across all platform workspaces. Skipped version upgrades will be documented in a separate PR. GitOrigin-RevId: a209f961d539ef5e67a72607eff1a7f74e038009

fix: remove nested scroll (#2709)

f396131

GitOrigin-RevId: 3fa1e141dd7097621f0de65f1fc610062248d23b

upgrade-internal

e490ccd

GitOrigin-RevId: 0e2dbc3d49d6dd874fa88fedc881de96fc42e8e9

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 10 commits June 11, 2026 19:10

upgrade-internal

2bda529

GitOrigin-RevId: cfb6869370bf8ec835e9829bf322d2cf296e40cf

Get e2e tests running correctly on Mac (#2897)

9ae8d15

* chore: update playwright * fix: attempt to stabilize playwright tests on macos * chore: ci playwright optimizations GitOrigin-RevId: 4df9d7f6781caa92ea78b0ffd07e5f22a0d72421

upgrade-internal

7f182ca

GitOrigin-RevId: c357d928bb604d67a06af8df72f42bf8861e9f1e

fix: validate and quote postgres sort.field to avoid injection (#2901)

c0d8939

Also reject filters so that they're always built on the server from stored templates GitOrigin-RevId: 6d43e189389b82b8b2573ed5108adfecc8c70ec6

github-actions Bot force-pushed the merge/upstream branch from 2d5ff3c to b7745ae Compare June 15, 2026 10:16

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

jaslong and others added 16 commits June 15, 2026 16:13

[cpa] run-cpa: project-level CSS as non-module (.module.css -> .css) …

3c42924

…(#2902) GitOrigin-RevId: 4dbb006222c6da583d10dcd0852194f817615e92

Publish

6b04bf3

- create-plasmic-app@0.0.154 GitOrigin-RevId: 0298c004ffbb3e047c5ed214fa29cfebda7ec3b6

refactor(wab): remove legacy postgres credentials.connectionString pa…

015d1f6

…th (#2913) GitOrigin-RevId: 879719a61acaf11623832a41daabf37b3f49c9ca

export isPlasmicUndefinedDataErrorPromise from data-sources (#2915)

bfbff88

* feat: export isPlasmicUndefinedDataErrorPromise from data-sources * refactor: use exported isPlasmicUndefinedDataErrorPromise in canvas-error GitOrigin-RevId: d3e5f4adab01febdd5ec9218af1738e711ae29a5

upgrade-internal

d9a7938

GitOrigin-RevId: d0f3d70cab6ae2f156ab72ee2b17e9d305f22941

upgrade-internal

05462bc

GitOrigin-RevId: 02f05fcb51b1cb67b47515cb6b01567e08a76a08

[copilot-tools]: add deleteComponent tool (#2905)

03246c0

GitOrigin-RevId: 8c18989c72d0485f0e597ae192d4df240bafb7c0

Export _safeExecResult from data-sources (#2918)

bc3ea88

* feat: export _safeExecResult and add error getter to query results * fix: remove unused error getter GitOrigin-RevId: 109000017c223337f4b7abdbd47b527c22edd361

upgrade-internal

779e70b

GitOrigin-RevId: 1e2994e70b32cf5d43b3fde7106f7c1d36a07d87

upgrade-internal

cc4d75f

GitOrigin-RevId: e6749719c735166b8e7be46a9b01169876be9abe

merge: upstream (conflicts to resolve)

63ed9a2

github-actions Bot force-pushed the merge/upstream branch from b7745ae to 63ed9a2 Compare June 22, 2026 10:09

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

merge: upstream 238 commits#313

merge: upstream 238 commits#313
github-actions[bot] wants to merge 239 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