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

Feature: Font Awesome 5 + GraphQL API integration #17

Merged
merged 66 commits into from Mar 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
33f6cf7
Add missing new files
MickeyKay Sep 10, 2020
5ca8cad
Update #allththings
MickeyKay Sep 10, 2020
bc82ec4
Test the new tests
MickeyKay Sep 10, 2020
5f3c920
Add conditional v4 shim support
MickeyKay Sep 10, 2020
afc2ee6
Reset test framework
MickeyKay Sep 10, 2020
0a42e35
Add helper function to get bfal instance
MickeyKay Sep 10, 2020
3fc8802
Fix test issue
MickeyKay Sep 10, 2020
0a5d4a5
Fix test issue
MickeyKay Sep 10, 2020
ced42ee
Fix test issue
MickeyKay Sep 10, 2020
adb2287
Fix test issue
MickeyKay Sep 10, 2020
ef1bdb7
Testing the tests
MickeyKay Sep 10, 2020
d011eef
Testing the tests
MickeyKay Sep 10, 2020
c710144
Testing the tests
MickeyKay Sep 10, 2020
2841a41
Testing the tests
MickeyKay Sep 10, 2020
a64f7c3
Testing the tests
MickeyKay Sep 10, 2020
2ca2ab9
Testing the tests
MickeyKay Sep 10, 2020
16ca607
Testing the tests
MickeyKay Sep 10, 2020
d841e79
Testing the tests
MickeyKay Sep 10, 2020
f25367f
Testing the tests
MickeyKay Sep 10, 2020
91ab317
Add separate BFAL test file :|
MickeyKay Sep 10, 2020
17ff67a
Add separate BFAL test file :|
MickeyKay Sep 10, 2020
c5892b5
Fix travis config
MickeyKay Sep 10, 2020
f8816aa
Add tests
MickeyKay Sep 10, 2020
3c2207c
Fix typo
MickeyKay Sep 10, 2020
896b75d
Revert to getter
MickeyKay Sep 10, 2020
be7607f
Typo
MickeyKay Sep 11, 2020
6f363f4
Update test
MickeyKay Sep 11, 2020
5cecb12
Vendor updates + admin update
MickeyKay Sep 13, 2020
1a1be79
Update admin + tests
MickeyKay Sep 13, 2020
7599583
Validate composer deps
MickeyKay Sep 14, 2020
0c63879
Add package lock
MickeyKay Sep 14, 2020
79c6390
Update composer deps
MickeyKay Sep 14, 2020
60df16f
Run build + git ignore /svn
MickeyKay Sep 14, 2020
3e3672d
Bump readme test version, update composer dep
MickeyKay Sep 15, 2020
d10b8c2
Remove extra phpcs file
MickeyKay Oct 4, 2020
b5e9d1f
Restore master travis.yml file
MickeyKay Oct 4, 2020
0ab69b7
Update test things
MickeyKay Oct 4, 2020
2953380
Re-remove vendor
MickeyKay Oct 4, 2020
f75467e
Fix merge conflicts
MickeyKay Oct 4, 2020
dcb3efc
Fix indentation + lint
MickeyKay Oct 4, 2020
fa7f2e6
More lint fixes
MickeyKay Oct 3, 2020
a66074d
Update tests
MickeyKay Oct 5, 2020
d232e18
Restore constructor visibility
MickeyKay Oct 5, 2020
f3d40c0
Reindent composer.json to tabs
MickeyKay Oct 5, 2020
4d1caa3
Bump deps and clean up JS issues
MickeyKay Feb 14, 2021
fab3745
Fix tests!
MickeyKay Feb 14, 2021
5f75b6e
Update composer deps
MickeyKay Feb 14, 2021
4e0cb27
Resolve conflicts
MickeyKay Feb 14, 2021
b3de7ef
Add older testing for WP@4.9
MickeyKay Feb 14, 2021
7a219e2
Bump version
MickeyKay Feb 16, 2021
5c4d11f
Add PHP 7.3 testing
MickeyKay Feb 21, 2021
ebd8c6a
Version assets, remove legacy script, update composer script
MickeyKay Feb 21, 2021
0f3cc2c
Revert composer --prefer-source
MickeyKay Feb 22, 2021
927cd6e
Bump BFAL version
MickeyKay Feb 22, 2021
578352e
Update BFAL version
MickeyKay Feb 22, 2021
b04b86e
Bump version
MickeyKay Feb 23, 2021
8fc6cf8
Set v4 shim to true if conditions met
MickeyKay Feb 28, 2021
9a90a1f
Bump BFAL dep + version
MickeyKay Feb 28, 2021
c229b53
Bump BFAL properly ;)
MickeyKay Feb 28, 2021
7d2cf41
Repair tests
MickeyKay Mar 1, 2021
cbba060
Merge branch 'feature/fa-5-latest' of github.com:MickeyKay/better-fon…
MickeyKay Mar 1, 2021
a373101
Update changelog
MickeyKay Mar 1, 2021
510dcc7
Bump BFAL -> 2.0.0
MickeyKay Mar 1, 2021
55d19ef
Modify changelog + versions
MickeyKay Mar 1, 2021
1f8544c
Rebuild
MickeyKay Mar 1, 2021
4412b9b
Update travis links
MickeyKay Mar 1, 2021
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
4 changes: 4 additions & 0 deletions .travis.yml
Expand Up @@ -20,10 +20,14 @@ matrix:
include:
- php: 7.4
env: WP_VERSION=latest
- php: 7.3
env: WP_VERSION=latest
- php: 5.6
env: WP_VERSION=latest
- php: 5.6
env: WP_VERSION=trunk
- php: 5.6
env: WP_VERSION=4.9
- php: 7.4
env: WP_TRAVISCI=phpcs

