Merge branch 'dev' into 1180-deprecate-pattern-parameters

Author: mfranzke

CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.0.2](https://github.com/pattern-lab/patternlab-node/compare/v6.0.1...v6.0.2) (2023-02-26)
+
+
+### Bug Fixes
+
+* **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)
+
+
+
+
+
 ## [6.0.1](https://github.com/pattern-lab/patternlab-node/compare/v6.0.0...v6.0.1) (2023-02-01)
 
 

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "4.0.0",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "packages": [
     "packages/*"
   ],

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

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.0.2](https://github.com/pattern-lab/patternlab-node/compare/v6.0.1...v6.0.2) (2023-02-26)
+
+
+### Bug Fixes
+
+* **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)
+
+
+
+
+
 ## [6.0.1](https://github.com/pattern-lab/patternlab-node/compare/v6.0.0...v6.0.1) (2023-02-01)
 
 **Note:** Version bump only for package @pattern-lab/development-edition-engine-twig

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

@@ -1,7 +1,7 @@
 {
   "name": "@pattern-lab/development-edition-engine-twig",
   "private": true,
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "The tree of components we use to test, develop and validate the twig engine (not engine-twig-php)",
   "scripts": {
     "postbootstrap": "patternlab install --starterkits @pattern-lab/starterkit-twig-demo",
@@ -33,7 +33,7 @@
     "@pattern-lab/cli": "^6.0.1",
     "@pattern-lab/core": "^6.0.1",
     "@pattern-lab/engine-twig": "^6.0.0",
-    "@pattern-lab/starterkit-twig-demo": "^6.0.1",
+    "@pattern-lab/starterkit-twig-demo": "^6.0.2",
     "@pattern-lab/uikit-workshop": "^6.0.1"
   },
   "workspaces": {

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

@@ -114,7 +114,7 @@
         "organisms": "source/_patterns/organisms/",
         "templates": "source/_patterns/templates/",
         "pages": "source/_patterns/pages/",
-        "macros": "source/_macros/"
+        "macros": "source/_patterns/macros/"
       }
     }
   }

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

@@ -198,7 +198,7 @@ Other engine specific configuration options can be added and will be passed to t
   "engines": {
     "handlebars": {
       "package": "@pattern-lab/engine-handlebars",
-      "extensions": [
+      "fileExtensions": [
         "handlebars",
         "hbs"
       ],

packages/starterkit-twig-demo/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.0.2](https://github.com/pattern-lab/patternlab-node/compare/v6.0.1...v6.0.2) (2023-02-26)
+
+
+### Bug Fixes
+
+* **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)
+
+
+
+
+
 ## [6.0.1](https://github.com/pattern-lab/patternlab-node/compare/v6.0.0...v6.0.1) (2023-02-01)
 
 

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

@@ -86,7 +86,7 @@
     "first_name": "Author",
     "last_name": "Name"
   },
-  "hero": true,
+  "hero": {},
   "emergency" : false,
   "touts" : [
     { },

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

@@ -0,0 +1,3 @@
+---
+hidden: true
+---