Skip to content

Commit 5cbacb0

Browse files
obenlandobenland
authored
Merge branch 'add/js-lint-format' into add/css-processing
2 parents 226a796 + ad23834 commit 5cbacb0

Some content is hidden

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

49 files changed

+792
-1210
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Bug Report
22
description: Helps us improve our product!
3-
labels: [ 'Needs triage', '[Type] Bug' ]
3+
labels: ['Needs triage', '[Type] Bug']
44
type: 'Bug'
55
body:
66
- type: markdown
@@ -20,7 +20,7 @@ body:
2020
- type: textarea
2121
id: summary
2222
attributes:
23-
label: Quick summary
23+
label: Quick summary
2424
- type: textarea
2525
id: steps
2626
attributes:
@@ -63,7 +63,8 @@ body:
6363
id: severity
6464
attributes:
6565
label: Severity
66-
description: What is the severity of this issue? Please take a look at the descriptions below for further context.<br>
66+
description:
67+
What is the severity of this issue? Please take a look at the descriptions below for further context.<br>
6768
<br> - **Critical:** Prevents core functionality or has severe impact on the website/platform.
6869
<br> - **Major:** Significantly impairs important features or has notable impact on the website/platform.
6970
<br> - **Moderate:** Affects non-critical features or has limited impact on the website/platform.

‎.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Feature Request
22
description: Suggest an idea for the ActivityPub plugin!
3-
title: "Feature Request:"
4-
labels: ["[Type] Feature Request"]
3+
title: 'Feature Request:'
4+
labels: ['[Type] Feature Request']
55
type: 'Enhancement'
66
body:
77
- type: markdown

‎.github/dependabot.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@
55

66
version: 2
77
updates:
8-
- package-ecosystem: "composer" # See documentation for possible values
9-
directory: "/" # Location of package manifests
8+
- package-ecosystem: 'composer' # See documentation for possible values
9+
directory: '/' # Location of package manifests
1010
schedule:
11-
interval: "daily"
11+
interval: 'daily'
1212
labels:
13-
- "dependencies"
14-
- "php"
15-
- "Skip Changelog"
16-
- package-ecosystem: "github-actions" # See documentation for possible values
17-
directory: "/" # Location of package manifests
13+
- 'dependencies'
14+
- 'php'
15+
- 'Skip Changelog'
16+
- package-ecosystem: 'github-actions' # See documentation for possible values
17+
directory: '/' # Location of package manifests
1818
schedule:
19-
interval: "daily"
19+
interval: 'daily'
2020
labels:
21-
- "dependencies"
22-
- "github-actions"
23-
- "Skip Changelog"
24-
- package-ecosystem: "npm" # See documentation for possible values
25-
directory: "/" # Location of package manifests
21+
- 'dependencies'
22+
- 'github-actions'
23+
- 'Skip Changelog'
24+
- package-ecosystem: 'npm' # See documentation for possible values
25+
directory: '/' # Location of package manifests
2626
schedule:
27-
interval: "daily"
27+
interval: 'daily'
2828
labels:
29-
- "dependencies"
30-
- "javascript"
31-
- "Skip Changelog"
29+
- 'dependencies'
30+
- 'javascript'
31+
- 'Skip Changelog'

‎.github/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
changelog:
22
exclude:
33
labels:
4-
- "Skip Changelog"
5-
- "Release"
4+
- 'Skip Changelog'
5+
- 'Release'
66
authors:
77
- dependabot[bot]

