0ct0pu5/themes-wordpress
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try fixing the husky actions. (#5493)

Browse source 
* Test commit.

* Test.

* Test.

* test.

* test

* Update package.json.

* Update package-lock.json.

* Remove incorrect formatting.

* Test a syntax error.

* Test a style error.

* Remove weird undefined.

* test

* test

* test commit

* Update phpcodesniffer-composer-installer

* Update phpcompatibility-wp

* test

* fix composer

* test

* test

* Update composer lock

* test

* test.

* Fix linters error?

* test

* test

* reset

* test

* test

Co-authored-by: Ben Dwyer <ben@scruffian.com>
Co-authored-by: Sarah Norris <sarah@sekai.co.uk>
This commit is contained in:
Jeff Ong 2022-02-15 06:28:42 -05:00 • committed by GitHub
parent 31e8d63895
commit c75d4ef9c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 2496 additions and 7075 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.husky/_/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
*

5
.husky/pre-commit Executable file
View file

@ -0,0 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
npx lint-staged
node pre-commit-hook.js

28
blockbase/inc/social-navigation.php
View file

@ -36,29 +36,29 @@ function get_social_menu_as_social_links_block( $block ) {
}
$social_links_location = $block['attrs']['__unstableSocialLinks'];
$nav_menu_locations = get_nav_menu_locations();
$social_menu_id = $nav_menu_locations[ $social_links_location ];
$class_name = 'is-style-logos-only';
if( ! empty( $block['attrs']['itemsJustification'] ) ) {
$nav_menu_locations = get_nav_menu_locations();
$social_menu_id = $nav_menu_locations[ $social_links_location ];
$class_name = 'is-style-logos-only';
if ( ! empty( $block['attrs']['itemsJustification'] ) ) {
$class_name .= ' items-justified-' . $block['attrs']['itemsJustification'];
}
// Get color for social icons.
$theme_data = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data()->get_raw_data();
$social_links_icon_color_value = "var(--wp--custom--color--primary)";
$social_links_icon_color = 'primary';
$theme_data = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data()->get_raw_data();
$social_links_icon_color_value = 'var(--wp--custom--color--primary)';
$social_links_icon_color = 'primary';
if ( blockbase_theme_has_navigation_social_links_settings( $theme_data ) ) {
$social_links_icon_color_value = $theme_data['settings']['custom']['navigation/social-links']['color']['text'];
$social_links_icon_color = preg_replace( '/var\(--wp--custom--color--(.+)\)/', '$0 --> $2 $1', $social_links_icon_color_value );
$social_links_icon_color = preg_replace( '/var\(--wp--custom--color--(.+)\)/', '$0 --> $2 $1', $social_links_icon_color_value );
}
$social_links_content = '<!-- wp:social-links {"iconColor":"' . $social_links_icon_color . '","iconColorValue":"' . $social_links_icon_color_value . '","className":"' . $class_name . '"} --><ul class="wp-block-social-links has-icon-color ' . $class_name . '">';
$menu = wp_get_nav_menu_items( $social_menu_id );
if ( $menu ) {
foreach ($menu as $menu_item) {
$service_name = preg_replace( '/(-[0-9]+)/', '', $menu_item->post_name );
foreach ( $menu as $menu_item ) {
$service_name = preg_replace( '/(-[0-9]+)/', '', $menu_item->post_name );
$social_links_content .= '<!-- wp:social-link {"url":"' . $menu_item->url . '","service":"' . $service_name . '"} /-->';
}
}
@ -70,18 +70,18 @@ function append_social_links_block( $parent_content, $social_links_block ) {
if ( empty( $parent_content ) ) {
return $social_links_block;
}
$dom = new domDocument;
$dom = new domDocument;
$domXPath = new DomXPath( $dom );
// Since the nav block uses HTML5 element names, we need to suppress the warnings it sends when we loadHTML with HTML5 elements.
libxml_use_internal_errors( true );
$dom->loadHTML( '<?xml encoding="utf-8" ?>' . $parent_content );
$wp_block_navigation__container = $dom->getElementsByTagName('ul')->item( 0 )->parentNode;
$social_links_node = $dom->createDocumentFragment();
$wp_block_navigation__container = $dom->getElementsByTagName( 'ul' )->item( 0 )->parentNode;
$social_links_node = $dom->createDocumentFragment();
$social_links_node->appendXML( $social_links_block );
if ( ! empty( $wp_block_navigation__container ) ) {
$wp_block_navigation__container->appendChild( $social_links_node );
}
$navigation_block = $dom->getElementsByTagName('nav')->item( 0 );
$navigation_block = $dom->getElementsByTagName( 'nav' )->item( 0 );
return $dom->saveXML( $navigation_block );
}

9
composer.json
View file

@ -1,7 +1,7 @@
{
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
"phpcompatibility/phpcompatibility-wp": "2.1.0",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"phpcompatibility/phpcompatibility-wp": "2.1.3",
"sirbrillig/phpcs-changed": "^2.5.1",
"sirbrillig/phpcs-variable-analysis": "^2.7.0",
"wp-coding-standards/wpcs": "^2.1.1"
@ -11,5 +11,10 @@
"php:lint:errors": "vendor/bin/phpcs -p -s --runtime-set ignore_warnings_on_exit 1",
"php:lint:autofix": "vendor/bin/phpcbf",
"php:lint:changed": "vendor/bin/phpcs-changed --git --git-unstaged"
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
}
}

144
composer.lock generated
View file

@ -4,32 +4,32 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "b6f63ee6bbf9e80dcf77f67f5bd61c45",
"content-hash": "3e126609920d4089e867e1610f05f2d1",
"packages": [],
"packages-dev": [
{
"name": "dealerdirect/phpcodesniffer-composer-installer",
"version": "v0.5.0",
"version": "v0.7.2",
"source": {
"type": "git",
"url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
"reference": "e749410375ff6fb7a040a68878c656c2e610b132"
"reference": "1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e749410375ff6fb7a040a68878c656c2e610b132",
"reference": "e749410375ff6fb7a040a68878c656c2e610b132",
"url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db",
"reference": "1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0",
"php": "^5.3|^7",
"squizlabs/php_codesniffer": "^2|^3"
"composer-plugin-api": "^1.0 || ^2.0",
"php": ">=5.3",
"squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0"
},
"require-dev": {
"composer/composer": "*",
"phpcompatibility/php-compatibility": "^9.0",
"sensiolabs/security-checker": "^4.1.0"
"php-parallel-lint/php-parallel-lint": "^1.3.1",
"phpcompatibility/php-compatibility": "^9.0"
},
"type": "composer-plugin",
"extra": {
@ -50,6 +50,10 @@
"email": "franck.nijhof@dealerdirect.com",
"homepage": "http://www.frenck.nl",
"role": "Developer / IT Manager"
},
{
"name": "Contributors",
"homepage": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer/graphs/contributors"
}
],
"description": "PHP_CodeSniffer Standards Composer Installer Plugin",
@ -61,6 +65,7 @@
"codesniffer",
"composer",
"installer",
"phpcbf",
"phpcs",
"plugin",
"qa",
@ -71,7 +76,11 @@
"stylecheck",
"tests"
],
"time": "2018-10-26T13:21:45+00:00"
"support": {
"issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues",
"source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer"
},
"time": "2022-02-04T12:51:07+00:00"
},
{
"name": "phpcompatibility/php-compatibility",
@ -129,32 +138,36 @@
"phpcs",
"standards"
],
"support": {
"issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues",
"source": "https://github.com/PHPCompatibility/PHPCompatibility"
},
"time": "2019-12-27T09:44:58+00:00"
},
{
"name": "phpcompatibility/phpcompatibility-paragonie",
"version": "1.3.0",
"version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git",
"reference": "b862bc32f7e860d0b164b199bd995e690b4b191c"
"reference": "ddabec839cc003651f2ce695c938686d1086cf43"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/b862bc32f7e860d0b164b199bd995e690b4b191c",
"reference": "b862bc32f7e860d0b164b199bd995e690b4b191c",
"url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/ddabec839cc003651f2ce695c938686d1086cf43",
"reference": "ddabec839cc003651f2ce695c938686d1086cf43",
"shasum": ""
},
"require": {
"phpcompatibility/php-compatibility": "^9.0"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
"paragonie/random_compat": "dev-master",
"paragonie/sodium_compat": "dev-master"
},
"suggest": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
"roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
},
"type": "phpcodesniffer-standard",
@ -181,20 +194,24 @@
"polyfill",
"standards"
],
"time": "2019-11-04T15:17:54+00:00"
"support": {
"issues": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/issues",
"source": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie"
},
"time": "2021-02-15T10:24:51+00:00"
},
{
"name": "phpcompatibility/phpcompatibility-wp",
"version": "2.1.0",
"version": "2.1.3",
"source": {
"type": "git",
"url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git",
"reference": "41bef18ba688af638b7310666db28e1ea9158b2f"
"reference": "d55de55f88697b9cdb94bccf04f14eb3b11cf308"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/41bef18ba688af638b7310666db28e1ea9158b2f",
"reference": "41bef18ba688af638b7310666db28e1ea9158b2f",
"url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/d55de55f88697b9cdb94bccf04f14eb3b11cf308",
"reference": "d55de55f88697b9cdb94bccf04f14eb3b11cf308",
"shasum": ""
},
"require": {
@ -202,10 +219,10 @@
"phpcompatibility/phpcompatibility-paragonie": "^1.0"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5"
"dealerdirect/phpcodesniffer-composer-installer": "^0.7"
},
"suggest": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
"roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
},
"type": "phpcodesniffer-standard",
@ -231,30 +248,33 @@
"standards",
"wordpress"
],
"time": "2019-08-28T14:22:28+00:00"
"support": {
"issues": "https://github.com/PHPCompatibility/PHPCompatibilityWP/issues",
"source": "https://github.com/PHPCompatibility/PHPCompatibilityWP"
},
"time": "2021-12-30T16:37:40+00:00"
},
{
"name": "sirbrillig/phpcs-changed",
"version": "v2.5.1",
"version": "v2.9.0",
"source": {
"type": "git",
"url": "https://github.com/sirbrillig/phpcs-changed.git",
"reference": "735133374065f7541e9201c06893eec5ebbf53d3"
"reference": "bc5ae2cce40055e87ad9d8037187797b62a6ada3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sirbrillig/phpcs-changed/zipball/735133374065f7541e9201c06893eec5ebbf53d3",
"reference": "735133374065f7541e9201c06893eec5ebbf53d3",
"url": "https://api.github.com/repos/sirbrillig/phpcs-changed/zipball/bc5ae2cce40055e87ad9d8037187797b62a6ada3",
"reference": "bc5ae2cce40055e87ad9d8037187797b62a6ada3",
"shasum": ""
},
"require": {
"php": "^7.1"
"php": "^7.1 || ^8.0"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
"limedeck/phpunit-detailed-printer": "^3.1",
"phpstan/phpstan": "^0.11.12",
"phpunit/phpunit": "^6.4",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
"phpstan/phpstan": "^0.12.33",
"phpunit/phpunit": "^6.4 || ^9.5",
"sirbrillig/phpcs-import-detection": "^1.1.1",
"sirbrillig/phpcs-variable-analysis": "^2.1.3",
"squizlabs/php_codesniffer": "^3.2.1"
@ -264,15 +284,15 @@
],
"type": "library",
"autoload": {
"psr-4": {
"PhpcsChanged\\": "PhpcsChanged/"
},
"files": [
"PhpcsChanged/Cli.php",
"PhpcsChanged/SvnWorkflow.php",
"PhpcsChanged/GitWorkflow.php",
"PhpcsChanged/functions.php"
]
],
"psr-4": {
"PhpcsChanged\\": "PhpcsChanged/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@ -285,28 +305,32 @@
}
],
"description": "Run phpcs on files, but only report warnings/errors from lines which were changed.",
"time": "2020-06-24T15:36:36+00:00"
"support": {
"issues": "https://github.com/sirbrillig/phpcs-changed/issues",
"source": "https://github.com/sirbrillig/phpcs-changed/tree/v2.9.0"
},
"time": "2022-02-01T18:05:55+00:00"
},
{
"name": "sirbrillig/phpcs-variable-analysis",
"version": "v2.8.3",
"version": "v2.11.2",
"source": {
"type": "git",
"url": "https://github.com/sirbrillig/phpcs-variable-analysis.git",
"reference": "00b4fa3130faa26762c929989e3d958086c627f1"
"reference": "3fad28475bfbdbf8aa5c440f8a8f89824983d85e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/00b4fa3130faa26762c929989e3d958086c627f1",
"reference": "00b4fa3130faa26762c929989e3d958086c627f1",
"url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/3fad28475bfbdbf8aa5c440f8a8f89824983d85e",
"reference": "3fad28475bfbdbf8aa5c440f8a8f89824983d85e",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
"squizlabs/php_codesniffer": "^3.1"
"squizlabs/php_codesniffer": "^3.5"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.4 || ^0.5 || ^0.6",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"limedeck/phpunit-detailed-printer": "^3.1 || ^4.0 || ^5.0",
"phpstan/phpstan": "^0.11.8",
"phpunit/phpunit": "^5.0 || ^6.5 || ^7.0 || ^8.0",
@ -333,20 +357,25 @@
}
],
"description": "A PHPCS sniff to detect problems with variables.",
"time": "2020-07-11T23:32:06+00:00"
"support": {
"issues": "https://github.com/sirbrillig/phpcs-variable-analysis/issues",
"source": "https://github.com/sirbrillig/phpcs-variable-analysis",
"wiki": "https://github.com/sirbrillig/phpcs-variable-analysis/wiki"
},
"time": "2021-07-06T23:45:17+00:00"
},
{
"name": "squizlabs/php_codesniffer",
"version": "3.5.6",
"version": "3.6.2",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "e97627871a7eab2f70e59166072a6b767d5834e0"
"reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e97627871a7eab2f70e59166072a6b767d5834e0",
"reference": "e97627871a7eab2f70e59166072a6b767d5834e0",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
"reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
"shasum": ""
},
"require": {
@ -384,7 +413,12 @@
"phpcs",
"standards"
],
"time": "2020-08-10T04:50:15+00:00"
"support": {
"issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
"source": "https://github.com/squizlabs/PHP_CodeSniffer",
"wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
},
"time": "2021-12-12T21:44:58+00:00"
},
{
"name": "wp-coding-standards/wpcs",
@ -430,6 +464,11 @@
"standards",
"wordpress"
],
"support": {
"issues": "https://github.com/WordPress/WordPress-Coding-Standards/issues",
"source": "https://github.com/WordPress/WordPress-Coding-Standards",
"wiki": "https://github.com/WordPress/WordPress-Coding-Standards/wiki"
},
"time": "2020-05-13T23:57:56+00:00"
}
],
@ -439,5 +478,6 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
"platform-dev": []
"platform-dev": [],
"plugin-api-version": "2.2.0"
}

9370
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

10
package.json
View file

@ -22,7 +22,8 @@
"deploy:preview": "node ./theme-utils.mjs deploy-preview",
"deploy:theme": "node ./theme-utils.mjs deploy-theme",
"deploy:zip": "node ./theme-utils.mjs build-com-zip",
"build:variations": "node ./variations/build-variations.mjs"
"build:variations": "node ./variations/build-variations.mjs",
"prepare": "husky install"
},
"devDependencies": {
"@octokit/rest": "^18.12.0",
@ -37,13 +38,8 @@
"lodash": "^4.17.21",
"open": "^8.4.0"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged && node pre-commit-hook.js"
}
},
"lint-staged": {
"*.{scss}": [
"*.scss": [
"wp-scripts lint-style --fix="
]
},

4
videomaker-white/functions.php
View file

@ -8,8 +8,8 @@ function videomaker_editor_styles() {
register_nav_menus(
array(
'primary' => __( 'Primary Navigation', 'videomaker' ),
'social' => __( 'Social Navigation', 'videomaker' ),
'footer' => __( 'Footer Navigation', 'videomaker' )
'social' => __( 'Social Navigation', 'videomaker' ),
'footer' => __( 'Footer Navigation', 'videomaker' ),
)
);
}