From 95dfa188b0b72ec9be644945b8a1e6716e4e66e1 Mon Sep 17 00:00:00 2001 From: fushar Date: Thu, 12 Dec 2024 10:21:04 +0000 Subject: [PATCH] Starter page templates: correctly insert the pattern to the Content block (#40583) Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12294109073 Upstream-Ref: Automattic/jetpack@709e37f846335c7c90b8d88b6395d98d12dfeda1 --- composer.lock | 58 +++++++++---------- .../automattic/jetpack-mu-wpcom/CHANGELOG.md | 1 + .../starter-page-templates.asset.php | 2 +- .../starter-page-templates.js | 2 +- .../page-patterns-plugin.tsx | 23 +++++++- vendor/composer/installed.json | 56 +++++++++--------- vendor/composer/installed.php | 56 +++++++++--------- 7 files changed, 109 insertions(+), 89 deletions(-) diff --git a/composer.lock b/composer.lock index f19f9d2e..99d9f54d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c57350f3cb839924f1cb8ec691e83920", + "content-hash": "a9e68d0c8ddeaad198ae3e13966468d1", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats", - "reference": "873a210b844f1bf2399a03aab68ff23e42f9f720" + "reference": "14178074f77469b2e0a5bdc3a981e6d9dc61dc8f" }, "require": { "php": ">=7.2" @@ -65,7 +65,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "7c0c11117a231a81a7e5c5354dcf5a8b1d3f239a" + "reference": "4a1310c4a8162c4705e030e5d7e03f5bdaf995aa" }, "require": { "php": ">=7.2" @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "cb71d6eebe0c7468c75c33c1eb5a97c40171fa90" + "reference": "79a71cdb64f742ceac434f6483905740d6a96095" }, "require": { "automattic/jetpack-constants": "^3.0.1", @@ -199,7 +199,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "a490c151a22ecb95df9db1288e6eb7f104c3f632" + "reference": "19b02e612a834bf64e8d17b39eb052816ab73e43" }, "require": { "automattic/jetpack-assets": "^4.0.2-alpha", @@ -280,7 +280,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "ad1d9fb367dd1b248e24f9fb01aea08d60b8c920" + "reference": "ffd836d6b05fdf507dc15092d2c52a2c2e8cede3" }, "require": { "automattic/jetpack-constants": "^3.0.1", @@ -342,7 +342,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "39eb71bc11e99893838f3b7c1b66e2118c8aed47" + "reference": "332dfe824bcb58f38d1689a78c7cf951754433ca" }, "require": { "automattic/jetpack-assets": "^4.0.2-alpha", @@ -407,7 +407,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "3a8e1cb8493e18dc6cda45c66f627eddb45da020" + "reference": "8dd157c3b18e6af887d8977605789ddefbc0763c" }, "require": { "automattic/jetpack-assets": "^4.0.2-alpha", @@ -478,7 +478,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "8eae15b3efe213e5d840a1a9833afeda0790b030" + "reference": "d519c3f3ffcde04b2592c9d7ce2dc43e3689642b" }, "require": { "php": ">=7.2" @@ -515,7 +515,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "0bb1d59a91336b97fb4416f7f375278e5a18705a" + "reference": "2e18f9641463154301773b79c651afe7dc7944ca" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", @@ -605,7 +605,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "e8f816359f92df9447754615746233bfbe5576f6" + "reference": "1d7f679781b9e8fb86cf42e29780b53420a8a5e1" }, "require": { "php": ">=7.2" @@ -659,7 +659,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "396844625222fd7d35026855057093d9523cb381" + "reference": "06aee8137dc39c20e082d6e2ba67e808f01d9e84" }, "require": { "php": ">=7.2" @@ -712,7 +712,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "5c20c6cf2d7eba2c6e1741494e98aa4fbf8c9489" + "reference": "2620dce33b7f845157b907438a602da64c599e52" }, "require": { "automattic/jetpack-status": "^5.0.1", @@ -783,7 +783,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "028dab6c930fa49a8ff9d46f68a8e2d38fb277e7" + "reference": "7c7f5650b2c0be0fdd807ce33ea2f2e73dbe840f" }, "require": { "php": ">=7.2" @@ -841,7 +841,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "1cff8557892ea30cf0c5dd35c587b794b567e34e" + "reference": "86493c137082e98f1bbd18f5df23065edaea67e3" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", @@ -916,7 +916,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "01cca9eb672928478bb8d77abb731591c7149427" + "reference": "61e80db5642a114b44569ce443e083bde8dce6f9" }, "require": { "php": ">=7.2" @@ -969,7 +969,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "c93dd001a5d52ac4f42f7c8f62dc1073df405ae2" + "reference": "34551b367bc9834ffea198fae75a240f45c40327" }, "require": { "automattic/jetpack-assets": "^4.0.2-alpha", @@ -1053,11 +1053,11 @@ }, { "name": "automattic/jetpack-mu-wpcom", - "version": "6.1.0-alpha.1733980392", + "version": "6.1.0-alpha.1733997921", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "3ff1ae0eadc6b0595e200ebca580a7456ae991a8" + "reference": "5136893721e381a2742c66ed22d5e9b8bc9fee22" }, "require": { "automattic/jetpack-assets": "^4.0.2-alpha", @@ -1140,7 +1140,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "f5152d79306b0a52713f6c528b6cc30a07898764" + "reference": "0bbcc4ec686489dc700427ff143013f06d9a164a" }, "require": { "php": ">=7.2" @@ -1201,7 +1201,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "4e6df2b4fe0bb87f7929a3a7d3779b3e152dad00" + "reference": "6b2222480cafc25ba86a2d8d86ed25bf304f5f1c" }, "require": { "automattic/jetpack-connection": "^6.2.1-alpha", @@ -1269,7 +1269,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "31e047af49f3605847241b41d25458b7340e6273" + "reference": "1d436694c42e81b9ef64609179362626186d372d" }, "require": { "automattic/jetpack-status": "^5.0.1", @@ -1324,7 +1324,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "bc2a693ade273e168ee9c2df956a411fb5f54688" + "reference": "4a0560239701ccf6d81439ecb07689b57cc7ceba" }, "require": { "php": ">=7.2" @@ -1378,7 +1378,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "34fcd8ac5ca0c88f0366b63385aaaccecd22136b" + "reference": "8afa8bac92d008ab89baca8b40084dc01dac6c43" }, "require": { "automattic/jetpack-connection": "^6.2.1-alpha", @@ -1445,7 +1445,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "61b3d9879c827e8bb40664cfc6b4ba379e663f99" + "reference": "7ab134028d3e6ed2d5deab667ad9eb295217d012" }, "require": { "automattic/jetpack-connection": "^6.2.1-alpha", @@ -1518,7 +1518,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "7145c36f389dbc5adbec4042826fb6172fd4243b" + "reference": "1a941538edfc9e17e52d098d0948a5469a3e07f0" }, "require": { "automattic/jetpack-constants": "^3.0.1", @@ -1582,7 +1582,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "cfd8cb4d62c36b029ec1bfe37b1b7102776119d5" + "reference": "d9ec14b72d24cdae4178f1d749782320395d741d" }, "require": { "automattic/jetpack-connection": "^6.2.1-alpha", @@ -1660,7 +1660,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "56f8d53c96d3ed431989e69025d2e2c50c157a82" + "reference": "698bcd78495207ede67d12a01ae8c503fdd7ef43" }, "require": { "automattic/jetpack-connection": "^6.2.1-alpha", @@ -1812,7 +1812,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "6c2e50f1de5d76b1be87b955057974016c2eb8e5" + "reference": "d27959f509c734d9fb45b4b4ea7cf31922f126cc" }, "require": { "php": ">=7.2.5", diff --git a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md index 55caaf06..1228d89c 100644 --- a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md +++ b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md @@ -23,6 +23,7 @@ This is an alpha version! The changes listed here are not final. - Holiday Snow: do not display on p2s. - Load WPCOM sidebar notice async - Restore visited button color in themes.php to Core's default +- Starter page templates: correctly insert the pattern to the Content block when rendering mode is template-locked ## [6.0.0] - 2024-12-04 ### Changed diff --git a/vendor/automattic/jetpack-mu-wpcom/src/build/starter-page-templates/starter-page-templates.asset.php b/vendor/automattic/jetpack-mu-wpcom/src/build/starter-page-templates/starter-page-templates.asset.php index 69eddeae..98f16dc7 100644 --- a/vendor/automattic/jetpack-mu-wpcom/src/build/starter-page-templates/starter-page-templates.asset.php +++ b/vendor/automattic/jetpack-mu-wpcom/src/build/starter-page-templates/starter-page-templates.asset.php @@ -1 +1 @@ - array('lodash', 'react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-nux', 'wp-plugins', 'wp-polyfill'), 'version' => 'dff4f4eec5b58faf4d31'); + array('lodash', 'react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-nux', 'wp-plugins'), 'version' => 'ccc5e66e58d7afd8a36c'); diff --git a/vendor/automattic/jetpack-mu-wpcom/src/build/starter-page-templates/starter-page-templates.js b/vendor/automattic/jetpack-mu-wpcom/src/build/starter-page-templates/starter-page-templates.js index 1b54cffb..eb3f7f4b 100644 --- a/vendor/automattic/jetpack-mu-wpcom/src/build/starter-page-templates/starter-page-templates.js +++ b/vendor/automattic/jetpack-mu-wpcom/src/build/starter-page-templates/starter-page-templates.js @@ -1 +1 @@ -(()=>{var e={43377:(e,t,r)=>{"use strict";r.d(t,{A:()=>b});var s=r(10790),n=r(74997),a=r(56427),o=r(29491),i=r(86087),l=r(27723),c=r(13022),p=r(66087),d=r(10356),u=r(79917),m=r(64797),g=r(55897),h=r(13613),_=r(78193);const w=a.MenuItem;class k extends i.Component{constructor(e){super(e),this.state={selectedCategory:this.getDefaultSelectedCategory()}}getFormattedPatternsByPatternSlugs=(0,p.memoize)((e=>{const t=e.reduce(((e,{name:t,title:r="",description:s="",html:a,pattern_meta:o})=>{const i=o?.viewport_width?Number(o.viewport_width):1280;return e[t]={name:t,title:s||r,blocks:a?(0,n.parse)((0,g.A)(a,this.props.siteInformation)):[],viewportWidth:Math.max(i,320)},e}),{});return this.filterPatternsWithMissingBlocks(t)}));filterPatternsWithMissingBlocks(e){return Object.entries(e).reduce(((e,[t,r])=>((0,d.A)(r.blocks)&&r.blocks.length||(e[t]=r),e)),{})}getBlocksForSelection=e=>{const t=this.getBlocksByPatternSlug(e);return(0,m.A)(t,(function(e){return"core/button"===e.name&&void 0!==e.attributes.url&&(e.attributes.url="#"),e}))};componentDidMount(){this.props.isOpen&&this.trackCurrentView()}componentDidUpdate(e){!e.isOpen&&this.props.isOpen&&this.trackCurrentView(),(this.props.isWelcomeGuideActive||this.props.areTipsEnabled)&&this.props.hideWelcomeGuide()}trackCurrentView(){(0,h.$3)("add-page")}getDefaultSelectedCategory(){const e=this.getPatternCategories();return e?.length?e[0].slug:null}setPattern=e=>{(0,h.m3)(e);const{selectedCategory:t}=this.state;if(this.props.savePatternChoice(e,t),"blank"===e)return this.props.insertPattern("",[]),void this.props.onClose();const r=this.props.patterns.find((t=>t.name===e)),s=(r?.categories||{}).hasOwnProperty("home"),n=this.getBlocksForSelection(e),a=s?null:r?.title||"";n&&n.length?(this.props.insertPattern(a,n),this.props.onClose()):this.props.onClose()};handleCategorySelection=e=>{this.setState({selectedCategory:e})};closeModal=e=>{"blur"!==e?.type?((0,h.mk)(),this.props.onClose()):e.stopPropagation()};getBlocksByPatternSlug(e){return this.getFormattedPatternsByPatternSlugs(this.props.patterns)?.[e]?.blocks??[]}getPatternGroups=()=>{if(!this.props.patterns.length)return null;const e={};for(const t of this.props.patterns)for(const r in t.categories)r in e||(e[r]=t.categories[r]);return(0,u.W)(["featured","about","blog","home","gallery","services","contact"],e)};getPatternsForGroup=e=>{if(!this.props.patterns.length)return null;if("blank"===e)return[{name:"blank",title:"Blank",html:"",ID:null}];const t=[];for(const r of this.props.patterns)for(const s in r.categories)s===e&&t.push(r);return t};getPatternCategories=()=>{const e=this.getPatternGroups();if(!e)return null;const t=[];for(const r in e)t.push({slug:r,name:e[r].title});return t};renderPatternGroup=()=>{const{selectedCategory:e}=this.state;if(!e)return null;const t=this.getPatternsForGroup(e);return t?.length?this.renderPatternsList(t):null};renderPatternsList=e=>{if(!e.length)return null;const t=this.getFormattedPatternsByPatternSlugs(this.props.patterns),r=Object.keys(t),n=(a=r,e.filter((e=>a.includes(e.name))));var a;return n.length?(0,s.jsx)(_.A,{label:(0,l.__)("Layout","jetpack-mu-wpcom"),patterns:n.map((e=>t[e.name])),onPatternSelect:this.setPattern}):null};render(){const{selectedCategory:e}=this.state,{isOpen:t,instanceId:r}=this.props;return t?(0,s.jsx)(a.Modal,{title:"",className:"page-pattern-modal",onRequestClose:this.closeModal,aria:{labelledby:`page-pattern-modal__heading-${r}`,describedby:`page-pattern-modal__description-${r}`},children:(0,s.jsxs)("div",{className:"page-pattern-modal__inner",children:[(0,s.jsxs)("div",{className:"page-pattern-modal__sidebar",children:[(0,s.jsx)("h1",{id:`page-pattern-modal__heading-${r}`,className:(0,c.A)("page-pattern-modal__heading",{"page-pattern-modal__heading--default":!this.props.title}),children:this.props.title||(0,l.__)("Add a page","jetpack-mu-wpcom")}),(0,s.jsx)("p",{id:`page-pattern-modal__description-${r}`,className:"page-pattern-modal__description",children:this.props.description||(0,l.__)("Pick a pre-defined layout or start with a blank page.","jetpack-mu-wpcom")}),(0,s.jsxs)("div",{className:"page-pattern-modal__button-container",children:[(0,s.jsx)(a.Button,{variant:"secondary",onClick:()=>this.setPattern("blank"),className:"page-pattern-modal__blank-button",children:(0,l.__)("Blank page","jetpack-mu-wpcom")}),(0,s.jsx)("select",{className:"page-pattern-modal__mobile-category-dropdown",value:e??void 0,onChange:e=>this.handleCategorySelection(e.currentTarget.value),children:this.getPatternCategories()?.map((({slug:e,name:t})=>(0,s.jsx)("option",{value:e,children:t},e)))})]}),(0,s.jsx)(a.VisuallyHidden,{as:"h2",id:`page-pattern-modal__list-heading-${r}`,children:(0,l.__)("Page categories","jetpack-mu-wpcom")}),(0,s.jsx)(a.NavigableMenu,{className:"page-pattern-modal__category-list",orientation:"vertical","aria-labelledby":`page-pattern-modal__list-heading-${r}`,onNavigate:(e,t)=>this.handleCategorySelection(t.dataset.slug??null),children:this.getPatternCategories()?.map((({slug:t,name:r})=>(0,s.jsx)(w,{variant:"tertiary","aria-selected":t===e,"data-slug":t,onClick:()=>this.handleCategorySelection(t),className:"page-pattern-modal__category-button",tabIndex:t===e?void 0:-1,children:(0,s.jsx)("span",{className:"page-pattern-modal__category-item-selection-wrapper",children:r})},t)))})]}),(0,s.jsx)("div",{className:"page-pattern-modal__pattern-list-container",children:this.renderPatternGroup()})]})}):null}}const b=(0,o.withInstanceId)(k)},78193:(e,t,r)=>{"use strict";r.d(t,{A:()=>c});var s=r(10790),n=r(94715),a=r(56427),o=r(29491),i=r(86087);const l=()=>{},c=(0,i.memo)((0,o.withInstanceId)((({instanceId:e,label:t,patterns:r=[],onPatternSelect:i=l})=>{const c=(0,o.useAsyncList)(r);return Array.isArray(r)&&r.length?(0,s.jsx)(a.BaseControl,{id:`pattern-selector-control__${e}`,label:t,className:"pattern-selector-control",children:(0,s.jsx)(n.__experimentalBlockPatternsList,{blockPatterns:r,shownPatterns:c,onClickPattern:e=>i(e.name)})}):null})))},10356:(e,t,r)=>{"use strict";r.d(t,{A:()=>s});const s=function e(t){return!!t.find((t=>"core/missing"===t.name||!(!t.innerBlocks||!t.innerBlocks.length)&&e(t.innerBlocks)))}},79917:(e,t,r)=>{"use strict";function s(e,t){const r=Object.keys(t),s=e.filter((e=>r.includes(e))),n=r.filter((t=>!e.includes(t)));return s.concat(n.sort()).reduce(((e,r)=>(e[r]=t[r],e)),{})}r.d(t,{W:()=>s})},64797:(e,t,r)=>{"use strict";r.d(t,{A:()=>n});var s=r(74997);const n=function e(t,r){return t.map((t=>((t=r((0,s.cloneBlock)(t))).innerBlocks&&t.innerBlocks.length&&(t.innerBlocks=e(t.innerBlocks,r)),t)))}},55897:(e,t,r)=>{"use strict";r.d(t,{A:()=>i});var s=r(27723);const n={Address:(0,s._x)("123 Main St","default address","jetpack-mu-wpcom"),Phone:(0,s._x)("555-555-5555","default phone number","jetpack-mu-wpcom"),CompanyName:(0,s._x)("Your Company Name","default company name","jetpack-mu-wpcom"),Vertical:(0,s._x)("Business","default vertical name","jetpack-mu-wpcom")},a={CompanyName:"title",Address:"address",Phone:"phone",Vertical:"vertical"};function o(e,t){return e in t}const i=(e,t={})=>e?e.replace(/{{(\w+)}}/g,((e,r)=>{const s=o(r,n)?n[r]:"",i=o(r,a)?a[r]:"";return t[i]||s||r})):""},13613:(e,t,r)=>{"use strict";r.d(t,{$3:()=>a,br:()=>n,m3:()=>i,mk:()=>o}),window._tkq=window._tkq||[];let s=null;const n=e=>{s=e,window._tkq.push(["identifyUser",e.userid,e.username])},a=e=>{s&&window._tkq.push(["recordEvent","a8c_full_site_editing_template_selector_view",{blog_id:s.blogid,source:e}])},o=()=>{s&&window._tkq.push(["recordEvent","a8c_full_site_editing_template_selector_dismiss",{blog_id:s.blogid}])},i=e=>{s&&window._tkq.push(["recordEvent","a8c_full_site_editing_template_selector_template_selected",{blog_id:s.blogid,pattern:e}])}},95048:(e,t,r)=>{"use strict";r.d(t,{i:()=>m});var s=r(96072),n=r.n(s),a=r(43377),o=r(47143),i=r(86087),l=r(52619),c=r(27723),p=r(77514);r(45518);const __=c.__,d="isInsertingPagePattern",u="automattic/full-site-editing/inserting-pattern";function m(e){const{setOpenState:t}=(0,o.useDispatch)(p.L),{setUsedPageOrPatternsModal:r}=(0,o.useDispatch)("automattic/wpcom-welcome-guide"),{replaceInnerBlocks:s}=(0,o.useDispatch)("core/block-editor"),{editPost:c}=(0,o.useDispatch)("core/editor"),{toggleFeature:m}=(0,o.useDispatch)("core/edit-post"),{disableTips:g}=(0,o.useDispatch)("core/nux"),h=(0,o.useSelect)((e=>{const{isOpen:t,isPatternPicker:r}=e(p.L);return{isOpen:t(),isWelcomeGuideActive:e("core/edit-post").isFeatureActive("welcomeGuide"),areTipsEnabled:e("core/nux").areTipsEnabled(),...r()&&{title:__("Choose a Pattern","jetpack-mu-wpcom"),description:__("Pick a pre-defined layout or continue with a blank page","jetpack-mu-wpcom")}}}),[]),{getMeta:_,postContentBlock:w}=(0,o.useSelect)((e=>({getMeta:()=>e("core/editor").getEditedPostAttribute("meta"),postContentBlock:e("core/editor").getBlocks().find((e=>"a8c/post-content"===e.name))})),[]),k=(0,i.useCallback)(((e,t)=>{const r=_(),s=Array.isArray(r._wpcom_template_layout_category)&&r._wpcom_template_layout_category||[];c({meta:{...r,_starter_page_template:e,_wpcom_template_layout_category:[...s,t]}})}),[c,_]),b=(0,i.useCallback)(((e,t)=>{(0,l.addFilter)(d,u,(()=>!0)),e&&c({title:e}),s(w?w.clientId:"",t,!1),(0,l.removeFilter)(d,u)}),[c,w,s]),{isWelcomeGuideActive:f,areTipsEnabled:P}=h,y=(0,i.useCallback)((()=>{f?m("welcomeGuide"):P&&g()}),[P,g,f,m]),v=(0,i.useCallback)((()=>{t("CLOSED"),r?.()}),[t,r]);return React.createElement(a.A,n()({},h,{onClose:v,savePatternChoice:k,insertPattern:b,hideWelcomeGuide:y},e))}},77514:(e,t,r)=>{"use strict";r.d(t,{L:()=>n});var s=r(47143);const n=(0,s.createReduxStore)("automattic/starter-page-layouts",{reducer:(e="CLOSED",{type:t,...r})=>"SET_IS_OPEN"===t?r.openState:e,actions:{setOpenState:e=>({type:"SET_IS_OPEN",openState:e||"CLOSED"})},selectors:{isOpen:e=>"CLOSED"!==e,isPatternPicker:e=>"OPEN_FOR_BLANK_CANVAS"===e}});(0,s.register)(n)},10790:e=>{"use strict";e.exports=window.ReactJSXRuntime},66087:e=>{"use strict";e.exports=window.lodash},94715:e=>{"use strict";e.exports=window.wp.blockEditor},74997:e=>{"use strict";e.exports=window.wp.blocks},56427:e=>{"use strict";e.exports=window.wp.components},29491:e=>{"use strict";e.exports=window.wp.compose},47143:e=>{"use strict";e.exports=window.wp.data},86087:e=>{"use strict";e.exports=window.wp.element},52619:e=>{"use strict";e.exports=window.wp.hooks},27723:e=>{"use strict";e.exports=window.wp.i18n},45518:e=>{"use strict";e.exports=window.wp.nux},92279:e=>{"use strict";e.exports=window.wp.plugins},96072:e=>{function t(){return e.exports=t=Object.assign?Object.assign.bind():function(e){for(var t=1;t{"use strict";function s(e){var t,r,n="";if("string"==typeof e||"number"==typeof e)n+=e;else if("object"==typeof e)if(Array.isArray(e)){var a=e.length;for(t=0;tn});const n=function(){for(var e,t,r=0,n="",a=arguments.length;r{var t=e&&e.__esModule?()=>e.default:()=>e;return r.d(t,{a:t}),t},r.d=(e,t)=>{for(var s in t)r.o(t,s)&&!r.o(e,s)&&Object.defineProperty(e,s,{enumerable:!0,get:t[s]})},r.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{"use strict";var e=r(13613),t=r(47143),s=r(92279),n=r(95048),a=r(77514);const{templates:o=[],tracksUserData:i,screenAction:l}=window.starterPageTemplatesConfig??{};i&&(0,e.br)(i),"add"===l&&(0,t.dispatch)(a.L).setOpenState("OPEN_FROM_ADD_PAGE"),(0,s.registerPlugin)("page-patterns",{render:()=>React.createElement(n.i,{patterns:o}),icon:void 0})})()})(); \ No newline at end of file +(()=>{var e={43377:(e,t,r)=>{"use strict";r.d(t,{A:()=>f});var s=r(10790),n=r(74997),a=r(56427),o=r(29491),i=r(86087),l=r(27723),c=r(13022),p=r(66087),d=r(10356),u=r(79917),m=r(64797),g=r(55897),h=r(13613),_=r(78193);const w=a.MenuItem;class k extends i.Component{constructor(e){super(e),this.state={selectedCategory:this.getDefaultSelectedCategory()}}getFormattedPatternsByPatternSlugs=(0,p.memoize)((e=>{const t=e.reduce(((e,{name:t,title:r="",description:s="",html:a,pattern_meta:o})=>{const i=o?.viewport_width?Number(o.viewport_width):1280;return e[t]={name:t,title:s||r,blocks:a?(0,n.parse)((0,g.A)(a,this.props.siteInformation)):[],viewportWidth:Math.max(i,320)},e}),{});return this.filterPatternsWithMissingBlocks(t)}));filterPatternsWithMissingBlocks(e){return Object.entries(e).reduce(((e,[t,r])=>((0,d.A)(r.blocks)&&r.blocks.length||(e[t]=r),e)),{})}getBlocksForSelection=e=>{const t=this.getBlocksByPatternSlug(e);return(0,m.A)(t,(function(e){return"core/button"===e.name&&void 0!==e.attributes.url&&(e.attributes.url="#"),e}))};componentDidMount(){this.props.isOpen&&this.trackCurrentView()}componentDidUpdate(e){!e.isOpen&&this.props.isOpen&&this.trackCurrentView(),(this.props.isWelcomeGuideActive||this.props.areTipsEnabled)&&this.props.hideWelcomeGuide()}trackCurrentView(){(0,h.$3)("add-page")}getDefaultSelectedCategory(){const e=this.getPatternCategories();return e?.length?e[0].slug:null}setPattern=e=>{(0,h.m3)(e);const{selectedCategory:t}=this.state;if(this.props.savePatternChoice(e,t),"blank"===e)return this.props.insertPattern("",[]),void this.props.onClose();const r=this.props.patterns.find((t=>t.name===e)),s=(r?.categories||{}).hasOwnProperty("home"),n=this.getBlocksForSelection(e),a=s?null:r?.title||"";n&&n.length?(this.props.insertPattern(a,n),this.props.onClose()):this.props.onClose()};handleCategorySelection=e=>{this.setState({selectedCategory:e})};closeModal=e=>{"blur"!==e?.type?((0,h.mk)(),this.props.onClose()):e.stopPropagation()};getBlocksByPatternSlug(e){return this.getFormattedPatternsByPatternSlugs(this.props.patterns)?.[e]?.blocks??[]}getPatternGroups=()=>{if(!this.props.patterns.length)return null;const e={};for(const t of this.props.patterns)for(const r in t.categories)r in e||(e[r]=t.categories[r]);return(0,u.W)(["featured","about","blog","home","gallery","services","contact"],e)};getPatternsForGroup=e=>{if(!this.props.patterns.length)return null;if("blank"===e)return[{name:"blank",title:"Blank",html:"",ID:null}];const t=[];for(const r of this.props.patterns)for(const s in r.categories)s===e&&t.push(r);return t};getPatternCategories=()=>{const e=this.getPatternGroups();if(!e)return null;const t=[];for(const r in e)t.push({slug:r,name:e[r].title});return t};renderPatternGroup=()=>{const{selectedCategory:e}=this.state;if(!e)return null;const t=this.getPatternsForGroup(e);return t?.length?this.renderPatternsList(t):null};renderPatternsList=e=>{if(!e.length)return null;const t=this.getFormattedPatternsByPatternSlugs(this.props.patterns),r=Object.keys(t),n=(a=r,e.filter((e=>a.includes(e.name))));var a;return n.length?(0,s.jsx)(_.A,{label:(0,l.__)("Layout","jetpack-mu-wpcom"),patterns:n.map((e=>t[e.name])),onPatternSelect:this.setPattern}):null};render(){const{selectedCategory:e}=this.state,{isOpen:t,instanceId:r}=this.props;return t?(0,s.jsx)(a.Modal,{title:"",className:"page-pattern-modal",onRequestClose:this.closeModal,aria:{labelledby:`page-pattern-modal__heading-${r}`,describedby:`page-pattern-modal__description-${r}`},children:(0,s.jsxs)("div",{className:"page-pattern-modal__inner",children:[(0,s.jsxs)("div",{className:"page-pattern-modal__sidebar",children:[(0,s.jsx)("h1",{id:`page-pattern-modal__heading-${r}`,className:(0,c.A)("page-pattern-modal__heading",{"page-pattern-modal__heading--default":!this.props.title}),children:this.props.title||(0,l.__)("Add a page","jetpack-mu-wpcom")}),(0,s.jsx)("p",{id:`page-pattern-modal__description-${r}`,className:"page-pattern-modal__description",children:this.props.description||(0,l.__)("Pick a pre-defined layout or start with a blank page.","jetpack-mu-wpcom")}),(0,s.jsxs)("div",{className:"page-pattern-modal__button-container",children:[(0,s.jsx)(a.Button,{variant:"secondary",onClick:()=>this.setPattern("blank"),className:"page-pattern-modal__blank-button",children:(0,l.__)("Blank page","jetpack-mu-wpcom")}),(0,s.jsx)("select",{className:"page-pattern-modal__mobile-category-dropdown",value:e??void 0,onChange:e=>this.handleCategorySelection(e.currentTarget.value),children:this.getPatternCategories()?.map((({slug:e,name:t})=>(0,s.jsx)("option",{value:e,children:t},e)))})]}),(0,s.jsx)(a.VisuallyHidden,{as:"h2",id:`page-pattern-modal__list-heading-${r}`,children:(0,l.__)("Page categories","jetpack-mu-wpcom")}),(0,s.jsx)(a.NavigableMenu,{className:"page-pattern-modal__category-list",orientation:"vertical","aria-labelledby":`page-pattern-modal__list-heading-${r}`,onNavigate:(e,t)=>this.handleCategorySelection(t.dataset.slug??null),children:this.getPatternCategories()?.map((({slug:t,name:r})=>(0,s.jsx)(w,{variant:"tertiary","aria-selected":t===e,"data-slug":t,onClick:()=>this.handleCategorySelection(t),className:"page-pattern-modal__category-button",tabIndex:t===e?void 0:-1,children:(0,s.jsx)("span",{className:"page-pattern-modal__category-item-selection-wrapper",children:r})},t)))})]}),(0,s.jsx)("div",{className:"page-pattern-modal__pattern-list-container",children:this.renderPatternGroup()})]})}):null}}const f=(0,o.withInstanceId)(k)},78193:(e,t,r)=>{"use strict";r.d(t,{A:()=>c});var s=r(10790),n=r(94715),a=r(56427),o=r(29491),i=r(86087);const l=()=>{},c=(0,i.memo)((0,o.withInstanceId)((({instanceId:e,label:t,patterns:r=[],onPatternSelect:i=l})=>{const c=(0,o.useAsyncList)(r);return Array.isArray(r)&&r.length?(0,s.jsx)(a.BaseControl,{id:`pattern-selector-control__${e}`,label:t,className:"pattern-selector-control",children:(0,s.jsx)(n.__experimentalBlockPatternsList,{blockPatterns:r,shownPatterns:c,onClickPattern:e=>i(e.name)})}):null})))},10356:(e,t,r)=>{"use strict";r.d(t,{A:()=>s});const s=function e(t){return!!t.find((t=>"core/missing"===t.name||!(!t.innerBlocks||!t.innerBlocks.length)&&e(t.innerBlocks)))}},79917:(e,t,r)=>{"use strict";function s(e,t){const r=Object.keys(t),s=e.filter((e=>r.includes(e))),n=r.filter((t=>!e.includes(t)));return s.concat(n.sort()).reduce(((e,r)=>(e[r]=t[r],e)),{})}r.d(t,{W:()=>s})},64797:(e,t,r)=>{"use strict";r.d(t,{A:()=>n});var s=r(74997);const n=function e(t,r){return t.map((t=>((t=r((0,s.cloneBlock)(t))).innerBlocks&&t.innerBlocks.length&&(t.innerBlocks=e(t.innerBlocks,r)),t)))}},55897:(e,t,r)=>{"use strict";r.d(t,{A:()=>i});var s=r(27723);const n={Address:(0,s._x)("123 Main St","default address","jetpack-mu-wpcom"),Phone:(0,s._x)("555-555-5555","default phone number","jetpack-mu-wpcom"),CompanyName:(0,s._x)("Your Company Name","default company name","jetpack-mu-wpcom"),Vertical:(0,s._x)("Business","default vertical name","jetpack-mu-wpcom")},a={CompanyName:"title",Address:"address",Phone:"phone",Vertical:"vertical"};function o(e,t){return e in t}const i=(e,t={})=>e?e.replace(/{{(\w+)}}/g,((e,r)=>{const s=o(r,n)?n[r]:"",i=o(r,a)?a[r]:"";return t[i]||s||r})):""},13613:(e,t,r)=>{"use strict";r.d(t,{$3:()=>a,br:()=>n,m3:()=>i,mk:()=>o}),window._tkq=window._tkq||[];let s=null;const n=e=>{s=e,window._tkq.push(["identifyUser",e.userid,e.username])},a=e=>{s&&window._tkq.push(["recordEvent","a8c_full_site_editing_template_selector_view",{blog_id:s.blogid,source:e}])},o=()=>{s&&window._tkq.push(["recordEvent","a8c_full_site_editing_template_selector_dismiss",{blog_id:s.blogid}])},i=e=>{s&&window._tkq.push(["recordEvent","a8c_full_site_editing_template_selector_template_selected",{blog_id:s.blogid,pattern:e}])}},95048:(e,t,r)=>{"use strict";r.d(t,{i:()=>g});var s=r(96072),n=r.n(s),a=r(43377),o=r(47143),i=r(86087),l=r(52619),c=r(27723),p=r(77514);r(45518);const __=c.__,d="isInsertingPagePattern",u="automattic/full-site-editing/inserting-pattern";function m(e){for(const t of e){if("core/post-content"===t.name||"a8c/post-content"===t.name)return t;const e=m(t.innerBlocks);if(e)return e}return null}function g(e){const{setOpenState:t}=(0,o.useDispatch)(p.L),{setUsedPageOrPatternsModal:r}=(0,o.useDispatch)("automattic/wpcom-welcome-guide"),{replaceInnerBlocks:s}=(0,o.useDispatch)("core/block-editor"),{editPost:c}=(0,o.useDispatch)("core/editor"),{toggleFeature:g}=(0,o.useDispatch)("core/edit-post"),{disableTips:h}=(0,o.useDispatch)("core/nux"),_=(0,o.useSelect)((e=>{const{isOpen:t,isPatternPicker:r}=e(p.L);return{isOpen:t(),isWelcomeGuideActive:e("core/edit-post").isFeatureActive("welcomeGuide"),areTipsEnabled:e("core/nux").areTipsEnabled(),...r()&&{title:__("Choose a Pattern","jetpack-mu-wpcom"),description:__("Pick a pre-defined layout or continue with a blank page","jetpack-mu-wpcom")}}}),[]),{getMeta:w,postContentBlock:k}=(0,o.useSelect)((e=>({getMeta:()=>e("core/editor").getEditedPostAttribute("meta"),postContentBlock:m(e("core/editor").getBlocks())})),[]),f=(0,i.useCallback)(((e,t)=>{const r=w(),s=Array.isArray(r._wpcom_template_layout_category)&&r._wpcom_template_layout_category||[];c({meta:{...r,_starter_page_template:e,_wpcom_template_layout_category:[...s,t]}})}),[c,w]),b=(0,i.useCallback)(((e,t)=>{(0,l.addFilter)(d,u,(()=>!0)),e&&c({title:e}),s(k?k.clientId:"",t,!1),(0,l.removeFilter)(d,u)}),[c,k,s]),{isWelcomeGuideActive:P,areTipsEnabled:y}=_,v=(0,i.useCallback)((()=>{P?g("welcomeGuide"):y&&h()}),[y,h,P,g]),x=(0,i.useCallback)((()=>{t("CLOSED"),r?.()}),[t,r]);return React.createElement(a.A,n()({},_,{onClose:x,savePatternChoice:f,insertPattern:b,hideWelcomeGuide:v},e))}},77514:(e,t,r)=>{"use strict";r.d(t,{L:()=>n});var s=r(47143);const n=(0,s.createReduxStore)("automattic/starter-page-layouts",{reducer:(e="CLOSED",{type:t,...r})=>"SET_IS_OPEN"===t?r.openState:e,actions:{setOpenState:e=>({type:"SET_IS_OPEN",openState:e||"CLOSED"})},selectors:{isOpen:e=>"CLOSED"!==e,isPatternPicker:e=>"OPEN_FOR_BLANK_CANVAS"===e}});(0,s.register)(n)},10790:e=>{"use strict";e.exports=window.ReactJSXRuntime},66087:e=>{"use strict";e.exports=window.lodash},94715:e=>{"use strict";e.exports=window.wp.blockEditor},74997:e=>{"use strict";e.exports=window.wp.blocks},56427:e=>{"use strict";e.exports=window.wp.components},29491:e=>{"use strict";e.exports=window.wp.compose},47143:e=>{"use strict";e.exports=window.wp.data},86087:e=>{"use strict";e.exports=window.wp.element},52619:e=>{"use strict";e.exports=window.wp.hooks},27723:e=>{"use strict";e.exports=window.wp.i18n},45518:e=>{"use strict";e.exports=window.wp.nux},92279:e=>{"use strict";e.exports=window.wp.plugins},96072:e=>{function t(){return e.exports=t=Object.assign?Object.assign.bind():function(e){for(var t=1;t{"use strict";function s(e){var t,r,n="";if("string"==typeof e||"number"==typeof e)n+=e;else if("object"==typeof e)if(Array.isArray(e)){var a=e.length;for(t=0;tn});const n=function(){for(var e,t,r=0,n="",a=arguments.length;r{var t=e&&e.__esModule?()=>e.default:()=>e;return r.d(t,{a:t}),t},r.d=(e,t)=>{for(var s in t)r.o(t,s)&&!r.o(e,s)&&Object.defineProperty(e,s,{enumerable:!0,get:t[s]})},r.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{"use strict";var e=r(13613),t=r(47143),s=r(92279),n=r(95048),a=r(77514);const{templates:o=[],tracksUserData:i,screenAction:l}=window.starterPageTemplatesConfig??{};i&&(0,e.br)(i),"add"===l&&(0,t.dispatch)(a.L).setOpenState("OPEN_FROM_ADD_PAGE"),(0,s.registerPlugin)("page-patterns",{render:()=>React.createElement(n.i,{patterns:o}),icon:void 0})})()})(); \ No newline at end of file diff --git a/vendor/automattic/jetpack-mu-wpcom/src/features/starter-page-templates/page-patterns-plugin.tsx b/vendor/automattic/jetpack-mu-wpcom/src/features/starter-page-templates/page-patterns-plugin.tsx index 2263c65e..5416ef35 100644 --- a/vendor/automattic/jetpack-mu-wpcom/src/features/starter-page-templates/page-patterns-plugin.tsx +++ b/vendor/automattic/jetpack-mu-wpcom/src/features/starter-page-templates/page-patterns-plugin.tsx @@ -1,4 +1,5 @@ import { PagePatternModal, PatternDefinition } from '@automattic/page-pattern-modal'; +import { BlockInstance } from '@wordpress/blocks'; import { useSelect, useDispatch } from '@wordpress/data'; import { useCallback } from '@wordpress/element'; import { addFilter, removeFilter } from '@wordpress/hooks'; @@ -13,7 +14,7 @@ interface PagePatternsPluginProps { patterns: PatternDefinition[]; } type CoreEditorPlaceholder = { - getBlocks: ( ...args: unknown[] ) => Array< { name: string; clientId: string } >; + getBlocks: ( ...args: unknown[] ) => BlockInstance[]; getEditedPostAttribute: ( ...args: unknown[] ) => unknown; }; type CoreEditPostPlaceholder = { @@ -23,6 +24,24 @@ type CoreNuxPlaceholder = { areTipsEnabled: ( ...args: unknown[] ) => boolean; }; +/** + * Recursively finds the Content block if any. + * + * @param blocks - The current blocks + */ +function findPostContentBlock( blocks: BlockInstance[] ): BlockInstance | null { + for ( const block of blocks ) { + if ( block.name === 'core/post-content' || block.name === 'a8c/post-content' ) { + return block; + } + const result = findPostContentBlock( block.innerBlocks ); + if ( result ) { + return result; + } + } + return null; +} + /** * Starter page templates feature plugin * @@ -60,7 +79,7 @@ export function PagePatternsPlugin( props: PagePatternsPluginProps ) { const currentBlocks = ( select( 'core/editor' ) as CoreEditorPlaceholder ).getBlocks(); return { getMeta: getMetaNew, - postContentBlock: currentBlocks.find( block => block.name === 'a8c/post-content' ), + postContentBlock: findPostContentBlock( currentBlocks ), }; }, [] ); diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 352082c0..a3c82343 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -7,7 +7,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats", - "reference": "873a210b844f1bf2399a03aab68ff23e42f9f720" + "reference": "14178074f77469b2e0a5bdc3a981e6d9dc61dc8f" }, "require": { "php": ">=7.2" @@ -63,7 +63,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui", - "reference": "7c0c11117a231a81a7e5c5354dcf5a8b1d3f239a" + "reference": "4a1310c4a8162c4705e030e5d7e03f5bdaf995aa" }, "require": { "php": ">=7.2" @@ -131,7 +131,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-assets", - "reference": "cb71d6eebe0c7468c75c33c1eb5a97c40171fa90" + "reference": "79a71cdb64f742ceac434f6483905740d6a96095" }, "require": { "automattic/jetpack-constants": "^3.0.1", @@ -203,7 +203,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blaze", - "reference": "a490c151a22ecb95df9db1288e6eb7f104c3f632" + "reference": "19b02e612a834bf64e8d17b39eb052816ab73e43" }, "require": { "automattic/jetpack-assets": "^4.0.2-alpha", @@ -287,7 +287,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-blocks", - "reference": "ad1d9fb367dd1b248e24f9fb01aea08d60b8c920" + "reference": "ffd836d6b05fdf507dc15092d2c52a2c2e8cede3" }, "require": { "automattic/jetpack-constants": "^3.0.1", @@ -352,7 +352,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify", - "reference": "39eb71bc11e99893838f3b7c1b66e2118c8aed47" + "reference": "332dfe824bcb58f38d1689a78c7cf951754433ca" }, "require": { "automattic/jetpack-assets": "^4.0.2-alpha", @@ -420,7 +420,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper", - "reference": "3a8e1cb8493e18dc6cda45c66f627eddb45da020" + "reference": "8dd157c3b18e6af887d8977605789ddefbc0763c" }, "require": { "automattic/jetpack-assets": "^4.0.2-alpha", @@ -494,7 +494,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-compat", - "reference": "8eae15b3efe213e5d840a1a9833afeda0790b030" + "reference": "d519c3f3ffcde04b2592c9d7ce2dc43e3689642b" }, "require": { "php": ">=7.2" @@ -534,7 +534,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-connection", - "reference": "0bb1d59a91336b97fb4416f7f375278e5a18705a" + "reference": "2e18f9641463154301773b79c651afe7dc7944ca" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", @@ -627,7 +627,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-constants", - "reference": "e8f816359f92df9447754615746233bfbe5576f6" + "reference": "1d7f679781b9e8fb86cf42e29780b53420a8a5e1" }, "require": { "php": ">=7.2" @@ -684,7 +684,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "396844625222fd7d35026855057093d9523cb381" + "reference": "06aee8137dc39c20e082d6e2ba67e808f01d9e84" }, "require": { "php": ">=7.2" @@ -740,7 +740,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-google-analytics", - "reference": "5c20c6cf2d7eba2c6e1741494e98aa4fbf8c9489" + "reference": "2620dce33b7f845157b907438a602da64c599e52" }, "require": { "automattic/jetpack-status": "^5.0.1", @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-ip", - "reference": "028dab6c930fa49a8ff9d46f68a8e2d38fb277e7" + "reference": "7c7f5650b2c0be0fdd807ce33ea2f2e73dbe840f" }, "require": { "php": ">=7.2" @@ -875,7 +875,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-jitm", - "reference": "1cff8557892ea30cf0c5dd35c587b794b567e34e" + "reference": "86493c137082e98f1bbd18f5df23065edaea67e3" }, "require": { "automattic/jetpack-a8c-mc-stats": "^3.0.0", @@ -953,7 +953,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-logo", - "reference": "01cca9eb672928478bb8d77abb731591c7149427" + "reference": "61e80db5642a114b44569ce443e083bde8dce6f9" }, "require": { "php": ">=7.2" @@ -1009,7 +1009,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar", - "reference": "c93dd001a5d52ac4f42f7c8f62dc1073df405ae2" + "reference": "34551b367bc9834ffea198fae75a240f45c40327" }, "require": { "automattic/jetpack-assets": "^4.0.2-alpha", @@ -1095,12 +1095,12 @@ }, { "name": "automattic/jetpack-mu-wpcom", - "version": "6.1.0-alpha.1733980392", - "version_normalized": "6.1.0.0-alpha1733980392", + "version": "6.1.0-alpha.1733997921", + "version_normalized": "6.1.0.0-alpha1733997921", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "3ff1ae0eadc6b0595e200ebca580a7456ae991a8" + "reference": "5136893721e381a2742c66ed22d5e9b8bc9fee22" }, "require": { "automattic/jetpack-assets": "^4.0.2-alpha", @@ -1186,7 +1186,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker", - "reference": "f5152d79306b0a52713f6c528b6cc30a07898764" + "reference": "0bbcc4ec686489dc700427ff143013f06d9a164a" }, "require": { "php": ">=7.2" @@ -1250,7 +1250,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-plans", - "reference": "4e6df2b4fe0bb87f7929a3a7d3779b3e152dad00" + "reference": "6b2222480cafc25ba86a2d8d86ed25bf304f5f1c" }, "require": { "automattic/jetpack-connection": "^6.2.1-alpha", @@ -1321,7 +1321,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-redirect", - "reference": "31e047af49f3605847241b41d25458b7340e6273" + "reference": "1d436694c42e81b9ef64609179362626186d372d" }, "require": { "automattic/jetpack-status": "^5.0.1", @@ -1379,7 +1379,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-roles", - "reference": "bc2a693ade273e168ee9c2df956a411fb5f54688" + "reference": "4a0560239701ccf6d81439ecb07689b57cc7ceba" }, "require": { "php": ">=7.2" @@ -1436,7 +1436,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats", - "reference": "34fcd8ac5ca0c88f0366b63385aaaccecd22136b" + "reference": "8afa8bac92d008ab89baca8b40084dc01dac6c43" }, "require": { "automattic/jetpack-connection": "^6.2.1-alpha", @@ -1506,7 +1506,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin", - "reference": "61b3d9879c827e8bb40664cfc6b4ba379e663f99" + "reference": "7ab134028d3e6ed2d5deab667ad9eb295217d012" }, "require": { "automattic/jetpack-connection": "^6.2.1-alpha", @@ -1582,7 +1582,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-status", - "reference": "7145c36f389dbc5adbec4042826fb6172fd4243b" + "reference": "1a941538edfc9e17e52d098d0948a5469a3e07f0" }, "require": { "automattic/jetpack-constants": "^3.0.1", @@ -1649,7 +1649,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-sync", - "reference": "cfd8cb4d62c36b029ec1bfe37b1b7102776119d5" + "reference": "d9ec14b72d24cdae4178f1d749782320395d741d" }, "require": { "automattic/jetpack-connection": "^6.2.1-alpha", @@ -1730,7 +1730,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/scheduled-updates", - "reference": "56f8d53c96d3ed431989e69025d2e2c50c157a82" + "reference": "698bcd78495207ede67d12a01ae8c503fdd7ef43" }, "require": { "automattic/jetpack-connection": "^6.2.1-alpha", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 095f8770..dd3b5557 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -13,7 +13,7 @@ 'automattic/jetpack-a8c-mc-stats' => array( 'pretty_version' => '3.0.0', 'version' => '3.0.0.0', - 'reference' => '873a210b844f1bf2399a03aab68ff23e42f9f720', + 'reference' => '14178074f77469b2e0a5bdc3a981e6d9dc61dc8f', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-a8c-mc-stats', 'aliases' => array(), @@ -22,7 +22,7 @@ 'automattic/jetpack-admin-ui' => array( 'pretty_version' => '0.5.1', 'version' => '0.5.1.0', - 'reference' => '7c0c11117a231a81a7e5c5354dcf5a8b1d3f239a', + 'reference' => '4a1310c4a8162c4705e030e5d7e03f5bdaf995aa', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-admin-ui', 'aliases' => array(), @@ -31,7 +31,7 @@ 'automattic/jetpack-assets' => array( 'pretty_version' => '4.0.2-alpha.1733980392', 'version' => '4.0.2.0-alpha1733980392', - 'reference' => 'cb71d6eebe0c7468c75c33c1eb5a97c40171fa90', + 'reference' => '79a71cdb64f742ceac434f6483905740d6a96095', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-assets', 'aliases' => array(), @@ -40,7 +40,7 @@ 'automattic/jetpack-blaze' => array( 'pretty_version' => '0.25.4-alpha.1733980392', 'version' => '0.25.4.0-alpha1733980392', - 'reference' => 'a490c151a22ecb95df9db1288e6eb7f104c3f632', + 'reference' => '19b02e612a834bf64e8d17b39eb052816ab73e43', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-blaze', 'aliases' => array(), @@ -49,7 +49,7 @@ 'automattic/jetpack-blocks' => array( 'pretty_version' => '3.0.1', 'version' => '3.0.1.0', - 'reference' => 'ad1d9fb367dd1b248e24f9fb01aea08d60b8c920', + 'reference' => 'ffd836d6b05fdf507dc15092d2c52a2c2e8cede3', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-blocks', 'aliases' => array(), @@ -58,7 +58,7 @@ 'automattic/jetpack-calypsoify' => array( 'pretty_version' => '0.2.1-alpha.1733980392', 'version' => '0.2.1.0-alpha1733980392', - 'reference' => '39eb71bc11e99893838f3b7c1b66e2118c8aed47', + 'reference' => '332dfe824bcb58f38d1689a78c7cf951754433ca', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-calypsoify', 'aliases' => array(), @@ -67,7 +67,7 @@ 'automattic/jetpack-classic-theme-helper' => array( 'pretty_version' => '0.8.0-alpha.1733980392', 'version' => '0.8.0.0-alpha1733980392', - 'reference' => '3a8e1cb8493e18dc6cda45c66f627eddb45da020', + 'reference' => '8dd157c3b18e6af887d8977605789ddefbc0763c', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-classic-theme-helper', 'aliases' => array(), @@ -76,7 +76,7 @@ 'automattic/jetpack-compat' => array( 'pretty_version' => '4.0.0', 'version' => '4.0.0.0', - 'reference' => '8eae15b3efe213e5d840a1a9833afeda0790b030', + 'reference' => 'd519c3f3ffcde04b2592c9d7ce2dc43e3689642b', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-compat', 'aliases' => array(), @@ -85,7 +85,7 @@ 'automattic/jetpack-connection' => array( 'pretty_version' => '6.2.1-alpha.1733980392', 'version' => '6.2.1.0-alpha1733980392', - 'reference' => '0bb1d59a91336b97fb4416f7f375278e5a18705a', + 'reference' => '2e18f9641463154301773b79c651afe7dc7944ca', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-connection', 'aliases' => array(), @@ -94,7 +94,7 @@ 'automattic/jetpack-constants' => array( 'pretty_version' => '3.0.1', 'version' => '3.0.1.0', - 'reference' => 'e8f816359f92df9447754615746233bfbe5576f6', + 'reference' => '1d7f679781b9e8fb86cf42e29780b53420a8a5e1', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-constants', 'aliases' => array(), @@ -103,7 +103,7 @@ 'automattic/jetpack-device-detection' => array( 'pretty_version' => '3.0.0', 'version' => '3.0.0.0', - 'reference' => '396844625222fd7d35026855057093d9523cb381', + 'reference' => '06aee8137dc39c20e082d6e2ba67e808f01d9e84', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-device-detection', 'aliases' => array(), @@ -112,7 +112,7 @@ 'automattic/jetpack-google-analytics' => array( 'pretty_version' => '0.3.0', 'version' => '0.3.0.0', - 'reference' => '5c20c6cf2d7eba2c6e1741494e98aa4fbf8c9489', + 'reference' => '2620dce33b7f845157b907438a602da64c599e52', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-google-analytics', 'aliases' => array(), @@ -121,7 +121,7 @@ 'automattic/jetpack-ip' => array( 'pretty_version' => '0.4.1', 'version' => '0.4.1.0', - 'reference' => '028dab6c930fa49a8ff9d46f68a8e2d38fb277e7', + 'reference' => '7c7f5650b2c0be0fdd807ce33ea2f2e73dbe840f', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-ip', 'aliases' => array(), @@ -130,7 +130,7 @@ 'automattic/jetpack-jitm' => array( 'pretty_version' => '4.0.3-alpha.1733980392', 'version' => '4.0.3.0-alpha1733980392', - 'reference' => '1cff8557892ea30cf0c5dd35c587b794b567e34e', + 'reference' => '86493c137082e98f1bbd18f5df23065edaea67e3', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-jitm', 'aliases' => array(), @@ -139,7 +139,7 @@ 'automattic/jetpack-logo' => array( 'pretty_version' => '3.0.0', 'version' => '3.0.0.0', - 'reference' => '01cca9eb672928478bb8d77abb731591c7149427', + 'reference' => '61e80db5642a114b44569ce443e083bde8dce6f9', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-logo', 'aliases' => array(), @@ -148,16 +148,16 @@ 'automattic/jetpack-masterbar' => array( 'pretty_version' => '0.10.3-alpha.1733980392', 'version' => '0.10.3.0-alpha1733980392', - 'reference' => 'c93dd001a5d52ac4f42f7c8f62dc1073df405ae2', + 'reference' => '34551b367bc9834ffea198fae75a240f45c40327', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-masterbar', 'aliases' => array(), 'dev_requirement' => false, ), 'automattic/jetpack-mu-wpcom' => array( - 'pretty_version' => '6.1.0-alpha.1733980392', - 'version' => '6.1.0.0-alpha1733980392', - 'reference' => '3ff1ae0eadc6b0595e200ebca580a7456ae991a8', + 'pretty_version' => '6.1.0-alpha.1733997921', + 'version' => '6.1.0.0-alpha1733997921', + 'reference' => '5136893721e381a2742c66ed22d5e9b8bc9fee22', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-mu-wpcom', 'aliases' => array(), @@ -175,7 +175,7 @@ 'automattic/jetpack-password-checker' => array( 'pretty_version' => '0.4.1', 'version' => '0.4.1.0', - 'reference' => 'f5152d79306b0a52713f6c528b6cc30a07898764', + 'reference' => '0bbcc4ec686489dc700427ff143013f06d9a164a', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-password-checker', 'aliases' => array(), @@ -184,7 +184,7 @@ 'automattic/jetpack-plans' => array( 'pretty_version' => '0.5.1', 'version' => '0.5.1.0', - 'reference' => '4e6df2b4fe0bb87f7929a3a7d3779b3e152dad00', + 'reference' => '6b2222480cafc25ba86a2d8d86ed25bf304f5f1c', 'type' => 'library', 'install_path' => __DIR__ . '/../automattic/jetpack-plans', 'aliases' => array(), @@ -193,7 +193,7 @@ 'automattic/jetpack-redirect' => array( 'pretty_version' => '3.0.1', 'version' => '3.0.1.0', - 'reference' => '31e047af49f3605847241b41d25458b7340e6273', + 'reference' => '1d436694c42e81b9ef64609179362626186d372d', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-redirect', 'aliases' => array(), @@ -202,7 +202,7 @@ 'automattic/jetpack-roles' => array( 'pretty_version' => '3.0.1', 'version' => '3.0.1.0', - 'reference' => 'bc2a693ade273e168ee9c2df956a411fb5f54688', + 'reference' => '4a0560239701ccf6d81439ecb07689b57cc7ceba', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-roles', 'aliases' => array(), @@ -211,7 +211,7 @@ 'automattic/jetpack-stats' => array( 'pretty_version' => '0.14.1', 'version' => '0.14.1.0', - 'reference' => '34fcd8ac5ca0c88f0366b63385aaaccecd22136b', + 'reference' => '8afa8bac92d008ab89baca8b40084dc01dac6c43', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-stats', 'aliases' => array(), @@ -220,7 +220,7 @@ 'automattic/jetpack-stats-admin' => array( 'pretty_version' => '0.23.1', 'version' => '0.23.1.0', - 'reference' => '61b3d9879c827e8bb40664cfc6b4ba379e663f99', + 'reference' => '7ab134028d3e6ed2d5deab667ad9eb295217d012', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-stats-admin', 'aliases' => array(), @@ -229,7 +229,7 @@ 'automattic/jetpack-status' => array( 'pretty_version' => '5.0.1', 'version' => '5.0.1.0', - 'reference' => '7145c36f389dbc5adbec4042826fb6172fd4243b', + 'reference' => '1a941538edfc9e17e52d098d0948a5469a3e07f0', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-status', 'aliases' => array(), @@ -238,7 +238,7 @@ 'automattic/jetpack-sync' => array( 'pretty_version' => '4.1.0', 'version' => '4.1.0.0', - 'reference' => 'cfd8cb4d62c36b029ec1bfe37b1b7102776119d5', + 'reference' => 'd9ec14b72d24cdae4178f1d749782320395d741d', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-sync', 'aliases' => array(), @@ -247,7 +247,7 @@ 'automattic/scheduled-updates' => array( 'pretty_version' => '0.14.0', 'version' => '0.14.0.0', - 'reference' => '56f8d53c96d3ed431989e69025d2e2c50c157a82', + 'reference' => '698bcd78495207ede67d12a01ae8c503fdd7ef43', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/scheduled-updates', 'aliases' => array(),