Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,12 @@ output.log
phpdoc.dist.xml
release-please-config.json
docker_tag
package.json
package.json
.eslintrc.js
.prettierrc.js
.phpstan.neon.dist.yml
.phpstan.neon.dist
.phpstan-baseline.neon
.phpstan.neon.dist.yml
.phpstan.neon.dist
.phpstan-baseline.neon
31 changes: 25 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
# This file is for unifying the coding style for different editors and IDEs
# editorconfig.org

# WordPress Coding Standards
# http://make.wordpress.org/core/handbook/coding-standards/

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
tab_width = 4
indent_style = tab
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.{php,js,css,scss}]
end_of_line = lf
insert_final_newline = false
indent_style = tab
indent_size = 4
[*\.txt]
trim_trailing_whitespace = false

[*\.{json,yml,yaml,xml,xml\.dist,eslintrc}]
indent_style = space
indent_size = 2

[*.md]
indent_style = space
indent_size = 2
trim_trailing_whitespace = false

[*\.svg]
insert_final_newline = false
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/build
/node_modules
/js
27 changes: 27 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/**
* External dependencies
*/
const wpConfig = require('@wordpress/scripts/config/.eslintrc.js');

const config = {
...wpConfig,
rules: {
...(wpConfig?.rules || {}),
'jsdoc/valid-types': 'off',
'import/no-unresolved': ['error'],
},
env: {
browser: true,
},
ignorePatterns: [
'/vendor',
'/node_modules',
'/build',
'/dist',
'/tools',
'/tests',
'/**/*.min.js',
],
};

module.exports = config;
2 changes: 1 addition & 1 deletion .github/workflows/phpcbf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
signoff: false
branch: phpcbf-${{ github.run_id }}-${{ github.run_attempt }}
delete-branch: true
title: "Auto Fix Formatting - ${{ github.run_id }}"
title: 'Auto Fix Formatting - ${{ github.run_id }}'
body: |
${{ steps.read_report.outputs.report }}
labels: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: rtCamp/action-phpcs-code-review@v3.1.1
env:
GH_BOT_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
SKIP_FOLDERS: ".deployment,.github,assets,css,js,lib,sourcedata,wsdl,vendor"
PHPCS_STANDARD_FILE_NAME: "phpcs.xml"
SKIP_FOLDERS: '.deployment,.github,assets,css,js,lib,sourcedata,wsdl,vendor'
PHPCS_STANDARD_FILE_NAME: 'phpcs.xml'
with:
args: "WordPress,WordPress-Core,WordPress-Extra"
args: 'WordPress,WordPress-Core,WordPress-Extra'
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

# Update the readme but only when it's creating a new release, not during the build
update-readme:
needs: [ release-please ]
needs: [release-please]
if: github.event_name != 'pull_request' && github.event.pull_request.merged != true && ! needs.release-please.outputs.release_created
uses: linchpin/actions/.github/workflows/update-readme.yml@v3
secrets: inherit
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/wiki.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
on:
push:
branches:
- main
- master
- '!release-please-*'
- '!renovate/*'
Expand Down Expand Up @@ -37,4 +38,4 @@ jobs:
WIKI_DIR: wiki/
GH_TOKEN: ${{ secrets.GH_WIKI_UPDATE_TOKEN }}
GH_MAIL: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
GH_NAME: ${{ github.repository_owner }}
GH_NAME: ${{ github.repository_owner }}
7 changes: 2 additions & 5 deletions .github/workflows/wordpress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: php-actions/composer@v6
with:
dev: no
php_version: "7.4"
php_version: '7.4'

- name: Install Yarn Dependencies
run: |
Expand All @@ -34,7 +34,7 @@ jobs:
rm -rf node_modules

- name: Clean Build Files/Folders
run : |
run: |
chmod +x ./.deployment/cleanup.sh
sh ./.deployment/cleanup.sh;

Expand All @@ -50,6 +50,3 @@ jobs:
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}



1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ Session.vim
Thumbs.db
Desktop.ini
vendor
vendor-prefixed
1 change: 1 addition & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npx commitlint --edit $1
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# npx lint-staged
1 change: 1 addition & 0 deletions .php-cs-fixer.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"php":"8.4.5","version":"3.84.0:v3.84.0#38dad0767bf2a9b516b976852200ae722fe984ca","indent":" ","lineEnding":"\n","rules":{"octal_notation":true,"clean_namespace":true,"no_unset_cast":true,"assign_null_coalescing_to_coalesce_equal":true,"normalize_index_brace":true,"short_scalar_cast":true,"heredoc_indentation":true,"no_whitespace_before_comma_in_array":{"after_heredoc":true},"trailing_comma_in_multiline":{"after_heredoc":true},"list_syntax":{"syntax":"short"},"visibility_required":true,"ternary_to_null_coalescing":true,"array_syntax":{"syntax":"short"},"native_constant_invocation":true,"native_function_casing":true,"native_function_invocation":true,"native_type_declaration_casing":true},"hashes":{"includes\/Controller\/Cron.php":"05b3ab71d8472fb9a005d933912d586e"}}
4 changes: 2 additions & 2 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
$finder = PhpCsFixer\Finder::create()->in(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 Error: Global variables defined by a theme/plugin should start with the theme/plugin prefix. Found: "$finder" (WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedVariableFound).

[
__DIR__ . '/includes/',
__DIR__ . '/blocks/src/',
__DIR__ . '/blocks/src-iapi/',
]
);

Expand All @@ -28,6 +26,8 @@
'native_function_casing' => true,
'native_function_invocation' => true,
'native_type_declaration_casing' => true,
'array_syntax' => [ 'syntax' => 'short' ],
'list_syntax' => [ 'syntax' => 'short' ],
]
);
$config->setFinder( $finder );
Expand Down
9 changes: 9 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module.exports = {
...require('@wordpress/prettier-config'),
overrides: [
{
files: ['*.yml', '*.yaml'],
options: { tabWidth: 2, useTabs: false },
},
],
};
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "1.7.1"
}
}
28 changes: 28 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll": "explicit",
"source.organizeImports": "explicit"
},
"[php]": {
"editor.defaultFormatter": "junstyle.php-cs-fixer",
"editor.formatOnSave": true
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"php-cs-fixer.executablePath": "./vendor/bin/php-cs-fixer",
"php-cs-fixer.config": ".php-cs-fixer.dist.php",
"php-cs-fixer.onsave": true,
"php-cs-fixer.autoExecutable": true,
"prettier.configPath": "package.json"
}
10 changes: 7 additions & 3 deletions FAQ.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# Frequently Asked Questions #
# Frequently Asked Questions

## Does this plugin work with Full Page Caching or WordPress Object Caching? ##
## Does this plugin work with Full Page Caching or WordPress Object Caching?

Yes

## I'm looking for a specific type of notice that courier doesn't have, what's next? ##
## I'm looking for a specific type of notice that courier doesn't have, what's next?

The great thing is that Courier Notices is highly extendable and our team is adding new features constantly since release. You can always create a pull request in GitHub or add an issue. You can also take a look at the Pro version which also has some great features.

## Is the compatible with the block editor?

No but our next release v2.0.0 will be
2,385 changes: 2,361 additions & 24 deletions assets/js/admin/core.js

Large diffs are not rendered by default.

Loading
Loading