diff --git a/composer.json b/composer.json index 093385ad6..8294b50df 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ } }, "scripts": { - "fix-standards": [ + "fix:standards": [ "./vendor/bin/phpcbf --standard=./.phpcs.dist.xml .", "PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix -v --diff" ], @@ -55,20 +55,14 @@ "i18n": [ "@i18n-pot", "@i18n-po", -<<<<<<< HEAD - "@i18n-mo" + "@i18n-mo", + "@i18n-json" ], "lint": "@test", "test": "@test-standards", "test-standards": [ "./vendor/bin/phpcs --standard=./.phpcs.dist.xml", "PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix -v --diff --dry-run" -||||||| 72e3d866bcfe - "@i18n-mo" -======= - "@i18n-mo", - "@i18n-json" ->>>>>>> main ] }, "scripts-descriptions": { @@ -79,65 +73,23 @@ "i18n-pot": "Generate a .pot file for translation.", "i18n-po": "Update existing .po files.", "i18n-mo": "Generate new language .mo files.", -<<<<<<< HEAD "i18n-json": "Generate new language .json files.", "i18n-json-rename": "Rename the language json files to remove the pesky hash.", "test": "Run all test scripts.", "test-standards": "Check files against coding standards without fixing." -||||||| 72e3d866bcfe - "i18n-json": "Generate new language .json files.", - "i18n-json-rename": "Rename the language json files to remove the pesky hash." -======= - "i18n-json": "Generate new language .json files." ->>>>>>> main }, "require-dev": { -<<<<<<< HEAD "dealerdirect/phpcodesniffer-composer-installer": "@stable", "friendsofphp/php-cs-fixer": "^2.19", - "newfold-labs/wp-php-standards": "^1.2", "phpcompatibility/phpcompatibility-wp": "@stable", "roave/security-advisories": "dev-latest", "squizlabs/php_codesniffer": "@stable", - "wp-cli/i18n-command": "^2.5.0", "wp-coding-standards/wpcs": "^3.0", - "wp-phpunit/wp-phpunit": "^6.4.2" -||||||| 72e3d866bcfe - "roave/security-advisories": "dev-latest", - "newfold-labs/wp-php-standards": "^1.2", - "wp-cli/i18n-command": "^2.5.0", - "wp-phpunit/wp-phpunit": "^6.4.2" -======= - "roave/security-advisories": "dev-latest", "newfold-labs/wp-php-standards": "^1.2.4", "wp-cli/i18n-command": "^2.6.2", "wp-phpunit/wp-phpunit": "^6.6.2" ->>>>>>> main }, "require": { -<<<<<<< HEAD - "wp-forge/wp-upgrade-handler": "^1.0", - "newfold-labs/wp-module-sso": "^1.0.4", -||||||| 72e3d866bcfe - "newfold-labs/wp-module-activation": "^1.0.1", - "newfold-labs/wp-module-coming-soon": "^1.2.3", - "newfold-labs/wp-module-context": "^1.0.0", - "newfold-labs/wp-module-data": "^2.4.20", - "newfold-labs/wp-module-deactivation": "^1.1.1", - "newfold-labs/wp-module-ecommerce": "^1.3.25", - "newfold-labs/wp-module-global-ctb": "^1.0.11", - "newfold-labs/wp-module-help-center": "^1.0.24", - "newfold-labs/wp-module-loader": "^1.0.10", - "newfold-labs/wp-module-marketplace": "^2.2.4", - "newfold-labs/wp-module-notifications": "^1.2.5", - "newfold-labs/wp-module-onboarding": "^2.1.8", - "newfold-labs/wp-module-patterns": "^0.1.15", - "newfold-labs/wp-module-performance": "^1.4.0", - "newfold-labs/wp-module-runtime": "^1.0.9", - "newfold-labs/wp-module-secure-passwords": "^1.1.1", - "newfold-labs/wp-module-sso": "^1.0.4", - "newfold-labs/wp-module-staging": "^1.3.0", -======= "newfold-labs/wp-module-activation": "^1.0.3", "newfold-labs/wp-module-atomic": "^1.3.0", "newfold-labs/wp-module-coming-soon": "^1.2.6", @@ -161,24 +113,7 @@ "newfold-labs/wp-module-secure-passwords": "^1.1.1", "newfold-labs/wp-module-sso": "^1.0.6", "newfold-labs/wp-module-staging": "^2.1.1", ->>>>>>> main "wp-forge/wp-update-handler": "^1.0.2", - "newfold-labs/wp-module-data": "^2.4.20", - "newfold-labs/wp-module-context": "^1.0.0", - "newfold-labs/wp-module-loader": "^1.0.10", - "newfold-labs/wp-module-runtime": "^1.0.9", - "newfold-labs/wp-module-staging": "^1.3.0", - "newfold-labs/wp-module-patterns": "^0.1.15", - "newfold-labs/wp-module-activation": "^1.0.1", - "newfold-labs/wp-module-ecommerce": "^1.3.25", - "newfold-labs/wp-module-onboarding": "^2.1.8", - "newfold-labs/wp-module-coming-soon": "^1.2.3", - "newfold-labs/wp-module-global-ctb": "^1.0.11", - "newfold-labs/wp-module-marketplace": "^2.2.4", - "newfold-labs/wp-module-performance": "^1.4.0", - "newfold-labs/wp-module-deactivation": "^1.1.1", - "newfold-labs/wp-module-help-center": "^1.0.24", - "newfold-labs/wp-module-notifications": "^1.2.5", - "newfold-labs/wp-module-secure-passwords": "^1.1.1" + "wp-forge/wp-upgrade-handler": "^1.0" } } diff --git a/composer.lock b/composer.lock index fcf537573..27cbac076 100644 --- a/composer.lock +++ b/composer.lock @@ -4,13 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], -<<<<<<< HEAD - "content-hash": "739b014b18c926e90b2f97ee0ab80c22", -||||||| 72e3d866bcfe - "content-hash": "db91ae62cc37d21c85c9c2534702f62e", -======= - "content-hash": "e4996e001f644a254f0778f80d79d442", ->>>>>>> main + "content-hash": "af5c39dfc0204724353ae298c2334e9c", "packages": [ { "name": "doctrine/inflector", @@ -574,16 +568,8 @@ "version": "1.0.3", "source": { "type": "git", -<<<<<<< HEAD - "url": "https://github.com/newfold-labs/wp-module-activation.git", - "reference": "e84749f2299f876bf6cd03f37eb9bf8103a731f7" -||||||| 72e3d866bcfe - "url": "git@github.com:newfold-labs/wp-module-activation.git", - "reference": "e84749f2299f876bf6cd03f37eb9bf8103a731f7" -======= "url": "https://github.com/newfold-labs/wp-module-activation.git", "reference": "701a4416759799b2172578eb651a0774a94ecc4f" ->>>>>>> main }, "dist": { "type": "zip", @@ -629,34 +615,24 @@ } ], "description": "A Module for handling WordPress brand plugins activations", -<<<<<<< HEAD - "support": { - "source": "https://github.com/newfold-labs/wp-module-activation/tree/1.0.1", - "issues": "https://github.com/newfold-labs/wp-module-activation/issues" - }, - "time": "2024-03-15T16:42:51+00:00" -||||||| 72e3d866bcfe - "time": "2024-03-15T16:42:51+00:00" -======= "support": { "source": "https://github.com/newfold-labs/wp-module-activation/tree/1.0.3", "issues": "https://github.com/newfold-labs/wp-module-activation/issues" }, "time": "2024-07-01T19:05:14+00:00" ->>>>>>> main }, { "name": "newfold-labs/wp-module-ai", - "version": "1.1.11", + "version": "1.1.12", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-ai.git", - "reference": "523fe373a723b2336e3043cbcaeac058734ed761" + "reference": "3836a576e83e068b53de1d850bcb60aac471656d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-ai/zipball/523fe373a723b2336e3043cbcaeac058734ed761", - "reference": "523fe373a723b2336e3043cbcaeac058734ed761", + "url": "https://api.github.com/repos/newfold-labs/wp-module-ai/zipball/3836a576e83e068b53de1d850bcb60aac471656d", + "reference": "3836a576e83e068b53de1d850bcb60aac471656d", "shasum": "" }, "require": { @@ -686,10 +662,10 @@ ], "description": "A module for providing artificial intelligence capabilities.", "support": { - "source": "https://github.com/newfold-labs/wp-module-ai/tree/1.1.11", + "source": "https://github.com/newfold-labs/wp-module-ai/tree/1.1.12", "issues": "https://github.com/newfold-labs/wp-module-ai/issues" }, - "time": "2024-08-28T15:18:10+00:00" + "time": "2024-09-19T07:47:50+00:00" }, { "name": "newfold-labs/wp-module-atomic", @@ -1453,16 +1429,16 @@ }, { "name": "newfold-labs/wp-module-migration", - "version": "v1.0.11", + "version": "v1.0.12", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-migration.git", - "reference": "d84570b93abf5baade814bbb8d71871adff10e89" + "reference": "dad4efa9b8a02b2693fc3d26a228e4f58dde85e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-migration/zipball/d84570b93abf5baade814bbb8d71871adff10e89", - "reference": "d84570b93abf5baade814bbb8d71871adff10e89", + "url": "https://api.github.com/repos/newfold-labs/wp-module-migration/zipball/dad4efa9b8a02b2693fc3d26a228e4f58dde85e1", + "reference": "dad4efa9b8a02b2693fc3d26a228e4f58dde85e1", "shasum": "" }, "require": { @@ -1500,10 +1476,10 @@ ], "description": "Initiates the migration process", "support": { - "source": "https://github.com/newfold-labs/wp-module-migration/tree/v1.0.11", + "source": "https://github.com/newfold-labs/wp-module-migration/tree/v1.0.12", "issues": "https://github.com/newfold-labs/wp-module-migration/issues" }, - "time": "2024-08-21T14:04:06+00:00" + "time": "2024-09-25T08:45:49+00:00" }, { "name": "newfold-labs/wp-module-my-products", @@ -1611,16 +1587,16 @@ }, { "name": "newfold-labs/wp-module-onboarding", - "version": "2.4.1", + "version": "2.4.2", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-onboarding.git", - "reference": "bc7bc4f472a0524a9cf5542e5703d7df71a7d729" + "reference": "88893d89dda0af3ee013e2d6cf5432475fae6f35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-onboarding/zipball/bc7bc4f472a0524a9cf5542e5703d7df71a7d729", - "reference": "bc7bc4f472a0524a9cf5542e5703d7df71a7d729", + "url": "https://api.github.com/repos/newfold-labs/wp-module-onboarding/zipball/88893d89dda0af3ee013e2d6cf5432475fae6f35", + "reference": "88893d89dda0af3ee013e2d6cf5432475fae6f35", "shasum": "" }, "require": { @@ -1666,34 +1642,34 @@ ], "description": "Next-generation WordPress Onboarding for WordPress sites at Newfold Digital.", "support": { - "source": "https://github.com/newfold-labs/wp-module-onboarding/tree/2.4.1", + "source": "https://github.com/newfold-labs/wp-module-onboarding/tree/2.4.2", "issues": "https://github.com/newfold-labs/wp-module-onboarding/issues" }, - "time": "2024-09-17T10:18:51+00:00" + "time": "2024-09-25T11:59:03+00:00" }, { "name": "newfold-labs/wp-module-onboarding-data", - "version": "1.1.17", + "version": "1.1.18", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-onboarding-data.git", - "reference": "1c60007a352cb18511536b8b58c3b9dc65821f73" + "reference": "b82268167f0a1c58a06406697d979eed27268c85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-onboarding-data/zipball/1c60007a352cb18511536b8b58c3b9dc65821f73", - "reference": "1c60007a352cb18511536b8b58c3b9dc65821f73", + "url": "https://api.github.com/repos/newfold-labs/wp-module-onboarding-data/zipball/b82268167f0a1c58a06406697d979eed27268c85", + "reference": "b82268167f0a1c58a06406697d979eed27268c85", "shasum": "" }, "require": { "mustache/mustache": "^2.14", "newfold-labs/wp-module-ai": "^1.1", "newfold-labs/wp-module-coming-soon": "^1.2", - "newfold-labs/wp-module-data": "^2.0", + "newfold-labs/wp-module-data": "^2.6", "newfold-labs/wp-module-install-checker": "^1.0", "newfold-labs/wp-module-installer": "^1.1", - "newfold-labs/wp-module-patterns": "^2.0", - "newfold-labs/wp-module-performance": "^1.4", + "newfold-labs/wp-module-patterns": "^2.4", + "newfold-labs/wp-module-performance": "^2.0", "newfold-labs/wp-module-survey": "^1.0", "wp-forge/wp-upgrade-handler": "^1.0" }, @@ -1718,28 +1694,29 @@ ], "description": "A non-toggleable module containing a standardized interface for interacting with Onboarding data.", "support": { - "source": "https://github.com/newfold-labs/wp-module-onboarding-data/tree/1.1.17", + "source": "https://github.com/newfold-labs/wp-module-onboarding-data/tree/1.1.18", "issues": "https://github.com/newfold-labs/wp-module-onboarding-data/issues" }, - "time": "2024-09-11T05:58:44+00:00" + "time": "2024-09-25T07:44:47+00:00" }, { "name": "newfold-labs/wp-module-patterns", - "version": "2.4.1", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-patterns.git", - "reference": "2d8bb11201123adc6505afd89af6494490f929ed" + "reference": "d5e37c1b9ac7290e117001c40fe33ac2f95af094" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-patterns/zipball/2d8bb11201123adc6505afd89af6494490f929ed", - "reference": "2d8bb11201123adc6505afd89af6494490f929ed", + "url": "https://api.github.com/repos/newfold-labs/wp-module-patterns/zipball/d5e37c1b9ac7290e117001c40fe33ac2f95af094", + "reference": "d5e37c1b9ac7290e117001c40fe33ac2f95af094", "shasum": "" }, "require": { "newfold-labs/wp-module-data": "^2.5.1", - "newfold-labs/wp-module-features": "^1.4" + "newfold-labs/wp-module-features": "^1.4", + "newfold-labs/wp-module-installer": "^1.1" }, "require-dev": { "newfold-labs/wp-php-standards": "^1.2.2" @@ -1772,10 +1749,10 @@ ], "description": "WordPress Cloud Patterns", "support": { - "source": "https://github.com/newfold-labs/wp-module-patterns/tree/2.4.1", + "source": "https://github.com/newfold-labs/wp-module-patterns/tree/2.5.0", "issues": "https://github.com/newfold-labs/wp-module-patterns/issues" }, - "time": "2024-09-04T13:49:43+00:00" + "time": "2024-09-26T18:04:12+00:00" }, { "name": "newfold-labs/wp-module-performance", @@ -1976,36 +1953,16 @@ }, { "name": "newfold-labs/wp-module-staging", -<<<<<<< HEAD - "version": "1.3.2", -||||||| 72e3d866bcfe - "version": "1.3.1", -======= "version": "2.1.1", ->>>>>>> main "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-staging.git", -<<<<<<< HEAD - "reference": "0dfda9c88034066a633b4a9a9bc532a62c4eb79f" -||||||| 72e3d866bcfe - "reference": "4358628ec018976d21b87b4cbd08802f5a28bcf3" -======= "reference": "bf00499e80ba23729dfe140e8211a325627c259c" ->>>>>>> main }, "dist": { "type": "zip", -<<<<<<< HEAD - "url": "https://api.github.com/repos/newfold-labs/wp-module-staging/zipball/0dfda9c88034066a633b4a9a9bc532a62c4eb79f", - "reference": "0dfda9c88034066a633b4a9a9bc532a62c4eb79f", -||||||| 72e3d866bcfe - "url": "https://api.github.com/repos/newfold-labs/wp-module-staging/zipball/4358628ec018976d21b87b4cbd08802f5a28bcf3", - "reference": "4358628ec018976d21b87b4cbd08802f5a28bcf3", -======= "url": "https://api.github.com/repos/newfold-labs/wp-module-staging/zipball/bf00499e80ba23729dfe140e8211a325627c259c", "reference": "bf00499e80ba23729dfe140e8211a325627c259c", ->>>>>>> main "shasum": "" }, "require": { @@ -2043,22 +2000,10 @@ ], "description": "Newfold module for staging functionality in brand plugins", "support": { -<<<<<<< HEAD - "source": "https://github.com/newfold-labs/wp-module-staging/tree/1.3.2", -||||||| 72e3d866bcfe - "source": "https://github.com/newfold-labs/wp-module-staging/tree/1.3.1", -======= "source": "https://github.com/newfold-labs/wp-module-staging/tree/2.1.1", ->>>>>>> main "issues": "https://github.com/newfold-labs/wp-module-staging/issues" }, -<<<<<<< HEAD - "time": "2024-03-19T17:24:51+00:00" -||||||| 72e3d866bcfe - "time": "2024-03-15T16:43:57+00:00" -======= "time": "2024-09-03T18:35:49+00:00" ->>>>>>> main }, { "name": "newfold-labs/wp-module-survey", @@ -2894,24 +2839,24 @@ }, { "name": "composer/semver", - "version": "3.4.0", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", + "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.4", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" }, "type": "library", "extra": { @@ -2955,7 +2900,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.0" + "source": "https://github.com/composer/semver/tree/3.4.3" }, "funding": [ { @@ -2971,7 +2916,7 @@ "type": "tidelift" } ], - "time": "2023-08-31T09:50:34+00:00" + "time": "2024-09-19T14:15:21+00:00" }, { "name": "composer/xdebug-handler", @@ -3119,16 +3064,16 @@ }, { "name": "doctrine/annotations", - "version": "1.14.3", + "version": "1.14.4", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af" + "reference": "253dca476f70808a5aeed3a47cc2cc88c5cab915" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/253dca476f70808a5aeed3a47cc2cc88c5cab915", + "reference": "253dca476f70808a5aeed3a47cc2cc88c5cab915", "shasum": "" }, "require": { @@ -3139,11 +3084,11 @@ }, "require-dev": { "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "~1.4.10 || ^1.8.0", + "doctrine/coding-standard": "^9 || ^12", + "phpstan/phpstan": "~1.4.10 || ^1.10.28", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "symfony/cache": "^4.4 || ^5.4 || ^6", - "vimeo/psalm": "^4.10" + "symfony/cache": "^4.4 || ^5.4 || ^6.4 || ^7", + "vimeo/psalm": "^4.30 || ^5.14" }, "suggest": { "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" @@ -3189,9 +3134,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.14.3" + "source": "https://github.com/doctrine/annotations/tree/1.14.4" }, - "time": "2023-02-01T09:20:38+00:00" + "time": "2024-09-05T10:15:52+00:00" }, { "name": "doctrine/deprecations", @@ -4355,26 +4300,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", -<<<<<<< HEAD - "reference": "a2c33d8cc3719997b91b628eec3570d725cebf7e" -||||||| 72e3d866bcfe - "reference": "a93bfa3d635bfaf71fa8c459a6df6278c5cdb9e8" -======= - "reference": "22aca9a3467be44288882a3bcf7f2865abe08ca3" ->>>>>>> main + "reference": "6f63660a573ec1e6d48d54ff7c44dfb1e303f30d" }, "dist": { "type": "zip", -<<<<<<< HEAD - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/a2c33d8cc3719997b91b628eec3570d725cebf7e", - "reference": "a2c33d8cc3719997b91b628eec3570d725cebf7e", -||||||| 72e3d866bcfe - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/a93bfa3d635bfaf71fa8c459a6df6278c5cdb9e8", - "reference": "a93bfa3d635bfaf71fa8c459a6df6278c5cdb9e8", -======= - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/22aca9a3467be44288882a3bcf7f2865abe08ca3", - "reference": "22aca9a3467be44288882a3bcf7f2865abe08ca3", ->>>>>>> main + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/6f63660a573ec1e6d48d54ff7c44dfb1e303f30d", + "reference": "6f63660a573ec1e6d48d54ff7c44dfb1e303f30d", "shasum": "" }, "conflict": { @@ -4385,7 +4316,7 @@ "aimeos/ai-admin-graphql": ">=2022.04.1,<2022.10.10|>=2023.04.1,<2023.10.6|>=2024.04.1,<2024.04.6", "aimeos/ai-admin-jsonadm": "<2020.10.13|>=2021.04.1,<2021.10.6|>=2022.04.1,<2022.10.3|>=2023.04.1,<2023.10.4|==2024.04.1", "aimeos/ai-client-html": ">=2020.04.1,<2020.10.27|>=2021.04.1,<2021.10.22|>=2022.04.1,<2022.10.13|>=2023.04.1,<2023.10.15|>=2024.04.1,<2024.04.7", - "aimeos/ai-controller-frontend": "<2020.10.15|>=2021.04.1,<2021.10.8|>=2022.04.1,<2022.10.8|>=2023.04.1,<2023.10.9", + "aimeos/ai-controller-frontend": "<2020.10.15|>=2021.04.1,<2021.10.8|>=2022.04.1,<2022.10.8|>=2023.04.1,<2023.10.9|==2024.04.1", "aimeos/aimeos-core": ">=2022.04.1,<2022.10.17|>=2023.04.1,<2023.10.17|>=2024.04.1,<2024.04.7", "aimeos/aimeos-typo3": "<19.10.12|>=20,<20.10.5", "airesvsg/acf-to-rest-api": "<=3.1", @@ -4512,9 +4443,9 @@ "dolibarr/dolibarr": "<19.0.2", "dompdf/dompdf": "<2.0.4", "doublethreedigital/guest-entries": "<3.1.2", - "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.1.8|>=10.2,<10.2.2|==11.9999999.9999999.9999999-dev", - "drupal/core-recommended": "==11.9999999.9999999.9999999-dev", - "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4|==11.9999999.9999999.9999999-dev", + "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<=11.0.4", + "drupal/core-recommended": ">=8,<=11.0.4", + "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<=11.0.4", "duncanmcclean/guest-entries": "<3.1.2", "dweeves/magmi": "<=0.7.24", "ec-cube/ec-cube": "<2.4.4|>=2.11,<=2.17.1|>=3,<=3.0.18.0-patch4|>=4,<=4.1.2", @@ -4557,6 +4488,8 @@ "feehi/cms": "<=2.1.1", "feehi/feehicms": "<=2.1.1", "fenom/fenom": "<=2.12.1", + "filament/infolists": ">=3,<3.2.115", + "filament/tables": ">=3,<3.2.115", "filegator/filegator": "<7.8", "filp/whoops": "<2.1.13", "fineuploader/php-traditional-server": "<=1.2.2", @@ -4582,45 +4515,21 @@ "frappant/frp-form-answers": "<3.1.2|>=4,<4.0.2", "friendsofsymfony/oauth2-php": "<1.3", "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", -<<<<<<< HEAD - "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", - "friendsofsymfony1/symfony1": ">=1.1,<1.5.19", -||||||| 72e3d866bcfe - "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", - "friendsofsymfony1/symfony1": ">=1.3,<1.5.13", -======= "friendsofsymfony/user-bundle": ">=1,<1.3.5", "friendsofsymfony1/swiftmailer": ">=4,<5.4.13|>=6,<6.2.5", "friendsofsymfony1/symfony1": ">=1.1,<1.5.19", ->>>>>>> main "friendsoftypo3/mediace": ">=7.6.2,<7.6.5", "friendsoftypo3/openid": ">=4.5,<4.5.31|>=4.7,<4.7.16|>=6,<6.0.11|>=6.1,<6.1.6", -<<<<<<< HEAD - "froala/wysiwyg-editor": "<3.2.7|>=4.0.1,<=4.1.3", - "froxlor/froxlor": "<=2.1.1", -||||||| 72e3d866bcfe - "froala/wysiwyg-editor": "<3.2.7|>=4.0.1,<=4.1.1", - "froxlor/froxlor": "<=2.1.1", -======= "froala/wysiwyg-editor": "<3.2.7|>=4.0.1,<=4.1.3", "froxlor/froxlor": "<=2.2.0.0-RC3", "frozennode/administrator": "<=5.0.12", ->>>>>>> main "fuel/core": "<1.8.1", "funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3", "gaoming13/wechat-php-sdk": "<=1.10.2", "genix/cms": "<=1.1.11", -<<<<<<< HEAD - "getgrav/grav": "<1.7.45", - "getkirby/cms": "<4.1.1", -||||||| 72e3d866bcfe - "getgrav/grav": "<1.7.44", - "getkirby/cms": "<4.1.1", -======= "getformwork/formwork": "<1.13.1|==2.0.0.0-beta1", "getgrav/grav": "<1.7.46", "getkirby/cms": "<=3.6.6.5|>=3.7,<=3.7.5.4|>=3.8,<=3.8.4.3|>=3.9,<=3.9.8.1|>=3.10,<=3.10.1|>=4,<=4.3", ->>>>>>> main "getkirby/kirby": "<=2.5.12", "getkirby/panel": "<2.5.14", "getkirby/starterkit": "<=3.7.0.2", @@ -4646,17 +4555,9 @@ "hov/jobfair": "<1.0.13|>=2,<2.0.2", "httpsoft/http-message": "<1.0.12", "hyn/multi-tenant": ">=5.6,<5.7.2", -<<<<<<< HEAD - "ibexa/admin-ui": ">=4.2,<4.2.3", - "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3|>=4.5,<4.5.6|>=4.6,<4.6.2", -||||||| 72e3d866bcfe - "ibexa/admin-ui": ">=4.2,<4.2.3", - "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3|>=4.5,<4.5.4", -======= "ibexa/admin-ui": ">=4.2,<4.2.3|>=4.6.0.0-beta1,<4.6.9", "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3|>=4.5,<4.5.6|>=4.6,<4.6.2", "ibexa/fieldtype-richtext": ">=4.6,<4.6.10", ->>>>>>> main "ibexa/graphql": ">=2.5,<2.5.31|>=3.3,<3.3.28|>=4.2,<4.2.3", "ibexa/post-install": "<=1.0.4", "ibexa/solr": ">=4.5,<4.5.4", @@ -4746,10 +4647,10 @@ "magneto/core": "<1.9.4.4-dev", "maikuolan/phpmussel": ">=1,<1.6", "mainwp/mainwp": "<=4.4.3.3", - "mantisbt/mantisbt": "<2.26.2", + "mantisbt/mantisbt": "<=2.26.3", "marcwillmann/turn": "<0.3.3", "matyhtf/framework": "<3.0.6", - "mautic/core": "<4.4.13|>=5.0.0.0-alpha,<5.1.1", + "mautic/core": "<4.4.13|>=5,<5.1.1", "mautic/core-lib": ">=1.0.0.0-beta,<4.4.13|>=5.0.0.0-alpha,<5.1.1", "mdanter/ecc": "<2", "mediawiki/core": "<1.36.2", @@ -4772,13 +4673,7 @@ "mojo42/jirafeau": "<4.4", "mongodb/mongodb": ">=1,<1.9.2", "monolog/monolog": ">=1.8,<1.12", -<<<<<<< HEAD - "moodle/moodle": "<=4.3.3", -||||||| 72e3d866bcfe - "moodle/moodle": "<4.3.3", -======= "moodle/moodle": "<4.3.5|>=4.4.0.0-beta,<4.4.1", ->>>>>>> main "mos/cimage": "<0.7.19", "movim/moxl": ">=0.8,<=0.10", "movingbytes/social-network": "<=1.2.1", @@ -4831,17 +4726,9 @@ "oro/commerce": ">=4.1,<5.0.11|>=5.1,<5.1.1", "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7", "oro/crm-call-bundle": ">=4.2,<=4.2.5|>=5,<5.0.4|>=5.1,<5.1.1", -<<<<<<< HEAD - "oro/customer-portal": ">=4.1,<=4.1.13|>=4.2,<=4.2.10|>=5,<=5.0.11|>=5.1,<=5.1.3", - "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<=4.2.10|>=5,<=5.0.12|>=5.1,<=5.1.3", -||||||| 72e3d866bcfe - "oro/customer-portal": ">=4.2,<=4.2.8|>=5,<5.0.11|>=5.1,<5.1.1", - "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<=4.2.10|>=5,<5.0.8", -======= "oro/customer-portal": ">=4.1,<=4.1.13|>=4.2,<=4.2.10|>=5,<=5.0.11|>=5.1,<=5.1.3", "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<=4.2.10|>=5,<=5.0.12|>=5.1,<=5.1.3", "oveleon/contao-cookiebar": "<1.16.3|>=2,<2.1.3", ->>>>>>> main "oxid-esales/oxideshop-ce": "<4.5", "oxid-esales/paymorrow-module": ">=1,<1.0.2|>=2,<2.0.1", "packbackbooks/lti-1-3-php-library": "<5", @@ -4871,14 +4758,8 @@ "phpmailer/phpmailer": "<6.5", "phpmussel/phpmussel": ">=1,<1.6", "phpmyadmin/phpmyadmin": "<5.2.1", -<<<<<<< HEAD - "phpmyfaq/phpmyfaq": "<3.2.5|==3.2.5", -||||||| 72e3d866bcfe - "phpmyfaq/phpmyfaq": "<3.2.5", -======= "phpmyfaq/phpmyfaq": "<3.2.5|==3.2.5", "phpoffice/common": "<0.2.9", ->>>>>>> main "phpoffice/phpexcel": "<1.8", "phpoffice/phpspreadsheet": "<1.29.1|>=2,<2.1.1|>=2.2,<2.2.1", "phpseclib/phpseclib": "<2.0.47|>=3,<3.0.36", @@ -4896,13 +4777,7 @@ "pimcore/demo": "<10.3", "pimcore/ecommerce-framework-bundle": "<1.0.10", "pimcore/perspective-editor": "<1.5.1", -<<<<<<< HEAD - "pimcore/pimcore": "<11.1.6.1-dev|>=11.2,<11.2.2", -||||||| 72e3d866bcfe - "pimcore/pimcore": "<11.1.1", -======= "pimcore/pimcore": "<11.2.4", ->>>>>>> main "pixelfed/pixelfed": "<0.11.11", "plotly/plotly.js": "<2.25.2", "pocketmine/bedrock-protocol": "<8.0.2", @@ -5006,6 +4881,7 @@ "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", "ssddanbrown/bookstack": "<24.05.1", + "starcitizentools/citizen-skin": ">=2.6.3,<2.31", "statamic/cms": "<4.46|>=5.3,<5.6.2", "stormpath/sdk": "<9.9.99", "studio-42/elfinder": "<=2.1.64", @@ -5075,14 +4951,8 @@ "thinkcmf/thinkcmf": "<6.0.8", "thorsten/phpmyfaq": "<3.2.2", "tikiwiki/tiki-manager": "<=17.1", -<<<<<<< HEAD - "tinymce/tinymce": "<7", -||||||| 72e3d866bcfe - "tinymce/tinymce": "<5.10.9|>=6,<6.7.3", -======= "timber/timber": ">=0.16.6,<1.23.1|>=1.24,<1.24.1|>=2,<2.1", "tinymce/tinymce": "<7.2", ->>>>>>> main "tinymighty/wiki-seo": "<1.2.2", "titon/framework": "<9.9.99", "tobiasbg/tablepress": "<=2.0.0.0-RC1", @@ -5250,13 +5120,7 @@ "type": "tidelift" } ], -<<<<<<< HEAD - "time": "2024-03-26T22:04:37+00:00" -||||||| 72e3d866bcfe - "time": "2024-03-18T21:04:52+00:00" -======= - "time": "2024-09-18T23:05:04+00:00" ->>>>>>> main + "time": "2024-09-30T18:06:02+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -5336,21 +5200,20 @@ "type": "open_collective" } ], -<<<<<<< HEAD - "time": "2024-02-16T15:06:51+00:00" + "time": "2024-09-18T10:38:58+00:00" }, { "name": "symfony/console", - "version": "v5.4.36", + "version": "v5.4.44", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e" + "reference": "5b5a0aa66e3296e303e22490f90f521551835a83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e", - "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e", + "url": "https://api.github.com/repos/symfony/console/zipball/5b5a0aa66e3296e303e22490f90f521551835a83", + "reference": "5b5a0aa66e3296e303e22490f90f521551835a83", "shasum": "" }, "require": { @@ -5420,74 +5283,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.36" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-02-20T16:33:57+00:00" - }, - { - "name": "symfony/deprecation-contracts", - "version": "v2.5.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/console/tree/v5.4.44" }, "funding": [ { @@ -5503,92 +5299,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" -||||||| 72e3d866bcfe - "time": "2024-02-16T15:06:51+00:00" - }, - { - "name": "symfony/deprecation-contracts", - "version": "v2.5.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-01-02T09:53:40+00:00" -======= - "time": "2024-09-18T10:38:58+00:00" ->>>>>>> main + "time": "2024-09-20T07:56:40+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.35", + "version": "v5.4.40", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38" + "reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7a69a85c7ea5bdd1e875806a99c51a87d3a74b38", - "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a54e2a8a114065f31020d6a89ede83e34c3b27a4", + "reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4", "shasum": "" }, "require": { @@ -5644,7 +5368,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.35" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.40" }, "funding": [ { @@ -5660,20 +5384,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T13:51:25+00:00" + "time": "2024-05-31T14:33:22+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" + "reference": "540f4c73e87fd0c71ca44a6aa305d024ac68cb73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/540f4c73e87fd0c71ca44a6aa305d024ac68cb73", + "reference": "540f4c73e87fd0c71ca44a6aa305d024ac68cb73", "shasum": "" }, "require": { @@ -5723,7 +5447,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.3" }, "funding": [ { @@ -5739,20 +5463,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2024-01-23T13:51:25+00:00" }, { "name": "symfony/filesystem", - "version": "v5.4.35", + "version": "v5.4.44", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "5a553607d4ffbfa9c0ab62facadea296c9db7086" + "reference": "76c3818964e9d32be3862c9318ae3ba9aa280ddc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/5a553607d4ffbfa9c0ab62facadea296c9db7086", - "reference": "5a553607d4ffbfa9c0ab62facadea296c9db7086", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/76c3818964e9d32be3862c9318ae3ba9aa280ddc", + "reference": "76c3818964e9d32be3862c9318ae3ba9aa280ddc", "shasum": "" }, "require": { @@ -5761,6 +5485,9 @@ "symfony/polyfill-mbstring": "~1.8", "symfony/polyfill-php80": "^1.16" }, + "require-dev": { + "symfony/process": "^5.4|^6.4" + }, "type": "library", "autoload": { "psr-4": { @@ -5787,7 +5514,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.35" + "source": "https://github.com/symfony/filesystem/tree/v5.4.44" }, "funding": [ { @@ -5803,7 +5530,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T13:51:25+00:00" + "time": "2024-09-16T14:52:48+00:00" }, { "name": "symfony/finder", @@ -5870,16 +5597,16 @@ }, { "name": "symfony/options-resolver", - "version": "v5.4.21", + "version": "v5.4.40", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9" + "reference": "bd1afbde6613a8d6b956115e0e14b196191fd0c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", - "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/bd1afbde6613a8d6b956115e0e14b196191fd0c4", + "reference": "bd1afbde6613a8d6b956115e0e14b196191fd0c4", "shasum": "" }, "require": { @@ -5919,7 +5646,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.21" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.40" }, "funding": [ { @@ -5935,24 +5662,24 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2024-05-31T14:33:22+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -5998,7 +5725,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -6014,24 +5741,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -6076,7 +5803,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -6092,24 +5819,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -6157,7 +5884,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -6173,24 +5900,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -6237,7 +5964,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -6253,7 +5980,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php70", @@ -6325,36 +6052,28 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25" + "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25", - "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", + "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, - "type": "library", + "type": "metapackage", "extra": { "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -6378,7 +6097,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.31.0" }, "funding": [ { @@ -6394,24 +6113,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2" + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb", + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -6454,7 +6173,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" }, "funding": [ { @@ -6470,7 +6189,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", @@ -6554,16 +6273,16 @@ }, { "name": "symfony/process", - "version": "v5.4.36", + "version": "v5.4.44", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "4fdf34004f149cc20b2f51d7d119aa500caad975" + "reference": "1b9fa82b5c62cd49da8c9e3952dd8531ada65096" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/4fdf34004f149cc20b2f51d7d119aa500caad975", - "reference": "4fdf34004f149cc20b2f51d7d119aa500caad975", + "url": "https://api.github.com/repos/symfony/process/zipball/1b9fa82b5c62cd49da8c9e3952dd8531ada65096", + "reference": "1b9fa82b5c62cd49da8c9e3952dd8531ada65096", "shasum": "" }, "require": { @@ -6596,7 +6315,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.36" + "source": "https://github.com/symfony/process/tree/v5.4.44" }, "funding": [ { @@ -6612,20 +6331,20 @@ "type": "tidelift" } ], - "time": "2024-02-12T15:49:53+00:00" + "time": "2024-09-17T12:46:43+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/a2329596ddc8fd568900e3fc76cba42489ecc7f3", + "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3", "shasum": "" }, "require": { @@ -6679,7 +6398,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.3" }, "funding": [ { @@ -6695,20 +6414,20 @@ "type": "tidelift" } ], - "time": "2022-05-30T19:17:29+00:00" + "time": "2023-04-21T15:04:16+00:00" }, { "name": "symfony/stopwatch", - "version": "v5.4.35", + "version": "v5.4.40", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "887762aa99ff16f65dc8b48aafead415f942d407" + "reference": "0e9daf3b7c805c747638b2cc48f1649e594f9625" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/887762aa99ff16f65dc8b48aafead415f942d407", - "reference": "887762aa99ff16f65dc8b48aafead415f942d407", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/0e9daf3b7c805c747638b2cc48f1649e594f9625", + "reference": "0e9daf3b7c805c747638b2cc48f1649e594f9625", "shasum": "" }, "require": { @@ -6741,7 +6460,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.35" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.40" }, "funding": [ { @@ -6757,20 +6476,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T13:51:25+00:00" + "time": "2024-05-31T14:33:22+00:00" }, { "name": "symfony/string", - "version": "v5.4.36", + "version": "v5.4.44", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "4e232c83622bd8cd32b794216aa29d0d266d353b" + "reference": "832caa16b6d9aac6bf11747315225f5aba384c24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/4e232c83622bd8cd32b794216aa29d0d266d353b", - "reference": "4e232c83622bd8cd32b794216aa29d0d266d353b", + "url": "https://api.github.com/repos/symfony/string/zipball/832caa16b6d9aac6bf11747315225f5aba384c24", + "reference": "832caa16b6d9aac6bf11747315225f5aba384c24", "shasum": "" }, "require": { @@ -6827,7 +6546,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.36" + "source": "https://github.com/symfony/string/tree/v5.4.44" }, "funding": [ { @@ -6843,7 +6562,7 @@ "type": "tidelift" } ], - "time": "2024-02-01T08:49:30+00:00" + "time": "2024-09-20T07:56:40+00:00" }, { "name": "wp-cli/i18n-command", @@ -7235,5 +6954,5 @@ "platform-overrides": { "php": "7.3.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/package-lock.json b/package-lock.json index 951dc88f7..49067aa30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,12 +15,12 @@ "@newfold-labs/wp-module-runtime": "^1.0.10", "@newfold/ui-component-library": "^1.1.0", "@reduxjs/toolkit": "^2.2.7", - "@wordpress/compose": "^7.7.0", + "@wordpress/compose": "^7.8.0", "@wordpress/dom-ready": "^4.6.0", - "@wordpress/element": "^6.3.0", - "@wordpress/html-entities": "^4.6.0", + "@wordpress/element": "^6.8.0", + "@wordpress/html-entities": "^4.8.0", "@wordpress/i18n": "^5.7.0", - "@wordpress/icons": "^10.6.0", + "@wordpress/icons": "^10.8.0", "ajv": "^8.17.1", "classnames": "^2.5.1", "jquery": "^3.7.1", @@ -32,29 +32,12 @@ "semver": "^7.6.3" }, "devDependencies": { -<<<<<<< HEAD - "@tailwindcss/forms": "^0.5.7", - "@testing-library/cypress": "^10.0.1", - "@wordpress/env": "^9.5.0", - "@wordpress/eslint-plugin": "^17.10.0", - "@wordpress/scripts": "^27.4.0", - "concurrently": "8.2.2", - "cypress": "^13.7.0", -||||||| 72e3d866bcfe - "@tailwindcss/forms": "^0.5.7", - "@testing-library/cypress": "^10.0.1", - "@wordpress/env": "^9.5.0", - "@wordpress/eslint-plugin": "^17.10.0", - "@wordpress/scripts": "^27.4.0", - "cypress": "^13.7.0", -======= "@tailwindcss/forms": "^0.5.8", "@testing-library/cypress": "^10.0.2", - "@wordpress/env": "^10.6.0", - "@wordpress/eslint-plugin": "^21.0.0", + "@wordpress/env": "^10.8.0", + "@wordpress/eslint-plugin": "^21.1.2", "@wordpress/scripts": "^27.9.0", "cypress": "^13.14.2", ->>>>>>> main "cypress-axe": "^1.5.0", "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.29.1", @@ -5788,11 +5771,10 @@ } }, "node_modules/@wordpress/babel-preset-default": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-8.7.0.tgz", - "integrity": "sha512-umHgTnOeC9IqejB78XvpSVYwFPxCm2Df7dsQN1MxiwXfacHleiR/b2x+HDSXtNHRp1fESYpz8oIeUYtfOGZKWg==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-8.8.2.tgz", + "integrity": "sha512-XhIpSw6d8GeaBe+gQ25nck01+Q3UiVQgih/yBCFWNtzB2qp/AB7195lHGxbuAYUO9RM1eXsf8kVJV2caAb4WnA==", "dev": true, - "license": "GPL-2.0-or-later", "dependencies": { "@babel/core": "^7.16.0", "@babel/plugin-transform-react-jsx": "^7.16.0", @@ -5800,8 +5782,8 @@ "@babel/preset-env": "^7.16.0", "@babel/preset-typescript": "^7.16.0", "@babel/runtime": "^7.16.0", - "@wordpress/browserslist-config": "^6.7.0", - "@wordpress/warning": "^3.7.0", + "@wordpress/browserslist-config": "^6.8.1", + "@wordpress/warning": "^3.8.1", "browserslist": "^4.21.10", "core-js": "^3.31.0", "react": "^18.3.0" @@ -5812,11 +5794,10 @@ } }, "node_modules/@wordpress/babel-preset-default/node_modules/@wordpress/warning": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-3.7.0.tgz", - "integrity": "sha512-wGbQfPlf8YV6gGhcGPYWUhHORct4xaBQSaDTJrwzlgHYyrrJUVXXgZxaM4+Aa23zQoA13nvFQHvfssOkwdh65g==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-3.8.1.tgz", + "integrity": "sha512-xlo0Xw1jiyiE6nh43NAtQMAL05VDk837kY2xfjsus6wD597TeWFpj6gmcRMH25FZULTUHDB2EPfLviWXqOgUfg==", "dev": true, - "license": "GPL-2.0-or-later", "engines": { "node": ">=18.12.0", "npm": ">=8.19.2" @@ -5830,11 +5811,10 @@ "license": "GPL-2.0-or-later" }, "node_modules/@wordpress/browserslist-config": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-6.7.0.tgz", - "integrity": "sha512-4iMAK3HJEMRm16E2GLXKbQLO085FvFvVwTU2lhzXHLhewjBfjWL3TnqQ9KdOcPmPZ0AK//hULte6PG2VhTWl6w==", + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-6.8.1.tgz", + "integrity": "sha512-hp2eE0DiRbFGTUEQ49kLVyZWlR8lfm8hb2XKqSoWbeqzWM5ZkgrRRJMrJRPS/jCEWTWDdlBwUFfsVNDKpmHc9A==", "dev": true, - "license": "GPL-2.0-or-later", "engines": { "node": ">=18.12.0", "npm": ">=8.19.2" @@ -6020,21 +6000,29 @@ "node": ">=12" } }, + "node_modules/@wordpress/components/node_modules/date-fns": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz", + "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/kossnocorp" + } + }, "node_modules/@wordpress/compose": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-7.7.0.tgz", - "integrity": "sha512-TjhGcw9n/XbiMT63POESs1TF9O6eQRVhAPrMan5t2yusQbog5KLk4TetOasIWxD80pu5sg9P5NuupuU/oSEBYQ==", - "license": "GPL-2.0-or-later", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-7.8.0.tgz", + "integrity": "sha512-bxyy3800+WxEDPj1ksPnCGsOTAUza7OQBhpuaJLzXsB5Q4oJQLKI+WOZUDUxeXOajy1G+WeofAcJjFOdi1RUdg==", "dependencies": { "@babel/runtime": "^7.16.0", "@types/mousetrap": "^1.6.8", - "@wordpress/deprecated": "^4.7.0", - "@wordpress/dom": "^4.7.0", - "@wordpress/element": "^6.7.0", - "@wordpress/is-shallow-equal": "^5.7.0", - "@wordpress/keycodes": "^4.7.0", - "@wordpress/priority-queue": "^3.7.0", - "@wordpress/undo-manager": "^1.7.0", + "@wordpress/deprecated": "^4.8.0", + "@wordpress/dom": "^4.8.0", + "@wordpress/element": "^6.8.0", + "@wordpress/is-shallow-equal": "^5.8.0", + "@wordpress/keycodes": "^4.8.0", + "@wordpress/priority-queue": "^3.8.0", + "@wordpress/undo-manager": "^1.8.0", "change-case": "^4.1.2", "clipboard": "^2.0.11", "mousetrap": "^1.6.5", @@ -6049,13 +6037,12 @@ } }, "node_modules/@wordpress/compose/node_modules/@wordpress/deprecated": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-4.7.0.tgz", - "integrity": "sha512-FMtYPk+yxvEAs1LDBHk1yHz48vlp/TWrTQeMph5ov7dpw4Xgfd9darXorsl4zudJVrB+Nn6dYrPmrS08rAXtQQ==", - "license": "GPL-2.0-or-later", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-4.8.0.tgz", + "integrity": "sha512-ijyGPkQMGREGDOGS3oGrB6a+9vf+naYGXHJ7oRvAS7mK9NyZfs5EZveslEYlYvZTKBmeY7L0f2SVjPrjwGFl4A==", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/hooks": "^4.7.0" + "@wordpress/hooks": "^4.8.0" }, "engines": { "node": ">=18.12.0", @@ -6063,13 +6050,12 @@ } }, "node_modules/@wordpress/compose/node_modules/@wordpress/dom": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-4.7.0.tgz", - "integrity": "sha512-lGPEJHSHOT5Y9gWsX8V2tcsd5shDCTJqDxzL+pwDTfEsi/Os52nZCvzmavzGwRDzlm2Wmd3wNW+k/UCS/PhmXQ==", - "license": "GPL-2.0-or-later", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-4.8.0.tgz", + "integrity": "sha512-7tSLmWPaYOQSsoA+eKW3xLh+GNBuCtbIvPvzlUWb+JHu0t/XBesrs/2XXPm4NZXZxruAgT4+XBnc759RKDjiZA==", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/deprecated": "^4.7.0" + "@wordpress/deprecated": "^4.8.0" }, "engines": { "node": ">=18.12.0", @@ -6077,10 +6063,9 @@ } }, "node_modules/@wordpress/compose/node_modules/@wordpress/hooks": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-4.7.0.tgz", - "integrity": "sha512-EGHMsNCt+PyStm3o1JWujaTA+HKcTxuEXdSHBBFDavzsgOF13bxTf1LpDYgTZJT3K9TSMP983IwfckP5t66pDw==", - "license": "GPL-2.0-or-later", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-4.8.0.tgz", + "integrity": "sha512-6CPXtkZOHg8Q9gFulbuB+V74yCaPK2E2nRMw2BXE1yNfIAItqMbUiC8zrNOamtLcg3ifsk1PPeJ2DX5mR7Wyug==", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -6090,10 +6075,9 @@ } }, "node_modules/@wordpress/compose/node_modules/@wordpress/is-shallow-equal": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-5.7.0.tgz", - "integrity": "sha512-PW+OEkojwd8pZs7m8m9jVwVhLTA1kxmf01f0R2aC+bGfYvw0mlqcviCQTR6+EpRYpceh2nkDch2mD/LWT8c7ZA==", - "license": "GPL-2.0-or-later", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-5.8.0.tgz", + "integrity": "sha512-DLADJVspAFOeY6wO+uYQrcEy+IF3OtRLh4xbI0Qrc6nIs3gdEd+Dwud9tDu6BirV+9ZpON9yDffmq1/5Nhhtww==", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -6103,13 +6087,12 @@ } }, "node_modules/@wordpress/compose/node_modules/@wordpress/keycodes": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-4.7.0.tgz", - "integrity": "sha512-x8I0xjRM8U0RnpFHWN9mA+x3MqjhJNBldiCpb59GTi3BIzPeDPgxbosAsAAgF0pYdDtGyiRkrOZA23NTia63TA==", - "license": "GPL-2.0-or-later", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-4.8.0.tgz", + "integrity": "sha512-HIg8ALiALwMfuI2MAeKaQPraERRf+skCixCIjHs9HM0C48Vov95F3aoHfINCrKXkyQXhTjrJrLDDNEXw6ZF+gw==", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/i18n": "^5.7.0" + "@wordpress/i18n": "^5.8.0" }, "engines": { "node": ">=18.12.0", @@ -6335,15 +6318,14 @@ } }, "node_modules/@wordpress/element": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-6.7.0.tgz", - "integrity": "sha512-d0kiN8DCNDNoh5P5xLb496amoadvjsSnkyJHmQsw17qP4dHZaSLONiMi9yh3NQlwIu0pcbbn3WI/9ENA79HlFQ==", - "license": "GPL-2.0-or-later", + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-6.8.0.tgz", + "integrity": "sha512-RufMjsZl0vyYRWGbc/iDlUbu10qRcpOYLCBnayKcAeRh0ojQ/upMcObW+PPnpo/FOcbDRqj29FCvkZDqI/2cOg==", "dependencies": { "@babel/runtime": "^7.16.0", "@types/react": "^18.2.79", "@types/react-dom": "^18.2.25", - "@wordpress/escape-html": "^3.7.0", + "@wordpress/escape-html": "^3.8.0", "change-case": "^4.1.2", "is-plain-object": "^5.0.0", "react": "^18.3.0", @@ -6355,10 +6337,9 @@ } }, "node_modules/@wordpress/element/node_modules/@wordpress/escape-html": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-3.7.0.tgz", - "integrity": "sha512-VqLQGNMs1BF6LnS+5eNjpM/sCUQhjn4QOfhDlWdVDi0ZxpZgssPzKhJ1ils/7FC0qF3vrMg8EH5xXxw2xz8A/w==", - "license": "GPL-2.0-or-later", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-3.8.0.tgz", + "integrity": "sha512-PTooGfO0I6wQ4WT96iAjiljT7nU1Jvc45XC1jxahC0Tml9pGxGx7Rkxlldq2F41aBpg3ZgBZ+ceEb+DOOSy+kQ==", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -6368,11 +6349,10 @@ } }, "node_modules/@wordpress/env": { - "version": "10.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-10.7.0.tgz", - "integrity": "sha512-tRUZJV4K5T/5lq814FaAdk35kNf50a+YcB9xay7LX5D+VN0PhAVGLPudfexc1yOIINh6cFYnDaCB+1TcAdqKhQ==", + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-10.8.0.tgz", + "integrity": "sha512-kU66r7y/3AnUd6D4XeWE7h6bVJmzteTKDMMWoIoJsSNI5YP/BmXRa+/dJ4bwk0KFKxfh3tcRBhearGeEa4TGBw==", "dev": true, - "license": "GPL-2.0-or-later", "dependencies": { "chalk": "^4.0.0", "copy-dir": "^1.3.0", @@ -6408,17 +6388,16 @@ } }, "node_modules/@wordpress/eslint-plugin": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-21.0.0.tgz", - "integrity": "sha512-4ioakbwSZNL8eXkfK0hcY93e5Fj9dZljxj3lEFkCBWMkSpU8/pPw/7UMS0OBbGQK8rqmvnXF1y/LFH7ihCxuww==", + "version": "21.1.2", + "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-21.1.2.tgz", + "integrity": "sha512-f89Q8J1yGq6b1Myqgby7Xdon+mx/YjSBCs3/saydaJWJoXaDIXZFTMrY0cjWzbSOTDThYCvbkvQm0QGAPanNTA==", "dev": true, - "license": "GPL-2.0-or-later", "dependencies": { "@babel/eslint-parser": "^7.16.0", "@typescript-eslint/eslint-plugin": "^6.4.1", "@typescript-eslint/parser": "^6.4.1", - "@wordpress/babel-preset-default": "^8.7.0", - "@wordpress/prettier-config": "^4.7.0", + "@wordpress/babel-preset-default": "^8.8.2", + "@wordpress/prettier-config": "^4.8.1", "cosmiconfig": "^7.0.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-import": "^2.25.2", @@ -6493,10 +6472,9 @@ } }, "node_modules/@wordpress/html-entities": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-4.7.0.tgz", - "integrity": "sha512-dVhbaGyQaDFwMoZn5PT+d6amO3VYurVQN/bkUl6h6SeBNOsTY1DqUVzO0rLxFp8Is/4MOms61sFJL7nvWtkxaA==", - "license": "GPL-2.0-or-later", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-4.8.0.tgz", + "integrity": "sha512-kJZg83oKZLvXz4jmZUoqPxXTDeoGxy1yV2nyqVWuEXoGRVFzBSPZRxVf7Rn6R06WU/0bGpjMH2ZDrj9MlMoWqA==", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -6506,13 +6484,12 @@ } }, "node_modules/@wordpress/i18n": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-5.7.0.tgz", - "integrity": "sha512-o1cq1zutE5rMAM//Ra1hRfgHuWNBxFtd7XNk+BuAcILRENMaEoqAoGBmGj9lRtOcqAj+cdoWxFjBIxRa67vIrg==", - "license": "GPL-2.0-or-later", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-5.8.0.tgz", + "integrity": "sha512-pPx8RPT69Kds8wygHGfkt+D2jxdyu2HIYw3yM+dj47rNW2rHtZFVoOr+QzwOJ4yoHRuN1zMhOfzHsC4WV+ARcg==", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/hooks": "^4.7.0", + "@wordpress/hooks": "^4.8.0", "gettext-parser": "^1.3.1", "memize": "^2.1.0", "sprintf-js": "^1.1.1", @@ -6527,10 +6504,9 @@ } }, "node_modules/@wordpress/i18n/node_modules/@wordpress/hooks": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-4.7.0.tgz", - "integrity": "sha512-EGHMsNCt+PyStm3o1JWujaTA+HKcTxuEXdSHBBFDavzsgOF13bxTf1LpDYgTZJT3K9TSMP983IwfckP5t66pDw==", - "license": "GPL-2.0-or-later", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-4.8.0.tgz", + "integrity": "sha512-6CPXtkZOHg8Q9gFulbuB+V74yCaPK2E2nRMw2BXE1yNfIAItqMbUiC8zrNOamtLcg3ifsk1PPeJ2DX5mR7Wyug==", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -6540,14 +6516,13 @@ } }, "node_modules/@wordpress/icons": { - "version": "10.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-10.7.0.tgz", - "integrity": "sha512-4cvi9ZIaz6IYRcOjVuALtDLPtzgt1zK+E9LskL0PAi3TJhoh746q28wv6ycP+KtJEiI+bsTf2Qu5dmCePGR/jA==", - "license": "GPL-2.0-or-later", + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-10.8.0.tgz", + "integrity": "sha512-JiBI44uNkJEHV3IU0rKLn0wO36crWY62NqiQ6Fi+nn8KG0J4e1/JrJoV5EiFkaLneWBAFPeUkLjIOYlNPcZnmA==", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/element": "^6.7.0", - "@wordpress/primitives": "^4.7.0" + "@wordpress/element": "^6.8.0", + "@wordpress/primitives": "^4.8.0" }, "engines": { "node": ">=18.12.0", @@ -6555,13 +6530,12 @@ } }, "node_modules/@wordpress/icons/node_modules/@wordpress/primitives": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-4.7.0.tgz", - "integrity": "sha512-PcAAIMT8+WqKB2HAeQlLmrcQyzyhNw9IeToJoxz+VKcc/7uLfGHplsDvtHY/X4jH8QlwlVwHSiqW/McTcxoUvQ==", - "license": "GPL-2.0-or-later", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-4.8.0.tgz", + "integrity": "sha512-ZGY+vrc6+Rklsbc+cm506fHc8JGCSXKv041VHtxwxtc92zVdVjugx+4XWzEsiEe0/vV6aFqFdGibKwureMmQ5A==", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/element": "^6.7.0", + "@wordpress/element": "^6.8.0", "clsx": "^2.1.1" }, "engines": { @@ -6683,11 +6657,10 @@ } }, "node_modules/@wordpress/prettier-config": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-4.7.0.tgz", - "integrity": "sha512-GuWbbVT4ebDbkIv40AbnF+WKDl9ra6+Y+oJAbh1cpivlKnbJBFofIxk4W/MOCtaFJhsfkzrQJGFqg3xkcPJM7g==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-4.8.1.tgz", + "integrity": "sha512-JDiVChhgwv6ZGa4aVOXnDJnj/dUFkD/SSvRLFkLOdB+ZbWgddJQkVB3rpJOfREsPtEFWqgTxcJoZjnkqltNbww==", "dev": true, - "license": "GPL-2.0-or-later", "engines": { "node": ">=18.12.0", "npm": ">=8.19.2" @@ -6730,10 +6703,9 @@ } }, "node_modules/@wordpress/priority-queue": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-3.7.0.tgz", - "integrity": "sha512-WgKOhaQdaEeOxRLL49cp2YKfsZyUsR1qHoLid64Jux9FjFqLT8t52UTYJ796AhU4W0ifxf3R1SkNpW5zslxKOg==", - "license": "GPL-2.0-or-later", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-3.8.0.tgz", + "integrity": "sha512-AVzPk/Y+Cs3cjgg1cOLSXYbM7s8lRVWh1f4b6yXNaaskv932EiE25CEqihE8PVZgXVQzlF292aP0jR1YYisZDg==", "dependencies": { "@babel/runtime": "^7.16.0", "requestidlecallback": "^0.3.0" @@ -7106,13 +7078,12 @@ } }, "node_modules/@wordpress/undo-manager": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/undo-manager/-/undo-manager-1.7.0.tgz", - "integrity": "sha512-FHkwMD/jbe5jhVXfD9bSNhEivhMeszm20/ymEP6vAsLVJB2K25iAMOGvsq5jtznyJiqQzNUmvPERN0IKnaHQnA==", - "license": "GPL-2.0-or-later", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/undo-manager/-/undo-manager-1.8.0.tgz", + "integrity": "sha512-Cl8Eb+VxVYX9AptMXdMczLkUmcaKXx0PJpgTQ+isZASagXBLZ3ebWGqbChtShqR0IyPn9jMYkPw6Zk4+V6T+eg==", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/is-shallow-equal": "^5.7.0" + "@wordpress/is-shallow-equal": "^5.8.0" }, "engines": { "node": ">=18.12.0", @@ -7120,10 +7091,9 @@ } }, "node_modules/@wordpress/undo-manager/node_modules/@wordpress/is-shallow-equal": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-5.7.0.tgz", - "integrity": "sha512-PW+OEkojwd8pZs7m8m9jVwVhLTA1kxmf01f0R2aC+bGfYvw0mlqcviCQTR6+EpRYpceh2nkDch2mD/LWT8c7ZA==", - "license": "GPL-2.0-or-later", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-5.8.0.tgz", + "integrity": "sha512-DLADJVspAFOeY6wO+uYQrcEy+IF3OtRLh4xbI0Qrc6nIs3gdEd+Dwud9tDu6BirV+9ZpON9yDffmq1/5Nhhtww==", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -9290,57 +9260,6 @@ "typedarray": "^0.0.6" } }, - "node_modules/concurrently": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-8.2.2.tgz", - "integrity": "sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg==", - "dev": true, - "dependencies": { - "chalk": "^4.1.2", - "date-fns": "^2.30.0", - "lodash": "^4.17.21", - "rxjs": "^7.8.1", - "shell-quote": "^1.8.1", - "spawn-command": "0.0.2", - "supports-color": "^8.1.1", - "tree-kill": "^1.2.2", - "yargs": "^17.7.2" - }, - "bin": { - "conc": "dist/bin/concurrently.js", - "concurrently": "dist/bin/concurrently.js" - }, - "engines": { - "node": "^14.13.0 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/open-cli-tools/concurrently?sponsor=1" - } - }, - "node_modules/concurrently/node_modules/rxjs": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "dev": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/concurrently/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, "node_modules/configstore": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", @@ -10116,25 +10035,6 @@ "node": ">=12" } }, -<<<<<<< HEAD - "node_modules/date-fns": { - "version": "2.30.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", - "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", - "dev": true, - "dependencies": { - "@babel/runtime": "^7.21.0" - }, - "engines": { - "node": ">=0.11" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/date-fns" - } - }, -||||||| 72e3d866bcfe -======= "node_modules/data-view-buffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", @@ -10189,17 +10089,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/date-fns": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz", - "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/kossnocorp" - } - }, ->>>>>>> main "node_modules/dayjs": { "version": "1.11.13", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", @@ -22268,12 +22157,6 @@ "node": ">=0.10.0" } }, - "node_modules/spawn-command": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2.tgz", - "integrity": "sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==", - "dev": true - }, "node_modules/spawnd": { "version": "9.0.2", "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-9.0.2.tgz", @@ -24415,6 +24298,15 @@ "react-dom": "*" } }, + "node_modules/use-lilius/node_modules/date-fns": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz", + "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/kossnocorp" + } + }, "node_modules/use-memo-one": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz", diff --git a/package.json b/package.json index bc26e3231..6e221e499 100644 --- a/package.json +++ b/package.json @@ -38,12 +38,12 @@ "@newfold-labs/wp-module-runtime": "^1.0.10", "@newfold/ui-component-library": "^1.1.0", "@reduxjs/toolkit": "^2.2.7", - "@wordpress/compose": "^7.7.0", + "@wordpress/compose": "^7.8.0", "@wordpress/dom-ready": "^4.6.0", - "@wordpress/element": "^6.3.0", - "@wordpress/html-entities": "^4.6.0", + "@wordpress/element": "^6.8.0", + "@wordpress/html-entities": "^4.8.0", "@wordpress/i18n": "^5.7.0", - "@wordpress/icons": "^10.6.0", + "@wordpress/icons": "^10.8.0", "ajv": "^8.17.1", "classnames": "^2.5.1", "jquery": "^3.7.1", @@ -55,29 +55,12 @@ "semver": "^7.6.3" }, "devDependencies": { -<<<<<<< HEAD - "@tailwindcss/forms": "^0.5.7", - "@testing-library/cypress": "^10.0.1", - "@wordpress/env": "^9.5.0", - "@wordpress/eslint-plugin": "^17.10.0", - "@wordpress/scripts": "^27.4.0", - "concurrently": "8.2.2", - "cypress": "^13.7.0", -||||||| 72e3d866bcfe - "@tailwindcss/forms": "^0.5.7", - "@testing-library/cypress": "^10.0.1", - "@wordpress/env": "^9.5.0", - "@wordpress/eslint-plugin": "^17.10.0", - "@wordpress/scripts": "^27.4.0", - "cypress": "^13.7.0", -======= "@tailwindcss/forms": "^0.5.8", "@testing-library/cypress": "^10.0.2", - "@wordpress/env": "^10.6.0", - "@wordpress/eslint-plugin": "^21.0.0", + "@wordpress/env": "^10.8.0", + "@wordpress/eslint-plugin": "^21.1.2", "@wordpress/scripts": "^27.9.0", "cypress": "^13.14.2", ->>>>>>> main "cypress-axe": "^1.5.0", "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.29.1",