Skip to content

Commit 1b7991c

Browse files
mfranzkemfranzke
authored
Merge branch 'dev' into 1180-deprecate-pattern-parameters
2 parents 7a0d742 + dd8895d commit 1b7991c

File tree

20 files changed

+320
-286
lines changed

20 files changed

+320
-286
lines changed

‎CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [6.0.2](https://github.com/pattern-lab/patternlab-node/compare/v6.0.1...v6.0.2) (2023-02-26)
7+
8+
9+
### Bug Fixes
10+
11+
* **starterkit-twig-demo:** pages not rendering pattern-specific data from json ([#1490](https://github.com/pattern-lab/patternlab-node/issues/1490)) ([1c878df](https://github.com/pattern-lab/patternlab-node/commit/1c878dfa35d549f23e199b3e235ff79cb471ac86)), closes [#1486](https://github.com/pattern-lab/patternlab-node/issues/1486)
12+
13+
14+
15+
16+
617
## [6.0.1](https://github.com/pattern-lab/patternlab-node/compare/v6.0.0...v6.0.1) (2023-02-01)
718

819

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lerna": "4.0.0",
3-
"version": "6.0.1",
3+
"version": "6.0.2",
44
"packages": [
55
"packages/*"
66
],

‎packages/development-edition-engine-twig/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [6.0.2](https://github.com/pattern-lab/patternlab-node/compare/v6.0.1...v6.0.2) (2023-02-26)
7+
8+
9+
### Bug Fixes
10+
11+
* **starterkit-twig-demo:** pages not rendering pattern-specific data from json ([#1490](https://github.com/pattern-lab/patternlab-node/issues/1490)) ([1c878df](https://github.com/pattern-lab/patternlab-node/commit/1c878dfa35d549f23e199b3e235ff79cb471ac86)), closes [#1486](https://github.com/pattern-lab/patternlab-node/issues/1486)
12+
13+
14+
15+
16+
617
## [6.0.1](https://github.com/pattern-lab/patternlab-node/compare/v6.0.0...v6.0.1) (2023-02-01)
718

819
**Note:** Version bump only for package @pattern-lab/development-edition-engine-twig

‎packages/development-edition-engine-twig/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@pattern-lab/development-edition-engine-twig",
33
"private": true,
4-
"version": "6.0.1",
4+
"version": "6.0.2",
55
"description": "The tree of components we use to test, develop and validate the twig engine (not engine-twig-php)",
66
"scripts": {
77
"postbootstrap": "patternlab install --starterkits @pattern-lab/starterkit-twig-demo",
@@ -33,7 +33,7 @@
3333
"@pattern-lab/cli": "^6.0.1",
3434
"@pattern-lab/core": "^6.0.1",
3535
"@pattern-lab/engine-twig": "^6.0.0",
36-
"@pattern-lab/starterkit-twig-demo": "^6.0.1",
36+
"@pattern-lab/starterkit-twig-demo": "^6.0.2",
3737
"@pattern-lab/uikit-workshop": "^6.0.1"
3838
},
3939
"workspaces": {

‎packages/development-edition-engine-twig/patternlab-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"organisms": "source/_patterns/organisms/",
115115
"templates": "source/_patterns/templates/",
116116
"pages": "source/_patterns/pages/",
117-
"macros": "source/_macros/"
117+
"macros": "source/_patterns/macros/"
118118
}
119119
}
120120
}

‎packages/docs/src/docs/advanced-config-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ Other engine specific configuration options can be added and will be passed to t
198198
"engines": {
199199
"handlebars": {
200200
"package": "@pattern-lab/engine-handlebars",
201-
"extensions": [
201+
"fileExtensions": [
202202
"handlebars",
203203
"hbs"
204204
],

‎packages/starterkit-twig-demo/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [6.0.2](https://github.com/pattern-lab/patternlab-node/compare/v6.0.1...v6.0.2) (2023-02-26)
7+
8+
9+
### Bug Fixes
10+
11+
* **starterkit-twig-demo:** pages not rendering pattern-specific data from json ([#1490](https://github.com/pattern-lab/patternlab-node/issues/1490)) ([1c878df](https://github.com/pattern-lab/patternlab-node/commit/1c878dfa35d549f23e199b3e235ff79cb471ac86)), closes [#1486](https://github.com/pattern-lab/patternlab-node/issues/1486)
12+
13+
14+
15+
16+
617
## [6.0.1](https://github.com/pattern-lab/patternlab-node/compare/v6.0.0...v6.0.1) (2023-02-01)
718

819

‎packages/starterkit-twig-demo/dist/_data/data.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"first_name": "Author",
8787
"last_name": "Name"
8888
},
89-
"hero": true,
89+
"hero": {},
9090
"emergency" : false,
9191
"touts" : [
9292
{ },

‎packages/starterkit-twig-demo/dist/_macros/.gitkeep renamed to ‎packages/starterkit-twig-demo/dist/_patterns/macros/.gitkeep

File renamed without changes.

‎packages/starterkit-twig-demo/dist/_patterns/macros/_macros.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
hidden: true
3+
---

‎packages/starterkit-twig-demo/dist/_macros/forms.twig renamed to ‎packages/starterkit-twig-demo/dist/_patterns/macros/forms.twig

File renamed without changes.

‎packages/starterkit-twig-demo/dist/_patterns/organisms/sections/latest-posts.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<h2 class="section-title">Latest Posts</h2>
33
<ul class="post-list">
44
{% for post in latest_posts %}
5-
<li>{% include "@molecules/blocks/media-block.twig" %}</li>
5+
<li>{% include "@molecules/blocks/media-block.twig" with post %}</li>
66
{% endfor %}
77
</ul>
88
<a href="#" class="text-btn">View more posts</a>

‎packages/starterkit-twig-demo/dist/_patterns/pages/article.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
{
2-
"title" : "Top 10 Trails You Have To Hike Before You Die",
3-
"bodyClass": "article",
4-
"author" : {
5-
"first-name" : "Julianne",
6-
"last-name" : "McCormick"
7-
},
8-
"img": {
9-
"landscape_4x3": {
10-
"src": "../../images/sample/landscape-16x9-mountains.jpg",
11-
"alt": "Mountains",
12-
"width": "1151",
13-
"height": "638"
14-
},
15-
"landscape_16x9": {
16-
"src": "../../images/sample/landscape-16x9-mountains.jpg",
17-
"alt": "Mountains",
18-
"width": "1151",
19-
"height": "638"
20-
}
21-
},
22-
"inset_blocks" : [
23-
{
24-
"headline" : "This is the headline for the inset block"
25-
}
26-
],
27-
"latest_block" : [
28-
{
29-
"headline" : "This is the headline for the latest block"
30-
}
31-
]
2+
"title": "Top 10 Trails You Have To Hike Before You Die",
3+
"bodyClass": "article",
4+
"author": {
5+
"first_name": "Julianne",
6+
"last_name": "McCormick"
7+
},
8+
"img": {
9+
"landscape_4x3": {
10+
"src": "../../images/sample/landscape-16x9-mountains.jpg",
11+
"alt": "Mountains",
12+
"width": "1151",
13+
"height": "638"
14+
},
15+
"landscape_16x9": {
16+
"src": "../../images/sample/landscape-16x9-mountains.jpg",
17+
"alt": "Mountains",
18+
"width": "1151",
19+
"height": "638"
20+
}
21+
},
22+
"inset_blocks": [
23+
{
24+
"headline": "This is the headline for the inset block"
25+
}
26+
],
27+
"latest_block": [
28+
{
29+
"headline": "This is the headline for the latest block"
30+
}
31+
]
3232
}

‎packages/starterkit-twig-demo/dist/_patterns/pages/blog.json

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,86 @@
11
{
2-
"title" : "Blog",
3-
"bodyClass": "blog",
4-
"latest-posts" : [
5-
{
6-
"img": {
7-
"square": {
8-
"src": "../../images/sample/thumb-square-river.jpg",
9-
"alt": "Post Thumbnail"
10-
}
11-
},
12-
"headline" : {
13-
"short" : "Navigate the Allegheny River"
14-
},
15-
"excerpt" : {
16-
"medium" : "The Allegheny River is a principal tributary of the Ohio River; it is located in the Eastern United States. The Allegheny River joins with the Monongahela River to form the Ohio River at the Point of Point State Park in Downtown Pittsburgh, Pennsylvania."
17-
}
18-
},
19-
{
20-
"img": {
21-
"square": {
22-
"src": "../../images/sample/thumb-square-ivy.jpg",
23-
"alt": "Ivy"
24-
}
25-
},
26-
"headline" : {
27-
"short" : "How to detect and avoid poison ivy"
28-
},
29-
"excerpt" : {
30-
"medium" : "Toxicodendron radicans, commonly known as poison ivy is a poisonous North American plant that is well known for its production of urushiol"
31-
}
32-
},
33-
{
34-
"img": {
35-
"square": {
36-
"src": "../../images/sample/thumb-square-yosemite.jpg",
37-
"alt": "Yosemite"
38-
}
39-
},
40-
"headline" : {
41-
"short" : "Top 10 hiking mountains"
42-
},
43-
"excerpt" : {
44-
"medium" : "Yosemite National Park is a United States National Park spanning eastern portions of Tuolumne, Mariposa and Madera counties in the central eastern portion of the U.S. state of California."
45-
}
46-
},
47-
{
48-
"img": {
49-
"square": {
50-
"src": "../../images/sample/thumb-square-fire.jpg",
51-
"alt": "Fire"
52-
}
53-
},
54-
"headline" : {
55-
"short" : "How to build a campfire"
56-
},
57-
"excerpt" : {
58-
"medium" : "A campfire is a fire lit at a campsite, to serve the following functions: light, warmth, a beacon, an insect and/or apex predator deterrent, to cook, and for a psychological sense of security. "
59-
}
60-
},
61-
{
62-
"img": {
63-
"square": {
64-
"src": "../../images/sample/thumb-square-gear.jpg",
65-
"alt": "Camping Gear"
66-
}
67-
},
68-
"headline" : {
69-
"short" : "Pick the right camping gear"
70-
},
71-
"excerpt" : {
72-
"medium" : "The equipment used in camping varies with the particular type of camping. For instance, in survival camping the equipment consists of small items which have the purpose of helping the camper in providing food, heat and safety."
73-
}
74-
}
75-
],
76-
"inset_blocks" : [
77-
{
78-
"headline" : "This is the headline for the inset block"
79-
}
80-
],
81-
"latest_block" : [
82-
{
83-
"headline" : "This is the headline for the latest block"
84-
}
85-
]
86-
}
2+
"title": "Blog",
3+
"bodyClass": "blog",
4+
"latest_posts": [
5+
{
6+
"img": {
7+
"square": {
8+
"src": "../../images/sample/thumb-square-river.jpg",
9+
"alt": "Post Thumbnail"
10+
}
11+
},
12+
"headline": {
13+
"short": "Navigate the Allegheny River"
14+
},
15+
"excerpt": {
16+
"medium": "The Allegheny River is a principal tributary of the Ohio River; it is located in the Eastern United States. The Allegheny River joins with the Monongahela River to form the Ohio River at the Point of Point State Park in Downtown Pittsburgh, Pennsylvania."
17+
}
18+
},
19+
{
20+
"img": {
21+
"square": {
22+
"src": "../../images/sample/thumb-square-ivy.jpg",
23+
"alt": "Ivy"
24+
}
25+
},
26+
"headline": {
27+
"short": "How to detect and avoid poison ivy"
28+
},
29+
"excerpt": {
30+
"medium": "Toxicodendron radicans, commonly known as poison ivy is a poisonous North American plant that is well known for its production of urushiol"
31+
}
32+
},
33+
{
34+
"img": {
35+
"square": {
36+
"src": "../../images/sample/thumb-square-yosemite.jpg",
37+
"alt": "Yosemite"
38+
}
39+
},
40+
"headline": {
41+
"short": "Top 10 hiking mountains"
42+
},
43+
"excerpt": {
44+
"medium": "Yosemite National Park is a United States National Park spanning eastern portions of Tuolumne, Mariposa and Madera counties in the central eastern portion of the U.S. state of California."
45+
}
46+
},
47+
{
48+
"img": {
49+
"square": {
50+
"src": "../../images/sample/thumb-square-fire.jpg",
51+
"alt": "Fire"
52+
}
53+
},
54+
"headline": {
55+
"short": "How to build a campfire"
56+
},
57+
"excerpt": {
58+
"medium": "A campfire is a fire lit at a campsite, to serve the following functions: light, warmth, a beacon, an insect and/or apex predator deterrent, to cook, and for a psychological sense of security. "
59+
}
60+
},
61+
{
62+
"img": {
63+
"square": {
64+
"src": "../../images/sample/thumb-square-gear.jpg",
65+
"alt": "Camping Gear"
66+
}
67+
},
68+
"headline": {
69+
"short": "Pick the right camping gear"
70+
},
71+
"excerpt": {
72+
"medium": "The equipment used in camping varies with the particular type of camping. For instance, in survival camping the equipment consists of small items which have the purpose of helping the camper in providing food, heat and safety."
73+
}
74+
}
75+
],
76+
"inset_blocks": [
77+
{
78+
"headline": "This is the headline for the inset block"
79+
}
80+
],
81+
"latest_block": [
82+
{
83+
"headline": "This is the headline for the latest block"
84+
}
85+
]
86+
}

0 commit comments

Comments
 (0)