From f402a2f3e9aff0ead34fa9e8d0c3119d74e51997 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Mon, 9 Oct 2017 10:51:14 -0700 Subject: [PATCH] Fixing lineage config line (#45) * Fixing lineage config line Mega PR: Merging Drupal Pattern Lab's Twig Pattern Engine Fork Back Into the Main Pattern Lab PHP Twig Pattern Engine Repo (#44) * updating dev-dev dependencies * fixing failing constraint * Testing regex updates meant for composer.json-based consumption. Not nearly as easy as copying over from the config.yml file... * Adding original for testing comparison * Testing updated and simplified regex which also fixes lineages when using D8 friendly Twig paths * Updating registered namespace to Drupal Pattern Lab * Revert "Updating registered namespace to Drupal Pattern Lab" This reverts commit ba07a6e714dc84ef6fdae59d3315d4f72aaa9c7a. * updating info * Remove reference to Drupal Pattern Lab fork --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2108fdc..08b3a46 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "extra": { "patternlab": { "config": { - "lineageMatch": "{%([ ]+)?include( |\\()["\\']([A-Za-z0-9-_]+)["\\'](\\))?(.*)%}", + "lineageMatch": "{%([ ]+)?(?:include|extends|embed)( |\\()["\\']([\\/.@A-Za-z0-9-_]+)["\\']([\\s\\S+]*?)%}", "lineageMatchKey": 3, "patternExtension": "twig", "twigDebug": false,