Skip to content

Commit c93a1c1

Browse files
committed
Update build, composer deps, and languages
Adjust build and tooling configuration, add language JSON files, and bump dependencies. Changes include tweaks to .distignore entries, updates to .wp-env.json mappings and test environment flag, and removal of an outdated phpcs-text-domain-fixer reference. composer.json adds installer paths and a text-domain replacer config, updates several dependency versions (including pronamic/wp-datetime and wp-pay packages), and adds build script changes to produce ./build/pronamic-ideal using wptdr, wp-scripts, and i18n generation. Many new language JSON files and updated .mo/.po/.pot files were added/updated. Corresponding lock and package files were updated to match dependency changes.
1 parent 71e4bce commit c93a1c1

120 files changed

Lines changed: 20950 additions & 14424 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.distignore

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
.wp-env.json
99

1010
# Git (https://git-scm.com/)
11-
/.git/
12-
/.gitignore
13-
/.gitattributes
11+
.git/
12+
.gitignore
13+
.gitattributes
1414

1515
# .DS_Store (https://en.wikipedia.org/wiki/.DS_Store)
1616
.DS_Store
@@ -23,58 +23,60 @@
2323
/wp-content/
2424

2525
# WordPress.org assets
26-
/.wordpress-org/
26+
.wordpress-org/
2727

2828
# pNpm (https://pnpm.io/)
2929
/pnpm-lock.yaml
3030

3131
# IntelliJ's project specific settings files
3232
# @link https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
33-
/.idea/
33+
.idea/
3434

3535
# Visual Studio Code
36-
/.vscode/
36+
.vscode/
3737

3838
# JSHint (http://jshint.com/about/)
39-
/.jshintrc
39+
.jshintrc
4040

4141
# GitHub
42-
/.github/
42+
.github/
4343

4444
# Nova (https://nova.app)
45-
/.nova/
45+
.nova/
4646

4747
# PHP error logs
48-
/php_errors.log
48+
php_errors.log
4949

5050
# PHP_CodeSniffer (https://github.com/squizlabs/PHP_CodeSniffer)
51-
/phpcs.xml.dist
52-
/phpcs.xml
53-
/phpcs-text-domain-fixer.xml
51+
phpcs.xml.dist
52+
phpcs.xml
5453

5554
# phpDocumentor (https://www.phpdoc.org/)
56-
/phpdoc.dist.xml
57-
/phpdoc.xml
55+
phpdoc.dist.xml
56+
phpdoc.xml
5857

5958
# PHP Mess Detector (https://phpmd.org/)
60-
/phpmd.ruleset.xml
61-
/phpmd.xml.dist
62-
/phpmd.xml
59+
phpmd.ruleset.xml
60+
phpmd.xml.dist
61+
phpmd.xml
6362

6463
# PHP Static Analysis Tool (https://github.com/phpstan/phpstan)
65-
/phpstan.neon.dist
66-
/phpstan.neon
64+
phpstan.neon.dist
65+
phpstan.neon
6766

6867
# PHPUnit (https://phpunit.de/)
69-
/phpunit.xml.dist
70-
/phpunit.xml
68+
phpunit.xml.dist
69+
phpunit.xml
7170

7271
# Psalm (https://github.com/vimeo/psalm)
73-
/psalm.xml.dist
74-
/psalm.xml
72+
psalm.xml.dist
73+
psalm.xml
74+
75+
# Rector (https://getrector.com/)
76+
rector.php
7577

7678
# WP-CLI (https://wp-cli.org/)
77-
/wp-cli.yml
79+
wp-cli.yml
7880

7981
# Project
8082
/build/

