Skip to content

merge: upstream 510 commits - #431

Open
github-actions[bot] wants to merge 511 commits into
masterfrom
merge/upstream
Open

github-actions[bot] wants to merge 511 commits into
masterfrom
merge/upstream

Conversation

@github-actions

@github-actions github-actions Bot commented Aug 17, 2026 •

Copy link
Copy Markdown
Contributor

Upstream Merge

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

AGENTS.md
jest.config.js
packages/create-plasmic-app/.tool-versions
packages/loader-gatsby/package.json
packages/react-web/package.json
plasmicpkgs-dev/package.json
plasmicpkgs/commerce-providers/commerce/package.json
platform/.dockerignore
platform/canvas-packages/package.json
platform/canvas-packages/yarn.lock
platform/live-frame/yarn.lock
platform/loader-bundle-env/yarn.lock
platform/loader-html-hydrate/package.json
platform/loader-tests/data/antd5/collapse.json
platform/loader-tests/data/antd5/date-range-picker.json
platform/loader-tests/data/antd5/pagination.json
platform/loader-tests/data/antd5/popover.json
platform/loader-tests/data/antd5/progress.json
platform/loader-tests/data/antd5/rate.json
platform/loader-tests/data/antd5/segmented.json
platform/loader-tests/data/antd5/slider.json
platform/loader-tests/data/antd5/tabs.json
platform/loader-tests/data/app-hosting.json
platform/loader-tests/data/auth-e2e.json
platform/loader-tests/data/cms.json
platform/loader-tests/data/code-libs.json
platform/loader-tests/data/contentful.json
platform/loader-tests/data/custom-code-server-query.json
platform/loader-tests/data/data-source-basic.json
platform/loader-tests/data/dynamic-pages.json
platform/loader-tests/data/plasmic-antd.json
platform/loader-tests/data/plasmic-antd5.json
platform/loader-tests/data/plasmic-app-components.json
platform/loader-tests/data/plasmic-basic-components-example.json
platform/loader-tests/data/plasmic-basic-components/timer.json
platform/loader-tests/data/plasmic-cms.json
platform/loader-tests/data/plasmic-contentful.json
platform/loader-tests/data/plasmic-kit-website-components_16033.json
platform/loader-tests/data/plasmic-link-preview.json
platform/loader-tests/data/plasmic-sanity-io.json
platform/loader-tests/data/plasmic-split-components.json
platform/loader-tests/data/plasmic-strapi.json
platform/loader-tests/data/plasmic-website-2023.json
platform/loader-tests/data/plasmic-wordpress.json
platform/loader-tests/data/react-aria.json
platform/loader-tests/data/react-quill.json
platform/loader-tests/data/simpler-auth.json
platform/loader-tests/data/slick-slider.json
platform/loader-tests/data/strapi.json
platform/loader-tests/data/wordpress.json
platform/loader-tests/yarn.lock
platform/wab/Dockerfile
platform/wab/jest.config.ts
platform/wab/package.json
platform/wab/playwright/bundles/clone-project.json
platform/wab/playwright/bundles/code-libs.json
platform/wab/playwright/bundles/data-tokens.json
platform/wab/playwright/bundles/forms.json
platform/wab/playwright/bundles/prop-editors.json
platform/wab/playwright/bundles/state-management.json
platform/wab/playwright/bundles/tutorial-portfolio.json
platform/wab/playwright/e2e/data-tokens.spec.ts
platform/wab/playwright/e2e/rich-text.spec.ts
platform/wab/playwright/playwright.config.ts
platform/wab/playwright/yarn.lock
platform/wab/src/wab/client/components/NewProjectModal.tsx
platform/wab/src/wab/client/components/canvas/CanvasText.ts
platform/wab/src/wab/client/components/canvas/canvas-rendering.ts
platform/wab/src/wab/client/components/root-view.tsx
platform/wab/src/wab/client/components/studio/LeftTabStrip.tsx
platform/wab/src/wab/client/components/top-bar/CodeButton.tsx
platform/wab/src/wab/client/components/top-bar/TopBar.tsx
platform/wab/src/wab/client/plasmic/plasmic_kit_data_binding/PlasmicCopilotPromptDialog.tsx
platform/wab/src/wab/client/plasmic/plasmic_kit_design_system/PlasmicTextAreaInput.tsx
platform/wab/src/wab/server/AppServer.ts
platform/wab/src/wab/server/__testonly__/backend-util.ts
platform/wab/src/wab/server/app-backend-real.ts
platform/wab/src/wab/server/auth/custom-api-auth.ts
platform/wab/src/wab/server/auth/custom-passport-cfg.ts
platform/wab/src/wab/server/auth/routes.spec.ts
platform/wab/src/wab/server/auth/routes.ts
platform/wab/src/wab/server/auth/util.ts
platform/wab/src/wab/server/cdn/images.ts
platform/wab/src/wab/server/codegen-backend.ts
platform/wab/src/wab/server/db/DbBundleLoader.ts
platform/wab/src/wab/server/db/DbCon.ts
platform/wab/src/wab/server/db/DbMgr.spec.ts
platform/wab/src/wab/server/db/DbMgr.ts
platform/wab/src/wab/server/db/branching.spec.ts
platform/wab/src/wab/server/db/migrations-list.txt
platform/wab/src/wab/server/github/pages.ts
platform/wab/src/wab/server/integrations-backend.ts
platform/wab/src/wab/server/loader/error-handler.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/loader/module-bundler.ts
platform/wab/src/wab/server/loader/parse-query-params.ts
platform/wab/src/wab/server/loader/resolve-projects.ts
platform/wab/src/wab/server/main.ts
platform/wab/src/wab/server/observability/PinoLogger.ts
platform/wab/src/wab/server/observability/index.ts
platform/wab/src/wab/server/pkg-mgr/data/plexus-master-pkg.json
platform/wab/src/wab/server/pkg-mgr/data/plume-master-pkg.json
platform/wab/src/wab/server/rate-limit.ts
platform/wab/src/wab/server/routes/cms.ts
platform/wab/src/wab/server/routes/hosts.ts
platform/wab/src/wab/server/routes/loader.spec.ts
platform/wab/src/wab/server/routes/loader.ts
platform/wab/src/wab/server/routes/projects-socket.ts
platform/wab/src/wab/server/routes/projects.spec.ts
platform/wab/src/wab/server/routes/projects.ts
platform/wab/src/wab/server/routes/teams.ts
platform/wab/src/wab/server/scripts/__testonly__/259-repoint-ep-commerce-bindings.spec.ts
platform/wab/src/wab/server/scripts/__testonly__/fixtures/code-component-meta-add-refActions.migrated.json
platform/wab/src/wab/server/scripts/__testonly__/fixtures/code-component-variants.migrated.json
platform/wab/src/wab/server/scripts/__testonly__/fixtures/duplicate-variants.migrated.json
platform/wab/src/wab/server/scripts/__testonly__/fixtures/flex-gap-bundle.migrated.json
platform/wab/src/wab/server/scripts/__testonly__/fixtures/merge-duplicate-variants.migrated.json
platform/wab/src/wab/server/scripts/__testonly__/fixtures/page-meta-image-ref.migrated.json
platform/wab/src/wab/server/scripts/__testonly__/fixtures/plume-default-components.migrated.json
platform/wab/src/wab/server/scripts/__testonly__/fixtures/style-variants.migrated.json
platform/wab/src/wab/server/scripts/__testonly__/fixtures/transform-format-migration.migrated.json
platform/wab/src/wab/server/scripts/send-comments-notifications.ts
platform/wab/src/wab/server/server-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/codegen.ts
platform/wab/src/wab/server/workers/pool.ts
platform/wab/src/wab/server/workers/prefill-cloudfront.spec.ts
platform/wab/src/wab/server/workers/prefill-cloudfront.ts
platform/wab/src/wab/shared/ApiSchema.ts
platform/wab/src/wab/shared/cached-selectors.ts
platform/wab/src/wab/shared/codegen/__testonly__/bundles/animations-test.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/aria-code-components.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/counters-test.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/custom-functions-test.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/data-tokens-page-meta.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/data-tokens.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/form-with-reset-input.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/global-variant-test.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/hidden-components.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/imported-project-default-theme-styles.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/linked-props.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/links.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/people-list-explicit-states.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/people-list-implicit-states.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/style-token-overrides.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/todoapp.json
platform/wab/src/wab/shared/codegen/__testonly__/bundles/todomvc.json
platform/wab/src/wab/shared/codegen/react-p/index.ts
platform/wab/src/wab/shared/codegen/react-p/server-queries/__testonly__/bundles/advanced-component-server-queries.json
platform/wab/src/wab/shared/codegen/react-p/server-queries/__testonly__/bundles/simple-component-server-queries.json
platform/wab/src/wab/shared/core/clone-custom-functions.test.ts
platform/wab/src/wab/shared/core/components.ts
platform/wab/src/wab/shared/core/site-style-tokens.ts
platform/wab/src/wab/shared/core/sites.test.ts
platform/wab/src/wab/shared/core/sites.ts
platform/wab/src/wab/shared/core/tokens.test.ts
platform/wab/src/wab/shared/core/tokens.ts
platform/wab/src/wab/shared/core/tpls.ts
platform/wab/src/wab/shared/core/used-tokens-and-assets.spec.ts
platform/wab/src/wab/shared/core/used-tokens-cache.spec.ts
platform/wab/src/wab/shared/devflags.ts
platform/wab/src/wab/shared/insertable-templates/__testonly__/bundles/copy-and-paste.json
platform/wab/src/wab/shared/model/model-meta.spec.ts
platform/wab/src/wab/shared/model/model-meta.ts
platform/wab/src/wab/shared/model/model-tree-util.spec.ts
platform/wab/src/wab/shared/model/model-tree-util.ts
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/arg-variants-conflict-after-swap-components.json
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/code-components-with-same-name.json
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/default-slot-change.json
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/global-context-merge.json
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/multiple-interactions-with-conflicts.json
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/rich-text-conflict.json
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/style-tokens-conflict.json
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/test-dangling-ref-deletion.json
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/test-edge-cases-merge-2.json
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/test-edge-cases-merge.json
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/test-merging-deps.json
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/test-reroot.json
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/test-tpl-merge.json
platform/wab/src/wab/shared/site-diffs/__testonly__/bundles/test-tpl-parent-merge.json
platform/wab/src/wab/shared/site-diffs/__testonly__/compare-sites-tokens.spec.ts
platform/wab/src/wab/shared/site-diffs/commit-graph.ts
platform/wab/src/wab/shared/site-diffs/index.ts
platform/wab/src/wab/shared/web-exporter/bundles/starter-project-desktop-first.json
platform/wab/yarn.lock
pnpm-lock.yaml
pnpm-workspace.yaml

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