‎.github/workflows/changelog.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Changelog entry"
1+
name: 'Changelog entry'
22
on:
33
pull_request_target:
44
# The specific activity types are listed here to include "labeled" and "unlabeled"
@@ -12,7 +12,7 @@ jobs:
1212
changelog:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- name: "Check for Skip Changelog label, or if the PR is a draft"
15+
- name: 'Check for Skip Changelog label, or if the PR is a draft'
1616
id: check-skip-label
1717
uses: actions/github-script@v7
1818
with:
@@ -39,7 +39,7 @@ jobs:
3939
core.setOutput( 'skip-changelog', 'false' );
4040
}
4141
42-
- name: "Check for changelog file"
42+
- name: 'Check for changelog file'
4343
if: steps.check-skip-label.outputs.skip-changelog != 'true'
4444
id: check-changelog-file
4545
uses: actions/github-script@v7
@@ -82,7 +82,7 @@ jobs:
8282
core.setOutput('has-changelog-file', 'false');
8383
}
8484
85-
- name: "Check for changelog information in PR body"
85+
- name: 'Check for changelog information in PR body'
8686
id: check-pr-body
8787
if: steps.check-skip-label.outputs.skip-changelog != 'true' && steps.check-changelog-file.outputs.has-changelog-file != 'true'
8888
uses: actions/github-script@v7
@@ -160,7 +160,7 @@ jobs:
160160
core.setOutput( 'message', changelogMessage );
161161
core.setOutput( 'has-changelog-info', 'true' );
162162
163-
- name: "Create changelog file from PR description"
163+
- name: 'Create changelog file from PR description'
164164
id: create-changelog-file
165165
if: steps.check-skip-label.outputs.skip-changelog != 'true' && steps.check-changelog-file.outputs.has-changelog-file != 'true' && steps.check-pr-body.outputs.has-changelog-info == 'true'
166166
env:

‎.github/workflows/deploy.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ name: Deploy to WordPress.org
22
on:
33
push:
44
tags:
5-
- "*"
5+
- '*'
66
jobs:
77
tag:
88
name: New tag
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@master
12-
- name: Install SVN
13-
run: |
14-
sudo apt-get update
15-
sudo apt-get install subversion
16-
- name: WordPress Plugin Deploy
17-
uses: 10up/action-wordpress-plugin-deploy@stable
18-
env:
19-
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
20-
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
21-
SLUG: activitypub
11+
- uses: actions/checkout@master
12+
- name: Install SVN
13+
run: |
14+
sudo apt-get update
15+
sudo apt-get install subversion
16+
- name: WordPress Plugin Deploy
17+
uses: 10up/action-wordpress-plugin-deploy@stable
18+
env:
19+
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
20+
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
21+
SLUG: activitypub

‎.github/workflows/gardening.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,44 +22,44 @@ jobs:
2222
timeout-minutes: 10
2323

2424
steps:
25-
- name: Checkout
26-
uses: actions/checkout@v4
25+
- name: Checkout
26+
uses: actions/checkout@v4
2727