.wp-env.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"https://downloads.wordpress.org/plugin/code-profiler.zip",
1010
"https://downloads.wordpress.org/plugin/log-http-requests.zip",
1111
"https://downloads.wordpress.org/plugin/one-time-login.zip",
12-
"https://downloads.wordpress.org/plugin/plugin-check.1.0.1.zip",
12+
"https://downloads.wordpress.org/plugin/plugin-check.zip",
1313
"https://downloads.wordpress.org/plugin/pronamic-client.zip",
1414
"https://downloads.wordpress.org/plugin/query-monitor.zip",
1515
"https://downloads.wordpress.org/plugin/wp-rest-api-log.zip",
1616
"https://downloads.wordpress.org/plugin/wp-plugin-dependencies.zip"
1717
],
1818
"mappings": {
1919
"wp-content/plugins/pronamic-ideal-dev": "./",
20-
"wp-content/plugins/pronamic-ideal": "./build/project/",
20+
"wp-content/plugins/pronamic-ideal": "./build/pronamic-ideal/",
2121
"wp-content/plugins/charitable": "https://downloads.wordpress.org/plugin/charitable.zip",
2222
"wp-content/plugins/contact-form-7": "https://downloads.wordpress.org/plugin/contact-form-7.zip",
2323
"wp-content/plugins/easy-digital-downloads": "https://downloads.wordpress.org/plugin/easy-digital-downloads.zip",
@@ -26,7 +26,8 @@
2626
"wp-content/plugins/gravityforms": "pronamic/gravityforms",
2727
"wp-content/plugins/memberpress": "pronamic/memberpress",
2828
"wp-content/plugins/ninja-forms": "https://downloads.wordpress.org/plugin/ninja-forms.zip",
29-
"wp-content/plugins/restrict-content": "https://downloads.wordpress.org/plugin/restrict-content.zip",
29+
"wp-content/plugins/restrict-content": "https://downloads.wordpress.org/plugin/restrict-content.zip",
3030
"wp-content/plugins/woocommerce": "https://downloads.wordpress.org/plugin/woocommerce.zip"
31-
}
31+
},
32+
"testsEnvironment": false
3233
}

composer.json

