From b8dc262652a2013d39fc96eb364bc522ddaf59a9 Mon Sep 17 00:00:00 2001 From: Salem Date: Mon, 9 Oct 2017 13:48:30 -0400 Subject: [PATCH 1/2] 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 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 2108fdc..c159e5a 100644 --- a/composer.json +++ b/composer.json @@ -14,9 +14,9 @@ } ], "support": { - "issues": "https://github.com/pattern-lab/patternengine-php-twig/issues", + "issues": "https://github.com/drupal-pattern-lab/patternengine-php-twig/issues", "wiki": "http://patternlab.io/docs/", - "source": "https://github.com/pattern-lab/patternengine-php-twig/releases" + "source": "https://github.com/drupal-pattern-lab/patternengine-php-twig/releases" }, "autoload": { "psr-0": { @@ -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, From 6edccc16f98d9bc916179c8de76662364b92620d Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Mon, 9 Oct 2017 10:50:39 -0700 Subject: [PATCH 2/2] Remove reference to Drupal Pattern Lab fork --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c159e5a..08b3a46 100644 --- a/composer.json +++ b/composer.json @@ -14,9 +14,9 @@ } ], "support": { - "issues": "https://github.com/drupal-pattern-lab/patternengine-php-twig/issues", + "issues": "https://github.com/pattern-lab/patternengine-php-twig/issues", "wiki": "http://patternlab.io/docs/", - "source": "https://github.com/drupal-pattern-lab/patternengine-php-twig/releases" + "source": "https://github.com/pattern-lab/patternengine-php-twig/releases" }, "autoload": { "psr-0": {