Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set min version of WP to 6.1 & add grunt helper #2564

Merged
merged 5 commits into from Aug 28, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion class-coblocks.php
Expand Up @@ -8,7 +8,7 @@
* Text Domain: coblocks
* Domain Path: /languages
* Tested up to: 6.3
* Requires at least: 6.2
* Requires at least: 6.1
*
* CoBlocks is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
8 changes: 8 additions & 0 deletions gruntfile.js
Expand Up @@ -80,6 +80,10 @@ module.exports = function( grunt ) {
from: /Tested up to:(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
to: 'Tested up to:$1' + pkg.tested_up_to,
},
{
from: /Requires at least:(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
to: 'Requires at least:$1' + pkg.requires_at_least,
},
],
},
readme: {
Expand All @@ -94,6 +98,10 @@ module.exports = function( grunt ) {
from: /Tested up to:(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
to: 'Tested up to:$1' + pkg.tested_up_to,
},
{
from: /Requires at least:(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
to: 'Requires at least:$1' + pkg.requires_at_least,
},
],
},
tests: {
Expand Down
5 changes: 3 additions & 2 deletions package.json
Expand Up @@ -4,6 +4,7 @@
"description": "CoBlocks is a suite of professional page building blocks for the WordPress Gutenberg block editor.",
"version": "3.1.2",
"tested_up_to": "6.3",
"requires_at_least": "6.1",
"author": "GoDaddy",
"license": "GPL-2.0",
"repository": "godaddy-wordpress/coblocks",
Expand Down Expand Up @@ -31,8 +32,8 @@
"json2po": "cd languages && find . -name '*.json' ! -name 'coblocks*.json' -execdir /bin/bash -c 'FROM=\"$0\" && TO=\"coblocks-`basename $0 .json`.po\" && echo \"$FROM > $TO\" && ../vendor/bin/json2po coblocks.json $FROM $TO && msgmerge --previous $TO coblocks.pot > $TO-msgmerge && mv $TO-msgmerge $TO && if [[ \"$OSTYPE\" == \"darwin\"* ]]; then sed -i \"\" -e \"/^#, fuzzy$/d\" $TO; else sed -i -e \"/^#, fuzzy$/d\" $TO; fi;' '{}' \\;",
"lint:css": "wp-scripts lint-style",
"lint:js": "wp-scripts lint-js",
"lint:php": "wp-env run tests-cli --env-cwd=/var/www/html 'composer run lint -d /var/www/html/wp-content/plugins/coblocks/'; #we use phpunit container because composer container only use php 8;",
"lint:php:fix": "wp-env run tests-cli --env-cwd=/var/www/html 'composer run lint:fix -d /var/www/html/wp-content/plugins/coblocks/'; #we use phpunit container because composer container only use php 8;",
"lint:php": "wp-env run tests-cli --env-cwd=/var/www/html composer run lint -d /var/www/html/wp-content/plugins/coblocks/; #we use phpunit container because composer container only use php 8;",
"lint:php:fix": "wp-env run tests-cli --env-cwd=/var/www/html composer run lint:fix -d /var/www/html/wp-content/plugins/coblocks/; #we use phpunit container because composer container only use php 8;",
"makepot": "./vendor/bin/wp i18n make-pot . --skip-audit --exclude=\".dev,.github,.wordpress-org,build,docs,dist,node_modules,vendor,wordpress\" --headers='{\"Last-Translator\":\"plugins@godaddy.com\",\"Report-Msgid-Bugs-To\":\"https://github.com/godaddy-wordpress/coblocks/issues\"}' --file-comment=\"Copyright (c) $(date +'%Y') GoDaddy Operating Company, LLC. All Rights Reserved.\" languages/coblocks.pot && yarn run pot2json",
"po2jed": "cd languages && find . -name '*.po' -execdir /bin/bash -c 'FROM=\"$0\" && TO=\"`basename $0 .po`-coblocks-editor.json\" && echo \"$FROM > $TO\" && po2json $FROM $TO -f jed' '{}' \\;",
"po2mo": "cd languages && find . -name '*.po' -execdir /bin/bash -c 'FROM=\"$0\" && TO=\"`basename $0 .po`.mo\" && echo \"$FROM > $TO\" && msgfmt $FROM -o $TO' '{}' \\;",
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
Expand Up @@ -2,7 +2,7 @@
Author URI: https://www.godaddy.com
Contributors: godaddy, richtabor, eherman24, jonathanbardo, jrtashjian, paranoia1906, fjarrett, olivierlafleur, jasonlemay, snovosel
Tags: page builder, Gutenberg blocks, WordPress blocks, gutenberg, blocks
Requires at least: 6.2
Requires at least: 6.1
Tested up to: 6.3
Requires PHP: 7.4
Stable tag: 3.1.2
Expand Down
14 changes: 7 additions & 7 deletions src/blocks/events/test/events.cypress.js
Expand Up @@ -5,13 +5,13 @@ import * as helpers from '../../../../.dev/tests/cypress/helpers';

describe( 'Block: Events', function() {
// Setup events data.
const eventsData = {
color: {
textColor: '#ffffff',
textColorRGB: 'rgb(255, 255, 255)',
},
ical: 'https://calendar.google.com/calendar/ical/8hohgb8qv19fgvjbbkcehe0ce0%40group.calendar.google.com/public/basic.ics',
};
// const eventsData = {
// color: {
// textColor: '#ffffff',
// textColorRGB: 'rgb(255, 255, 255)',
// },
// ical: 'https://calendar.google.com/calendar/ical/8hohgb8qv19fgvjbbkcehe0ce0%40group.calendar.google.com/public/basic.ics',
// };

beforeEach( () => {
helpers.addBlockToPost( 'coblocks/events', true );
Expand Down