merge: upstream 307 commits#313
Open
github-actions[bot] wants to merge 308 commits into
Open
Conversation
github-actions
Bot
changed the title
github-actions
Bot
force-pushed
the
merge/upstream
branch
from
7c38a1c to
d195b8b
Compare
- Fixed read() so empty static attrs are not dropped - Fixed changeElement() so attrs still apply when a style update is skipped due to being dynamic - Updated the tool schema description to mention attrs GitOrigin-RevId: e6d8ffe96cfcb5384017aaf7de5be75a6119740d
GitOrigin-RevId: fcdae02111e0e85787afac69b9f5fa2444cd53ec
GitOrigin-RevId: 80beb1c1b4b17957c530b758724cb23525cff3e4
GitOrigin-RevId: 2d6bcae5ada7a70461059b6ba1bbdff091521c39
GitOrigin-RevId: e2ef038a5ce427028b1c553b1e55a87aad11c413
…ata for SSG
Generated gatsby-loader projects now ship with a gatsby-node.{ts,js} that runs
extractPlasmicQueryData per Plasmic page in onCreatePage and stores the result
in pageContext.queryCache. defaultPlasmicPage.{tsx,jsx} consumes it as
prefetchedQueryData. Without this, pages with data queries SSG'd to the
React Suspense fallback ("Loading...") instead of actual content.
Also rewrites gatsby-config.{ts,js} wholesale (instead of line-stitching the
plugin entry into the gatsby starter's config) so gatsby-node can recover the
plugin options via gatsbyConfig.plugins.find().
src/plasmic-init.js (loader, JS variant) is converted from ESM-syntax-in-.js
to CommonJS (module.exports). Previously it was only imported by the
webpack-bundled defaultPlasmicPage.jsx, where webpack happily handled ESM
syntax in .js files. The new gatsby-node.js is loaded directly by Node as
CJS and does require("./src/plasmic-init") — Node would throw
SyntaxError: Cannot use import statement outside a module against the old
ESM syntax. Adding "type": "module" to package.json was tried but breaks
gatsby's internal CJS subprocesses (it spawns tmp scripts under .cache/
that use require() and inherit the type setting). Renaming to .mjs would
require updating the defaultPlasmicPage.jsx import path. CJS conversion is
the smallest change that keeps everything else working.
GitOrigin-RevId: 796afecc534d8f416d122c51a21910ecbe7ddca1
GitOrigin-RevId: 179f7ac616ab7853faef6d18afbba7438a0d4973
GitOrigin-RevId: 2ff9ffd1508589381d887fc9ea35e4f944efe066
GitOrigin-RevId: 3aa8da5323c6c7ddda949a1d1a7d9ffbbbfee720
GitOrigin-RevId: cca8d899db45485ef2104c5430d7b6d3229efe2f
GitOrigin-RevId: 7b64fdaebeca5c39fa2235927c32b1d52da742e1
GitOrigin-RevId: 078dd102b19792c3ba858f070b482da29dd16842
use defaultValue for determining default query post GitOrigin-RevId: e6ea6d9008d21be1e92fd503b87eecf0e0c9db95
GitOrigin-RevId: 68e1154a4b9ef2c906057a8a8e58fc0298325250
GitOrigin-RevId: c5c3a70d38788e105d963729c68164a4f94efdc7
GitOrigin-RevId: 5c4b98bfcafcd858849daf4695825acffbce19f1
GitOrigin-RevId: 83a656814c66a6424432cd51fffc5a67cd942d95
- @plasmicapp/data-sources@1.0.6 - @plasmicapp/host@2.0.3 - @plasmicapp/loader-gatsby@2.0.5 - @plasmicapp/loader-nextjs@2.0.4 - @plasmicapp/loader-react@2.0.4 - @plasmicapp/react-web@1.0.7 - @plasmicapp/react-web-runtime@1.0.7 - plasmicpkgs-dev@0.0.64 - @plasmicpkgs/airtable@0.0.260 - @plasmicpkgs/antd@2.0.168 - @plasmicpkgs/antd5@0.0.344 - @plasmicpkgs/plasmic-chakra-ui@0.0.76 - @plasmicpkgs/cms@0.0.23 - @plasmicpkgs/commerce@0.0.244 - @plasmicpkgs/commerce-commercetools@0.0.194 - @plasmicpkgs/commerce-local@0.0.244 - @plasmicpkgs/commerce-saleor@0.0.208 - @plasmicpkgs/commerce-shopify@0.0.252 - @plasmicpkgs/commerce-swell@0.0.254 - @plasmicpkgs/contentful@0.0.18 - @plasmicpkgs/dnd-kit@0.0.23 - @plasmicpkgs/fetch@0.0.37 - @plasmicpkgs/framer-motion@0.0.244 - @plasmicpkgs/plasmic-google-maps@0.0.25 - @plasmicpkgs/graphql@0.0.31 - @plasmicpkgs/plasmic-keen-slider@0.0.89 - @plasmicpkgs/lottie-react@0.0.238 - @plasmicpkgs/plasmic-mailchimp@0.0.23 - @plasmicpkgs/plasmic-basic-components@0.0.275 - @plasmicpkgs/plasmic-calendly@0.0.92 - @plasmicpkgs/plasmic-cms@0.0.314 - @plasmicpkgs/plasmic-content-stack@0.0.200 - @plasmicpkgs/plasmic-contentful@0.0.194 - @plasmicpkgs/plasmic-embed-css@0.1.230 - @plasmicpkgs/plasmic-eventbrite@0.0.78 - @plasmicpkgs/plasmic-giphy@0.0.78 - @plasmicpkgs/plasmic-graphcms@0.0.217 - @plasmicpkgs/plasmic-hubspot@0.0.90 - @plasmicpkgs/plasmic-intercom@0.0.23 - @plasmicpkgs/plasmic-link-preview@1.0.150 - @plasmicpkgs/plasmic-nav@0.0.216 - @plasmicpkgs/plasmic-pigeon-maps@0.0.78 - @plasmicpkgs/plasmic-query@0.0.265 - @plasmicpkgs/plasmic-rich-components@1.0.249 - @plasmicpkgs/plasmic-sanity-io@1.0.225 - @plasmicpkgs/plasmic-soundcloud@0.0.90 - @plasmicpkgs/plasmic-strapi@0.1.202 - @plasmicpkgs/plasmic-tabs@0.0.87 - @plasmicpkgs/plasmic-typeform@0.0.90 - @plasmicpkgs/plasmic-wordpress@0.0.172 - @plasmicpkgs/plasmic-wordpress-graphql@0.0.162 - @plasmicpkgs/plasmic-yotpo@0.0.89 - @plasmicpkgs/radix-ui@0.0.104 - @plasmicpkgs/react-aria@0.0.178 - @plasmicpkgs/react-audio-player@0.0.73 - @plasmicpkgs/react-awesome-reveal@3.8.248 - @plasmicpkgs/react-chartjs-2@1.0.156 - @plasmicpkgs/react-parallax-tilt@0.0.246 - @plasmicpkgs/react-quill@1.0.109 - @plasmicpkgs/react-scroll-parallax@0.0.255 - @plasmicpkgs/react-slick@0.0.267 - @plasmicpkgs/react-twitter-widgets@0.0.244 - @plasmicpkgs/react-youtube@7.13.250 - @plasmicpkgs/rive@0.0.32 - @plasmicpkgs/plasmic-spotify@0.0.23 - @plasmicpkgs/strapi@0.0.21 - @plasmicpkgs/tiptap@0.0.31 - @plasmicpkgs/vanilla-cookieconsent@0.0.22 - @plasmicpkgs/wordpress@0.0.22 GitOrigin-RevId: c6d493ab33d8d50e512a6b0995aa882c8500d897
GitOrigin-RevId: 8b3a5e82aa643a19a5ca68ffc3543aba69be173a
* feat(copilot): add support for creating component, variantGroups and variants in copilot * refactor: move the batch operations responsbility from client operatioins to tool functions * refactor(add-component): requested changes * fix(copilot-tools): createComponent undo logic * fix(create-variant): add check to ensure standalone variant group only have single variant * chore: assert truthy values in the create-component.spec.ts GitOrigin-RevId: 28fa8d21d6e80a3971f37a8c8028b1ce4d5336cc
* chore(gh-action): update github workflow to v24 https://linear.app/plasmic/issue/PLA-12951/update-github-push-actions-before-june-2 * Update actions: checkout, cache, create-pr, setup-node * fix: workflow env and pr create idempotency --------- Co-authored-by: Sam Pullman <sampullman@gmail.com> GitOrigin-RevId: 7d1088608db410aeea249f969d5ce074610e1ba9
- Adds $state support to server queries (SSR): codegen serializes stateSpecs in the query tree and filters $q/$props/$ctx/$state to declared deps so cache keys aren't invalidated by unrelated query resolutions. - Replaces brittle $ctx/$props/$state change detection with a simpler "compare resolved args, reset if changed" model. - Refactors serializeServerQuery into serializeCustomCode + serializeCustomFunctionExpr; tightens $StateSpec type to match react-web. - Modifies custom code query codegen to explicitly list each dollar dependency. GitOrigin-RevId: f8805b89239aa0904c8c0b28e4ce8670952ff940
- @plasmicapp/data-sources@1.0.7 - @plasmicapp/react-web@1.0.8 - @plasmicapp/react-web-runtime@1.0.8 - @plasmicpkgs/antd5@0.0.345 - @plasmicpkgs/plasmic-link-preview@1.0.151 - @plasmicpkgs/plasmic-rich-components@1.0.250 - @plasmicpkgs/react-aria@0.0.179 - @plasmicpkgs/tiptap@0.0.32 GitOrigin-RevId: 9b61e0f3ae3424690b98ea05cfc6c3a470f32f39
GitOrigin-RevId: 135928f9f7b708eaa5586ddcfbc703ef87c7cfb5
GitOrigin-RevId: 31bd41a283c30a77d39b04aafdf2a663112ef945
* feat(copilot): add tools to manage StyleTokens and it's varianted values * refactor(variants): make component optional in getAllVariantsForTpl * refactor(tools-token): only allow changing MutableTokens for now * chore: address TS error with discriminated union * chore: revert consideration of discriminated union type for getAllVariantsForTpl GitOrigin-RevId: bdbed8e1b18e75bc3a9064cee5cf43e6e1921aa3
GitOrigin-RevId: 53dcfbbe778c0e8e2e1b408e47d47e7dbd8f6dd7
Co-authored-by: CharlieHelps <charlie@charlielabs.ai> GitOrigin-RevId: 6a52ab3eb197f21053b984f3096134807d2a0328
* fix: avoid pkg version undefined when getting branch * fix: self-heal missing branch entries in commitGraph Branches that have never published still have no head we can recover, so the nil checks in getProjectAndBranchesByIdOrNames stay and getLowestCommonAncestor returns undefined when either branch has no head. * fix: lock project row in maybeUpdateCommitGraphForProject * refactor: lock branch update from dbMgr explicitly where needed * refactor: refactor branch healing logic * fix: branch repair logic and pr review comments * chore: add comment to DbMgr about pessimistic_write GitOrigin-RevId: d44fcd33810d4b0f72a2f257263734b981adace6
Co-authored-by: CharlieHelps <charlie@charlielabs.ai> GitOrigin-RevId: 8a9cb1f81b64ddcd8c8405dae333815d2162265d
GitOrigin-RevId: 76c72b6126427d2856fe1cbeb21b616904a5c161
GitOrigin-RevId: 01ab3a4f4631a1df31bcd309d492bccec0d96d66
- @plasmicapp/data-sources@1.0.18 - @plasmicapp/host@2.0.9 - @plasmicapp/loader-edge@1.0.80 - @plasmicapp/loader-gatsby@2.0.14 - @plasmicapp/loader-nextjs@2.0.13 - @plasmicapp/loader-react@2.0.12 - @plasmicapp/loader-splits@1.0.74 - @plasmicapp/react-web@1.0.20 - @plasmicapp/react-web-runtime@1.0.20 - plasmicpkgs-dev@0.0.74 - @plasmicpkgs/airtable@0.0.266 - @plasmicpkgs/antd@2.0.174 - @plasmicpkgs/antd5@0.0.357 - @plasmicpkgs/plasmic-chakra-ui@0.0.82 - @plasmicpkgs/cms@0.0.30 - @plasmicpkgs/commerce@0.0.250 - @plasmicpkgs/commerce-commercetools@0.0.200 - @plasmicpkgs/commerce-local@0.0.250 - @plasmicpkgs/commerce-saleor@0.0.214 - @plasmicpkgs/commerce-shopify@0.0.258 - @plasmicpkgs/commerce-swell@0.0.260 - @plasmicpkgs/contentful@0.0.24 - @plasmicpkgs/dnd-kit@0.0.30 - @plasmicpkgs/fetch@0.0.44 - @plasmicpkgs/framer-motion@0.0.250 - @plasmicpkgs/plasmic-google-maps@0.0.31 - @plasmicpkgs/graphql@0.0.38 - @plasmicpkgs/plasmic-keen-slider@0.0.95 - @plasmicpkgs/lottie-react@0.0.244 - @plasmicpkgs/plasmic-mailchimp@0.0.29 - @plasmicpkgs/plasmic-basic-components@0.0.281 - @plasmicpkgs/plasmic-calendly@0.0.98 - @plasmicpkgs/plasmic-cms@0.0.321 - @plasmicpkgs/plasmic-content-stack@0.0.206 - @plasmicpkgs/plasmic-contentful@0.0.200 - @plasmicpkgs/plasmic-embed-css@0.1.236 - @plasmicpkgs/plasmic-eventbrite@0.0.84 - @plasmicpkgs/plasmic-giphy@0.0.84 - @plasmicpkgs/plasmic-graphcms@0.0.223 - @plasmicpkgs/plasmic-hubspot@0.0.96 - @plasmicpkgs/plasmic-intercom@0.0.29 - @plasmicpkgs/plasmic-link-preview@1.0.162 - @plasmicpkgs/plasmic-nav@0.0.222 - @plasmicpkgs/plasmic-pigeon-maps@0.0.84 - @plasmicpkgs/plasmic-query@0.0.271 - @plasmicpkgs/plasmic-rich-components@1.0.262 - @plasmicpkgs/plasmic-sanity-io@1.0.231 - @plasmicpkgs/plasmic-soundcloud@0.0.96 - @plasmicpkgs/plasmic-strapi@0.1.209 - @plasmicpkgs/plasmic-tabs@0.0.93 - @plasmicpkgs/plasmic-typeform@0.0.96 - @plasmicpkgs/plasmic-wordpress@0.0.179 - @plasmicpkgs/plasmic-wordpress-graphql@0.0.168 - @plasmicpkgs/plasmic-yotpo@0.0.95 - @plasmicpkgs/radix-ui@0.0.110 - @plasmicpkgs/react-aria@0.0.187 - @plasmicpkgs/react-audio-player@0.0.79 - @plasmicpkgs/react-awesome-reveal@3.8.254 - @plasmicpkgs/react-chartjs-2@1.0.162 - @plasmicpkgs/react-parallax-tilt@0.0.252 - @plasmicpkgs/react-quill@1.0.115 - @plasmicpkgs/react-scroll-parallax@0.0.261 - @plasmicpkgs/react-slick@0.0.273 - @plasmicpkgs/react-twitter-widgets@0.0.250 - @plasmicpkgs/react-youtube@7.13.256 - @plasmicpkgs/rive@0.0.38 - @plasmicpkgs/plasmic-spotify@0.0.29 - @plasmicpkgs/strapi@0.0.28 - @plasmicpkgs/tiptap@0.0.43 - @plasmicpkgs/vanilla-cookieconsent@0.0.28 - @plasmicpkgs/wordpress@0.0.29 GitOrigin-RevId: 824769f1fdd29dbc7ff8ae7895ed07deb46a1a9a
GitOrigin-RevId: 2c04347da7c2ed83f3ba6380e7cd78fba3a8dc90
* fix: Code completion z-index issue GitOrigin-RevId: 4d1df84cd239b3a225ec16a9d768dc812cd48f48
* fix: avoid hang in url.spec.ts when external service is slow * fix: only skip transient errors in url.spec.ts GitOrigin-RevId: 445836b85aef6ff52f4d3bc8c30297d720c23011
GitOrigin-RevId: e6d3d7b4b7a8ed627ca6602df7924552ec79803f
GitOrigin-RevId: ad6a58e6a20c97085442281c5dc531da618576ff
* feat: add dot menu icon to data source rows * fix: move design and style updates to plasmic GitOrigin-RevId: 10b1fe66270ee9bc01abe03855319f9b3aaf690b
GitOrigin-RevId: c904a3d746ba76225b8248c28c2874f1a3c40451
* fix: Function insertion UX Missing spinner * refactor: Move the fix to the call site to match asyncExtraInfo pattern GitOrigin-RevId: f5191768696c8df69672eaf0e4f01a9746357f03
* feat: flatten query data in data picker * fix: address pr review comments * refactor: consolidate picker flattening via traversal policy * refactor: rename <QueryErrorNotice to generic error * fix: correct preview execution in picker code editor * fix: address pr comment and clean up unused flatten arg * refactor: rewrite flatten/descend code for data picker * refactor: handle flattening state more explicitly * refactor: move state/query special-casing up into getInitialColumns The lower-level data picker functions (mkColumnItems, itemPath, itemChildColumns, mkListColumn) are now agnostic of what kind of data they hold: one item per key, one path per item. All knowledge of $-containers, $state's surfaced implicit states, and $q queries lives in getInitialColumns' root-column construction, which builds query items directly for `$q.<name>.data` (carrying the query's error on the item). This removes isFlattened/isFlattenedStatePath and the base-path/real-path split (itemRealPath/itemRealValue/itemErrorMessage). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor: derive flattenedStateNames inside getInitialColumns Callers now pass the Component itself; getInitialColumns derives which implicit states surface at the top level, so no state-specific data threads through the picker plumbing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor: minor review cleanup * nits * reorg tests * fix getSourceUiId for $state.elementName.stateName * test: cover getSourceUiId for $state rows Ported from fix/data-picker-state-jump-source before deleting it. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Jason Long <j@jaslong.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com> GitOrigin-RevId: 6ce062e3a35fa3e74297fefbe7ed15470be49611
* [wab] remove dead defaultExportHostLessComponents export opt Loader requests with loaderVersion < 7 throw LoaderDeprecatedVersionError before codegen output is bundled or cached, so the loaderVersion > 2 conditional was the only place that could set this flag to true and it is now unreachable. Remove the flag entirely. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * [wab] loader always uses component substitution API Loader requests with loaderVersion < 7 throw LoaderDeprecatedVersionError, so the loaderVersion >= 6 condition is always true. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * [wab] loader always uses global variants substitution API Loader requests with loaderVersion < 7 throw LoaderDeprecatedVersionError, so the loaderVersion >= 7 condition is always true. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * [wab] bump loaderVersion in tests to 7 7 is the minimum loader version the server still accepts; older versions get LoaderDeprecatedVersionError. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com> GitOrigin-RevId: c19cb8f6bd9cc8ef7e73b3df9770b198a6a52307
* [move-element-tool]: add new move element tool * [move-element-tool]: fix append/prepend for moving element within same parent * [operations]: Extract pure insert-tpl operation from ViewOps insertion leaf methods * [copilot-tools]: Switch moveElement to pure insert-tpl operation, dropping ViewCtx dependency * [operations]: Add insert-tpl spec and bind test VariantTplMgr frame to the real component * [insert-tpl-operation]: fix typescript error for SlotSelection target and rephrase comments * chore: rename targetUuid to targetTplUuid GitOrigin-RevId: e4e4ed5882bc8abe7072da90391a9aa6155f34b3
* feat: export page prop types from react-web * fix: address review feedback GitOrigin-RevId: 8d2ff3ec652edaccf597d6d8832ffc275104c8aa
GitOrigin-RevId: 7b830b9fbabb2a077282aeb68fdd150b5c95828f
GitOrigin-RevId: e23d745ec31a4b6562fefa626a65e8b3a9c276e7
* chore: migration for code component subtreePrefetchingConfig meta * feat: serverRendering codegen support and loader test * refactor: rename serverRendering to subtreePrefetchingConfig * refactor: improve prefetching test * fix: update subtreePrefetchingConfig? doc comment GitOrigin-RevId: 8bc03ad9a5080c26893779eda0b364d7ef65a378
- @plasmicapp/data-sources@1.0.19 - @plasmicapp/host@2.0.10 - @plasmicapp/loader-gatsby@2.0.15 - @plasmicapp/loader-nextjs@2.0.15 - @plasmicapp/loader-react@2.0.13 - @plasmicapp/react-web@1.0.23 - @plasmicapp/react-web-runtime@1.0.23 - plasmicpkgs-dev@0.0.76 - @plasmicpkgs/airtable@0.0.267 - @plasmicpkgs/antd@2.0.175 - @plasmicpkgs/antd5@0.0.360 - @plasmicpkgs/plasmic-chakra-ui@0.0.83 - @plasmicpkgs/cms@0.0.31 - @plasmicpkgs/commerce@0.0.251 - @plasmicpkgs/commerce-commercetools@0.0.201 - @plasmicpkgs/commerce-local@0.0.251 - @plasmicpkgs/commerce-saleor@0.0.215 - @plasmicpkgs/commerce-shopify@0.0.259 - @plasmicpkgs/commerce-swell@0.0.261 - @plasmicpkgs/contentful@0.0.25 - @plasmicpkgs/dnd-kit@0.0.31 - @plasmicpkgs/fetch@0.0.45 - @plasmicpkgs/framer-motion@0.0.251 - @plasmicpkgs/plasmic-google-maps@0.0.32 - @plasmicpkgs/graphql@0.0.39 - @plasmicpkgs/plasmic-keen-slider@0.0.96 - @plasmicpkgs/lottie-react@0.0.245 - @plasmicpkgs/plasmic-mailchimp@0.0.30 - @plasmicpkgs/plasmic-basic-components@0.0.282 - @plasmicpkgs/plasmic-calendly@0.0.99 - @plasmicpkgs/plasmic-cms@0.0.322 - @plasmicpkgs/plasmic-content-stack@0.0.207 - @plasmicpkgs/plasmic-contentful@0.0.201 - @plasmicpkgs/plasmic-embed-css@0.1.237 - @plasmicpkgs/plasmic-eventbrite@0.0.85 - @plasmicpkgs/plasmic-giphy@0.0.85 - @plasmicpkgs/plasmic-graphcms@0.0.224 - @plasmicpkgs/plasmic-hubspot@0.0.97 - @plasmicpkgs/plasmic-intercom@0.0.30 - @plasmicpkgs/plasmic-link-preview@1.0.163 - @plasmicpkgs/plasmic-nav@0.0.223 - @plasmicpkgs/plasmic-pigeon-maps@0.0.85 - @plasmicpkgs/plasmic-query@0.0.272 - @plasmicpkgs/plasmic-rich-components@1.0.263 - @plasmicpkgs/plasmic-sanity-io@1.0.232 - @plasmicpkgs/plasmic-soundcloud@0.0.97 - @plasmicpkgs/plasmic-strapi@0.1.210 - @plasmicpkgs/plasmic-tabs@0.0.94 - @plasmicpkgs/plasmic-typeform@0.0.97 - @plasmicpkgs/plasmic-wordpress@0.0.180 - @plasmicpkgs/plasmic-wordpress-graphql@0.0.169 - @plasmicpkgs/plasmic-yotpo@0.0.96 - @plasmicpkgs/radix-ui@0.0.111 - @plasmicpkgs/react-aria@0.0.188 - @plasmicpkgs/react-audio-player@0.0.80 - @plasmicpkgs/react-awesome-reveal@3.8.255 - @plasmicpkgs/react-chartjs-2@1.0.163 - @plasmicpkgs/react-parallax-tilt@0.0.253 - @plasmicpkgs/react-quill@1.0.116 - @plasmicpkgs/react-scroll-parallax@0.0.262 - @plasmicpkgs/react-slick@0.0.274 - @plasmicpkgs/react-twitter-widgets@0.0.251 - @plasmicpkgs/react-youtube@7.13.257 - @plasmicpkgs/rive@0.0.39 - @plasmicpkgs/plasmic-spotify@0.0.30 - @plasmicpkgs/strapi@0.0.29 - @plasmicpkgs/tiptap@0.0.44 - @plasmicpkgs/vanilla-cookieconsent@0.0.29 - @plasmicpkgs/wordpress@0.0.30 GitOrigin-RevId: 4870d0b934194930901e254d28f762f34f1fdbfd
* fix: pass searchParams to queries without breaking SSG * refactor: use new PlasmicPageProps in codegen GitOrigin-RevId: 1ae61d6ee9130c1728b4e7816323f85e9895d60e
GitOrigin-RevId: bd9c793bbd287500695af635fce9d05a84bd90ca
github-actions
Bot
force-pushed
the
merge/upstream
branch
from
560ff08 to
a3de669
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
307 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.