create-prisma-php-app 3.1.16 → 3.1.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -162,7 +162,7 @@ class TwMerge
|
|
|
162
162
|
private static function getClassGroup($class)
|
|
163
163
|
{
|
|
164
164
|
// Match optional prefixes (responsive and variants).
|
|
165
|
-
$pattern = '/^((?:[
|
|
165
|
+
$pattern = '/^((?:[^:]+:)*)([^:]+)$/';
|
|
166
166
|
if (preg_match($pattern, $class, $matches)) {
|
|
167
167
|
$prefixes = $matches[1];
|
|
168
168
|
$utilityClass = $matches[2];
|
|
@@ -183,7 +183,7 @@ class TwMerge
|
|
|
183
183
|
private static function getConflictingKeys($classKey)
|
|
184
184
|
{
|
|
185
185
|
// Remove any responsive or variant prefixes.
|
|
186
|
-
$baseClassKey = preg_replace("/^(?:[
|
|
186
|
+
$baseClassKey = preg_replace("/^(?:[^:]+:)+/", "", $classKey);
|
|
187
187
|
if (isset(self::$conflictGroups[$baseClassKey])) {
|
|
188
188
|
$prefix = preg_replace("/" . preg_quote($baseClassKey, "/") . '$/', "", $classKey);
|
|
189
189
|
return array_map(function ($conflict) use ($prefix) {
|