From 84e4a19a546ee1b67db133109c7d056605bdd52c Mon Sep 17 00:00:00 2001 From: Dave Olsen Date: Wed, 18 May 2016 22:23:44 -0400 Subject: [PATCH 1/8] updating dev-dev dependencies --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 83e723e..d221cd4 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ } }, "require": { - "pattern-lab/core": "^2.0.0", + "pattern-lab/core": "dev-dev", "twig/twig": "~1.*" }, "extra": { From 4490358bc354a4201f00982fedda641aa507e94a Mon Sep 17 00:00:00 2001 From: Dave Olsen Date: Wed, 18 May 2016 23:09:58 -0400 Subject: [PATCH 2/8] fixing failing constraint --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d221cd4..8de2b05 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ }, "require": { "pattern-lab/core": "dev-dev", - "twig/twig": "~1.*" + "twig/twig": "~1.0" }, "extra": { "patternlab": { From 25825fed3e632f983baa98da38c01b33ed8831bd Mon Sep 17 00:00:00 2001 From: Salem Ghoweri Date: Thu, 27 Apr 2017 23:48:17 -0400 Subject: [PATCH 3/8] Testing regex updates meant for composer.json-based consumption. Not nearly as easy as copying over from the config.yml file... --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8de2b05..878391e 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-_]+)[\"\\']([ \/._\\-.@#A-Za-z0-9-&}_\n{\":',\/. [\\]]+)%}", "lineageMatchKey": 3, "patternExtension": "twig", "twigDebug": false, From c07bf8a72c0647f1bec97877f759bc15556c80d2 Mon Sep 17 00:00:00 2001 From: Salem Ghoweri Date: Thu, 27 Apr 2017 23:57:30 -0400 Subject: [PATCH 4/8] Adding original for testing comparison --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 878391e..8de2b05 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "extra": { "patternlab": { "config": { - "lineageMatch": "{%([ ]+)?(?:include|extends|embed)( |\\()[\"\\']([\/._\\-.@#A-Za-z0-9-_]+)[\"\\']([ \/._\\-.@#A-Za-z0-9-&}_\n{\":',\/. [\\]]+)%}", + "lineageMatch": "{%([ ]+)?include( |\\()["\\']([A-Za-z0-9-_]+)["\\'](\\))?(.*)%}", "lineageMatchKey": 3, "patternExtension": "twig", "twigDebug": false, From e132ead0f98d36ab84555a8355dff6b3d14d4948 Mon Sep 17 00:00:00 2001 From: Salem Ghoweri Date: Mon, 1 May 2017 14:05:55 -0400 Subject: [PATCH 5/8] Testing updated and simplified regex which also fixes lineages when using D8 friendly Twig paths --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8de2b05..d86702a 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, From ba07a6e714dc84ef6fdae59d3315d4f72aaa9c7a Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Wed, 24 May 2017 11:11:41 -0700 Subject: [PATCH 6/8] Updating registered namespace to Drupal Pattern Lab --- composer.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 08b3a46..87c34b4 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { - "name": "pattern-lab/patternengine-twig", + "name": "drupal-pattern-lab/patternengine-twig", "description": "Twig-based PatternEngine for Pattern Lab.", "keywords": ["twig", "pattern lab", "pattern engine"], - "homepage": "http://patternlab.io", + "homepage": "http://drupal-pattern-lab.github.io", "license": "MIT", "type": "patternlab-patternengine", "authors": [ @@ -14,9 +14,8 @@ } ], "support": { - "issues": "https://github.com/pattern-lab/patternengine-php-twig/issues", - "wiki": "http://patternlab.io/docs/", - "source": "https://github.com/pattern-lab/patternengine-php-twig/releases" + "issues": "https://github.com/drupal-pattern-lab/patternengine-php-twig/issues", + "source": "https://github.com/drupal-pattern-lab/patternengine-php-twig/releases" }, "autoload": { "psr-0": { @@ -24,7 +23,7 @@ } }, "require": { - "pattern-lab/core": "^2.0.0", + "drupal-pattern-lab/core": "^2.0.0", "twig/twig": "~1.0" }, "extra": { From f79a6d9eb805986b5ed38ed8ad44326e8e5ad846 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Thu, 25 May 2017 15:59:19 -0700 Subject: [PATCH 7/8] Revert "Updating registered namespace to Drupal Pattern Lab" This reverts commit ba07a6e714dc84ef6fdae59d3315d4f72aaa9c7a. --- composer.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 87c34b4..08b3a46 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { - "name": "drupal-pattern-lab/patternengine-twig", + "name": "pattern-lab/patternengine-twig", "description": "Twig-based PatternEngine for Pattern Lab.", "keywords": ["twig", "pattern lab", "pattern engine"], - "homepage": "http://drupal-pattern-lab.github.io", + "homepage": "http://patternlab.io", "license": "MIT", "type": "patternlab-patternengine", "authors": [ @@ -14,8 +14,9 @@ } ], "support": { - "issues": "https://github.com/drupal-pattern-lab/patternengine-php-twig/issues", - "source": "https://github.com/drupal-pattern-lab/patternengine-php-twig/releases" + "issues": "https://github.com/pattern-lab/patternengine-php-twig/issues", + "wiki": "http://patternlab.io/docs/", + "source": "https://github.com/pattern-lab/patternengine-php-twig/releases" }, "autoload": { "psr-0": { @@ -23,7 +24,7 @@ } }, "require": { - "drupal-pattern-lab/core": "^2.0.0", + "pattern-lab/core": "^2.0.0", "twig/twig": "~1.0" }, "extra": { From f3254de28b9f0a0a1e1015070209a1e06908a829 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Thu, 25 May 2017 16:13:15 -0700 Subject: [PATCH 8/8] updating info --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 08b3a46..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": {