Merge branch 'develop' into feature/add-support-to-webhook-events

Author: glaubersilva

README.md

@@ -11,15 +11,15 @@ plugin for WordPress.
 6. Update this README (see below for a starting point)
 
 ### Asset Compilation
+Note: We use [@wordpress/scripts](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/).
+
 To compile your CSS & JS assets, run one of the following:
 
-- `npm run dev` — Compiles all assets (except Form Extension assets) for development one time
-- `npm run watch` — Compiles all assets (except Form Extension assets) for development one time and then watches for
-  changes, supporting [BrowserSync](https://laravel-mix.com/docs/5.0/browsersync)
-- `npm run dev:form-extension` — Compiles Form Extension assets for development one time
-- `npm run watch:form-extension` — Compiles Form Extension assets for development one time and then watches for changes,
-  supporting [BrowserSync](https://laravel-mix.com/docs/5.0/browsersync)
-- `npm run start` — Compiles all assets for development one time and then watches for changes
+| Command         | Description                                                             |
+|:----------------|:------------------------------------------------------------------------|
+| `npm run dev`   | Runs a one time build for development. No production files are created. |
+| `npm run watch` | Automatically re-builds as changes are made.                            |
+| `npm run build` | Builds the minified production files for release.
 
 ## Concepts
 

build.php

@@ -48,7 +48,7 @@
 $files = array_filter( array_merge(
 	[
         __DIR__ . '/readme.txt',
-        __DIR__ . '/webpack.mix.js',
+        __DIR__ . '/webpack.config.js',
         __DIR__ . '/composer.json',
         __DIR__ . '/.github/workflows/pre-release.yml',
     ],
@@ -58,7 +58,9 @@
     rglob(__DIR__ . '/src/*.php', GLOB_NOSORT),
     rglob(__DIR__ . '/src/*.js', GLOB_NOSORT),
     rglob(__DIR__ . '/src/*.ts', GLOB_NOSORT),
-    rglob(__DIR__ . '/src/*.tsx', GLOB_NOSORT)
+    rglob(__DIR__ . '/src/*.tsx', GLOB_NOSORT),
+    rglob(__DIR__ . '/src/*.scss', GLOB_NOSORT),
+    rglob(__DIR__ . '/src/*.css', GLOB_NOSORT),
 ), static function ( $file ) {
 	return $file !== __FILE__;
 } );
@@ -67,6 +69,7 @@
     'GiveAddon' => trim($namespace),
     '\\Domain' => trim("\\$domain"),
     'src/Domain' => trim("src/$domain"),
+    'Domain' => trim("$domain"),
     'ADDON_DOMAIN' => trim($domain),
     'ADDON_NAME' => trim($name),
     'ADDON_CONSTANT' => trim($constant),
@@ -86,26 +89,6 @@
     __DIR__ . "/$id.php"
 );
 
-rename(
-    __DIR__ . '/src/Domain/resources/js/admin/ADDON_ID-admin.ts',
-    __DIR__ . "/src/Domain/resources/js/admin/$id-admin.ts"
-);
-
-rename(
-    __DIR__ . '/src/Domain/resources/js/frontend/ADDON_ID-frontend.js',
-    __DIR__ . "/src/Domain/resources/js/frontend/$id-frontend.js"
-);
-
-rename(
-    __DIR__ . '/src/Domain/resources/css/admin/ADDON_ID-admin.scss',
-    __DIR__ . "/src/Domain/resources/css/admin/$id-admin.scss"
-);
-
-rename(
-    __DIR__ . '/src/Domain/resources/css/frontend/ADDON_ID-frontend.scss',
-    __DIR__ . "/src/Domain/resources/css/frontend/$id-frontend.scss"
-);
-
 rename(
     __DIR__ . '/src/Domain',
     __DIR__ . "/src/$domain"

composer.json

@@ -3,16 +3,13 @@
     "description": "ADDON_DESCRIPTION",
     "type": "wordpress-plugin",
     "license": "GPL-2.0-or-later",
-    "require": {},
     "require-dev": {
-        "kjohnson/since-unreleased": "^1.0.0",
-        "phpunit/phpunit": "^5",
-        "yoast/phpunit-polyfills": "^1.1.0",
         "squizlabs/php_codesniffer": "^3.5",
         "phpcompatibility/phpcompatibility-wp": "^2.1",
         "wp-coding-standards/wpcs": "^2.3",
         "phpcompatibility/php-compatibility": "^9.3",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0"
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+        "yoast/phpunit-polyfills": "^4.0"
     },
     "scripts": {
         "test": "./vendor/bin/phpunit --colors --stop-on-failure",
@@ -37,7 +34,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.0"
+            "php": "7.4.0"
         },
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true