merge: upstream 223 commits#313
Open
github-actions[bot] wants to merge 224 commits into
Open
Conversation
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
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
… (#2852) * feat(copilot-tools): add support for imported components * refactor(copilot-tools): project-exporter to now include only it's own site animations * feat(component-exporter): add data-plasmic-project attr for dependency component usages * chore(component-exporter): change signature of component-utils functions * chore(html-parser): add data-plasmic-project in html-parser snapshot * refactor(component-utils): couple data plasmic attrs structure with tpl component serialization GitOrigin-RevId: 05278660673e3a685e29730f963daa27e9b667ad
* feat(animations): fix parseCssAnimiation to parse animation var names * chore: move tryGetAnimationSequenceUuidFromCssVar to core styles * refactor(delete-variant): add resuable delete-variant operation with user confirmation and copilot error behaviour * refactor(delete-variant-group): add resuable delete-variant-group operation with user confirmation and copilot error behaviour * chore: minor change to remove unnecessary variable decl * chore(delete-resources): added tests for delete operations * fix(delete-resources): add cancelled state in the DeleteResourcesResult GitOrigin-RevId: 83f7ba7f775f697628532294fe0507c65af623ec
This PR should not have any runtime behavior changes, refactor only. - Add LocalStorageKey which centralizes local storage key strings to ensure we don't accidentally overlap keys. - Un-export ReactUtil.updateRef (only used within the module). - Add ApiSchema.spec.ts asserting @plasmicapp/host StyleSection stays assignable to PublicStyleSection. Added tiny change to fix broken typecheckin platform/wab/src/wab/client/copilot/enterprise/tools/deleteComponentVariants.ts GitOrigin-RevId: fdc04f0ff41b721ddb46b5d20e339db20f4ee51e
* fix: deduplicate copilot test bundle and fix import * fix: error after merge in master GitOrigin-RevId: a3cae15b37ff5184cc2ad7c6033e12ae5a2c19c3
* fix: implement prop delete for server query params * refactor: use omit instead of manual object filter GitOrigin-RevId: 61ca20ccdac684148a0f234729c515753e84b233
GitOrigin-RevId: 11c2d0e5ff0aa9c3fadada0ef45c77318a52f3af
github-actions
Bot
changed the title
github-actions
Bot
force-pushed
the
merge/upstream
branch
from
b183c14 to
2d5ff3c
Compare
GitOrigin-RevId: 91784bde0f7f2690781ee526c7ad43078b766b63
- @plasmicapp/data-sources@1.0.10 - @plasmicapp/host@2.0.5 - @plasmicapp/loader-gatsby@2.0.8 - @plasmicapp/loader-nextjs@2.0.7 - @plasmicapp/loader-react@2.0.7 - @plasmicapp/react-web@1.0.11 - @plasmicapp/react-web-runtime@1.0.11 - plasmicpkgs-dev@0.0.68 - @plasmicpkgs/airtable@0.0.262 - @plasmicpkgs/antd@2.0.170 - @plasmicpkgs/antd5@0.0.348 - @plasmicpkgs/plasmic-chakra-ui@0.0.78 - @plasmicpkgs/cms@0.0.26 - @plasmicpkgs/commerce@0.0.246 - @plasmicpkgs/commerce-commercetools@0.0.196 - @plasmicpkgs/commerce-local@0.0.246 - @plasmicpkgs/commerce-saleor@0.0.210 - @plasmicpkgs/commerce-shopify@0.0.254 - @plasmicpkgs/commerce-swell@0.0.256 - @plasmicpkgs/contentful@0.0.20 - @plasmicpkgs/dnd-kit@0.0.26 - @plasmicpkgs/fetch@0.0.40 - @plasmicpkgs/framer-motion@0.0.246 - @plasmicpkgs/plasmic-google-maps@0.0.27 - @plasmicpkgs/graphql@0.0.34 - @plasmicpkgs/plasmic-keen-slider@0.0.91 - @plasmicpkgs/lottie-react@0.0.240 - @plasmicpkgs/plasmic-mailchimp@0.0.25 - @plasmicpkgs/plasmic-basic-components@0.0.277 - @plasmicpkgs/plasmic-calendly@0.0.94 - @plasmicpkgs/plasmic-cms@0.0.317 - @plasmicpkgs/plasmic-content-stack@0.0.202 - @plasmicpkgs/plasmic-contentful@0.0.196 - @plasmicpkgs/plasmic-embed-css@0.1.232 - @plasmicpkgs/plasmic-eventbrite@0.0.80 - @plasmicpkgs/plasmic-giphy@0.0.80 - @plasmicpkgs/plasmic-graphcms@0.0.219 - @plasmicpkgs/plasmic-hubspot@0.0.92 - @plasmicpkgs/plasmic-intercom@0.0.25 - @plasmicpkgs/plasmic-link-preview@1.0.154 - @plasmicpkgs/plasmic-nav@0.0.218 - @plasmicpkgs/plasmic-pigeon-maps@0.0.80 - @plasmicpkgs/plasmic-query@0.0.267 - @plasmicpkgs/plasmic-rich-components@1.0.254 - @plasmicpkgs/plasmic-sanity-io@1.0.227 - @plasmicpkgs/plasmic-soundcloud@0.0.92 - @plasmicpkgs/plasmic-strapi@0.1.205 - @plasmicpkgs/plasmic-tabs@0.0.89 - @plasmicpkgs/plasmic-typeform@0.0.92 - @plasmicpkgs/plasmic-wordpress@0.0.175 - @plasmicpkgs/plasmic-wordpress-graphql@0.0.164 - @plasmicpkgs/plasmic-yotpo@0.0.91 - @plasmicpkgs/radix-ui@0.0.106 - @plasmicpkgs/react-aria@0.0.182 - @plasmicpkgs/react-audio-player@0.0.75 - @plasmicpkgs/react-awesome-reveal@3.8.250 - @plasmicpkgs/react-chartjs-2@1.0.158 - @plasmicpkgs/react-parallax-tilt@0.0.248 - @plasmicpkgs/react-quill@1.0.111 - @plasmicpkgs/react-scroll-parallax@0.0.257 - @plasmicpkgs/react-slick@0.0.269 - @plasmicpkgs/react-twitter-widgets@0.0.246 - @plasmicpkgs/react-youtube@7.13.252 - @plasmicpkgs/rive@0.0.34 - @plasmicpkgs/plasmic-spotify@0.0.25 - @plasmicpkgs/strapi@0.0.24 - @plasmicpkgs/tiptap@0.0.35 - @plasmicpkgs/vanilla-cookieconsent@0.0.24 - @plasmicpkgs/wordpress@0.0.25 GitOrigin-RevId: 41f43c9b107d2fff575c443bc4649fa708897242
GitOrigin-RevId: 1cd543d1a400699f630566259e220cb01274b736
* live-preview: fixed dependency global css imports in the live preview * [live-preview]: inject dependencies css stylesheet conditionally based on the usage * [project-deps]: add tests for getDependenciesWithReferencedCss * [docs-preview]: inject only referenced deps css imports for docs preview GitOrigin-RevId: 8968b267374bf6c2d202a68b0bfa3a291ff1a0fc
* feat: group multiple packages under a single bundleName feat: create draft query fix: function icon fix: functions always appear first fix: Install CTA icon refactor: miscellaneous refactor: miscellaneous fix: type error in legacy Omnibar fix: function icon refactor / feedback fix: allow multiple primaries fix: ensure single install CTA fix: rename Imported Packages -> Installed * fix: choose query function when adding from drawer feat: show fetcher package contents before install feat: show fetcher components before install feat: show un-added package functions and update headers * refactor: hide non query functions and simplify notification --------- Co-authored-by: Sam Pullman <sampullman@gmail.com> GitOrigin-RevId: cee4dd10bf35c68d4f45e37fe9c3be2c2aece9db
GitOrigin-RevId: 888c265e916ffac63f92a00379efb3799f12e62a
GitOrigin-RevId: ed1b670a921cb843895effe442122ca5c01b314a
GitOrigin-RevId: 883f00ea220bfd6f1643308e4354b8d342449be8
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
github-actions
Bot
force-pushed
the
merge/upstream
branch
from
2d5ff3c to
b7745ae
Compare
github-actions
Bot
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Upstream Merge
223 new commits from plasmicapp/plasmic master.
Conflicts to resolve
git fetch origin merge/upstream git checkout merge/upstream # Resolve conflicts, then: git push origin merge/upstreamConflicted files:
Before merging
See Upstream Merge Runbook.