Lines changed: 45 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,34 @@
5454
"bamarni/composer-bin-plugin": true,
5555
"composer/installers": true,
5656
"automattic/jetpack-autoloader": true
57+
}
58+
},
59+
"extra": {
60+
"installer-paths": {
61+
"packages/{$vendor}/{$name}": [
62+
"vendor:pronamic",
63+
"vendor:wp-pay",
64+
"vendor:wp-pay-extensions",
65+
"vendor:wp-pay-gateways",
66+
"woocommerce/action-scheduler"
67+
]
68+
},
69+
"solvebeam-wp-text-domain-replacer": {
70+
"search": [
71+
"action-scheduler",
72+
"pronamic_ideal",
73+
"pronamic-forms",
74+
"pronamic-ideal",
75+
"pronamic-money",
76+
"pronamic-pay-admin-reports",
77+
"pronamic-payment-gateways-countries-condition-for-woocommerce",
78+
"pronamic-pay-woocommerce"
79+
],
80+
"replace": "pronamic-ideal",
81+
"exclude": [
82+
"vendor",
83+
"node_modules"
84+
]
5785
},
5886
"wp-slug": "pronamic-ideal"
5987
},
@@ -64,14 +92,15 @@
6492
"composer/installers": "^2.3",
6593
"pronamic/pronamic-pay-admin-reports": "^1.0",
6694
"pronamic/pronamic-wp-updater": "^1.0",
67-
"pronamic/wp-datetime": "^2.1",
95+
"pronamic/wp-datetime": "^2.2",
6896
"pronamic/wp-gravityforms-nl": "^3.0",
6997
"pronamic/wp-html": "^2.2",
7098
"pronamic/wp-http": "^1.2",
7199
"pronamic/wp-mollie": "^1.10",
72100
"pronamic/wp-money": "^2.4",
73101
"pronamic/wp-number": "^1.4",
74102
"pronamic/wp-pay-logos": "^2.3",
103+
"pronamic/wp-pronamic-forms": "^2.0",
75104
"pronamic/wp-pronamic-pay-forms": "^1.2",
76105
"woocommerce/action-scheduler": "^3.9",
77106
"wp-pay-extensions/charitable": "^4.3",
@@ -80,20 +109,20 @@
80109
"wp-pay-extensions/event-espresso": "^4.3",
81110
"wp-pay-extensions/formidable-forms": "^4.4",
82111
"wp-pay-extensions/give": "^4.2",
83-
"wp-pay-extensions/gravityforms": "^4.11",
112+
"wp-pay-extensions/gravityforms": "^4.12",
84113
"wp-pay-extensions/memberpress": "^4.10",
85114
"wp-pay-extensions/ninjaforms": "^3.3",
86115
"wp-pay-extensions/restrict-content-pro": "^4.9",
87116
"wp-pay-extensions/woocommerce": "^4.14",
88117
"wp-pay-gateways/adyen": "^4.9",
89-
"wp-pay-gateways/buckaroo": "^4.4",
118+
"wp-pay-gateways/buckaroo": "^4.5",
90119
"wp-pay-gateways/ems-e-commerce": "^4.4",
91120
"wp-pay-gateways/mollie": "^4.19",
92121
"wp-pay-gateways/multisafepay": "^4.6",
93122
"wp-pay-gateways/omnikassa-2": "^4.10",
94123
"wp-pay-gateways/pay-nl": "^4.7",
95124
"wp-pay-gateways/paypal": "^2.3",
96-
"wp-pay/core": "^4.30",
125+
"wp-pay/core": "^4.32",
97126
"wp-pay/fundraising": "^3.2"
98127
},
99128
"require-dev": {
@@ -106,39 +135,31 @@
106135
"pronamic/pronamic-cli": "^1.1",
107136
"pronamic/wp-coding-standards": "^2.4",
108137
"roots/wordpress-no-content": "^6.4",
138+
"solvebeam/wp-text-domain-replacer": "dev-main",
109139
"vimeo/psalm": "^5.24",
110140
"wp-cli/dist-archive-command": "*",
111141
"wp-cli/wp-cli-bundle": "*",
112142
"yoast/phpunit-polyfills": "^1.1"
113143
},
114-
"extra": {
115-
"installer-paths": {
116-
"packages/{$vendor}/{$name}": [
117-
"vendor:pronamic",
118-
"vendor:wp-pay",
119-
"vendor:wp-pay-extensions",
120-
"vendor:wp-pay-gateways",
121-
"woocommerce/action-scheduler"
122-
]
123-
}
124-
},
125144
"scripts": {
126145
"build": [
127146
"Pronamic\\ChangelogMdToWordPressPluginReadmeTxt\\Synchronizer::run",
128-
"rm -rf ./build",
129-
"mkdir ./build",
130-
"mkdir ./build/stage-1",
131-
"mkdir ./build/stage-2",
147+
"rm -rf ./build/stage-1",
148+
"rm -rf ./build/pronamic-ideal/*",
132149
"rsync --recursive --verbose --exclude-from=.distignore --exclude-from=.gitignore ./ ./build/stage-1/",
133150
"composer install --no-dev --prefer-dist --optimize-autoloader --working-dir=./build/stage-1/",
134-
"rsync --recursive --verbose --exclude-from=.distignore ./build/stage-1/ ./build/stage-2/",
135-
"vendor/bin/phpcbf -s -v --standard=phpcs-text-domain-fixer.xml ./build/stage-2/ || true",
136-
"vendor/bin/wp i18n make-pot ./build/stage-2/ --slug=pronamic-ideal",
137-
"vendor/bin/wp dist-archive ./build/stage-2/ --plugin-dirname=pronamic-ideal"
151+
"rsync --recursive --verbose --exclude-from=.distignore ./build/stage-1/ ./build/pronamic-ideal/",
152+
"vendor/bin/wptdr --dir=./build/pronamic-ideal/",
153+
"npx wp-scripts build --webpack-src-dir=./build/pronamic-ideal/packages/pronamic/wp-pronamic-forms/blocks-src --output-path=./build/pronamic-ideal/packages/pronamic/wp-pronamic-forms/blocks",
154+
"npx wp-scripts build-blocks-manifest --input=./build/pronamic-ideal/packages/pronamic/wp-pronamic-forms/blocks --output=./build/pronamic-ideal/packages/pronamic/wp-pronamic-forms/blocks/blocks-manifest.php",
155+
"vendor/bin/wp i18n make-pot ./build/pronamic-ideal/ --slug=pronamic-ideal",
156+
"vendor/bin/wp i18n make-json ./build/pronamic-ideal/languages/",
157+
"vendor/bin/wp i18n make-mo ./build/pronamic-ideal/languages/",
158+
"vendor/bin/wp dist-archive ./build/pronamic-ideal/ --plugin-dirname=pronamic-ideal --force"
138159
],
139160
"translate": [
140161
"@build",
141-
"rsync --recursive --delete --verbose ./build/stage-2/languages/ ./languages/",
162+
"rsync --recursive --delete --verbose ./build/pronamic-ideal/languages/ ./languages/",
142163
"@update-po"
143164
],
144165
"version": [

0 commit comments

Comments
 (0)