28-
- name: Setup Node
29-
uses: actions/setup-node@v4
30-
with:
28+
- name: Setup Node
29+
uses: actions/setup-node@v4
30+
with:
3131
node-version: lts/*
3232

33-
- name: Wait for prior instances of the workflow to finish
34-
uses: softprops/turnstyle@v2
35-
env:
33+
- name: Wait for prior instances of the workflow to finish
34+
uses: softprops/turnstyle@v2
35+
env:
3636
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3737

38-
- name: 'Automate triage (add labels, clean labels, ...).'
39-
uses: automattic/action-repo-gardening@trunk
40-
with:
38+
- name: 'Automate triage (add labels, clean labels, ...).'
39+
uses: automattic/action-repo-gardening@trunk
40+
with:
4141
github_token: ${{ secrets.GITHUB_TOKEN }}
4242
slack_token: ${{ secrets.SLACK_TOKEN }}
4343
slack_team_channel: ${{ secrets.SLACK_TEAM_CHANNEL }}
4444
slack_he_triage_channel: ${{ secrets.SLACK_HE_TRIAGE_CHANNEL }}
4545
slack_quality_channel: ${{ secrets.SLACK_QUALITY_CHANNEL }}
4646
tasks: 'addLabels,cleanLabels,assignIssues,flagOss,gatherSupportReferences,replyToCustomersReminder,triageIssues'
4747
add_labels: '[
48-
{"path": "src/followers", "label": "[Block] Followers"},
49-
{"path": "src/follow-me", "label": "[Block] Follow Me"},
50-
{"path": "src/remote-reply", "label": "[Block] Remote reply"},
51-
{"path": "src/reply", "label": "[Block] Federated reply"},
52-
{"path": "src/reply-intent", "label": "[Block] Federated reply"},
53-
{"path": "src/editor-plugin", "label": "[Block] Post settings"},
54-
{"path": "src/reactions", "label": "[Block] Reactions"},
55-
{"path": "src/reactions", "label": "[Feature] Reactions"},
56-
{"path": "src", "label": "[Focus] Editor"},
57-
{"path": "integration", "label": "[Focus] Compatibility"},
58-
{"path": "includes/class-mailer.php", "label": "[Feature] Notifications"},
59-
{"path": "includes/class-blocks.php", "label": "[Focus] Editor"},
60-
{"path": "includes/collection", "label": "[Feature] Collections"},
61-
{"path": "includes/rest", "label": "[Feature] REST API"},
62-
{"path": "includes/wp-admin", "label": "[Feature] WP Admin"},
63-
{"path": "includes/wp-admin/import", "label": "[Feature] Import"},
64-
{"path": "includes/wp-admin/class-health-check.php", "label": "[Feature] Health Check"}
48+
{"path": "src/followers", "label": "[Block] Followers"},
49+
{"path": "src/follow-me", "label": "[Block] Follow Me"},
50+
{"path": "src/remote-reply", "label": "[Block] Remote reply"},
51+
{"path": "src/reply", "label": "[Block] Federated reply"},
52+
{"path": "src/reply-intent", "label": "[Block] Federated reply"},
53+
{"path": "src/editor-plugin", "label": "[Block] Post settings"},
54+
{"path": "src/reactions", "label": "[Block] Reactions"},
55+
{"path": "src/reactions", "label": "[Feature] Reactions"},
56+
{"path": "src", "label": "[Focus] Editor"},
57+
{"path": "integration", "label": "[Focus] Compatibility"},
58+
{"path": "includes/class-mailer.php", "label": "[Feature] Notifications"},
59+
{"path": "includes/class-blocks.php", "label": "[Focus] Editor"},
60+
{"path": "includes/collection", "label": "[Feature] Collections"},
61+
{"path": "includes/rest", "label": "[Feature] REST API"},
62+
{"path": "includes/wp-admin", "label": "[Feature] WP Admin"},
63+
{"path": "includes/wp-admin/import", "label": "[Feature] Import"},
64+
{"path": "includes/wp-admin/class-health-check.php", "label": "[Feature] Health Check"}
6565
]'

‎.github/workflows/phpunit.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ jobs:
88
phpunit:
99
runs-on: ubuntu-latest
1010
services:
11-
mysql:
12-
image: mariadb:10.4
13-
env:
14-
MYSQL_ROOT_PASSWORD: root
15-
ports:
16-
- 3306:3306
17-
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=10s --health-retries=10
11+
mysql:
12+
image: mariadb:10.4
13+
env:
14+
MYSQL_ROOT_PASSWORD: root
15+
ports:
16+
- 3306:3306
17+
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=10s --health-retries=10
1818
strategy:
1919
matrix:
2020
php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']

‎.prettierrc.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
const wpPrettierConfig = require( '@wordpress/prettier-config' );
2+
3+
module.exports = {
4+
...wpPrettierConfig,
5+
6+
printWidth: 120,
7+
overrides: [
8+
{
9+
files: '*.json',
10+
options: {
11+
useTabs: false,
12+
},
13+
},
14+
{
15+
files: '*.yml',
16+
options: {
17+
useTabs: false,
18+
tabWidth: 2,
19+
},
20+
},
21+
{
22+
files: '*.md',
23+
options: {
24+
trimTrailingWhitespace: false, // Not a valid Prettier option, handled by editorconfig only
25+
},
26+
},
27+
],
28+
};

‎.wordpress-org/blueprints/blueprint.json

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
{
2-
"landingPage": "/wp-admin/options-general.php?page=activitypub",
3-
"steps": [
4-
{
5-
"step": "setSiteOptions",
6-
"options": {
7-
"permalink_structure": "/%postname%/"
8-
}
9-
},
10-
{
11-
"step": "installPlugin",
12-
"pluginZipFile": {
13-
"resource": "wordpress.org/plugins",
14-
"slug": "activitypub"
15-
},
16-
"options": {
17-
"activate": true
18-
}
19-
},
20-
{
21-
"step": "login",
22-
"username": "admin",
23-
"password": "password"
24-
},
25-
{
26-
"step": "mkdir",
27-
"path": "wordpress/wp-content/mu-plugins"
28-
},
29-
{
30-
"step": "writeFile",
31-
"path": "wordpress/wp-content/mu-plugins/show-admin-notice-2.php",
32-
"data": "<?php\nadd_action(\n'admin_notices',\nfunction() {\n$dismissed = get_user_option( 'dismissed_expose_blueprint_notice-2', get_current_user_id() );\nif ( $dismissed ) {\nreturn;\n}\necho '<div class=\"notice notice-info is-dismissible\" id=\"custom-admin-notice-2\"><p>' . esc_html( 'Welcome and have fun 👋' ) . '</p></div>';\n}\n);\nadd_action('wp_ajax_dismiss_custom-admin-notice-2', function() {\ncheck_ajax_referer('custom-admin-notice-2', 'nonce');\n$user_id = get_current_user_id();\nif ( $user_id ) {\nupdate_user_option($user_id, 'dismissed_expose_blueprint_notice-2', 1, false);\nwp_send_json_success();\n} else {\nwp_send_json_error('User not found');\n}\n} );\nadd_action('admin_footer', function() {\n?>\n<script type=\"text/javascript\">\njQuery(document).ready( function($) {\nvar ajaxurl = '<?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>';\nvar nonce = '<?php echo esc_html( wp_create_nonce( 'custom-admin-notice-2' ) ); ?>';\n$( '#custom-admin-notice-2' ).on( 'click', '.notice-dismiss', function() {\n$.ajax({\nurl: ajaxurl,\ntype: 'POST',\ndata: {\naction: 'dismiss_custom-admin-notice-2',\nnonce: nonce\n}\n});\n});\n});\n</script>\n<?php\n} );"
33-
},
34-
{
35-
"step": "setSiteOptions",
36-
"options": {
37-
"blogname": "ActivityPub Demo",
38-
"blogdescription": "Democratize Publishing in the Fediverse",
39-
"activitypub_enable_blog_user": "1"
40-
}
41-
}
42-
]
2+
"landingPage": "/wp-admin/options-general.php?page=activitypub",
3+
"steps": [
4+
{
5+
"step": "setSiteOptions",
6+
"options": {
7+
"permalink_structure": "/%postname%/"
8+
}
9+
},
10+
{
11+
"step": "installPlugin",
12+
"pluginZipFile": {
13+
"resource": "wordpress.org/plugins",
14+
"slug": "activitypub"
15+
},
16+
"options": {
17+
"activate": true
18+
}
19+
},
20+
{
21+
"step": "login",
22+
"username": "admin",
23+
"password": "password"
24+
},
25+
{
26+
"step": "mkdir",
27+
"path": "wordpress/wp-content/mu-plugins"
28+
},
29+
{
30+
"step": "writeFile",
31+
"path": "wordpress/wp-content/mu-plugins/show-admin-notice-2.php",
32+
"data": "<?php\nadd_action(\n'admin_notices',\nfunction() {\n$dismissed = get_user_option( 'dismissed_expose_blueprint_notice-2', get_current_user_id() );\nif ( $dismissed ) {\nreturn;\n}\necho '<div class=\"notice notice-info is-dismissible\" id=\"custom-admin-notice-2\"><p>' . esc_html( 'Welcome and have fun 👋' ) . '</p></div>';\n}\n);\nadd_action('wp_ajax_dismiss_custom-admin-notice-2', function() {\ncheck_ajax_referer('custom-admin-notice-2', 'nonce');\n$user_id = get_current_user_id();\nif ( $user_id ) {\nupdate_user_option($user_id, 'dismissed_expose_blueprint_notice-2', 1, false);\nwp_send_json_success();\n} else {\nwp_send_json_error('User not found');\n}\n} );\nadd_action('admin_footer', function() {\n?>\n<script type=\"text/javascript\">\njQuery(document).ready( function($) {\nvar ajaxurl = '<?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>';\nvar nonce = '<?php echo esc_html( wp_create_nonce( 'custom-admin-notice-2' ) ); ?>';\n$( '#custom-admin-notice-2' ).on( 'click', '.notice-dismiss', function() {\n$.ajax({\nurl: ajaxurl,\ntype: 'POST',\ndata: {\naction: 'dismiss_custom-admin-notice-2',\nnonce: nonce\n}\n});\n});\n});\n</script>\n<?php\n} );"
33+
},
34+
{
35+
"step": "setSiteOptions",
36+
"options": {
37+
"blogname": "ActivityPub Demo",
38+
"blogdescription": "Democratize Publishing in the Fediverse",
39+
"activitypub_enable_blog_user": "1"
40+
}
41+
}
42+
]
4343
}

0 commit comments

Comments
 (0)