Expand Down
306 changes: 155 additions & 151 deletions Gruntfile.js
Expand Up @@ -3,161 +3,165 @@

module.exports = function( grunt ) {

// Grab package as variable for later use/
var pkg = grunt.file.readJSON( 'package.json' );
// Grab package as variable for later use/
var pkg = grunt.file.readJSON( 'package.json' );

// Load all tasks.
require('load-grunt-tasks')(grunt, {scope: 'devDependencies'});
// Load all tasks.
require('load-grunt-tasks')(grunt, {scope: 'devDependencies'});

// Project configuration
grunt.initConfig( {
pkg: pkg,
devUpdate: {
main: {
options: {
updateType: 'prompt',
packages: {
devDependencies: true
},
}
}
},
prompt: {
version: {
options: {
questions: [
{
config: 'newVersion',
type: 'input',
message: 'What specific version would you like?',
default: '<%= pkg.version %>'
},
{
config: 'updateStable',
type: 'confirm',
message: 'Bump stable version?',
default: false
}
]
}
}
},
replace: {
package: {
src: ['package.json'],
overwrite: true,
replacements: [
{
"version": "1.0.0",
from: /("version":\s*).*,\n/g,
to: '$1"<%= newVersion %>",\n'
}
]
},
readme: {
src: ['readme.txt'],
overwrite: true,
replacements: [
{
from: /(Stable tag:\s*)(.*)(\n)/g,
to: function(matchedText, index, fullText, regexMatches) {
return grunt.config('updateStable') ? regexMatches[0] + grunt.config('newVersion') + regexMatches[2]: matchedText;
}
}
]
},
php: {
src: ['better-font-awesome.php'],
overwrite: true,
replacements: [
{
from: /(\*\s*Version:\s*).*\n/g,
to: '$1<%= newVersion %>\n'
}
]
}
},
makepot: {
target: {
options: {
domainPath: '/languages/', // Where to save the POT file.
potFilename: 'better-font-awesome.pot', // Name of the POT file.
type: 'wp-plugin' // Type of project (wp-plugin or wp-theme).
}
}
},
wp_readme_to_markdown: {
readme: {
files: {
'readme.md': 'readme.txt'
},
options: {
post_convert: function(text) {
var prefix = [
'[![Build Status](https://travis-ci.org/MickeyKay/better-font-awesome.svg?branch=master)](https://travis-ci.org/MickeyKay/better-font-awesome)',
'[![Downloads](https://img.shields.io/wordpress/plugin/dt/better-font-awesome.svg)](https://wordpress.org/plugins/better-font-awesome/)',
'[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)'
].join(' ');
// Project configuration
grunt.initConfig( {
pkg: pkg,
devUpdate: {
main: {
options: {
updateType: 'prompt',
packages: {
devDependencies: true
},
}
}
},
prompt: {
version: {
options: {
questions: [
{
config: 'newVersion',
type: 'input',
message: 'What specific version would you like?',
default: '<%= pkg.version %>'
},
{
config: 'updateStable',
type: 'confirm',
message: 'Bump stable version?',
default: false
}
]
}
}
},
replace: {
package: {
src: ['package.json'],
overwrite: true,
replacements: [
{
"version": "1.0.0",
from: /("version":\s*).*,\n/g,
to: '$1"<%= newVersion %>",\n'
}
]
},
readme: {
src: ['readme.txt'],
overwrite: true,
replacements: [
{
from: /(Stable tag:\s*)(.*)(\n)/g,
to: function(matchedText, index, fullText, regexMatches) {
return grunt.config('updateStable') ? regexMatches[0] + grunt.config('newVersion') + regexMatches[2]: matchedText;
}
}
]
},
php: {
src: ['better-font-awesome.php'],
overwrite: true,
replacements: [
{
from: /(\*\s*Version:\s*).*\n/g,
to: '$1<%= newVersion %>\n'
},
{
from: /(const VERSION = ').*(';)/g,
to: '$1<%= newVersion %>$2'
}
]
}
},
makepot: {
target: {
options: {
domainPath: '/languages/', // Where to save the POT file.
potFilename: 'better-font-awesome.pot', // Name of the POT file.
type: 'wp-plugin' // Type of project (wp-plugin or wp-theme).
}
}
},
wp_readme_to_markdown: {
readme: {
files: {
'readme.md': 'readme.txt'
},
options: {
post_convert: function(text) {
var prefix = [
'[![Build Status](https://travis-ci.com/MickeyKay/better-font-awesome.svg?branch=master)](https://travis-ci.com/MickeyKay/better-font-awesome)',
'[![Downloads](https://img.shields.io/wordpress/plugin/dt/better-font-awesome.svg)](https://wordpress.org/plugins/better-font-awesome/)',
'[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)'
].join(' ');

return [prefix,text].join('\n\n');
}
}
},
},
copy: {
composerDeps: {
src: [
'vendor/mickey-kay/**'
],
dest: 'svn/trunk/'
},
svnAssets: {
cwd: 'assets/',
src: ['**'],
dest: 'svn/assets/',
expand: true,
},
svnTrunk: {
src: [
'**',
'!node_modules/**',
'!vendor/**',
'!svn/**',
'!.git/**',
'!.gitignore',
'!.gitmodules',
'!.sass-cache/**',
'!bin/**',
'!tests/**',
'!css/src/**',
'!js/src/**',
'!img/src/**',
'!assets/**',
'!design/**',
'!Gruntfile.js',
'!package.json',
'!composer*',
],
dest: 'svn/trunk/',
},
svnTags: {
cwd: 'svn/trunk/',
src: ['**'],
dest: 'svn/tags/<%= newVersion %>/',
expand: true,
}
}
} );
return [prefix,text].join('\n\n');
}
}
},
},
copy: {
composerDeps: {
src: [
'vendor/mickey-kay/**'
],
dest: 'svn/trunk/'
},
svnAssets: {
cwd: 'assets/',
src: ['**'],
dest: 'svn/assets/',
expand: true,
},
svnTrunk: {
src: [
'**',
'!node_modules/**',
'!vendor/**',
'!svn/**',
'!.git/**',
'!.gitignore',
'!.gitmodules',
'!.sass-cache/**',
'!bin/**',
'!tests/**',
'!css/src/**',
'!js/src/**',
'!img/src/**',
'!assets/**',
'!design/**',
'!Gruntfile.js',
'!package.json',
'!composer*',
],
dest: 'svn/trunk/',
},
svnTags: {
cwd: 'svn/trunk/',
src: ['**'],
dest: 'svn/tags/<%= newVersion %>/',
expand: true,
}
}
} );

grunt.registerTask( 'build', [
'prompt',
'replace',
'makepot',
'wp_readme_to_markdown',
'copy'
] );
grunt.registerTask( 'build', [
'prompt',
'replace',
'makepot',
'wp_readme_to_markdown',
'copy'
] );

grunt.registerTask( 'default', 'build' );
grunt.registerTask( 'default', 'build' );

grunt.util.linefeed = '\n';
grunt.util.linefeed = '\n';
};