Jenkins and others added 29 commits September 28, 2026 16:50
 - @plasmicapp/cli@0.1.381
 - create-plasmic-app@0.0.180

GitOrigin-RevId: df5e74df8027e19c1eb43a3ee8de674cbaa33445
GitOrigin-RevId: cca6a02a3fbdc3050b881faf111a2f1c9dccd9a9
* wab-sentry-upgrade

* sentry-review-fixes

GitOrigin-RevId: 4bd3ff00efcf741018ef30a769e493b5c1caa67b
* fix(wab): detect custom fonts declared by canvas hosts

Recognize custom fonts supplied by the canvas host.

- Refresh font availability when host styles are added or a linked stylesheet loads.
- Avoid fetching unused font weights and subsets, and skip updates when availability is unchanged.
- Add regression coverage for late declarations, host loading, and missing and local fonts. All eight focused tests pass.

[Task review and evidence](https://plasmic-x2.sampullman.com:4290/execute/1a403a38-7d74-4ab0-a697-f56636b66f2c)

Executor model: codex · gpt-6-sol (high)
Local review model: codex · gpt-6-sol (medium)

* fix: address pr review feedback

Opus 5.5
- Add maybeUnquote helper
- Naming consistency
- Track host frame instead of canvas frames
- Refresh after CSSOM font changes

* fix: refresh font availability when CSSOM rules are deleted

---------

Co-authored-by: plasmic-ai-executor <plasmic-ai-executor@users.noreply.github.com>
GitOrigin-RevId: c9cb3d4fad6bcc5f98aaa7b495e03a063e4136fe
GitOrigin-RevId: 94753921ac2cfd6f5aac23e3f8f647a2fa7d25ae
* fix(wab): preserve conditional prop editors for hidden components

Conditional prop editors now use effective model values when a code component is unrendered.

- Preserve evaluated runtime props and context for rendered components.
- Cover model edits, defaults, variants, and canvas expression evaluation.
- Correct the iframe window mock's TypeScript type.
- Validation: typecheck, eight regression tests, all three acceptance checks, lint, formatting, and refreshed local Studio screenshots.

[Task review and evidence](https://plasmic-x2.sampullman.com:4290/execute/275451e0-90b3-4089-adc2-727db0916c45)

Executor model: codex · gpt-6-astra (medium)
Local review model: codex · gpt-5.6-sol (high)

* AI review fix: Feedback from charliecreates[bot]

platform/wab/src/wab/client/studio-ctx/view-ctx.ts:1513 — Feedback from charliecreates[bot]
Matched canvas rendering’s active-variant StyleExpr aggregation. Added a regression test that verifies combined classes, excludes inactive variants, and checks conditional editor visibility.

Fixes findings from the AI review of 4f0f7cbba124d3c141fe1d2873b03015eaee1f5a.

Plasmic-AI-Review-Fix: fix-3322-20260918-034457-1b84

* fix: playwright tests and unit test cleanup

Fable 5.1

* fix: address pr review feedback about env for hidden controls

Opus 5.0
- Resolve linked wrapper props before evaluating hidden controls
- Resolve token refs before evaluating hidden-component controls

* refactor: clean up code, comments, and tests

---------

Co-authored-by: plasmic-ai-executor <plasmic-ai-executor@users.noreply.github.com>
Co-authored-by: plasmic-ai-review <plasmic-ai-review@users.noreply.github.com>
Co-authored-by: Sam Pullman <sampullman@gmail.com>
GitOrigin-RevId: e8ea391f73e19c52fa6ab3e12fe81366169b144b
* deps: update runtime dependencies

* fix: pnpm install to fix lockfile

---------

Co-authored-by: CharlieHelps <charlie@charlielabs.ai>
Co-authored-by: Sam Pullman <sampullman@gmail.com>
GitOrigin-RevId: f337c7b563f0b7d18a46c15b981b70ed15a969b2
 - plasmicpkgs-dev@0.0.95
 - @plasmicpkgs/commerce@0.0.263
 - @plasmicpkgs/commerce-commercetools@0.0.213
 - @plasmicpkgs/commerce-local@0.0.264
 - @plasmicpkgs/commerce-saleor@0.0.229
 - @plasmicpkgs/commerce-shopify@0.0.273
 - @plasmicpkgs/commerce-swell@0.0.274
 - @plasmicpkgs/react-parallax-tilt@0.0.265
 - @plasmicpkgs/rive@0.0.51

GitOrigin-RevId: 7e2170243c645a1a45be03213a464933aee977ef
GitOrigin-RevId: 71b4ec4c88dadb679c36985afa23a6153c4e368d
* [copilot]: drop $schema from chat tool input schemas

Anthropic sends tool input schemas verbatim, so the draft-07 `$schema`
URL on each of the 36 tools cost ~720 prompt tokens per request (22,783
-> 22,063 by count_tokens). OpenAI's tool rendering already ignores it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* [copilot]: shorten the {{ }} binding reminder repeated on dynamic fields

interpolatedStringFormatDescription is appended to 17 tool schema
descriptions, while the chat system prompt and the plasmic-designer skill
already explain the binding format in full. Trim it to a one-line
reminder that keeps the static-by-default and non-string-literal rules.

Prompt tokens per chat request: OpenAI 14,293 -> 13,953, Anthropic
22,063 -> 21,608.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* [copilot]: list imported resources under their project in project reads

A project-level read flattened every imported project's components,
tokens, mixins, animations, themes and global variant groups into each
section, tagging each with a 22-char `fromProject` id. Design-system
imports dominate that list (e.g. 242 of 335 tokens in the starter
project come from the Tailwind colors library), so the repeated ids were
a large share of the result.

Each section now lists the project's own resources, and each entry of
the always-present `importedProjects` lists its own resources under the
same keys. A full project read of the starter project drops from 26,214
to 19,567 tokens on OpenAI (-25%), and that result typically stays in
the chat history for the whole session. The read tool description and
system prompt now point at `importedProjects` instead of `fromProject`.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* fix: clean up comments

* fix: address pr review feedback

Opus 5.5
- Remove fromProject and group directly
- Simplify tool call descriptions by avoiding redundant importedProjects mentions

* refactor: some code simplification and abstraction

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
GitOrigin-RevId: e0c875a93a1222e16500e51e1de3e14f0970dc34
GitOrigin-RevId: 0f0bd98fd279a4d12c7b0b2f714971d90ab5c3ce
* Improve some postgres queries

* Added getPkgByProjectOrThrow and simplified latest version queries

* Add parenthesis on condition to match right index

* Address some code review things and change/improve some queries

* Add parenthesis on tests

GitOrigin-RevId: 51df342f4e7b469d50eee66260633eacefc96c45
GitOrigin-RevId: 399a2f3489c7dde0e788fb645dd3c6fd723bdeab
GitOrigin-RevId: b760014974b084b94eb7dbe355b06279ff3014f2
GitOrigin-RevId: f7fff6d721bf19c7f9bb9ff399351de117fc4c89
* sync changes to prompt input UI

* feat: abort chat

* grace period before send

* fix: Esc not working

* loading state for the send button

* design feedback

* fix: charlie feedback

* chore: resync

* refactor / feedback

* chore: resync from main/latest

GitOrigin-RevId: 1d24e00c045d1e080bf86312d48a06980fb29c6b
GitOrigin-RevId: 92da2f4f8eff1cc45922d1c4d07007c3d7529fa8
* Created session pruner cronjob.

* Address code review things

* Address code review things

* Address code review things

GitOrigin-RevId: 93d19794cae93fa5e41c20bc9cc400a4a17f5067
* First version of build error detector

* Propagate children errors

* Simplify error handling

* Address code review things

* Fix sentry context leak

GitOrigin-RevId: 5a8d117b4dae79add01c78b3b1a5fe2bd26de779
* Create mini-cache metrics for services.

* Fix normalization

* Extract buckets to constant and add more values

GitOrigin-RevId: 1860b697082060e42b824161721091185c4c9f57
* [wab]: migrate remaining parsing of css-peg-parser and removed it

* [wab]: replace parseCssValue with splitCssValue

* [wab]: split css values by slicing source tokens

* [wab]: drop empty css value items and consolidate parseCss tests

GitOrigin-RevId: f15331261c7c6252836bf9c343d853c7e6de72a4
GitOrigin-RevId: 665141c3cba3f0f93f5f14c5f6f0f55ed0455098
svgo 3.3.3 is affected by GHSA-w27v-7q3p-w38r (high) and
GHSA-4vpr-x523-8j87 (medium): removeScriptElement let through
mixed-case and tab-split javascript: URLs, srcdoc inside
<foreignObject>, and data:text/html links. 4.1.0 fixes both.

The only config change is the removeScriptElement -> removeScripts
rename. Our plugin list is explicit, so v4's preset-default changes
don't apply. Running our pipeline over the repo's 223 SVGs on both
versions gave identical dimensions everywhere; output differs only in
lowercased hex colors and 4 transforms rewritten to equivalent forms.

Also override csso 5's css-tree to ^3.2.1 so it shares svgo's copy
instead of pinning a second one (~165 KB minified). csso pins ~2.2.0
because css-tree 2.3 broke its syntax fork; that was fixed in 3.2.0
and csso's test suite passes on it.

GitOrigin-RevId: 82b082834f26537c25ad9a7f20cea7f08b319221
GitOrigin-RevId: fdaf7f8f2f86e91e8d97e21c2e2f0e3a7909de6e
…#3422)

GitOrigin-RevId: 4fc61814bffdcabdcdb283ee8201c50ac332578d
* fix: reduce anonymous session creation and timeouts

Fable 5.1

* fix: address review comment

GitOrigin-RevId: 2a89bf707ff59a83850f5dd2411c61d3077404bb
- One entry per context name. When a context component is attached and an entry with the same name already exists, the entry is pointed at the new component instead of a second one being added. Args are kept when the new component has a param with the same name.
- Attach order in addNewRegisteredComponents. New contexts are attached after their params are set, so the takeover has params to match args against. Code components are still attached first, because building params looks them up by name (e.g. a slot's allowed components).
- Removal. removeComponentGroup now handles a context's entry: it points the entry back at a dependency's context with the same name if there is one, and removes it otherwise. The client and server code that removed entries by hand is gone, and the attach/detach helpers are private to TplMgr.
- Settings panel. LeftProjectSettingsPanel builds one row per entry (entry, component, dependency) instead of two parallel arrays, skips entries it can't resolve instead of crashing, and moves the entry in site.globalContexts directly when you reorder.

GitOrigin-RevId: ffc258740aadf4be191d8cab4bc2e9e499881469
create-next-app 16.4.0 enables Cache Components by default for App Router
projects, which rejects the revalidate route segment config used by our
loader App Router templates and breaks next build.

GitOrigin-RevId: 48b5c49cf43b4d8bfe553c98e4d68d10074ef148
* docs: fix local hosting development instructions

* docs: restore local hosting setup prerequisite

* fix: adjust docs

---------

Co-authored-by: CharlieHelps <charlie@charlielabs.ai>
Co-authored-by: Sam Pullman <sampullman@gmail.com>
GitOrigin-RevId: 77f572a7ee5085fa09ca51e66d5916cb1d154389
sampullman and others added 28 commits November 11, 2026 07:27
* fix: cleanup preview and improved error handling

Astra 6.1
- Consolidated duplicated codegen options.
- Added recovery from generation errors and failed error displays.
- Fixed registry-string escaping and missing-registry handling.

* chore: remove old getlib.js

* fix: use Result for PreviewTask

GitOrigin-RevId: 83df161e48db169800025d2c68c9b7d19df0ff77
Support component variant group read type and its mention

GitOrigin-RevId: 6f37b1626ed151f167789d0450d919cd5a590912
GitOrigin-RevId: e88920183416356f09dc6d055ac7b3eff4843063
GitOrigin-RevId: 2b75a6a4a13e36251cf7b6568000fe22cb2c5e01
…is selected (#3636)

GitOrigin-RevId: 01b7e3d49b85351cf91795b2e8b25280691539bb
* Fix loader server bundle cache collisions

* fix: clean up loader cache tests

---------

Co-authored-by: Suyash Bhattarai <bhattarai.suyash777@gmail.com>
GitOrigin-RevId: c014c73ff553cef426e02f67f8154f6316031bca
 - @plasmicapp/loader-core@2.0.10
 - @plasmicapp/loader-edge@1.0.87
 - @plasmicapp/loader-fetcher@2.0.10
 - @plasmicapp/loader-gatsby@2.0.30
 - @plasmicapp/loader-nextjs@2.0.31
 - @plasmicapp/loader-react@2.0.26
 - @plasmicapp/loader-splits@1.0.81
 - @plasmicapp/react-web@1.0.44
 - @plasmicapp/react-web-runtime@1.0.44
 - plasmicpkgs-dev@0.0.101
 - @plasmicpkgs/antd5@0.0.382

GitOrigin-RevId: 83c62fb564733609a04bd885231431d22f93554b
Astra 6.0
- Add missing CI path inputs and consolidate shared filters
- Split shared Vitest setup from browser initialization
- Consolidate Storybook commands into a reusable action
- Remove the stale Studio CI dependency comment

GitOrigin-RevId: 2fcaacde16a6a7402a7232539c20615dba0d3d17
GitOrigin-RevId: 6f5b7b4fbfdd83a42679de1bad0fe03db4d82215
* fix: show accurate paywall errors for unsupported roles

Astra 6.0
- Add a dedicated requireRole paywall response and client error type
- Show role-specific guidance when publishing or sharing projects
- Update trial-expiration test to expect the role paywall

* fix: StudioCtx.publish() now shows the role-specific error

GitOrigin-RevId: b69cfd64967e7846981dfc362cd7032bcc22ed80
… (#3637)

GitOrigin-RevId: 43b8595e4f83cb392f5fc294dd29e226da2bf5ba
GitOrigin-RevId: 6ccdc3bcab709ace0ef7f785a1c60e00f5659712
Co-authored-by: Sam Pullman <sampullman@gmail.com>
GitOrigin-RevId: 1ab557389ec736f799ae2d618cfb29fda81f63f1
…#3484)

* [wab] map expected upload, webhook, clip and GitHub failures to 4xx

- Unsupported upload file type -> BadRequestError (PLASMIC-SERVER-44W)
- Malformed URL in fetchUntrusted -> UnsafeUrlError, so webhooks and data
  source fetchers return their existing 400 "Invalid URL" (PLASMIC-SERVER-43V)
- GET /clip/:clipId for an unknown/expired clip -> NotFoundError
  (PLASMIC-SERVER-455, PLASMIC-SERVER-44S)
- GitHub create repo: read Octokit's response.data.errors so "repo exists"
  is handled again (PLASMIC-SERVER-446), and map other 403/422 rejections
  to BadRequestError (PLASMIC-SERVER-45V)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* fix: improve gh permission error reporting

Astra 6.0
- GH errors display a clearer message and retry
- Clean up comments
- Add clip/webhook tests

* fix: consolidate tests to it.each

* fix: preserve GitHub rate limits and rich-text selections

Astra 6.0
- Share GitHub rate-limit detection and preserve header-signaled throttling
- Handle Shift+Arrow selections in Slate to prevent lost characters
- Cover both selection directions and consolidate regression tests

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Sam Pullman <sampullman@gmail.com>
GitOrigin-RevId: d2b06575d469c1e7261a328e8d1fb4c1ba97404e
* fix(studio): ignore code formatting in the expressions search

The expressions panel reuses Matcher, which splits the query on whitespace
and matches each word literally. That works for names, but in code it means
`${itemsCount}` doesn't find `${ itemsCount }`, and since `.` doesn't cross
newlines, nothing that spans two lines of an expression can be found.

Add a matchCode option (used only by the expressions panel) that allows
whitespace between identifiers and symbols inside a query word and lets the
match span lines. Other Matcher users are unchanged.

* [wab] scroll exprs search snippets to regex matches, bold shortest match

getTextWithScrolling found the match with a literal indexOf, so matchCode and
multi-word matches in long expressions showed an unscrolled snippet with no
bold. Join query words with a lazy .*? so the bold stops at the first match.

Opus 5.5

* [wab] bold each query word in search snippets

- Bold words separately so snippets that cut off the full match still show them
- Skip one-char words like `?` unless the query has nothing longer
- Revert the lazy .*? join, only the old whole-match bold needed it

Opus 5.5

* fix: preserve Unicode identifiers in code search

Astra 6.0
- Keep Unicode identifier characters together when matching code
- Compare matching and highlighting across all matcher options
- Clarify multiline, word-order, and identifier matching coverage
- Assert exact scrolling and highlighting output

* fix: improve code expression search without freezing Studio

Astra 6.0
- Match code across lines and tolerate whitespace around symbols
- Highlight query words and scroll snippets to matching text
- Replace backtracking regex searches with sequential word scans
- Cover missing words, repeated searches, overlaps, and line boundaries

* fix: prevent insert search crashes on missing group labels

Astra 6.0
- Default missing match targets to empty strings and update the input type
- Add regression coverage for missing labels in both search modes
- Clarify the single-line matching rule outside code search

---------

Co-authored-by: Zayooo <mrcold135@gmail.com>
GitOrigin-RevId: 3a0e7e6393d4cfa2b99746a4e70bcaa689dc584e
GitOrigin-RevId: f4ebf22ffce6c90c230a392216881245df9ef760
* feat: block editing after subscription payment grace period

Fable 5.1
- Show warning banner in studio when payment past due
- Send reminder email 48 hours before blocking
- Show error banner and block after 7 days non payment

* fix: address pr review feedback

* fix: address pr review feedback

* fix: show billing alert only to owner/dev and update ui

Astra 6.0

* fix: inherited payment alert and clean up unused code

* fix: refine past-due billing deadlines and subscription status

Astra 6.0
- Consolidate past-due policy and warning delivery
- Use Temporal deadlines with full-day access through UTC-12
- Set the policy start to November 15, 2026
- Fetch subscription status through separate APIs
- Restore editing after payment and show the retained paid plan
- Skip stale warnings after failed subscription syncs
- Simplify billing regression tests

* fix: keep subscription updates consistent across builds and billing views

Astra 6.0
- Share subscription routes and entities with public and enterprise builds
- Refresh team and subscription data together for billing consumers
- Preserve stale-project edit locks during payment recovery
- Add regression coverage for refresh ordering and external registration

* fix: harden past-due billing controls and Studio alerts

Astra 6.0
- Add manual phase overrides with episode-scoped persistence
- Keep banners and warning emails consistent with overrides
- Convert subscription status endpoints to ts-rest
- Clear stale billing alerts and preserve anonymous quota locks
- Clarify helper naming and keep the grace constant private
- Add regression coverage and document reviewer responses

* fix: restore past-due billing indicators and update banner designs

Astra 6.0
- Show billing errors beside non-selected orgs in the switcher
- Place billing banners above org, settings, and workspace headers
- Sync AlertBanner from the updated Plasmic design branch
- Replace the banner X with a payment-link arrow and remove underlines
- Align payment links vertically with banner text
- Shorten payment messages and remove the Plasmic AI mention
- Configure a persistent local blocked-payment example
- Add switcher icon coverage and refresh screenshots across affected pages

* chore: sync main alert banner branch

* fix: restyle past-due Studio banner and keep dashboard billing alert sticky

Astra 6.0
- Restyle past-due AlertBanner to match design D with token colours, borders and shadow
- Apply new Design System "Overlay Shadow" mixin to past-due banner variants
- Move "Update payment" link markup and darker-tint hover styles into Plasmic
- Render actionLink as an anchor and delete the local AlertBanner stylesheet
- Pin the dashboard billing alert in a sticky header on team and settings pages
- Show the billing alert on workspace pages instead of in DashboardLayout
- Sync Design System 101.1.0 and Icons 7.1.1 generated code

* fix: stop past-due copilot bypass and reduce billing status polling

Opus 5.5
- Server copilot quota treats past-due teams as unpaid once editing is blocked
- Add copilot tests for grace, blocked, and manual override phases
- Studio pushes project subscription to the top frame instead of polling the team endpoint
- Org switcher rows fetch billing status once, without polling or refetch on focus

* fix: update banner red outline

* AI review fix: Remove the unreachable openBilling action

platform/wab/src/wab/client/components/widgets/plasmic/AlertBanner.tsx:22 — Remove the unreachable openBilling action
Confirmed both past-due variants hide the only button that invokes actionFn. Removed openBilling while preserving the visible billing link.

Fixes findings from the AI review of 723c6f09b31a05950030946fb16af7a3415acdac.

Plasmic-AI-Review-Fix: fix-3516-20261113-034639-9a4f

* fix: try to address flaky e2e tests

---------

Co-authored-by: plasmic-ai-review <plasmic-ai-review@users.noreply.github.com>
GitOrigin-RevId: eb5f7ef82da6d85444b6b0bd588eb6fb2df39d70
…ty (#3527)

GitOrigin-RevId: cf4ec35a316a97d3a968d2fd3f19d42ca4971cb1
…485)

Co-authored-by: Sam Pullman <sampullman@gmail.com>
GitOrigin-RevId: 6f20c3757cc443c69bc25cf2c86b0d9d8f54267e
…LA-13454) (#3641)

Add the limitDataQueriesExemptDataSourceIds devflag. Legacy data sources
listed in it skip the limitDataQueries rate limit, so specific customers
can keep using them while everyone else is limited or blocked.

GitOrigin-RevId: 1f841a6e9b2f81c97ee70fa57838ef379ae1fdee
…a personal project to an organization (#3639)

* [plasmic-ai]: Let the user choose the workspace when Plasmic AI moves a personal project

* [plasmic-ai]: Remove the move summary, shorten the chat copy

* [plasmic-ai]: hide the org Upgrade button in the move picker

* [plasmic-ai]: Upgrade and move the project in one helper

GitOrigin-RevId: 697c2cfaddb08ef8dde5038d233f0e4f129d490f
GitOrigin-RevId: 57e421b27ca4c97607086bc27218bc9d6c31d1d3
 - @plasmicapp/cli@0.1.386
 - create-plasmic-app@0.0.187

GitOrigin-RevId: 61938ef0e75c8469bffd3146dd81d8484643ed8f
GitOrigin-RevId: e8eb6035e6f9a12ed60eaa74b433b1b1078f8812
…13396) (#3529)

GitOrigin-RevId: d5f907450e6561d5a7cd177238170fa7587f95ff
GitOrigin-RevId: 5696de61b144338193e09e684ee52c6a6011ed9d
GitOrigin-RevId: 0671c754dcd2d3ab27f39d6dc58d157124058c42
@github-actions github-actions Bot changed the title merge: upstream 473 commits merge: upstream 510 commits Nov 16, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants