diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 3137b6a2d..be5b0bd4c 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,6 +1,6 @@ - + diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7746fd362..637f28bce 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -35,7 +35,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 648d89c97..12752d1c8 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -7,12 +7,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up NodeJS - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: '14' + node-version: '16' - name: Setup the project run: | diff --git a/.nvmrc b/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/CHANGELOG.md b/CHANGELOG.md index cf9d2784f..52f197a05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,50 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + + +### Features + +* **engine-twig-php:** update @basalt/twig-renderer to v3.0.1 using Twig v3.7.1 ([#1499](https://github.com/pattern-lab/patternlab-node/issues/1499)) ([2e5c9e1](https://github.com/pattern-lab/patternlab-node/commit/2e5c9e1c6a3318ba1cd3765d448c181e4a3a9a27)), closes [#1496](https://github.com/pattern-lab/patternlab-node/issues/1496) [#1496](https://github.com/pattern-lab/patternlab-node/issues/1496) + + + + + +## [6.0.3](https://github.com/pattern-lab/patternlab-node/compare/v6.0.2...v6.0.3) (2023-03-12) + + +### Bug Fixes + +* subitems menu height restricted only for horizontal mode ([#1492](https://github.com/pattern-lab/patternlab-node/issues/1492)) ([e65f294](https://github.com/pattern-lab/patternlab-node/commit/e65f294d9cbf032fd7fd03d9f957500949db5440)) + + + + + +## [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) + + +### Bug Fixes + +* **twig engine:** startup and running problems ([#1478](https://github.com/pattern-lab/patternlab-node/issues/1478)) ([e5a1904](https://github.com/pattern-lab/patternlab-node/commit/e5a19049f083315939406677b1c0480f4b420569)) + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) diff --git a/lerna.json b/lerna.json index d94a23343..7a57a21cc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "4.0.0", - "version": "6.0.0", + "version": "6.1.0", "packages": [ "packages/*" ], diff --git a/packages/cli/.nvmrc b/packages/cli/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/cli/.nvmrc +++ b/packages/cli/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 37b06c9cc..cadcbeb26 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/cli + + + + + +## [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/cli + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/cli diff --git a/packages/cli/package.json b/packages/cli/package.json index 850cdeec8..ddfe4da2e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@pattern-lab/cli", "description": "Command-line interface (CLI) for the @pattern-lab/core.", - "version": "6.0.0", + "version": "6.1.0", "bin": { "patternlab": "bin/patternlab.js" }, @@ -9,7 +9,7 @@ "name": "Patternlab contributors" }, "dependencies": { - "@pattern-lab/core": "^6.0.0", + "@pattern-lab/core": "^6.1.0", "archiver": "5.3.0", "chalk": "4.1.0", "commander": "9.4.1", @@ -49,7 +49,7 @@ "bugs": "https://github.com/pattern-lab/patternlab-node/issues", "license": "MIT", "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "publishConfig": { "access": "public" diff --git a/packages/core/.nvmrc b/packages/core/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/core/.nvmrc +++ b/packages/core/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index a1242a643..1dbed1bf9 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,25 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/core + + + + + +## [6.0.1](https://github.com/pattern-lab/patternlab-node/compare/v6.0.0...v6.0.1) (2023-02-01) + + +### Bug Fixes + +* **twig engine:** startup and running problems ([#1478](https://github.com/pattern-lab/patternlab-node/issues/1478)) ([e5a1904](https://github.com/pattern-lab/patternlab-node/commit/e5a19049f083315939406677b1c0480f4b420569)) + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/core diff --git a/packages/core/package.json b/packages/core/package.json index 835cf1ce7..74b3555ed 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,11 +1,12 @@ { "name": "@pattern-lab/core", "description": "Create atomic design systems with Pattern Lab. This is the core API and orchestrator of the ecosystem.", - "version": "6.0.0", + "version": "6.1.0", "main": "./src/index.js", "dependencies": { - "@pattern-lab/engine-mustache": "^6.0.0", - "@pattern-lab/live-server": "^6.0.0", + "@pattern-lab/engine-handlebars": "^6.1.0", + "@pattern-lab/engine-mustache": "^6.1.0", + "@pattern-lab/live-server": "^6.1.0", "chalk": "4.1.0", "chokidar": "3.5.1", "dive": "0.5.0", @@ -64,7 +65,7 @@ "test": "tap test/*_tests.js --reporter spec --coverage" }, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "publishConfig": { "access": "public" diff --git a/packages/core/src/lib/expandPartials.js b/packages/core/src/lib/expandPartials.js index d9f7fad8e..e4976fe8b 100644 --- a/packages/core/src/lib/expandPartials.js +++ b/packages/core/src/lib/expandPartials.js @@ -1,12 +1,10 @@ 'use strict'; const logger = require('./log'); -const ph = require('./parameter_hunter'); const jsonCopy = require('./json_copy'); const getPartial = require('./get'); -const parameter_hunter = new ph(); - +// TODO: remove when removing mustache module.exports = function (currentPattern, patternlab) { const processRecursive = require('./processRecursive'); @@ -23,56 +21,46 @@ module.exports = function (currentPattern, patternlab) { ) { logger.debug(`found partials for ${currentPattern.patternPartial}`); - // determine if the template contains any pattern parameters. if so they - // must be immediately consumed - return parameter_hunter - .find_parameters(currentPattern, patternlab) - .then(() => { - //do something with the regular old partials - foundPatternPartials.forEach((foundPartial) => { - const partial = currentPattern.findPartial(foundPartial); - const partialPattern = getPartial(partial, patternlab); + //do something with the regular old partials + foundPatternPartials.forEach((foundPartial) => { + const partial = currentPattern.findPartial(foundPartial); + const partialPattern = getPartial(partial, patternlab); - //recurse through nested partials to fill out this extended template. - return processRecursive(partialPattern.relPath, patternlab) - .then(() => { - //eslint-disable-line no-loop-func + //recurse through nested partials to fill out this extended template. + return processRecursive(partialPattern.relPath, patternlab) + .then(() => { + //eslint-disable-line no-loop-func - //complete assembly of extended template - //create a copy of the partial so as to not pollute it after the getPartial call. - const cleanPartialPattern = jsonCopy( - partialPattern, - `partial pattern ${partial}` - ); + //complete assembly of extended template + //create a copy of the partial so as to not pollute it after the getPartial call. + const cleanPartialPattern = jsonCopy( + partialPattern, + `partial pattern ${partial}` + ); - //this is what we came here for - logger.debug( - `within ${currentPattern.patternPartial}, replacing extendedTemplate partial ${foundPartial} with ${cleanPartialPattern.patternPartial}'s extendedTemplate` - ); + //this is what we came here for + logger.debug( + `within ${currentPattern.patternPartial}, replacing extendedTemplate partial ${foundPartial} with ${cleanPartialPattern.patternPartial}'s extendedTemplate` + ); - currentPattern.extendedTemplate = - currentPattern.extendedTemplate.replace( - foundPartial, - cleanPartialPattern.extendedTemplate - ); + currentPattern.extendedTemplate = + currentPattern.extendedTemplate.replace( + foundPartial, + cleanPartialPattern.extendedTemplate + ); - // update the extendedTemplate in the partials object in case this - // pattern is consumed later - patternlab.partials[currentPattern.patternPartial] = - currentPattern.extendedTemplate; + // update the extendedTemplate in the partials object in case this + // pattern is consumed later + patternlab.partials[currentPattern.patternPartial] = + currentPattern.extendedTemplate; - return Promise.resolve(); - }) - .catch((reason) => { - console.log(reason); - logger.error(reason); - }); + return Promise.resolve(); + }) + .catch((reason) => { + console.log(reason); + logger.error(reason); }); - }) - .catch((reason) => { - console.log(reason); - logger.error(reason); - }); + }); } return Promise.resolve(); }; diff --git a/packages/core/src/lib/get.js b/packages/core/src/lib/get.js index 4852670eb..2f180a77f 100644 --- a/packages/core/src/lib/get.js +++ b/packages/core/src/lib/get.js @@ -35,7 +35,7 @@ module.exports = function (partialName, patternlab, reportWarning = true) { } if (reportWarning) { logger.warning( - `Could not find pattern referenced with partial syntax ${partialName}. + `Could not find pattern referenced with partial syntax "${partialName}" from "${patternlab.config.paths.source.patterns}". This can occur when a pattern was renamed, moved, or no longer exists but it still referenced within a different template or within data as a link.` ); } diff --git a/packages/core/src/lib/parameter_hunter.js b/packages/core/src/lib/parameter_hunter.js deleted file mode 100644 index 01a260ffc..000000000 --- a/packages/core/src/lib/parameter_hunter.js +++ /dev/null @@ -1,339 +0,0 @@ -'use strict'; - -const getPartial = require('./get'); -const logger = require('./log'); -const parseLink = require('./parseLink'); -const jsonCopy = require('./json_copy'); -const replaceParameter = require('./replaceParameter'); - -const parameter_hunter = function () { - /** - * This function is really to accommodate the lax JSON-like syntax allowed by - * Pattern Lab PHP for parameter submissions to partials. Unfortunately, no - * easily searchable library was discovered for this. What we had to do was - * write a custom script to crawl through the parameter string, and wrap the - * keys and values in double-quotes as necessary. - * The steps on a high-level are as follows: - * * Further escape all escaped quotes and colons. Use the string - * representation of their unicodes for this. This has the added bonus - * of being interpreted correctly by JSON.parse() without further - * modification. This will be useful later in the function. - * * Once escaped quotes are out of the way, we know the remaining quotes - * are either key/value wrappers or wrapped within those wrappers. We know - * that remaining commas and colons are either delimiters, or wrapped - * within quotes to not be recognized as such. - * * A do-while loop crawls paramString to write keys to a keys array and - * values to a values array. - * * Start by parsing the first key. Determine the type of wrapping quote, - * if any. - * * By knowing the open wrapper, we know that the next quote of that kind - * (if the key is wrapped in quotes), HAS to be the close wrapper. - * Similarly, if the key is unwrapped, we know the next colon HAS to be - * the delimiter between key and value. - * * Save the key to the keys array. - * * Next, search for a value. It will either be the next block wrapped in - * quotes, or a string of alphanumerics, decimal points, or minus signs. - * * Save the value to the values array. - * * The do-while loop truncates the paramString value while parsing. Its - * condition for completion is when the paramString is whittled down to an - * empty string. - * * After the keys and values arrays are built, a for loop iterates through - * them to build the final paramStringWellFormed string. - * * No quote substitution had been done prior to this loop. In this loop, - * all keys are ensured to be wrapped in double-quotes. String values are - * also ensured to be wrapped in double-quotes. - * * Unescape escaped unicodes except for double-quotes. Everything beside - * double-quotes will be wrapped in double-quotes without need for escape. - * * Return paramStringWellFormed. - * - * @param {string} pString - * @returns {string} paramStringWellFormed - */ - function paramToJson(pString) { - let colonPos = -1; - const keys = []; - let paramString = pString; // to not reassign param - let paramStringWellFormed; - let quotePos = -1; - let regex; - const values = []; - let wrapper; - - // attempt to parse the data in case it is already well formed JSON - try { - paramStringWellFormed = JSON.stringify(JSON.parse(pString)); - return paramStringWellFormed; - } catch (err) { - logger.debug( - `Not valid JSON found for passed pattern parameter ${pString} will attempt to parse manually...` - ); - } - - //replace all escaped double-quotes with escaped unicode - paramString = paramString.replace(/\\"/g, '\\u0022'); - - //replace all escaped single-quotes with escaped unicode - paramString = paramString.replace(/\\'/g, '\\u0027'); - - //replace all escaped colons with escaped unicode - paramString = paramString.replace(/\\:/g, '\\u0058'); - - //with escaped chars out of the way, crawl through paramString looking for - //keys and values - do { - //check if searching for a key - if (paramString[0] === '{' || paramString[0] === ',') { - paramString = paramString.substring(1, paramString.length).trim(); - - //search for end quote if wrapped in quotes. else search for colon. - //everything up to that position will be saved in the keys array. - switch (paramString[0]) { - //need to search for end quote pos in case the quotes wrap a colon - case '"': - case "'": - wrapper = paramString[0]; - quotePos = paramString.indexOf(wrapper, 1); - break; - - default: - colonPos = paramString.indexOf(':'); - } - - if (quotePos > -1) { - keys.push(paramString.substring(0, quotePos + 1).trim()); - - //truncate the beginning from paramString and look for a value - paramString = paramString - .substring(quotePos + 1, paramString.length) - .trim(); - - //unset quotePos - quotePos = -1; - } else if (colonPos > -1) { - keys.push(paramString.substring(0, colonPos).trim()); - - //truncate the beginning from paramString and look for a value - paramString = paramString.substring(colonPos, paramString.length); - - //unset colonPos - colonPos = -1; - - //if there are no more colons, and we're looking for a key, there is - //probably a problem. stop any further processing. - } else { - paramString = ''; - break; - } - } - - //now, search for a value - if (paramString[0] === ':') { - paramString = paramString.substring(1, paramString.length).trim(); - - //the only reason we're using regexes here, instead of indexOf(), is - //because we don't know if the next delimiter is going to be a comma or - //a closing curly brace. since it's not much of a performance hit to - //use regexes as sparingly as here, and it's much more concise and - //readable, we'll use a regex for match() and replace() instead of - //performing conditional logic with indexOf(). - switch (paramString[0]) { - //since a quote of same type as its wrappers would be escaped, and we - //escaped those even further with their unicodes, it is safe to look - //for wrapper pairs and conclude that their contents are values - case '"': - regex = /^"(.|\s)*?"/; - break; - case "'": - regex = /^'(.|\s)*?'/; - break; - - //if there is no value wrapper, regex for alphanumerics, decimal - //points, and minus signs for exponential notation. - default: - regex = /^[\w\-\.]*/; - } - values.push(paramString.match(regex)[0].trim()); - - //truncate the beginning from paramString and continue either - //looking for a key, or returning - paramString = paramString.replace(regex, '').trim(); - - //exit do while if the final char is '}' - if (paramString === '}') { - paramString = ''; - break; - } - - //if there are no more colons, and we're looking for a value, there is - //probably a problem. stop any further processing. - } else { - paramString = ''; - break; - } - } while (paramString); - - //build paramStringWellFormed string for JSON parsing - paramStringWellFormed = '{'; - for (let i = 0; i < keys.length; i++) { - //keys - //replace single-quote wrappers with double-quotes - if (keys[i][0] === "'" && keys[i][keys[i].length - 1] === "'") { - paramStringWellFormed += '"'; - - //any enclosed double-quotes must be escaped - paramStringWellFormed += keys[i] - .substring(1, keys[i].length - 1) - .replace(/"/g, '\\"'); - paramStringWellFormed += '"'; - } else { - //open wrap with double-quotes if no wrapper - if (keys[i][0] !== '"' && keys[i][0] !== "'") { - paramStringWellFormed += '"'; - - //this is to clean up vestiges from Pattern Lab PHP's escaping scheme. - //F.Y.I. Pattern Lab PHP would allow special characters like question - //marks in parameter keys so long as the key was unwrapped and the - //special character escaped with a backslash. In Node, we need to wrap - //those keys and unescape those characters. - keys[i] = keys[i].replace(/\\/g, ''); - } - - paramStringWellFormed += keys[i]; - - //close wrap with double-quotes if no wrapper - if ( - keys[i][keys[i].length - 1] !== '"' && - keys[i][keys[i].length - 1] !== "'" - ) { - paramStringWellFormed += '"'; - } - } - - //colon delimiter. - paramStringWellFormed += ':'; - - //values - //replace single-quote wrappers with double-quotes - if (values[i][0] === "'" && values[i][values[i].length - 1] === "'") { - paramStringWellFormed += '"'; - - //any enclosed double-quotes must be escaped - paramStringWellFormed += values[i] - .substring(1, values[i].length - 1) - .replace(/"/g, '\\"'); - paramStringWellFormed += '"'; - - //for everything else, just add the value however it's wrapped - } else { - paramStringWellFormed += values[i]; - } - - //comma delimiter - if (i < keys.length - 1) { - paramStringWellFormed += ','; - } - } - paramStringWellFormed += '}'; - - //unescape escaped unicode except for double-quotes - paramStringWellFormed = paramStringWellFormed.replace(/\\u0027/g, "'"); - paramStringWellFormed = paramStringWellFormed.replace(/\\u0058/g, ':'); - - return paramStringWellFormed; - } - - //compile this partial immeadiately, essentially consuming it. - function findparameters(pattern, patternlab) { - if (pattern.parameteredPartials && pattern.parameteredPartials.length > 0) { - logger.debug(`processing patternParameters for ${pattern.patternName}`); - - return pattern.parameteredPartials.reduce((previousPromise, pMatch) => { - return previousPromise - .then(() => { - logger.debug(`processing patternParameter ${pMatch}`); - - //find the partial's name and retrieve it - const partialName = pMatch.match(/([\w\-\.\/~]+)/g)[0]; - const partialPattern = jsonCopy( - getPartial( - partialName, - patternlab, - `partial pattern ${partialName}` - ) - ); - - //if we retrieved a pattern we should make sure that its extendedTemplate is reset. looks to fix #190 - if (!partialPattern.extendedTemplate) { - partialPattern.extendedTemplate = partialPattern.template; - } - - if (!pattern.extendedTemplate) { - pattern.extendedTemplate = pattern.template; - } - - logger.debug(`retrieved pattern ${partialName}`); - - //strip out the additional data, convert string to JSON. - const leftParen = pMatch.indexOf('('); - const rightParen = pMatch.lastIndexOf(')'); - const paramString = - '{' + pMatch.substring(leftParen + 1, rightParen) + '}'; - const paramStringWellFormed = paramToJson(paramString); - - let paramData = {}; - - try { - paramData = JSON.parse(paramStringWellFormed); - } catch (err) { - logger.warning( - `There was a problem parsing JSON parameters for ${pattern.relPath}` - ); - logger.warning(err); - } - - // resolve any pattern links that might be present - paramData = parseLink( - patternlab, - paramData, - pattern.patternPartial - ); - - // for each property in paramData - for (const prop in paramData) { - if (paramData.hasOwnProperty(prop)) { - // find it within partialPattern.extendedTemplate and replace its value - partialPattern.extendedTemplate = replaceParameter( - partialPattern.extendedTemplate, - prop, - paramData[prop] - ); - } - } - - // set pattern.extendedTemplate pMatch with replacedPartial - pattern.extendedTemplate = pattern.extendedTemplate.replace( - pMatch, - partialPattern.extendedTemplate - ); - - //todo: this no longer needs to be a promise - return Promise.resolve(); - }) - .catch((reason) => { - console.log(reason); - logger.error(reason); - }); - }, Promise.resolve()); - } - logger.debug(`pattern has no partials ${pattern.patternPartial}`); - return Promise.resolve(); - } - - return { - find_parameters: function (pattern, patternlab) { - return findparameters(pattern, patternlab); - }, - }; -}; - -module.exports = parameter_hunter; diff --git a/packages/core/test/parameter_hunter_tests.js b/packages/core/test/parameter_hunter_tests.js deleted file mode 100644 index b19314d10..000000000 --- a/packages/core/test/parameter_hunter_tests.js +++ /dev/null @@ -1,462 +0,0 @@ -'use strict'; - -const path = require('path'); -const util = require('./util/test_utils.js'); -const tap = require('tap'); - -const loadPattern = require('../src/lib/loadPattern'); -const ph = require('../src/lib/parameter_hunter'); -const processIterative = require('../src/lib/processIterative'); - -const parameter_hunter = new ph(); - -const config = require('./util/patternlab-config.json'); -const engineLoader = require('../src/lib/pattern_engines'); -engineLoader.loadAllEngines(config); - -const testPatternsPath = path.resolve(__dirname, 'files', '_patterns'); - -tap.test('parameter hunter finds and extends templates', function (test) { - //arrange - const pl = util.fakePatternLab(testPatternsPath); - - var commentPath = path.join('test', 'comment.mustache'); - var commentPattern = loadPattern(commentPath, pl); - - var testPatternPath = path.join('test', 'sticky-comment.mustache'); - var testPattern = loadPattern(testPatternPath, pl); - - var p1 = processIterative(commentPattern, pl); - var p2 = processIterative(testPattern, pl); - - Promise.all([p1, p2]) - .then(() => { - //act - parameter_hunter - .find_parameters(testPattern, pl) - .then(() => { - //assert - test.equal( - util.sanitized(testPattern.extendedTemplate), - util.sanitized( - '

{{foo}}

A life is like a garden. Perfect moments can be had, but not preserved, except in memory.

' - ) - ); - test.end(); - }) - .catch(test.threw); - }) - .catch(test.threw); -}); - -tap.test( - 'parameter hunter finds and extends templates with verbose partials', - function (test) { - //arrange - const pl = util.fakePatternLab(testPatternsPath); - - var commentPath = path.join('test', 'comment.mustache'); - var commentPattern = loadPattern(commentPath, pl); - - var testPatternPath = path.join('test', 'sticky-comment-verbose.mustache'); - var testPattern = loadPattern(testPatternPath, pl); - - var p1 = processIterative(commentPattern, pl); - var p2 = processIterative(testPattern, pl); - - Promise.all([p1, p2]) - .then(() => { - //act - parameter_hunter - .find_parameters(testPattern, pl) - .then(() => { - //assert - test.equal( - util.sanitized(testPattern.extendedTemplate), - util.sanitized( - '

{{foo}}

A life is like a garden. Perfect moments can be had, but not preserved, except in memory.

' - ) - ); - test.end(); - }) - .catch(test.threw); - }) - .catch(test.threw); - } -); - -//previous tests were for unquoted parameter keys and single-quoted values. -//test other quoting options. -tap.test( - 'parameter hunter parses parameters with unquoted keys and unquoted values', - function (test) { - //arrange - const pl = util.fakePatternLab(testPatternsPath); - - var commentPath = path.join('test', 'comment.mustache'); - var commentPattern = loadPattern(commentPath, pl); - - var testPatternPath = path.join('test', 'sticky-comment.mustache'); - var testPattern = loadPattern(testPatternPath, pl); - - //override the file - testPattern.template = '{{> test-comment(description: true) }}'; - testPattern.extendedTemplate = testPattern.template; - testPattern.parameteredPartials[0] = testPattern.template; - - var p1 = processIterative(commentPattern, pl); - var p2 = processIterative(testPattern, pl); - - Promise.all([p1, p2]).then(() => { - //act - parameter_hunter.find_parameters(testPattern, pl).then(() => { - //assert - test.equal( - util.sanitized(testPattern.extendedTemplate), - util.sanitized('

{{foo}}

true

') - ); - test.end(); - }); - }); - } -); - -tap.test( - 'parameter hunter parses parameters with unquoted keys and double-quoted values', - function (test) { - //arrange - const pl = util.fakePatternLab(testPatternsPath); - - var commentPath = path.join('test', 'comment.mustache'); - var commentPattern = loadPattern(commentPath, pl); - - var testPatternPath = path.join('test', 'sticky-comment.mustache'); - var testPattern = loadPattern(testPatternPath, pl); - - //override the file - testPattern.template = '{{> test-comment(description: "true") }}'; - testPattern.extendedTemplate = testPattern.template; - testPattern.parameteredPartials[0] = testPattern.template; - - var p1 = processIterative(commentPattern, pl); - var p2 = processIterative(testPattern, pl); - - Promise.all([p1, p2]).then(() => { - //act - parameter_hunter.find_parameters(testPattern, pl).then(() => { - //assert - test.equal( - util.sanitized(testPattern.extendedTemplate), - util.sanitized('

{{foo}}

true

') - ); - test.end(); - }); - }); - } -); - -tap.test( - 'parameter hunter parses parameters with single-quoted keys and unquoted values', - function (test) { - //arrange - const pl = util.fakePatternLab(testPatternsPath); - - var commentPath = path.join('test', 'comment.mustache'); - var commentPattern = loadPattern(commentPath, pl); - - var testPatternPath = path.join('test', 'sticky-comment.mustache'); - var testPattern = loadPattern(testPatternPath, pl); - - //override the file - testPattern.template = "{{> test-comment('description': true) }}"; - testPattern.extendedTemplate = testPattern.template; - testPattern.parameteredPartials[0] = testPattern.template; - - var p1 = processIterative(commentPattern, pl); - var p2 = processIterative(testPattern, pl); - - Promise.all([p1, p2]).then(() => { - //act - parameter_hunter.find_parameters(testPattern, pl).then(() => { - //assert - test.equal( - util.sanitized(testPattern.extendedTemplate), - util.sanitized('

{{foo}}

true

') - ); - test.end(); - }); - }); - } -); - -tap.test( - 'parameter hunter parses parameters with single-quoted keys and single-quoted values wrapping internal escaped single-quotes', - function (test) { - //arrange - const pl = util.fakePatternLab(testPatternsPath); - - var commentPath = path.join('test', 'comment.mustache'); - var commentPattern = loadPattern(commentPath, pl); - - var testPatternPath = path.join('test', 'sticky-comment.mustache'); - var testPattern = loadPattern(testPatternPath, pl); - - //override the file - testPattern.template = - "{{> test-comment('description': 'true not,\\'true\\'') }}"; - testPattern.extendedTemplate = testPattern.template; - testPattern.parameteredPartials[0] = testPattern.template; - - var p1 = processIterative(commentPattern, pl); - var p2 = processIterative(testPattern, pl); - - Promise.all([p1, p2]).then(() => { - //act - parameter_hunter.find_parameters(testPattern, pl).then(() => { - //assert - test.equal( - util.sanitized(testPattern.extendedTemplate), - util.sanitized(`

{{foo}}

true not,'true'

`) - ); - test.end(); - }); - }); - } -); - -tap.test( - 'parameter hunter parses parameters with single-quoted keys and double-quoted values wrapping internal single-quotes', - function (test) { - //arrange - const pl = util.fakePatternLab(testPatternsPath); - - var commentPath = path.join('test', 'comment.mustache'); - var commentPattern = loadPattern(commentPath, pl); - - var testPatternPath = path.join('test', 'sticky-comment.mustache'); - var testPattern = loadPattern(testPatternPath, pl); - - //override the file - testPattern.template = - "{{> test-comment('description': \"true not:'true'\") }}"; - testPattern.extendedTemplate = testPattern.template; - testPattern.parameteredPartials[0] = testPattern.template; - - var p1 = processIterative(commentPattern, pl); - var p2 = processIterative(testPattern, pl); - - Promise.all([p1, p2]).then(() => { - //act - parameter_hunter.find_parameters(testPattern, pl).then(() => { - //assert - test.equal( - util.sanitized(testPattern.extendedTemplate), - util.sanitized(`

{{foo}}

true not:'true'

`) - ); - test.end(); - }); - }); - } -); - -tap.test( - 'parameter hunter parses parameters with double-unquoted keys and unquoted values', - function (test) { - //arrange - const pl = util.fakePatternLab(testPatternsPath); - - var commentPath = path.join('test', 'comment.mustache'); - var commentPattern = loadPattern(commentPath, pl); - - var testPatternPath = path.join('test', 'sticky-comment.mustache'); - var testPattern = loadPattern(testPatternPath, pl); - - //override the file - testPattern.template = '{{> test-comment("description": true) }}'; - testPattern.extendedTemplate = testPattern.template; - testPattern.parameteredPartials[0] = testPattern.template; - - var p1 = processIterative(commentPattern, pl); - var p2 = processIterative(testPattern, pl); - - Promise.all([p1, p2]).then(() => { - //act - parameter_hunter.find_parameters(testPattern, pl).then(() => { - //assert - test.equal( - util.sanitized(testPattern.extendedTemplate), - util.sanitized('

{{foo}}

true

') - ); - test.end(); - }); - }); - } -); - -tap.test( - 'parameter hunter parses parameters with double-quoted keys and single-quoted values wrapping internal double-quotes', - function (test) { - //arrange - const pl = util.fakePatternLab(testPatternsPath); - - var commentPath = path.join('test', 'comment.mustache'); - var commentPattern = loadPattern(commentPath, pl); - - var testPatternPath = path.join('test', 'sticky-comment.mustache'); - var testPattern = loadPattern(testPatternPath, pl); - - //override the file - testPattern.template = - '{{> test-comment("description": \'true not{"true"\') }}'; - testPattern.extendedTemplate = testPattern.template; - testPattern.parameteredPartials[0] = testPattern.template; - - var p1 = processIterative(commentPattern, pl); - var p2 = processIterative(testPattern, pl); - - Promise.all([p1, p2]).then(() => { - //act - parameter_hunter.find_parameters(testPattern, pl).then(() => { - //assert - test.equal( - util.sanitized(testPattern.extendedTemplate), - util.sanitized('

{{foo}}

true not{"true"

') - ); - test.end(); - }); - }); - } -); - -tap.test( - 'parameter hunter parses parameters with double-quoted keys and double-quoted values wrapping internal escaped double-quotes', - function (test) { - //arrange - const pl = util.fakePatternLab(testPatternsPath); - - var commentPath = path.join('test', 'comment.mustache'); - var commentPattern = loadPattern(commentPath, pl); - - var testPatternPath = path.join('test', 'sticky-comment.mustache'); - var testPattern = loadPattern(testPatternPath, pl); - - //override the file - testPattern.template = - '{{> test-comment("description": "true not}\\"true\\"") }}'; - testPattern.extendedTemplate = testPattern.template; - testPattern.parameteredPartials[0] = testPattern.template; - - var p1 = processIterative(commentPattern, pl); - var p2 = processIterative(testPattern, pl); - - Promise.all([p1, p2]).then(() => { - //act - parameter_hunter.find_parameters(testPattern, pl).then(() => { - //assert - test.equal( - util.sanitized(testPattern.extendedTemplate), - util.sanitized('

{{foo}}

true not}"true"

') - ); - test.end(); - }); - }); - } -); - -tap.test( - 'parameter hunter parses parameters with combination of quoting schemes for keys and values', - function (test) { - //arrange - const pl = util.fakePatternLab(testPatternsPath); - - var commentPath = path.join('test', 'comment.mustache'); - var commentPattern = loadPattern(commentPath, pl); - - var testPatternPath = path.join('test', 'sticky-comment.mustache'); - var testPattern = loadPattern(testPatternPath, pl); - - //override the file - testPattern.template = - '{{> test-comment(description: true, \'foo\': false, "bar": false, \'single\': true, \'singlesingle\': \'true\', \'singledouble\': "true", "double": true, "doublesingle": \'true\', "doubledouble": "true") }}'; - testPattern.extendedTemplate = testPattern.template; - testPattern.parameteredPartials[0] = testPattern.template; - - var p1 = processIterative(commentPattern, pl); - var p2 = processIterative(testPattern, pl); - - Promise.all([p1, p2]).then(() => { - //act - parameter_hunter.find_parameters(testPattern, pl).then(() => { - //assert - test.equal( - util.sanitized(testPattern.extendedTemplate), - util.sanitized('

false

true

') - ); - test.end(); - }); - }); - } -); - -//todo https://github.com/pattern-lab/patternlab-node/issues/673 -// tap.test('parameter hunter parses parameters with values containing a closing parenthesis', function (test) { -// //arrange -// const pl = util.fakePatternLab(testPatternsPath); - -// var commentPath = path.join('test', 'comment.mustache'); -// var commentPattern = loadPattern(commentPath, pl); - -// var testPatternPath = path.join('test', 'sticky-comment.mustache'); -// var testPattern = loadPattern(testPatternPath, pl); - -// //override the file -// testPattern.template = "{{> test-comment(description: 'Hello ) World') }}"; -// testPattern.extendedTemplate = testPattern.template; -// testPattern.parameteredPartials[0] = testPattern.template; - -// var p1 = processIterative(commentPattern, pl); -// var p2 = processIterative(testPattern, pl); - -// Promise.all([p1, p2]).then(() => { -// //act -// parameter_hunter.find_parameters(testPattern, pl).then(() => { -// //assert -// test.equal(util.sanitized(testPattern.extendedTemplate), util.sanitized('

Hello ) World

')); -// test.end(); -// }); -// }); -// }); - -tap.test('parameter hunter skips malformed parameters', function (test) { - const pl = util.fakePatternLab(testPatternsPath); - - var commentPath = path.join('test', 'comment.mustache'); - var commentPattern = loadPattern(commentPath, pl); - - var testPatternPath = path.join('test', 'sticky-comment.mustache'); - var testPattern = loadPattern(testPatternPath, pl); - - //override the file - testPattern.template = - '{{> test-comment( missing-val: , : missing-key, : , , foo: "Hello World") }}'; - testPattern.extendedTemplate = testPattern.template; - testPattern.parameteredPartials[0] = testPattern.template; - - var p1 = processIterative(commentPattern, pl); - var p2 = processIterative(testPattern, pl); - - Promise.all([p1, p2]).then(() => { - //act - parameter_hunter.find_parameters(testPattern, pl).then(() => { - //assert - console.log( - '\nPattern Lab should catch JSON.parse() errors and output useful debugging information...' - ); - test.equal( - util.sanitized(testPattern.extendedTemplate), - util.sanitized('

{{foo}}

{{description}}

') - ); - test.end(); - }); - }); -}); diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 70b23cbd8..edc41d235 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package create-pattern-lab + + + + + +## [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 create-pattern-lab + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package create-pattern-lab diff --git a/packages/create/package.json b/packages/create/package.json index 8a0d08369..2785e53c6 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,12 +1,12 @@ { "name": "create-pattern-lab", - "version": "6.0.0", + "version": "6.1.0", "description": "", "bin": "index.js", "main": "index.js", "scripts": {}, "dependencies": { - "@pattern-lab/cli": "^6.0.0" + "@pattern-lab/cli": "^6.1.0" }, "author": "", "license": "MIT", @@ -15,6 +15,6 @@ }, "gitHead": "80f62be442223e09bafb30d0529cbd768e03f2ac", "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" } } diff --git a/packages/development-edition-engine-handlebars/.nvmrc b/packages/development-edition-engine-handlebars/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/development-edition-engine-handlebars/.nvmrc +++ b/packages/development-edition-engine-handlebars/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/development-edition-engine-handlebars/CHANGELOG.md b/packages/development-edition-engine-handlebars/CHANGELOG.md index 43acdf4a4..635e4b857 100644 --- a/packages/development-edition-engine-handlebars/CHANGELOG.md +++ b/packages/development-edition-engine-handlebars/CHANGELOG.md @@ -3,6 +3,30 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/development-edition-engine-handlebars + + + + + +## [6.0.3](https://github.com/pattern-lab/patternlab-node/compare/v6.0.2...v6.0.3) (2023-03-12) + +**Note:** Version bump only for package @pattern-lab/development-edition-engine-handlebars + + + + + +## [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-handlebars + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/development-edition-engine-handlebars diff --git a/packages/development-edition-engine-handlebars/package.json b/packages/development-edition-engine-handlebars/package.json index 7d5f83c23..52c59b7d6 100644 --- a/packages/development-edition-engine-handlebars/package.json +++ b/packages/development-edition-engine-handlebars/package.json @@ -1,7 +1,7 @@ { "name": "@pattern-lab/development-edition-engine-handlebars", "private": true, - "version": "6.0.0", + "version": "6.1.0", "description": "The tree of components we use to test, develop and validate the Handlebars engine", "scripts": { "pl:build": "patternlab build --config ./patternlab-config.json", @@ -26,15 +26,15 @@ "url": "git://github.com/pattern-lab/patternlab-node.git" }, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "dependencies": { - "@pattern-lab/cli": "^6.0.0", - "@pattern-lab/core": "^6.0.0", - "@pattern-lab/engine-handlebars": "^6.0.0", - "@pattern-lab/engine-mustache": "^6.0.0", - "@pattern-lab/plugin-tab": "^6.0.0", - "@pattern-lab/starterkit-handlebars-demo": "^6.0.0", - "@pattern-lab/uikit-workshop": "^6.0.0" + "@pattern-lab/cli": "^6.1.0", + "@pattern-lab/core": "^6.1.0", + "@pattern-lab/engine-handlebars": "^6.1.0", + "@pattern-lab/engine-mustache": "^6.1.0", + "@pattern-lab/plugin-tab": "^6.1.0", + "@pattern-lab/starterkit-handlebars-demo": "^6.1.0", + "@pattern-lab/uikit-workshop": "^6.1.0" } } diff --git a/packages/development-edition-engine-react/.nvmrc b/packages/development-edition-engine-react/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/development-edition-engine-react/.nvmrc +++ b/packages/development-edition-engine-react/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/development-edition-engine-react/CHANGELOG.md b/packages/development-edition-engine-react/CHANGELOG.md index 798ac1f2c..6924275e4 100644 --- a/packages/development-edition-engine-react/CHANGELOG.md +++ b/packages/development-edition-engine-react/CHANGELOG.md @@ -3,6 +3,30 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/edition-node-gulp/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/engine-react-testing-tree + + + + + +## [6.0.3](https://github.com/pattern-lab/edition-node-gulp/compare/v6.0.2...v6.0.3) (2023-03-12) + +**Note:** Version bump only for package @pattern-lab/engine-react-testing-tree + + + + + +## [6.0.1](https://github.com/pattern-lab/edition-node-gulp/compare/v6.0.0...v6.0.1) (2023-02-01) + +**Note:** Version bump only for package @pattern-lab/engine-react-testing-tree + + + + + # [6.0.0](https://github.com/pattern-lab/edition-node-gulp/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/engine-react-testing-tree diff --git a/packages/development-edition-engine-react/package.json b/packages/development-edition-engine-react/package.json index 1563695cd..ed5c6f21d 100644 --- a/packages/development-edition-engine-react/package.json +++ b/packages/development-edition-engine-react/package.json @@ -1,14 +1,14 @@ { "name": "@pattern-lab/engine-react-testing-tree", "description": "The tree of components we use to test, develop and validate the React engine", - "version": "6.0.0", + "version": "6.1.0", "private": true, "main": "gulpfile.js", "dependencies": { - "@pattern-lab/core": "^6.0.0", - "@pattern-lab/engine-mustache": "^6.0.0", - "@pattern-lab/engine-react": "^6.0.0", - "@pattern-lab/uikit-workshop": "^6.0.0", + "@pattern-lab/core": "^6.1.0", + "@pattern-lab/engine-mustache": "^6.1.0", + "@pattern-lab/engine-react": "^6.1.0", + "@pattern-lab/uikit-workshop": "^6.1.0", "gulp": "4.0.2", "minimist": "^1.2.5", "react": "16.2.0" @@ -31,6 +31,6 @@ }, "license": "MIT", "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" } } diff --git a/packages/development-edition-engine-twig/CHANGELOG.md b/packages/development-edition-engine-twig/CHANGELOG.md index a258dab51..86702f2f3 100644 --- a/packages/development-edition-engine-twig/CHANGELOG.md +++ b/packages/development-edition-engine-twig/CHANGELOG.md @@ -3,6 +3,41 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/development-edition-engine-twig + + + + + +## [6.0.3](https://github.com/pattern-lab/patternlab-node/compare/v6.0.2...v6.0.3) (2023-03-12) + +**Note:** Version bump only for package @pattern-lab/development-edition-engine-twig + + + + + +## [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 + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/development-edition-engine-twig diff --git a/packages/development-edition-engine-twig/package.json b/packages/development-edition-engine-twig/package.json index 757d3deb0..7b8010f68 100644 --- a/packages/development-edition-engine-twig/package.json +++ b/packages/development-edition-engine-twig/package.json @@ -1,7 +1,7 @@ { "name": "@pattern-lab/development-edition-engine-twig", "private": true, - "version": "6.0.0", + "version": "6.1.0", "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", @@ -27,14 +27,14 @@ "url": "git://github.com/pattern-lab/patternlab-node.git" }, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "dependencies": { - "@pattern-lab/cli": "^6.0.0", - "@pattern-lab/core": "^6.0.0", - "@pattern-lab/engine-twig": "^6.0.0", - "@pattern-lab/starterkit-twig-demo": "^6.0.0", - "@pattern-lab/uikit-workshop": "^6.0.0" + "@pattern-lab/cli": "^6.1.0", + "@pattern-lab/core": "^6.1.0", + "@pattern-lab/engine-twig": "^6.1.0", + "@pattern-lab/starterkit-twig-demo": "^6.1.0", + "@pattern-lab/uikit-workshop": "^6.1.0" }, "workspaces": { "nohoist": [ diff --git a/packages/development-edition-engine-twig/patternlab-config.json b/packages/development-edition-engine-twig/patternlab-config.json index 8fba803bd..c50ccbcda 100644 --- a/packages/development-edition-engine-twig/patternlab-config.json +++ b/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/" } } } diff --git a/packages/docs/CHANGELOG.md b/packages/docs/CHANGELOG.md index 7f5f44be0..97fdd21e5 100644 --- a/packages/docs/CHANGELOG.md +++ b/packages/docs/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/bradfrost/pl-website-eleventy/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/website + + + + + # [6.0.0](https://github.com/bradfrost/pl-website-eleventy/compare/v5.17.0...v6.0.0) (2023-01-31) diff --git a/packages/docs/package.json b/packages/docs/package.json old mode 100755 new mode 100644 index 21a1d8887..84613c39f --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -1,6 +1,6 @@ { "name": "@pattern-lab/website", - "version": "6.0.0", + "version": "6.1.0", "description": "The website for patternlab.io", "main": "index.js", "dependencies": { @@ -55,6 +55,6 @@ "homepage": "https://github.com/bradfrost/pl-website-eleventy/#readme", "gitHead": "80f62be442223e09bafb30d0529cbd768e03f2ac", "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" } } diff --git a/packages/docs/src/docs/advanced-config-options.md b/packages/docs/src/docs/advanced-config-options.md index 4665c35ca..460b79395 100644 --- a/packages/docs/src/docs/advanced-config-options.md +++ b/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" ], diff --git a/packages/docs/src/docs/pattern-parameters.md b/packages/docs/src/docs/pattern-parameters.md index 5b040e926..c41130647 100644 --- a/packages/docs/src/docs/pattern-parameters.md +++ b/packages/docs/src/docs/pattern-parameters.md @@ -11,97 +11,4 @@ sitemapPriority: '0.8' sitemapChangefreq: 'monthly' --- -**Important:** Pattern parameters are supported by the Node Mustache PatternEngines. Other template languages provide better solutions to this problem. - -Pattern parameters are a **simple** mechanism for replacing Mustache variables in an included pattern. They are limited to replacing variables in the included pattern and **only** the included pattern. They are especially useful when including a single pattern multiple times in a molecule, template, or page and you want to supply unique data to that pattern each time it's included. Pattern parameters **do not** currently support the following: - -- sub-lists (_e.g. iteration of a section_), -- long strings of text (_can be unwieldy_) -- modifying/replacing variables in patterns included _within_ the targeted pattern - -Pattern parameters are Pattern Lab-specific, have no relationship to Mustache, and are implemented outside of Mustache. Learn more about pattern parameters: - -- [The Pattern Parameter Syntax](#pattern-parameter-syntax) -- [Adding Pattern Parameters to Your Pattern Partial](#adding-pattern-parameters) -- [Toggling Sections with Pattern Parameters](#toggling-sections) - -## The Pattern Parameter Syntax - -The attributes listed in the pattern parameters need to match Mustache variable names in your pattern. The values listed for each attribute will replace the Mustache variables. For example: - - {% raw %}{{> patternGroup-pattern(attribute1: value, attribute2: "value string") }}{% endraw %} - -Again, pattern parameters are a simple find and replace of Mustache variables with the supplied values. - -## Adding Pattern Parameters to Your Pattern Partial - -Let's look at a simple example for how we might use pattern parameters. First we'll set-up a pattern that might be included multiple times. We'll make it a simple "message" pattern with a single Mustache variable of `message`. - -```html -
{% raw %}{{ message }}{% endraw %}
-``` - -We'll organize it under Atoms > Global and call it "message" so it'll have the pattern partial of `atoms-message`. - -Now let's create a pattern that includes our message pattern partial multiple times. It might look like this. - -```html -
- {% raw %}{{> atoms-message }}{% endraw %} -
- A bunch of extra information -
- {% raw %}{{> atoms-message }}{% endraw %} -
-``` - -Using `data.json` or a pattern-specific JSON file we wouldn't be able to supply separate messages to each pattern partial. For example, if we defined `message` in our `data.json` as "this is an alert" then "this is an alert" would show up twice when our parent pattern was rendered. - -Instead we can use pattern parameters to supply unique messages for each instance. So let's show what that would look like: - -```html -{% raw %} -
- {{> atoms-message(message: "this is an alert message") }} -
- A bunch of extra information -
- {{> atoms-message(message: "this is an informational message") }} -
-{% endraw %} -``` - -Now each pattern would have its very own message. - -## Toggling Sections with Pattern Parameters - -While pattern parameters are not a one-to-one match for Mustache they do offer the ability to toggle sections of content. For example we might have the following in a generic header pattern called `organisms-header`: - -```html -{% raw %} -
- {{# emergency }} -
Emergency!!!
- {{/ emergency }} -
- ... stuff ... -
-
-{% endraw %} -``` - -We call the header pattern in a template like so: - -``` -{% raw %}{{> organisms-header }}{% endraw %} -... stuff ... -``` - -By default, if we don't have an `emergency` attribute in our `data.json` or the pattern-specific JSON file for the template the emergency alert will never be rendered. Instead of modifying either of those two files we can use a boolean pattern param to show it instead like so: - -``` -{% raw %}{{> organisms-header(emergency: true) }}{% endraw %} -... stuff ... -``` - -Again, because pattern parameters aren't leveraging Mustache this may not fit the normal Mustache workflow. We still wanted to offer a way to quickly turn on and off sections of an included pattern. +Passing parameters parameters to included patterns are a **simple** mechanism for replacing variables in an included pattern, by each of the standard ways of how to do it either in handlebars ([Partial Parameters](https://handlebarsjs.com/guide/partials.html#partial-parameters)) or twig ([include with `with` keyword](https://twig.symfony.com/doc/3.x/tags/include.html#:~:text=You%20can%20add%20additional%20variables%20by%20passing%20them%20after%20the%20with%20keyword%3A)) template language. They are limited to replacing variables in the included pattern and **only** the included pattern. They are especially useful when including a single pattern multiple times in a molecule, template, or page and you want to supply unique data to that pattern each time it's included. diff --git a/packages/docs/src/resources.md b/packages/docs/src/resources.md index 28f5e9833..e88c5c291 100644 --- a/packages/docs/src/resources.md +++ b/packages/docs/src/resources.md @@ -14,10 +14,8 @@ sitemapPriority: '0.8' ## Pattern Lab Examples - [Pattern Lab Demo](https://demo.patternlab.io/) -- [Frost Finery](http://patterns.frostfinery.com) -- [Pittsburgh Food Bank](https://foodbank.bradfrost.com/patternlab/v10/) -- [brianmuenzenmeyer.com](http://www.brianmuenzenmeyer.com/patternlab/public/) - [Altinn](https://altinn.github.io/DesignSystem/) +- [hTWOo UI Framework](https://lab.n8d.studio/htwoo/) - [Demo](https://lab.n8d.studio/htwoo/htwoo-core/) ## Articles diff --git a/packages/edition-node-gulp/.nvmrc b/packages/edition-node-gulp/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/edition-node-gulp/.nvmrc +++ b/packages/edition-node-gulp/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/edition-node-gulp/CHANGELOG.md b/packages/edition-node-gulp/CHANGELOG.md index be5af5ec3..75a92b671 100644 --- a/packages/edition-node-gulp/CHANGELOG.md +++ b/packages/edition-node-gulp/CHANGELOG.md @@ -3,6 +3,30 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/edition-node-gulp + + + + + +## [6.0.3](https://github.com/pattern-lab/patternlab-node/compare/v6.0.2...v6.0.3) (2023-03-12) + +**Note:** Version bump only for package @pattern-lab/edition-node-gulp + + + + + +## [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/edition-node-gulp + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/edition-node-gulp diff --git a/packages/edition-node-gulp/package.json b/packages/edition-node-gulp/package.json index 15ec85652..d6fc1857b 100644 --- a/packages/edition-node-gulp/package.json +++ b/packages/edition-node-gulp/package.json @@ -1,13 +1,13 @@ { "name": "@pattern-lab/edition-node-gulp", "description": "The gulp wrapper around patternlab-node core, providing tasks to interact with the core library and move supporting frontend assets.", - "version": "6.0.0", + "version": "6.1.0", "main": "gulpfile.js", "dependencies": { - "@pattern-lab/cli": "^6.0.0", - "@pattern-lab/core": "^6.0.0", - "@pattern-lab/engine-mustache": "^6.0.0", - "@pattern-lab/uikit-workshop": "^6.0.0", + "@pattern-lab/cli": "^6.1.0", + "@pattern-lab/core": "^6.1.0", + "@pattern-lab/engine-mustache": "^6.1.0", + "@pattern-lab/uikit-workshop": "^6.1.0", "gulp": "4.0.2", "minimist": "1.2.5" }, @@ -27,7 +27,7 @@ }, "license": "MIT", "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "publishConfig": { "access": "public" diff --git a/packages/edition-node/.nvmrc b/packages/edition-node/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/edition-node/.nvmrc +++ b/packages/edition-node/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/edition-node/CHANGELOG.md b/packages/edition-node/CHANGELOG.md index 2a3c16576..517af9e39 100644 --- a/packages/edition-node/CHANGELOG.md +++ b/packages/edition-node/CHANGELOG.md @@ -3,6 +3,30 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/edition-node + + + + + +## [6.0.3](https://github.com/pattern-lab/patternlab-node/compare/v6.0.2...v6.0.3) (2023-03-12) + +**Note:** Version bump only for package @pattern-lab/edition-node + + + + + +## [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/edition-node + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/edition-node diff --git a/packages/edition-node/package.json b/packages/edition-node/package.json index 0bf8ac76c..e4d9fa885 100644 --- a/packages/edition-node/package.json +++ b/packages/edition-node/package.json @@ -1,13 +1,13 @@ { "name": "@pattern-lab/edition-node", "description": "A pure wrapper around patternlab-node core, the default pattern engine, and supporting frontend assets.", - "version": "6.0.0", + "version": "6.1.0", "main": "patternlab-config.json", "dependencies": { - "@pattern-lab/cli": "^6.0.0", - "@pattern-lab/core": "^6.0.0", - "@pattern-lab/engine-handlebars": "^6.0.0", - "@pattern-lab/uikit-workshop": "^6.0.0" + "@pattern-lab/cli": "^6.1.0", + "@pattern-lab/core": "^6.1.0", + "@pattern-lab/engine-handlebars": "^6.1.0", + "@pattern-lab/uikit-workshop": "^6.1.0" }, "keywords": [ "Pattern Lab", @@ -28,7 +28,7 @@ }, "license": "MIT", "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "publishConfig": { "access": "public" diff --git a/packages/edition-twig/CHANGELOG.md b/packages/edition-twig/CHANGELOG.md index f5ff5bfce..25fd83c01 100644 --- a/packages/edition-twig/CHANGELOG.md +++ b/packages/edition-twig/CHANGELOG.md @@ -3,6 +3,36 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + + +### Features + +* **engine-twig-php:** update @basalt/twig-renderer to v3.0.1 using Twig v3.7.1 ([#1499](https://github.com/pattern-lab/patternlab-node/issues/1499)) ([2e5c9e1](https://github.com/pattern-lab/patternlab-node/commit/2e5c9e1c6a3318ba1cd3765d448c181e4a3a9a27)), closes [#1496](https://github.com/pattern-lab/patternlab-node/issues/1496) [#1496](https://github.com/pattern-lab/patternlab-node/issues/1496) + + + + + +## [6.0.3](https://github.com/pattern-lab/patternlab-node/compare/v6.0.2...v6.0.3) (2023-03-12) + +**Note:** Version bump only for package @pattern-lab/edition-twig + + + + + +## [6.0.1](https://github.com/pattern-lab/patternlab-node/compare/v6.0.0...v6.0.1) (2023-02-01) + + +### Bug Fixes + +* **twig engine:** startup and running problems ([#1478](https://github.com/pattern-lab/patternlab-node/issues/1478)) ([e5a1904](https://github.com/pattern-lab/patternlab-node/commit/e5a19049f083315939406677b1c0480f4b420569)) + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/edition-twig diff --git a/packages/edition-twig/alter-twig.php b/packages/edition-twig/alter-twig.php index 0c7c2918c..425775ae6 100644 --- a/packages/edition-twig/alter-twig.php +++ b/packages/edition-twig/alter-twig.php @@ -1,15 +1,17 @@ Hello {{ customTwigFunctionThatSaysWorld() }}!` => `

Hello Custom World

` */ -// $env->addFunction(new \Twig_SimpleFunction('customTwigFunctionThatSaysWorld', function () { +// $env->addFunction(new TwigFunction('customTwigFunctionThatSaysWorld', function () { // return 'Custom World'; // })); @@ -18,7 +20,7 @@ function addCustomExtension(\Twig_Environment &$env, $config) { * @param string $theString * @example `

{{ reverse('abc') }}

` => `

cba

` */ -// $env->addFunction(new \Twig_SimpleFunction('reverse', function ($theString) { +// $env->addFunction(new TwigFunction('reverse', function ($theString) { // return strrev($theString); // })); @@ -29,6 +31,5 @@ function addCustomExtension(\Twig_Environment &$env, $config) { // $env->addGlobal('foo', 'bar'); // example of enabling the Twig debug mode extension (ex. {{ dump(my_variable) }} to check out the template's available data) -- comment out to disable - // $env->addExtension(new \Twig_Extension_Debug()); - + // $env->addExtension(new Twig\Extension\DebugExtension()); } diff --git a/packages/edition-twig/package.json b/packages/edition-twig/package.json index 8fe67e300..9d1c2416a 100644 --- a/packages/edition-twig/package.json +++ b/packages/edition-twig/package.json @@ -1,6 +1,6 @@ { "name": "@pattern-lab/edition-twig", - "version": "6.0.0", + "version": "6.1.0", "description": "Pattern Lab node with Twig PHP Engine", "author": { "name": "Evan Lovely", @@ -23,13 +23,13 @@ "dev": "node ./node_modules/@pattern-lab/uikit-workshop/build-tools.js" }, "dependencies": { - "@pattern-lab/cli": "^6.0.0", - "@pattern-lab/core": "^6.0.0", - "@pattern-lab/engine-twig-php": "^6.0.0", - "@pattern-lab/uikit-workshop": "^6.0.0" + "@pattern-lab/cli": "^6.1.0", + "@pattern-lab/core": "^6.1.0", + "@pattern-lab/engine-twig-php": "^6.1.0", + "@pattern-lab/uikit-workshop": "^6.1.0" }, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "publishConfig": { "access": "public" diff --git a/packages/edition-twig/patternlab-config.json b/packages/edition-twig/patternlab-config.json index 3907ebb47..40d5301c4 100644 --- a/packages/edition-twig/patternlab-config.json +++ b/packages/edition-twig/patternlab-config.json @@ -1,6 +1,6 @@ { "engines": { - "twig": { + "twig-php": { "package": "@pattern-lab/engine-twig-php", "fileExtensions": [ "twig" diff --git a/packages/edition-twig/source/_patterns/atoms/buttons/button-dark-demo.twig b/packages/edition-twig/source/_patterns/atoms/buttons/button-dark-demo.twig index 636b15686..5a61b3cb7 100644 --- a/packages/edition-twig/source/_patterns/atoms/buttons/button-dark-demo.twig +++ b/packages/edition-twig/source/_patterns/atoms/buttons/button-dark-demo.twig @@ -1,4 +1,4 @@ -{% include '@atoms/buttons/_button.twig' with { +{% include '@atoms/buttons/button.twig' with { text: 'Click Me', dark: true, } only %} diff --git a/packages/edition-twig/source/_patterns/atoms/buttons/button-simple-demo.twig b/packages/edition-twig/source/_patterns/atoms/buttons/button-simple-demo.twig index ae1350317..81cf5f6cb 100644 --- a/packages/edition-twig/source/_patterns/atoms/buttons/button-simple-demo.twig +++ b/packages/edition-twig/source/_patterns/atoms/buttons/button-simple-demo.twig @@ -1,3 +1,3 @@ -{% include '@atoms/buttons/_button.twig' with { +{% include '@atoms/buttons/button.twig' with { text: 'Click Me', } only %} diff --git a/packages/edition-twig/source/_patterns/atoms/buttons/button.md b/packages/edition-twig/source/_patterns/atoms/buttons/button.md new file mode 100644 index 000000000..683af9f1a --- /dev/null +++ b/packages/edition-twig/source/_patterns/atoms/buttons/button.md @@ -0,0 +1,3 @@ +--- +hidden: true +--- diff --git a/packages/edition-twig/source/_patterns/atoms/buttons/_button.twig b/packages/edition-twig/source/_patterns/atoms/buttons/button.twig similarity index 100% rename from packages/edition-twig/source/_patterns/atoms/buttons/_button.twig rename to packages/edition-twig/source/_patterns/atoms/buttons/button.twig diff --git a/packages/edition-twig/source/_patterns/atoms/text/headings.twig b/packages/edition-twig/source/_patterns/atoms/text/headings.twig index 2ecbbf0c5..deb727bab 100644 --- a/packages/edition-twig/source/_patterns/atoms/text/headings.twig +++ b/packages/edition-twig/source/_patterns/atoms/text/headings.twig @@ -1,6 +1,6 @@

Heading Level 1

Heading Level 2

-

Heading Level 3

+

Heading Level 3

Heading Level 4

-
Heading Level 5
+
Heading Level 5
Heading Level 6
diff --git a/packages/edition-twig/source/_patterns/molecules/card/card.twig b/packages/edition-twig/source/_patterns/molecules/card/card.twig index d18f0069c..dbea5a7a8 100644 --- a/packages/edition-twig/source/_patterns/molecules/card/card.twig +++ b/packages/edition-twig/source/_patterns/molecules/card/card.twig @@ -1,6 +1,6 @@

Card Title here

- {% include '@atoms/buttons/_button.twig' with { + {% include '@atoms/buttons/button.twig' with { text: 'some text from card' } only %}
diff --git a/packages/engine-handlebars/.nvmrc b/packages/engine-handlebars/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/engine-handlebars/.nvmrc +++ b/packages/engine-handlebars/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/engine-handlebars/CHANGELOG.md b/packages/engine-handlebars/CHANGELOG.md index 90b9355ba..2fc04404b 100644 --- a/packages/engine-handlebars/CHANGELOG.md +++ b/packages/engine-handlebars/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/engine-handlebars + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/engine-handlebars diff --git a/packages/engine-handlebars/package.json b/packages/engine-handlebars/package.json index 4cac94e5f..30878bef1 100644 --- a/packages/engine-handlebars/package.json +++ b/packages/engine-handlebars/package.json @@ -1,7 +1,7 @@ { "name": "@pattern-lab/engine-handlebars", "description": "The Handlebars engine for Pattern Lab / Node", - "version": "6.0.0", + "version": "6.1.0", "main": "lib/engine_handlebars.js", "dependencies": { "fs-extra": "^10.0.0", @@ -23,7 +23,7 @@ "license": "MIT", "scripts": {}, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "publishConfig": { "access": "public" diff --git a/packages/engine-liquid/.nvmrc b/packages/engine-liquid/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/engine-liquid/.nvmrc +++ b/packages/engine-liquid/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/engine-liquid/CHANGELOG.md b/packages/engine-liquid/CHANGELOG.md index 0212f13bb..84d0b1a82 100644 --- a/packages/engine-liquid/CHANGELOG.md +++ b/packages/engine-liquid/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/engine-liquid + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/engine-liquid diff --git a/packages/engine-liquid/package.json b/packages/engine-liquid/package.json index 4f8f3f5cb..07a419444 100644 --- a/packages/engine-liquid/package.json +++ b/packages/engine-liquid/package.json @@ -1,7 +1,7 @@ { "name": "@pattern-lab/engine-liquid", "description": "The Liquid engine for Pattern Lab / Node", - "version": "6.0.0", + "version": "6.1.0", "main": "lib/engine_liquid.js", "dependencies": { "fs-extra": "10.0.0", @@ -22,7 +22,7 @@ "license": "MIT", "scripts": {}, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "publishConfig": { "access": "public" diff --git a/packages/engine-mustache/.nvmrc b/packages/engine-mustache/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/engine-mustache/.nvmrc +++ b/packages/engine-mustache/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/engine-mustache/CHANGELOG.md b/packages/engine-mustache/CHANGELOG.md index 8030db942..531153bef 100644 --- a/packages/engine-mustache/CHANGELOG.md +++ b/packages/engine-mustache/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/engine-mustache + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/engine-mustache diff --git a/packages/engine-mustache/package.json b/packages/engine-mustache/package.json index 1553c7b8a..8cf0b1506 100644 --- a/packages/engine-mustache/package.json +++ b/packages/engine-mustache/package.json @@ -1,7 +1,7 @@ { "name": "@pattern-lab/engine-mustache", "description": "The Mustache engine for Pattern Lab / Node", - "version": "6.0.0", + "version": "6.1.0", "main": "lib/engine_mustache.js", "dependencies": { "fs-extra": "10.0.0", @@ -22,7 +22,7 @@ "license": "MIT", "scripts": {}, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "publishConfig": { "access": "public" diff --git a/packages/engine-nunjucks/.nvmrc b/packages/engine-nunjucks/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/engine-nunjucks/.nvmrc +++ b/packages/engine-nunjucks/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/engine-nunjucks/CHANGELOG.md b/packages/engine-nunjucks/CHANGELOG.md index b3b95bde4..a84b3b3ca 100644 --- a/packages/engine-nunjucks/CHANGELOG.md +++ b/packages/engine-nunjucks/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/engine-nunjucks + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/engine-nunjucks diff --git a/packages/engine-nunjucks/package.json b/packages/engine-nunjucks/package.json index 29719f6e7..83bb934e6 100644 --- a/packages/engine-nunjucks/package.json +++ b/packages/engine-nunjucks/package.json @@ -11,7 +11,7 @@ "nunjucks": "^3.2.3" }, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "keywords": [ "Pattern Lab", @@ -26,7 +26,7 @@ "main": "lib/engine_nunjucks.js", "name": "@pattern-lab/engine-nunjucks", "scripts": {}, - "version": "6.0.0", + "version": "6.1.0", "publishConfig": { "access": "public" }, diff --git a/packages/engine-react/.nvmrc b/packages/engine-react/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/engine-react/.nvmrc +++ b/packages/engine-react/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/engine-react/CHANGELOG.md b/packages/engine-react/CHANGELOG.md index f0c634d5f..6f4c3ef02 100644 --- a/packages/engine-react/CHANGELOG.md +++ b/packages/engine-react/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/engine-react + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/engine-react diff --git a/packages/engine-react/package.json b/packages/engine-react/package.json index 795531909..569cb9bd3 100644 --- a/packages/engine-react/package.json +++ b/packages/engine-react/package.json @@ -1,7 +1,7 @@ { "name": "@pattern-lab/engine-react", "description": "The React engine for Pattern Lab / Node", - "version": "6.0.0", + "version": "6.1.0", "private": true, "main": "lib/engine_react.js", "dependencies": { @@ -31,7 +31,7 @@ "license": "MIT", "scripts": {}, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "publishConfig": { "access": "public" diff --git a/packages/engine-twig-php/CHANGELOG.md b/packages/engine-twig-php/CHANGELOG.md index e4331c4b3..f2da46cd2 100644 --- a/packages/engine-twig-php/CHANGELOG.md +++ b/packages/engine-twig-php/CHANGELOG.md @@ -3,6 +3,28 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + + +### Features + +* **engine-twig-php:** update @basalt/twig-renderer to v3.0.1 using Twig v3.7.1 ([#1499](https://github.com/pattern-lab/patternlab-node/issues/1499)) ([2e5c9e1](https://github.com/pattern-lab/patternlab-node/commit/2e5c9e1c6a3318ba1cd3765d448c181e4a3a9a27)), closes [#1496](https://github.com/pattern-lab/patternlab-node/issues/1496) [#1496](https://github.com/pattern-lab/patternlab-node/issues/1496) + + + + + +## [6.0.1](https://github.com/pattern-lab/patternlab-node/compare/v6.0.0...v6.0.1) (2023-02-01) + + +### Bug Fixes + +* **twig engine:** startup and running problems ([#1478](https://github.com/pattern-lab/patternlab-node/issues/1478)) ([e5a1904](https://github.com/pattern-lab/patternlab-node/commit/e5a19049f083315939406677b1c0480f4b420569)) + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) diff --git a/packages/engine-twig-php/lib/engine_twig_php.js b/packages/engine-twig-php/lib/engine_twig_php.js index d52a13ebc..0f728dc6b 100644 --- a/packages/engine-twig-php/lib/engine_twig_php.js +++ b/packages/engine-twig-php/lib/engine_twig_php.js @@ -40,13 +40,17 @@ const engine_twig_php = { usePatternLabConfig: function (config) { patternLabConfig = config; - if (!config.engines.twig) { + if (!config.engines['twig-php']) { console.error('Missing "twig" in Pattern Lab config file; exiting...'); process.exit(1); } const { namespaces, alterTwigEnv, relativeFrom, ...rest } = - config.engines.twig; + config.engines['twig-php']; + + // since package is a reserved word in node, we need to delete it from the config object like this + delete rest.package; + delete rest.fileExtensions; // Schema on config object being passed in: // https://github.com/basaltinc/twig-renderer/blob/master/config.schema.json @@ -221,10 +225,7 @@ const engine_twig_php = { // then tease out the folder name itself (including the # prefix) // ex. atoms - const folderName = fullFolderPath.substring( - fullFolderPath.lastIndexOf('/') + 1, - fullFolderPath.length - ); + const folderName = path.parse(fullFolderPath).base; // finally, return the Twig path we created from the full file path // ex. atoms/buttons/button.twig diff --git a/packages/engine-twig-php/package.json b/packages/engine-twig-php/package.json index eb9be115e..28e806163 100644 --- a/packages/engine-twig-php/package.json +++ b/packages/engine-twig-php/package.json @@ -1,11 +1,11 @@ { "name": "@pattern-lab/engine-twig-php", "description": "The Twig PHP engine for Pattern Lab Node", - "version": "6.0.0", + "version": "6.1.0", "main": "lib/engine_twig_php.js", "dependencies": { - "@basalt/twig-renderer": "^2.0.0", - "@pattern-lab/core": "^6.0.0", + "@basalt/twig-renderer": "^3.0.1", + "@pattern-lab/core": "^6.1.0", "chalk": "^4.1.0", "fs-extra": "10.0.0" }, @@ -28,7 +28,7 @@ "license": "MIT", "scripts": {}, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "publishConfig": { "access": "public" diff --git a/packages/engine-twig/.nvmrc b/packages/engine-twig/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/engine-twig/.nvmrc +++ b/packages/engine-twig/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/engine-twig/CHANGELOG.md b/packages/engine-twig/CHANGELOG.md index 15e3742f2..3f96a1670 100644 --- a/packages/engine-twig/CHANGELOG.md +++ b/packages/engine-twig/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/engine-twig + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) diff --git a/packages/engine-twig/package.json b/packages/engine-twig/package.json index 3525823e0..00ba42c3a 100644 --- a/packages/engine-twig/package.json +++ b/packages/engine-twig/package.json @@ -1,7 +1,7 @@ { "name": "@pattern-lab/engine-twig", "description": "The Twig engine for Pattern Lab / Node", - "version": "6.0.0", + "version": "6.1.0", "main": "lib/engine_twig.js", "dependencies": { "fs-extra": "10.0.0", @@ -22,7 +22,7 @@ "license": "MIT", "scripts": {}, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "publishConfig": { "access": "public" diff --git a/packages/engine-underscore/.nvmrc b/packages/engine-underscore/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/engine-underscore/.nvmrc +++ b/packages/engine-underscore/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/engine-underscore/CHANGELOG.md b/packages/engine-underscore/CHANGELOG.md index bb9b1661f..d42c4f81d 100644 --- a/packages/engine-underscore/CHANGELOG.md +++ b/packages/engine-underscore/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/engine-underscore + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/engine-underscore diff --git a/packages/engine-underscore/package.json b/packages/engine-underscore/package.json index d51200b31..0f15a5a74 100644 --- a/packages/engine-underscore/package.json +++ b/packages/engine-underscore/package.json @@ -1,7 +1,7 @@ { "name": "@pattern-lab/engine-underscore", "description": "The Underscore engine for Pattern Lab / Node", - "version": "6.0.0", + "version": "6.1.0", "main": "lib/engine_underscore.js", "dependencies": { "underscore": "1.13.0" @@ -23,7 +23,7 @@ "lint": "eslint **/*.js" }, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "publishConfig": { "access": "public" diff --git a/packages/live-server/.nvmrc b/packages/live-server/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/live-server/.nvmrc +++ b/packages/live-server/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/live-server/CHANGELOG.md b/packages/live-server/CHANGELOG.md index a647077a8..a25eef9c3 100644 --- a/packages/live-server/CHANGELOG.md +++ b/packages/live-server/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/live-server + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/live-server diff --git a/packages/live-server/package.json b/packages/live-server/package.json index 7df693208..d3dd4df95 100644 --- a/packages/live-server/package.json +++ b/packages/live-server/package.json @@ -1,6 +1,6 @@ { "name": "@pattern-lab/live-server", - "version": "6.0.0", + "version": "6.1.0", "description": "simple development http server with live reload capability", "keywords": [ "front-end", @@ -44,7 +44,7 @@ "repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/live-server", "bugs": "https://github.com/pattern-lab/patternlab-node/issues", "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-tab/.nvmrc b/packages/plugin-tab/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/plugin-tab/.nvmrc +++ b/packages/plugin-tab/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/plugin-tab/CHANGELOG.md b/packages/plugin-tab/CHANGELOG.md index 39ad40bcb..47ff1be60 100644 --- a/packages/plugin-tab/CHANGELOG.md +++ b/packages/plugin-tab/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/plugin-tab + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/plugin-tab diff --git a/packages/plugin-tab/package.json b/packages/plugin-tab/package.json index 061f7a85e..0d80f6994 100644 --- a/packages/plugin-tab/package.json +++ b/packages/plugin-tab/package.json @@ -1,6 +1,6 @@ { "name": "@pattern-lab/plugin-tab", - "version": "6.0.0", + "version": "6.1.0", "description": "", "main": "index.js", "dependencies": { @@ -9,7 +9,7 @@ "lodash": "4.17.21" }, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/plugin-tab", "bugs": "https://github.com/pattern-lab/patternlab-node/issues", diff --git a/packages/starterkit-handlebars-demo/CHANGELOG.md b/packages/starterkit-handlebars-demo/CHANGELOG.md index fbf8a9a91..c9b55346e 100644 --- a/packages/starterkit-handlebars-demo/CHANGELOG.md +++ b/packages/starterkit-handlebars-demo/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/starterkit-handlebars-demo + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) diff --git a/packages/starterkit-handlebars-demo/package.json b/packages/starterkit-handlebars-demo/package.json index cca5b5a0b..8b2ee7cdf 100644 --- a/packages/starterkit-handlebars-demo/package.json +++ b/packages/starterkit-handlebars-demo/package.json @@ -1,6 +1,6 @@ { "name": "@pattern-lab/starterkit-handlebars-demo", - "version": "6.0.0", + "version": "6.1.0", "description": "Pattern Lab's Demo StarterKit for Handlebars.", "main": "README.md", "repository": { @@ -26,7 +26,7 @@ "build": "copyfiles ../../node_modules/@fontsource/abel/files/*.woff* ../../node_modules/@fontsource/raleway/files/*400-*.woff* ../../node_modules/@fontsource/raleway/files/*700-normal.woff* dist/fonts -f && cd dist/css && sass style.scss:style.css pattern-scaffolding.scss:pattern-scaffolding.css --load-path=../../../../node_modules/" }, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" }, "devDependencies": { "@fontsource/abel": "^4.5.7", diff --git a/packages/starterkit-twig-demo/CHANGELOG.md b/packages/starterkit-twig-demo/CHANGELOG.md index a4a283e2e..2df57497a 100644 --- a/packages/starterkit-twig-demo/CHANGELOG.md +++ b/packages/starterkit-twig-demo/CHANGELOG.md @@ -3,6 +3,36 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/starterkit-twig-demo + + + + + +## [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) + + +### Bug Fixes + +* **twig engine:** startup and running problems ([#1478](https://github.com/pattern-lab/patternlab-node/issues/1478)) ([e5a1904](https://github.com/pattern-lab/patternlab-node/commit/e5a19049f083315939406677b1c0480f4b420569)) + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) diff --git a/packages/starterkit-twig-demo/dist/_data/data.json b/packages/starterkit-twig-demo/dist/_data/data.json index 9c501164c..bd0708c07 100755 --- a/packages/starterkit-twig-demo/dist/_data/data.json +++ b/packages/starterkit-twig-demo/dist/_data/data.json @@ -86,7 +86,7 @@ "first_name": "Author", "last_name": "Name" }, - "hero": true, + "hero": {}, "emergency" : false, "touts" : [ { }, diff --git a/packages/starterkit-twig-demo/dist/_macros/.gitkeep b/packages/starterkit-twig-demo/dist/_patterns/macros/.gitkeep similarity index 100% rename from packages/starterkit-twig-demo/dist/_macros/.gitkeep rename to packages/starterkit-twig-demo/dist/_patterns/macros/.gitkeep diff --git a/packages/starterkit-twig-demo/dist/_patterns/macros/_macros.md b/packages/starterkit-twig-demo/dist/_patterns/macros/_macros.md new file mode 100644 index 000000000..683af9f1a --- /dev/null +++ b/packages/starterkit-twig-demo/dist/_patterns/macros/_macros.md @@ -0,0 +1,3 @@ +--- +hidden: true +--- diff --git a/packages/starterkit-twig-demo/dist/_macros/forms.twig b/packages/starterkit-twig-demo/dist/_patterns/macros/forms.twig similarity index 100% rename from packages/starterkit-twig-demo/dist/_macros/forms.twig rename to packages/starterkit-twig-demo/dist/_patterns/macros/forms.twig diff --git a/packages/starterkit-twig-demo/dist/_patterns/organisms/sections/latest-posts.twig b/packages/starterkit-twig-demo/dist/_patterns/organisms/sections/latest-posts.twig index 16e2d76c0..1d025439c 100644 --- a/packages/starterkit-twig-demo/dist/_patterns/organisms/sections/latest-posts.twig +++ b/packages/starterkit-twig-demo/dist/_patterns/organisms/sections/latest-posts.twig @@ -2,7 +2,7 @@

Latest Posts

View more posts diff --git a/packages/starterkit-twig-demo/dist/_patterns/pages/article.json b/packages/starterkit-twig-demo/dist/_patterns/pages/article.json index 2f7eb842f..df2153ad7 100644 --- a/packages/starterkit-twig-demo/dist/_patterns/pages/article.json +++ b/packages/starterkit-twig-demo/dist/_patterns/pages/article.json @@ -1,32 +1,32 @@ { - "title" : "Top 10 Trails You Have To Hike Before You Die", - "bodyClass": "article", - "author" : { - "first-name" : "Julianne", - "last-name" : "McCormick" - }, - "img": { - "landscape_4x3": { - "src": "../../images/sample/landscape-16x9-mountains.jpg", - "alt": "Mountains", - "width": "1151", - "height": "638" - }, - "landscape_16x9": { - "src": "../../images/sample/landscape-16x9-mountains.jpg", - "alt": "Mountains", - "width": "1151", - "height": "638" - } - }, - "inset_blocks" : [ - { - "headline" : "This is the headline for the inset block" - } - ], - "latest_block" : [ - { - "headline" : "This is the headline for the latest block" - } - ] + "title": "Top 10 Trails You Have To Hike Before You Die", + "bodyClass": "article", + "author": { + "first_name": "Julianne", + "last_name": "McCormick" + }, + "img": { + "landscape_4x3": { + "src": "../../images/sample/landscape-16x9-mountains.jpg", + "alt": "Mountains", + "width": "1151", + "height": "638" + }, + "landscape_16x9": { + "src": "../../images/sample/landscape-16x9-mountains.jpg", + "alt": "Mountains", + "width": "1151", + "height": "638" + } + }, + "inset_blocks": [ + { + "headline": "This is the headline for the inset block" + } + ], + "latest_block": [ + { + "headline": "This is the headline for the latest block" + } + ] } diff --git a/packages/starterkit-twig-demo/dist/_patterns/pages/blog.json b/packages/starterkit-twig-demo/dist/_patterns/pages/blog.json index c5067e3e7..b702c2a95 100644 --- a/packages/starterkit-twig-demo/dist/_patterns/pages/blog.json +++ b/packages/starterkit-twig-demo/dist/_patterns/pages/blog.json @@ -1,86 +1,86 @@ { - "title" : "Blog", - "bodyClass": "blog", - "latest-posts" : [ - { - "img": { - "square": { - "src": "../../images/sample/thumb-square-river.jpg", - "alt": "Post Thumbnail" - } - }, - "headline" : { - "short" : "Navigate the Allegheny River" - }, - "excerpt" : { - "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." - } - }, - { - "img": { - "square": { - "src": "../../images/sample/thumb-square-ivy.jpg", - "alt": "Ivy" - } - }, - "headline" : { - "short" : "How to detect and avoid poison ivy" - }, - "excerpt" : { - "medium" : "Toxicodendron radicans, commonly known as poison ivy is a poisonous North American plant that is well known for its production of urushiol" - } - }, - { - "img": { - "square": { - "src": "../../images/sample/thumb-square-yosemite.jpg", - "alt": "Yosemite" - } - }, - "headline" : { - "short" : "Top 10 hiking mountains" - }, - "excerpt" : { - "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." - } - }, - { - "img": { - "square": { - "src": "../../images/sample/thumb-square-fire.jpg", - "alt": "Fire" - } - }, - "headline" : { - "short" : "How to build a campfire" - }, - "excerpt" : { - "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. " - } - }, - { - "img": { - "square": { - "src": "../../images/sample/thumb-square-gear.jpg", - "alt": "Camping Gear" - } - }, - "headline" : { - "short" : "Pick the right camping gear" - }, - "excerpt" : { - "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." - } - } - ], - "inset_blocks" : [ - { - "headline" : "This is the headline for the inset block" - } - ], - "latest_block" : [ - { - "headline" : "This is the headline for the latest block" - } - ] -} \ No newline at end of file + "title": "Blog", + "bodyClass": "blog", + "latest_posts": [ + { + "img": { + "square": { + "src": "../../images/sample/thumb-square-river.jpg", + "alt": "Post Thumbnail" + } + }, + "headline": { + "short": "Navigate the Allegheny River" + }, + "excerpt": { + "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." + } + }, + { + "img": { + "square": { + "src": "../../images/sample/thumb-square-ivy.jpg", + "alt": "Ivy" + } + }, + "headline": { + "short": "How to detect and avoid poison ivy" + }, + "excerpt": { + "medium": "Toxicodendron radicans, commonly known as poison ivy is a poisonous North American plant that is well known for its production of urushiol" + } + }, + { + "img": { + "square": { + "src": "../../images/sample/thumb-square-yosemite.jpg", + "alt": "Yosemite" + } + }, + "headline": { + "short": "Top 10 hiking mountains" + }, + "excerpt": { + "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." + } + }, + { + "img": { + "square": { + "src": "../../images/sample/thumb-square-fire.jpg", + "alt": "Fire" + } + }, + "headline": { + "short": "How to build a campfire" + }, + "excerpt": { + "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. " + } + }, + { + "img": { + "square": { + "src": "../../images/sample/thumb-square-gear.jpg", + "alt": "Camping Gear" + } + }, + "headline": { + "short": "Pick the right camping gear" + }, + "excerpt": { + "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." + } + } + ], + "inset_blocks": [ + { + "headline": "This is the headline for the inset block" + } + ], + "latest_block": [ + { + "headline": "This is the headline for the latest block" + } + ] +} diff --git a/packages/starterkit-twig-demo/dist/_patterns/pages/homepage.json b/packages/starterkit-twig-demo/dist/_patterns/pages/homepage.json index 9653d072c..e5446a262 100644 --- a/packages/starterkit-twig-demo/dist/_patterns/pages/homepage.json +++ b/packages/starterkit-twig-demo/dist/_patterns/pages/homepage.json @@ -1,153 +1,151 @@ { - "title" : "Home Page", - "bodyClass": "home", - "emergency" : false, - "hero" : [ - { - "img": { - "landscape_16x9": { - "src": "../../images/sample/landscape-16x9-mountains.jpg", - "alt": "Mountains", - "width": "1151", - "height": "638" - } - }, - "headline" : { - "medium" : "Top 10 mountain ranges for hiking" - } - } - ], - "touts" : [ - { - "img": { - "landscape_4x3": { - "src": "../../images/sample/tout-4x3-climber.jpg", - "alt": "Climber", - "width": "640", - "height": "480" - } - }, - "headline" : { - "short" : "Extreme climbing tips" - } - }, - { - "img": { - "landscape_4x3": { - "src": "../../images/sample/tout-4x3-stream.jpg", - "alt": "Stream hiking", - "width": "640", - "height": "480" - } - }, - "headline" : { - "short" : "Stream hiking" - } - }, - { - "img": { - "landscape_4x3": { - "src": "../../images/sample/tout-4x3-climbers.jpg", - "alt": "Explore hiking trails", - "width": "640", - "height": "480" - } - }, - "headline" : { - "short" : "Explore hiking trails" - } - } - ], - "latest-posts" : [ - { - "img": { - "square": { - "src": "../../images/sample/thumb-square-river.jpg", - "alt": "Post Thumbnail", - "width": "600", - "height": "600" - } - }, - "headline" : { - "short" : "Navigate the Allegheny River" - }, - "excerpt" : { - "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." - } - }, - { - "img": { - "square": { - "src": "../../images/sample/thumb-square-ivy.jpg", - "alt": "Ivy", - "width": "600", - "height": "600" - } - }, - "headline" : { - "short" : "How to detect and avoid poison ivy" - }, - "excerpt" : { - "medium" : "Toxicodendron radicans, commonly known as poison ivy is a poisonous North American plant that is well known for its production of urushiol" - } - }, - { - "img": { - "square": { - "src": "../../images/sample/thumb-square-yosemite.jpg", - "alt": "Yosemite", - "width": "600", - "height": "600" - } - }, - "headline" : { - "short" : "Top 10 hiking mountains" - }, - "excerpt" : { - "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." - } - }, - { - "img": { - "square": { - "src": "../../images/sample/thumb-square-fire.jpg", - "alt": "Fire", - "width": "600", - "height": "600" - } - }, - "headline" : { - "short" : "How to build a campfire" - }, - "excerpt" : { - "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. " - } - }, - { - "img": { - "square": { - "src": "../../images/sample/thumb-square-gear.jpg", - "alt": "Camping Gear", - "width": "600", - "height": "600" - } - }, - "headline" : { - "short" : "Pick the right camping gear" - }, - "excerpt" : { - "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." - } - } - ], - "inset-blocks" : [ - { - "headline" : "This is the headline for the inset block" - } - ], - "latest-block" : [ - { - "headline" : "This is the headline for the latest block" - } - ] + "title": "Home Page", + "bodyClass": "home", + "emergency": false, + "hero": { + "img": { + "landscape_16x9": { + "src": "../../images/sample/landscape-16x9-mountains.jpg", + "alt": "Mountains", + "width": "1151", + "height": "638" + } + }, + "headline": { + "medium": "Top 10 mountain ranges for hiking" + } + }, + "touts": [ + { + "img": { + "landscape_4x3": { + "src": "../../images/sample/tout-4x3-climber.jpg", + "alt": "Climber", + "width": "640", + "height": "480" + } + }, + "headline": { + "short": "Extreme climbing tips" + } + }, + { + "img": { + "landscape_4x3": { + "src": "../../images/sample/tout-4x3-stream.jpg", + "alt": "Stream hiking", + "width": "640", + "height": "480" + } + }, + "headline": { + "short": "Stream hiking" + } + }, + { + "img": { + "landscape_4x3": { + "src": "../../images/sample/tout-4x3-climbers.jpg", + "alt": "Explore hiking trails", + "width": "640", + "height": "480" + } + }, + "headline": { + "short": "Explore hiking trails" + } + } + ], + "latest_posts": [ + { + "img": { + "square": { + "src": "../../images/sample/thumb-square-river.jpg", + "alt": "Post Thumbnail", + "width": "600", + "height": "600" + } + }, + "headline": { + "short": "Navigate the Allegheny River" + }, + "excerpt": { + "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." + } + }, + { + "img": { + "square": { + "src": "../../images/sample/thumb-square-ivy.jpg", + "alt": "Ivy", + "width": "600", + "height": "600" + } + }, + "headline": { + "short": "How to detect and avoid poison ivy" + }, + "excerpt": { + "medium": "Toxicodendron radicans, commonly known as poison ivy is a poisonous North American plant that is well known for its production of urushiol" + } + }, + { + "img": { + "square": { + "src": "../../images/sample/thumb-square-yosemite.jpg", + "alt": "Yosemite", + "width": "600", + "height": "600" + } + }, + "headline": { + "short": "Top 10 hiking mountains" + }, + "excerpt": { + "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." + } + }, + { + "img": { + "square": { + "src": "../../images/sample/thumb-square-fire.jpg", + "alt": "Fire", + "width": "600", + "height": "600" + } + }, + "headline": { + "short": "How to build a campfire" + }, + "excerpt": { + "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. " + } + }, + { + "img": { + "square": { + "src": "../../images/sample/thumb-square-gear.jpg", + "alt": "Camping Gear", + "width": "600", + "height": "600" + } + }, + "headline": { + "short": "Pick the right camping gear" + }, + "excerpt": { + "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." + } + } + ], + "inset-blocks": [ + { + "headline": "This is the headline for the inset block" + } + ], + "latest-block": [ + { + "headline": "This is the headline for the latest block" + } + ] } diff --git a/packages/starterkit-twig-demo/dist/_patterns/pages/homepage~emergency.json b/packages/starterkit-twig-demo/dist/_patterns/pages/homepage~emergency.json index 0f4e4c393..c289ece6c 100644 --- a/packages/starterkit-twig-demo/dist/_patterns/pages/homepage~emergency.json +++ b/packages/starterkit-twig-demo/dist/_patterns/pages/homepage~emergency.json @@ -1,8 +1,8 @@ { - "emergency": { - "additionalClasses": "error", - "excerpt" : { - "short" : "Emergency! This is a variation of the core homepage template." - } - } + "emergency": { + "additionalClasses": "error", + "excerpt": { + "short": "Emergency! This is a variation of the core homepage template." + } + } } diff --git a/packages/starterkit-twig-demo/dist/_patterns/templates/blog.twig b/packages/starterkit-twig-demo/dist/_patterns/templates/blog.twig index 3aa69798a..d8baef2b0 100644 --- a/packages/starterkit-twig-demo/dist/_patterns/templates/blog.twig +++ b/packages/starterkit-twig-demo/dist/_patterns/templates/blog.twig @@ -1,8 +1,8 @@ -{% extends "@templates/layouts/site.twig" %} +{% extends "@templates/layouts/page-2col.twig" %} {% block title %}

Our Outdoor Blog

{% endblock %} {% block main %} - {% include "@organisms/sections/latest-posts.twig" %} + {% include "@organisms/sections/latest-posts.twig" with { 'latest_posts': latest_posts} %} {% include "@molecules/navigation/pagination.twig" %} {% endblock %} diff --git a/packages/starterkit-twig-demo/dist/_patterns/templates/homepage.twig b/packages/starterkit-twig-demo/dist/_patterns/templates/homepage.twig index 742e10621..3313e7bc2 100644 --- a/packages/starterkit-twig-demo/dist/_patterns/templates/homepage.twig +++ b/packages/starterkit-twig-demo/dist/_patterns/templates/homepage.twig @@ -4,13 +4,13 @@ {% include "@molecules/messaging/alert.twig" with emergency %} {% endif %} {% if hero %} - {% include "@molecules/blocks/block-hero.twig" %} + {% include "@molecules/blocks/block-hero.twig" with hero %} {% endif %}
{% for tout in touts %}
- {% include "@molecules/blocks/block-inset.twig" %} + {% include "@molecules/blocks/block-inset.twig" with tout %}
{% endfor %}
@@ -23,7 +23,7 @@

Latest Posts

View more posts diff --git a/packages/starterkit-twig-demo/package.json b/packages/starterkit-twig-demo/package.json old mode 100755 new mode 100644 index d2dd2e46f..76a18e669 --- a/packages/starterkit-twig-demo/package.json +++ b/packages/starterkit-twig-demo/package.json @@ -1,6 +1,6 @@ { "name": "@pattern-lab/starterkit-twig-demo", - "version": "6.0.0", + "version": "6.1.0", "description": "Pattern Lab's Demo StarterKit for Twig.", "main": "README.md", "repository": { @@ -24,6 +24,6 @@ }, "gitHead": "80f62be442223e09bafb30d0529cbd768e03f2ac", "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" } } diff --git a/packages/starterkit-twig-demo/patternlab-config.json b/packages/starterkit-twig-demo/patternlab-config.json index c25133362..f63ce7a53 100644 --- a/packages/starterkit-twig-demo/patternlab-config.json +++ b/packages/starterkit-twig-demo/patternlab-config.json @@ -1,6 +1,6 @@ { "engines": { - "twig": { + "twig-php": { "package": "@pattern-lab/engine-twig-php", "fileExtensions": [ "twig" @@ -45,7 +45,7 @@ "id": "macros", "recursive": true, "paths": [ - "source/_macros" + "source/_patterns/macros" ] } ] diff --git a/packages/uikit-polyfills/CHANGELOG.md b/packages/uikit-polyfills/CHANGELOG.md index 78de7d9bc..4cc9116e8 100644 --- a/packages/uikit-polyfills/CHANGELOG.md +++ b/packages/uikit-polyfills/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/uikit-polyfills + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) **Note:** Version bump only for package @pattern-lab/uikit-polyfills diff --git a/packages/uikit-polyfills/package.json b/packages/uikit-polyfills/package.json index 35c06a41d..92a07129a 100644 --- a/packages/uikit-polyfills/package.json +++ b/packages/uikit-polyfills/package.json @@ -1,6 +1,6 @@ { "name": "@pattern-lab/uikit-polyfills", - "version": "6.0.0", + "version": "6.1.0", "description": "Web Component and further necessary Polyfills used in Pattern Lab's UIKit", "main": "index.js", "author": "Salem Ghoweri ", @@ -16,6 +16,6 @@ "access": "public" }, "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" } } diff --git a/packages/uikit-workshop/.nvmrc b/packages/uikit-workshop/.nvmrc index 8aeef54f8..59ea99ee6 100644 --- a/packages/uikit-workshop/.nvmrc +++ b/packages/uikit-workshop/.nvmrc @@ -1 +1 @@ -14.21 +16.20 diff --git a/packages/uikit-workshop/CHANGELOG.md b/packages/uikit-workshop/CHANGELOG.md index 2d7c9bc4d..17d280112 100644 --- a/packages/uikit-workshop/CHANGELOG.md +++ b/packages/uikit-workshop/CHANGELOG.md @@ -3,6 +3,33 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.1.0](https://github.com/pattern-lab/patternlab-node/compare/v6.0.3...v6.1.0) (2023-12-21) + +**Note:** Version bump only for package @pattern-lab/uikit-workshop + + + + + +## [6.0.3](https://github.com/pattern-lab/patternlab-node/compare/v6.0.2...v6.0.3) (2023-03-12) + + +### Bug Fixes + +* subitems menu height restricted only for horizontal mode ([#1492](https://github.com/pattern-lab/patternlab-node/issues/1492)) ([e65f294](https://github.com/pattern-lab/patternlab-node/commit/e65f294d9cbf032fd7fd03d9f957500949db5440)) + + + + + +## [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/uikit-workshop + + + + + # [6.0.0](https://github.com/pattern-lab/patternlab-node/compare/v5.17.0...v6.0.0) (2023-01-31) diff --git a/packages/uikit-workshop/package.json b/packages/uikit-workshop/package.json index f1af9fc5e..2cbde0d98 100644 --- a/packages/uikit-workshop/package.json +++ b/packages/uikit-workshop/package.json @@ -1,6 +1,6 @@ { "name": "@pattern-lab/uikit-workshop", - "version": "6.0.0", + "version": "6.1.0", "description": "Front-end assets and templates for the default Pattern Lab workshop view", "main": "gulpfile.js", "scripts": { @@ -42,11 +42,10 @@ "@babel/plugin-transform-runtime": "^7.13.10", "@babel/preset-env": "^7.13.12", "@babel/runtime": "^7.13.10", - "@pattern-lab/core": "^6.0.0", - "@pattern-lab/engine-handlebars": "^6.0.0", - "@pattern-lab/engine-mustache": "^6.0.0", - "@pattern-lab/uikit-polyfills": "^6.0.0", - "@reach/visually-hidden": "^0.1.2", + "@pattern-lab/core": "^6.1.0", + "@pattern-lab/engine-handlebars": "^6.1.0", + "@pattern-lab/engine-mustache": "^6.1.0", + "@pattern-lab/uikit-polyfills": "^6.1.0", "@webcomponents/custom-elements": "^1.4.3", "autoprefixer": "^10.2.5", "babel-loader": "^9.1.2", @@ -119,6 +118,6 @@ ], "gitHead": "80f62be442223e09bafb30d0529cbd768e03f2ac", "engines": { - "node": ">=14.21.1" + "node": ">=16.20.0" } } diff --git a/packages/uikit-workshop/src/scripts/components/pl-nav/nav-accordion.scss b/packages/uikit-workshop/src/scripts/components/pl-nav/nav-accordion.scss index 656aa1fad..e70a4d989 100644 --- a/packages/uikit-workshop/src/scripts/components/pl-nav/nav-accordion.scss +++ b/packages/uikit-workshop/src/scripts/components/pl-nav/nav-accordion.scss @@ -18,10 +18,9 @@ .pl-c-body--theme-horizontal & { overflow: auto; - } - @media all and (min-width: $pl-bp-med) { - height: auto; - max-height: calc(100vh - #{$offset-top} - 2rem); /* 1 */ + @media all and (min-width: $pl-bp-med) { + max-height: calc(100vh - #{$offset-top} - 2rem); /* 1 */ + } } } diff --git a/packages/uikit-workshop/src/scripts/components/pl-search/pl-search.js b/packages/uikit-workshop/src/scripts/components/pl-search/pl-search.js index cd239bcb9..8aa566a73 100644 --- a/packages/uikit-workshop/src/scripts/components/pl-search/pl-search.js +++ b/packages/uikit-workshop/src/scripts/components/pl-search/pl-search.js @@ -7,7 +7,6 @@ import Fuse from 'fuse.js'; import ReactHtmlParser from 'react-html-parser'; import classNames from 'classnames'; import Mousetrap from 'mousetrap'; -import VisuallyHidden from '@reach/visually-hidden'; import Autosuggest from 'react-autosuggest'; import { urlHandler, iframeMsgDataExtraction } from '../../utils'; @@ -255,7 +254,7 @@ class Search extends BaseComponent { }} type="button" > - {clearButtonText} + {clearButtonText}