Skip to content

Commit

Permalink
Merge branch 'trunk' into feature/summary-block
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremyfelt committed Jul 24, 2024
2 parents 4b16048 + 7b6a544 commit 5aca9bf
Show file tree
Hide file tree
Showing 28 changed files with 7,979 additions and 25,473 deletions.
25 changes: 25 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module.exports = {
extends: [
'plugin:import/recommended',
'plugin:jsdoc/recommended',
'plugin:jsx-a11y/recommended',
'plugin:prettier/recommended',
'plugin:react/recommended',
'plugin:react-hooks/recommended',
],
env: {
browser: true,
},
ignorePatterns: ['build/**/*.js', 'vendor/**/*.js'],
rules: {
'no-console': ['warn', { allow: ['error'] }],
'import/no-unresolved': [2, { ignore: ['^@wordpress/'] }],
'react/react-in-jsx-scope': 'off',
'react/prop-types': 'off',
},
settings: {
react: {
version: '18',
},
},
};
9 changes: 2 additions & 7 deletions .github/workflows/issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,5 @@ on:

jobs:
add-to-project:
name: Add issue to project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@main
with:
project-url: https://github.com/orgs/happyprime/projects/5
github-token: ${{ secrets.AMIABOT_BOT_TOKEN }}
uses: happyprime/workflows/.github/workflows/issues.yml@trunk
secrets: inherit
47 changes: 12 additions & 35 deletions .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,21 @@
# Run PHP Code Sniffer (PHPCS) and comment on the pull request with any issues.
#
# This file is managed in https://github.com/happyprime/projects
name: PHPCS (Default, PHP 8.2)
name: PHPCS (PHP 8.2)

on: pull_request

# The GITHUB_TOKEN used by Dependabot has read-only permissions
# by default, so we provide write permissions to this workflow
# so that comments can be left on the pull request.
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#changing-github_token-permissions
# The GITHUB_TOKEN used by Dependabot has read-only permissions by default. We
# provide write permissions to this workflow so that comments can be left on
# the pull request.
#
# @see https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#changing-github_token-permissions
permissions:
contents: read
pull-requests: write

jobs:
phpcs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
coverage: none
tools: composer, cs2pr

- name: Cache Composer
id: cache-composer
run: |
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
with:
path: ${{ steps.cache-composer.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-
- name: Install dependencies
run: |
composer install --prefer-dist --no-progress
- name: Detect coding standard violations
run: vendor/bin/phpcs -q --report=checkstyle . | cs2pr --notices-as-warnings
call-workflow:
uses: happyprime/workflows/.github/workflows/phpcs.yml@trunk
with:
php-version: '8.2'
85 changes: 11 additions & 74 deletions .github/workflows/verify-build.yml
Original file line number Diff line number Diff line change
@@ -1,82 +1,19 @@
# This file is managed in https://github.com/happyprime/projects
name: Verify build (Node 18)
name: Verify build (Node 20)

on: [ pull_request ]
on: pull_request

# The GITHUB_TOKEN used by Dependabot has read-only permissions
# by default, so we provide write permissions to this workflow
# so that comments can be left on the pull request.
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#changing-github_token-permissions
# The GITHUB_TOKEN used by Dependabot has read-only permissions by default. We
# provide write permissions to this workflow so that comments can be left on
# the pull request.
#
# @see https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#changing-github_token-permissions
permissions:
contents: read
pull-requests: write

jobs:
build:
name: Check built files

runs-on: ubuntu-latest

steps:
- name: Checkout project
uses: actions/checkout@v4
with:
fetch-depth: 2

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 18
cache: 'npm'

- name: Verify Node dependency cache
uses: actions/cache@v3
with:
path: ./node_modules
key: node-dependencies-${{ hashFiles('package-lock.json') }}
restore-keys: node-dependencies-

- name: Install Node dependencies
run: npm install

- name: Build
run: npm run build

- name: Capture Git status
id: git
shell: bash
run: |
echo 'changes<<EOF' >> $GITHUB_OUTPUT
echo "$(git status --porcelain --untracked-files=all)" >> $GITHUB_OUTPUT
echo 'EOF' >> $GITHUB_OUTPUT
echo "nodeVersion=$(node --version)" >> $GITHUB_OUTPUT
echo "npmVersion=$(npm --version)" >> $GITHUB_OUTPUT
- name: Fail if changes detected
shell: bash
run: |
if [[ -n "${{ steps.git.outputs.changes }}" ]]; then
exit 1
fi
- name: Comment on pull request
if: failure()
uses: actions/github-script@v7
with:
script: |
const output = `Changed files were detected after build. Please run project build workflows and check \`git status\` for any missed changes.
\`\`\`
${{ steps.git.outputs.changes }}
\`\`\`
You may need to update your local NPM configuration if different than below:
* Node ${{ steps.git.outputs.nodeVersion }}
* NPM ${{ steps.git.outputs.npmVersion }}
`;
github.rest.issues.createComment({
...context.repo,
issue_number: context.payload.pull_request.number,
body: output
})
call-workflow:
uses: happyprime/workflows/.github/workflows/verify-build.yml@trunk
with:
node-version: 20
22 changes: 22 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
const config = {
useTabs: true,
tabWidth: 4,
printWidth: 80,
singleQuote: true,
trailingComma: 'es5',
bracketSameLine: false,
bracketSpacing: true,
semi: true,
arrowParens: 'always',
parenSpacing: true,
overrides: [
{
files: '*.{css,sass,scss}',
options: {
singleQuote: false,
},
},
],
};

module.exports = config;
28 changes: 13 additions & 15 deletions build/show-hide-details/block.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
"$schema": "https://json.schemastore.org/block.json",
"apiVersion": 2,
"name": "happyprime/show-hide-details",
"title": "Show Hide Details",
"textdomain": "show-hide-section-block",
"category": "widgets",
"description": "The remaining content in a details section.",
"icon": "media-document",
"parent": [
"happyprime/show-hide-section"
],
"attributes": {},
"supports": {},
"editorScript": "file:index.js"
}
"$schema": "https://json.schemastore.org/block.json",
"apiVersion": 2,
"name": "happyprime/show-hide-details",
"title": "Show Hide Details",
"textdomain": "show-hide-section-block",
"category": "widgets",
"description": "The remaining content in a details section.",
"icon": "media-document",
"parent": [ "happyprime/show-hide-section" ],
"attributes": {},
"supports": {},
"editorScript": "file:index.js"
}
2 changes: 1 addition & 1 deletion build/show-hide-details/index.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-element', 'wp-i18n'), 'version' => '2327d2db249c80917f77');
<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-i18n'), 'version' => '5a711bc380f8e042db4d');
2 changes: 1 addition & 1 deletion build/show-hide-details/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

