Skip to content

Commit 9bc84ad

Browse files
committed
Fix build conflicts
1 parent f2d8fa3 commit 9bc84ad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1108
-0
lines changed

build/editor-plugin/block.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "editor-plugin",
3+
"title": "Editor Plugin: not a block, but block.json is very useful.",
4+
"category": "widgets",
5+
"icon": "admin-comments",
6+
"keywords": [],
7+
"editorScript": "file:./plugin.js"
8+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?php return array('dependencies' => array('react', 'wp-components', 'wp-core-data', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '59c90d6c8ab5e740f5a1');

build/editor-plugin/plugin.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/follow-me/block.json

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"$schema": "https://schemas.wp.org/trunk/block.json",
3+
"name": "activitypub/follow-me",
4+
"apiVersion": 3,
5+
"version": "2.2.0",
6+
"title": "Follow me on the Fediverse",
7+
"category": "widgets",
8+
"description": "Display your Fediverse profile so that visitors can follow you.",
9+
"textdomain": "activitypub",
10+
"icon": "groups",
11+
"example": {
12+
"attributes": {
13+
"className": "is-style-default"
14+
}
15+
},
16+
"supports": {
17+
"html": false,
18+
"interactivity": true,
19+
"color": {
20+
"gradients": true,
21+
"link": true,
22+
"__experimentalDefaultControls": {
23+
"background": true,
24+
"text": true,
25+
"link": true
26+
}
27+
},
28+
"__experimentalBorder": {
29+
"radius": true,
30+
"width": true,
31+
"color": true,
32+
"style": true
33+
},
34+
"shadow": true,
35+
"typography": {
36+
"fontSize": true,
37+
"__experimentalDefaultControls": {
38+
"fontSize": true
39+
}
40+
},
41+
"innerBlocks": {
42+
"allowedBlocks": [
43+
"core/button"
44+
]
45+
}
46+
},
47+
"styles": [
48+
{
49+
"name": "default",
50+
"label": "Default",
51+
"isDefault": true
52+
},
53+
{
54+
"name": "button-only",
55+
"label": "Button"
56+
},
57+
{
58+
"name": "profile",
59+
"label": "Profile"
60+
}
61+
],
62+
"attributes": {
63+
"selectedUser": {
64+
"type": "string",
65+
"default": "blog"
66+
}
67+
},
68+
"usesContext": [
69+
"postType",
70+
"postId"
71+
],
72+
"editorScript": "file:./index.js",
73+
"viewScriptModule": "file:./view.js",
74+
"viewScript": "wp-api-fetch",
75+
"style": "file:./style-index.css",
76+
"render": "file:./render.php"
77+
}

build/follow-me/index.asset.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => 'f86e4533c114b4304dd1');

build/follow-me/index.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)