90 changes: 45 additions & 45 deletions build/show-hide-group/block.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
{
"$schema": "https://json.schemastore.org/block.json",
"apiVersion": 2,
"name": "happyprime/show-hide-group",
"title": "Show Hide Group",
"textdomain": "show-hide-section-block",
"category": "widgets",
"description": "A group of accessible summaries that can be toggled to show or hide additional details.",
"icon": "hidden",
"attributes": {
"hasToggle": {
"type": "boolean",
"default": false
}
},
"supports": {
"align": true,
"alignWide": true,
"anchor": true,
"color": {
"background": true,
"enableContrastChecker": true,
"text": true,
"link": true,
"gradients": true
},
"defaultStylePicker": true,
"dimensions": {
"minHeight": true
},
"html": false,
"position": {
"sticky": false
},
"spacing": {
"margin": true,
"padding": true
},
"typography": {
"fontSize": true,
"lineHeight": true
}
},
"editorScript": "file:index.js",
"viewScript": "file:view.js"
}
"$schema": "https://json.schemastore.org/block.json",
"apiVersion": 2,
"name": "happyprime/show-hide-group",
"title": "Show Hide Group",
"textdomain": "show-hide-section-block",
"category": "widgets",
"description": "A group of accessible summaries that can be toggled to show or hide additional details.",
"icon": "hidden",
"attributes": {
"hasToggle": {
"type": "boolean",
"default": false
}
},
"supports": {
"align": true,
"alignWide": true,
"anchor": true,
"color": {
"background": true,
"enableContrastChecker": true,
"text": true,
"link": true,
"gradients": true
},
"defaultStylePicker": true,
"dimensions": {
"minHeight": true
},
"html": false,
"position": {
"sticky": false
},
"spacing": {
"margin": true,
"padding": true
},
"typography": {
"fontSize": true,
"lineHeight": true
}
},
"editorScript": "file:index.js",
"viewScript": "file:view.js"
}
2 changes: 1 addition & 1 deletion build/show-hide-group/index.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '632e0b996cf0eaeabf03');
<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-i18n'), 'version' => 'b6fd5a6d69496c042e43');
2 changes: 1 addition & 1 deletion build/show-hide-group/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/show-hide-group/view.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array(), 'version' => 'c1c493ae492c636904dd');
<?php return array('dependencies' => array(), 'version' => 'fbf381460e85f307651f');
2 changes: 1 addition & 1 deletion build/show-hide-group/view.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5aca9bf

Please sign in to comment.