diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 558a1f99d..3120a9571 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,7 +2,7 @@ If you'd like to contribute to Pattern Lab Node, please do so! There is always a lot of ground to cover and something for your wheelhouse. -No pull request is too small. Check out any [help wanted πŸ†˜](https://github.com/pattern-lab/patternlab-node/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted+%3Asos%3A%22) or [good first issues πŸŽ“](https://github.com/pattern-lab/patternlab-node/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue+%3Amortar_board%3A%22)as a good way to get your feet wet, or add some more unit tests. +No pull request is too small. Check out any [help wanted πŸ†˜](https://github.com/pattern-lab/patternlab-node/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted+%3Asos%3A%22) or [good first issues πŸŽ“](https://github.com/pattern-lab/patternlab-node/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue+%3Amortar_board%3A%22) as a good way to get your feet wet, or add some more unit tests. ## Prerequisites diff --git a/CHANGELOG.md b/CHANGELOG.md index fd947720a..a9d4dab03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,49 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [5.11.1](https://github.com/pattern-lab/patternlab-node/compare/v5.10.2...v5.11.1) (2020-06-28) + + +### Bug Fixes + +* update Viewport Size toggle to better handle async-loaded ishControl data + prevent rendering errors ([b937706](https://github.com/pattern-lab/patternlab-node/commit/b93770669c6f723128ba68e522c9398cc1d2d70c)) +* update Webpack config to point to the patched version of preact-dom ([d3660b7](https://github.com/pattern-lab/patternlab-node/commit/d3660b78bc0a74c52ed85b69b023c612b789c318)) +* update yarn.lock ([dca1948](https://github.com/pattern-lab/patternlab-node/commit/dca19489b85f715de3ade2294fa49df89b8bb59f)) +* visually hide NavToggle icon text; fix for visual regression after merging down https://github.com/pattern-lab/patternlab-node/pull/1227 ([3a2ad9f](https://github.com/pattern-lab/patternlab-node/commit/3a2ad9f12d83b6d21dcca62e89d944a6a46342f6)) +* **docs:** corrected a URL ([26ede14](https://github.com/pattern-lab/patternlab-node/commit/26ede14a6eafe8649cbc6b0076d84f1d323c3e20)) +* **docs:** fixed css code for custom patternstates color ([8995241](https://github.com/pattern-lab/patternlab-node/commit/89952416162c01d1e3e05221ce58a7755544131c)), closes [#1216](https://github.com/pattern-lab/patternlab-node/issues/1216) +* **docs:** headlines styling breaks in edge cases [#1158](https://github.com/pattern-lab/patternlab-node/issues/1158) ([d8244a2](https://github.com/pattern-lab/patternlab-node/commit/d8244a2d307b0a81d0846491f8c5a12e0ae167a5)) +* **patternflyouts:** preventing horizontal scrollbar in pattern flyouts in Edge 18 [#1124](https://github.com/pattern-lab/patternlab-node/issues/1124) ([63300bc](https://github.com/pattern-lab/patternlab-node/commit/63300bc00ee797e38bfdb73fdc7694c188a423dc)) +* **patternstate:** added css color for pattern state "inprogress" [#1216](https://github.com/pattern-lab/patternlab-node/issues/1216) ([856bcda](https://github.com/pattern-lab/patternlab-node/commit/856bcda150239928bb5e8719246b97e9fa366468)) +* **resetcss:** selector in uikit-workshop [#1109](https://github.com/pattern-lab/patternlab-node/issues/1109) ([6893b7c](https://github.com/pattern-lab/patternlab-node/commit/6893b7cb5478309d4fdab0121edba3921718bd69)) +* enable partial build via option ([8aaa533](https://github.com/pattern-lab/patternlab-node/commit/8aaa53398563ade14123c481bf509f9ee0c768f5)) +* enable partial build via option ([4b9dbf9](https://github.com/pattern-lab/patternlab-node/commit/4b9dbf9095bfb8bfd2360b310dd7395dbfe3cf98)) + + + + + +# [5.11.0](https://github.com/pattern-lab/patternlab-node/compare/v5.10.2...v5.11.0) (2020-06-28) + + +### Bug Fixes + +* update Viewport Size toggle to better handle async-loaded ishControl data + prevent rendering errors ([b937706](https://github.com/pattern-lab/patternlab-node/commit/b93770669c6f723128ba68e522c9398cc1d2d70c)) +* update Webpack config to point to the patched version of preact-dom ([d3660b7](https://github.com/pattern-lab/patternlab-node/commit/d3660b78bc0a74c52ed85b69b023c612b789c318)) +* visually hide NavToggle icon text; fix for visual regression after merging down https://github.com/pattern-lab/patternlab-node/pull/1227 ([3a2ad9f](https://github.com/pattern-lab/patternlab-node/commit/3a2ad9f12d83b6d21dcca62e89d944a6a46342f6)) +* **docs:** corrected a URL ([26ede14](https://github.com/pattern-lab/patternlab-node/commit/26ede14a6eafe8649cbc6b0076d84f1d323c3e20)) +* **docs:** fixed css code for custom patternstates color ([8995241](https://github.com/pattern-lab/patternlab-node/commit/89952416162c01d1e3e05221ce58a7755544131c)), closes [#1216](https://github.com/pattern-lab/patternlab-node/issues/1216) +* **docs:** headlines styling breaks in edge cases [#1158](https://github.com/pattern-lab/patternlab-node/issues/1158) ([d8244a2](https://github.com/pattern-lab/patternlab-node/commit/d8244a2d307b0a81d0846491f8c5a12e0ae167a5)) +* **patternflyouts:** preventing horizontal scrollbar in pattern flyouts in Edge 18 [#1124](https://github.com/pattern-lab/patternlab-node/issues/1124) ([63300bc](https://github.com/pattern-lab/patternlab-node/commit/63300bc00ee797e38bfdb73fdc7694c188a423dc)) +* **patternstate:** added css color for pattern state "inprogress" [#1216](https://github.com/pattern-lab/patternlab-node/issues/1216) ([856bcda](https://github.com/pattern-lab/patternlab-node/commit/856bcda150239928bb5e8719246b97e9fa366468)) +* **resetcss:** selector in uikit-workshop [#1109](https://github.com/pattern-lab/patternlab-node/issues/1109) ([6893b7c](https://github.com/pattern-lab/patternlab-node/commit/6893b7cb5478309d4fdab0121edba3921718bd69)) +* enable partial build via option ([8aaa533](https://github.com/pattern-lab/patternlab-node/commit/8aaa53398563ade14123c481bf509f9ee0c768f5)) +* enable partial build via option ([4b9dbf9](https://github.com/pattern-lab/patternlab-node/commit/4b9dbf9095bfb8bfd2360b310dd7395dbfe3cf98)) + + + + + ## [5.10.2](https://github.com/pattern-lab/patternlab-node/compare/v5.10.1...v5.10.2) (2020-05-24) diff --git a/lerna.json b/lerna.json index 68da376ac..91053c6de 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "3.11.0", - "version": "5.10.2", + "version": "5.11.1", "packages": [ "packages/*" ], diff --git a/package.json b/package.json index 97fc859e4..f11ea4478 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,8 @@ "prettier": "^1.14.3", "lerna": "3.17.0", "pretty-quick": "^1.11.1", - "auto": "^9.31.1", - "@auto-it/released": "^9.31.1" + "auto": "^9.40.5", + "@auto-it/released": "^9.40.5" }, "repository": { "type": "git", diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 733080af4..f958b8db0 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. +## [5.11.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v5.10.2...v5.11.1) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/cli + + + + + +# [5.11.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v5.10.2...v5.11.0) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/cli + + + + + ## [5.10.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v5.10.0...v5.10.1) (2020-05-09) **Note:** Version bump only for package @pattern-lab/cli diff --git a/packages/cli/package.json b/packages/cli/package.json index 23da35b72..9ed00c602 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": "5.10.1", + "version": "5.11.1", "bin": { "patternlab": "bin/patternlab.js" }, @@ -9,7 +9,7 @@ "name": "Raphael Okon" }, "dependencies": { - "@pattern-lab/core": "^5.10.1", + "@pattern-lab/core": "^5.11.1", "@pattern-lab/live-server": "^5.10.1", "@pattern-lab/starterkit-mustache-base": "3.0.3", "archiver": "2.1.1", diff --git a/packages/cli/test/fixtures/patternlab-config.json b/packages/cli/test/fixtures/patternlab-config.json index 6102f522f..4bd371e26 100644 --- a/packages/cli/test/fixtures/patternlab-config.json +++ b/packages/cli/test/fixtures/patternlab-config.json @@ -72,6 +72,7 @@ "patternStateCascade": ["inprogress", "inreview", "complete"], "patternExportDirectory": "./pattern_exports/", "patternExportPatternPartials": [], + "patternMergeVariantArrays": true, "serverOptions": { "wait": 1000 }, diff --git a/packages/core/.npmignore b/packages/core/.npmignore new file mode 100644 index 000000000..c1e1ac97f --- /dev/null +++ b/packages/core/.npmignore @@ -0,0 +1,2 @@ +test +.nyc_output diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index e40c06606..6e8207e7b 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/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. +## [5.11.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/compare/v5.10.2...v5.11.1) (2020-06-28) + + +### Bug Fixes + +* enable partial build via option ([8aaa533](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/commit/8aaa53398563ade14123c481bf509f9ee0c768f5)) + + + + + +# [5.11.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/compare/v5.10.2...v5.11.0) (2020-06-28) + + +### Bug Fixes + +* enable partial build via option ([8aaa533](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/commit/8aaa53398563ade14123c481bf509f9ee0c768f5)) + + + + + ## [5.10.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/compare/v5.10.0...v5.10.1) (2020-05-09) **Note:** Version bump only for package @pattern-lab/core diff --git a/packages/core/docs/events.md b/packages/core/docs/events.md index 2df8191d1..0e7d26fe2 100644 --- a/packages/core/docs/events.md +++ b/packages/core/docs/events.md @@ -77,7 +77,7 @@ Emitted after global `data.json` and `listitems.json` are read, and the supporti Emitted before all data is merged prior to a Pattern's render. Global `data.json` is merged with any pattern `.json`. Global `listitems.json` is merged with any pattern `.listitems.json`. **Kind**: inner property of [EVENTS](#exp_module_Events--EVENTS) -**See**: [Pattern](https://github.com/pattern-lab/patternlab-node/blob/master/src/lib/object_factory.js#L16) +**See**: [Pattern](https://github.com/pattern-lab/patternlab-node/blob/master/packages/core/src/lib/object_factory.js#L16) **Properties** | Name | Type | Description | @@ -92,7 +92,7 @@ Emitted before all data is merged prior to a Pattern's render. Global `data.json Emitted before a pattern's template, HTML, and encoded HTML files are written to their output location **Kind**: inner property of [EVENTS](#exp_module_Events--EVENTS) -**See**: [Pattern](https://github.com/pattern-lab/patternlab-node/blob/master/src/lib/object_factory.js#L16) +**See**: [Pattern](https://github.com/pattern-lab/patternlab-node/blob/master/packages/core/src/lib/object_factory.js#L16) **Properties** | Name | Type | Description | @@ -107,7 +107,7 @@ Emitted before a pattern's template, HTML, and encoded HTML files are written to Emitted after a pattern's template, HTML, and encoded HTML files are written to their output location **Kind**: inner property of [EVENTS](#exp_module_Events--EVENTS) -**See**: [Pattern](https://github.com/pattern-lab/patternlab-node/blob/master/src/lib/object_factory.js#L16) +**See**: [Pattern](https://github.com/pattern-lab/patternlab-node/blob/master/packages/core/src/lib/object_factory.js#L16) **Properties** | Name | Type | Description | diff --git a/packages/core/package.json b/packages/core/package.json index b606d8edf..52f508ab6 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@pattern-lab/core", "description": "Create atomic design systems with Pattern Lab. This is the core API and orchestrator of the ecosystem.", - "version": "5.10.1", + "version": "5.11.1", "main": "./src/index.js", "dependencies": { "@pattern-lab/engine-mustache": "^5.10.1", diff --git a/packages/core/patternlab-config.json b/packages/core/patternlab-config.json index 39eed54fd..28d62a2d0 100644 --- a/packages/core/patternlab-config.json +++ b/packages/core/patternlab-config.json @@ -75,6 +75,7 @@ "patternExportPatternPartials": [], "patternExportPreserveDirectoryStructure": true, "patternExportRaw": false, + "patternMergeVariantArrays": true, "serverOptions": { "wait": 1000 }, diff --git a/packages/core/src/lib/buildPatterns.js b/packages/core/src/lib/buildPatterns.js index c550a6880..a1868d32f 100644 --- a/packages/core/src/lib/buildPatterns.js +++ b/packages/core/src/lib/buildPatterns.js @@ -55,7 +55,9 @@ module.exports = async (deletePatternDir, patternlab, additionalData) => { // Flags patternlab.incrementalBuildsEnabled = !( - patternlab.config.cleanPublic || graphNeedsUpgrade + patternlab.config.cleanPublic || + graphNeedsUpgrade || + deletePatternDir ); // diff --git a/packages/core/src/lib/events.js b/packages/core/src/lib/events.js index b1653b3c8..bb708bb3c 100644 --- a/packages/core/src/lib/events.js +++ b/packages/core/src/lib/events.js @@ -39,7 +39,7 @@ const EVENTS = Object.freeze({ * @desc Emitted before all data is merged prior to a Pattern's render. Global `data.json` is merged with any pattern `.json`. Global `listitems.json` is merged with any pattern `.listitems.json`. * @property {object} patternlab - global data store * @property {Pattern} pattern - current pattern - * @see {@link https://github.com/pattern-lab/patternlab-node/blob/master/src/lib/object_factory.js#L16|Pattern} + * @see {@link https://github.com/pattern-lab/patternlab-node/blob/master/packages/core/src/lib/object_factory.js#L16|Pattern} */ PATTERNLAB_PATTERN_BEFORE_DATA_MERGE: 'patternlab-pattern-before-data-merge', @@ -47,7 +47,7 @@ const EVENTS = Object.freeze({ * @desc Emitted before a pattern's template, HTML, and encoded HTML files are written to their output location * @property {object} patternlab - global data store * @property {Pattern} pattern - current pattern - * @see {@link https://github.com/pattern-lab/patternlab-node/blob/master/src/lib/object_factory.js#L16|Pattern} + * @see {@link https://github.com/pattern-lab/patternlab-node/blob/master/packages/core/src/lib/object_factory.js#L16|Pattern} */ PATTERNLAB_PATTERN_WRITE_BEGIN: 'patternlab-pattern-write-begin', @@ -55,7 +55,7 @@ const EVENTS = Object.freeze({ * @desc Emitted after a pattern's template, HTML, and encoded HTML files are written to their output location * @property {object} patternlab - global data store * @property {Pattern} pattern - current pattern - * @see {@link https://github.com/pattern-lab/patternlab-node/blob/master/src/lib/object_factory.js#L16|Pattern} + * @see {@link https://github.com/pattern-lab/patternlab-node/blob/master/packages/core/src/lib/object_factory.js#L16|Pattern} */ PATTERNLAB_PATTERN_WRITE_END: 'patternlab-pattern-write-end', diff --git a/packages/core/src/lib/pseudopattern_hunter.js b/packages/core/src/lib/pseudopattern_hunter.js index b95dd37f1..71c178177 100644 --- a/packages/core/src/lib/pseudopattern_hunter.js +++ b/packages/core/src/lib/pseudopattern_hunter.js @@ -60,10 +60,24 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function( } //extend any existing data with variant data - variantFileData = _.merge( + variantFileData = _.mergeWith( {}, currentPattern.jsonFileData, - variantFileData + variantFileData, + (objValue, srcValue) => { + if ( + _.isArray(objValue) && + // If the parameter is not available after updating pattern lab but + // not the patternlab-config it should not override arrays. + patternlab.config.hasOwnProperty('patternMergeVariantArrays') && + !patternlab.config.patternMergeVariantArrays + ) { + return srcValue; + } + // Lodash will only check for "undefined" and eslint needs a consistent + // return so do not remove + return undefined; + } ); const variantName = pseudoPatterns[i] diff --git a/packages/core/test/files/_patterns/00-test/475-variant-test.json b/packages/core/test/files/_patterns/00-test/475-variant-test.json new file mode 100644 index 000000000..9d371748a --- /dev/null +++ b/packages/core/test/files/_patterns/00-test/475-variant-test.json @@ -0,0 +1,9 @@ +{ + "a": 1, + "b": [2, 3], + "c": { + "d": [4, 5], + "e": 8, + "f": {"a": ["a"], "b": ["b"], "c": ["c"]} + } +} \ No newline at end of file diff --git a/packages/core/test/files/_patterns/00-test/475-variant-test.mustache b/packages/core/test/files/_patterns/00-test/475-variant-test.mustache new file mode 100644 index 000000000..fe4dd1f58 --- /dev/null +++ b/packages/core/test/files/_patterns/00-test/475-variant-test.mustache @@ -0,0 +1 @@ +{{a}} \ No newline at end of file diff --git a/packages/core/test/files/_patterns/00-test/475-variant-test~merge.json b/packages/core/test/files/_patterns/00-test/475-variant-test~merge.json new file mode 100644 index 000000000..c60d0974c --- /dev/null +++ b/packages/core/test/files/_patterns/00-test/475-variant-test~merge.json @@ -0,0 +1,8 @@ +{ + "a": 2, + "b": [8], + "c": { + "d": [6, 7], + "f": {"b": ["x"]} + } +} \ No newline at end of file diff --git a/packages/core/test/pseudopattern_hunter_tests.js b/packages/core/test/pseudopattern_hunter_tests.js index 1464f28b4..f3d0e8d4a 100644 --- a/packages/core/test/pseudopattern_hunter_tests.js +++ b/packages/core/test/pseudopattern_hunter_tests.js @@ -133,3 +133,68 @@ tap.test( }); } ); + +tap.test('pseudo pattern variant data should merge arrays', function(test) { + const pl = stubPatternlab(); + pl.config.patternMergeVariantArrays = true; + + const pattern = loadPattern('00-test/475-variant-test.mustache', pl); + + addPattern(pattern, pl); + + return pph.find_pseudopatterns(pattern, pl).then(() => { + test.equals(pl.patterns[1].patternPartial, 'test-variant-test-merge'); + test.equals( + JSON.stringify(pl.patterns[1].jsonFileData), + JSON.stringify({ + a: 2, + b: [8, 3], + c: { d: [6, 7], e: 8, f: { a: ['a'], b: ['x'], c: ['c'] } }, + }) + ); + }); +}); + +tap.test( + 'pseudo pattern variant data should merge arrays if config "patternMergeVariantArrays" is not available as default behavior', + function(test) { + const pl = stubPatternlab(); + + const pattern = loadPattern('00-test/475-variant-test.mustache', pl); + + addPattern(pattern, pl); + + return pph.find_pseudopatterns(pattern, pl).then(() => { + test.equals(pl.patterns[1].patternPartial, 'test-variant-test-merge'); + test.equals( + JSON.stringify(pl.patterns[1].jsonFileData), + JSON.stringify({ + a: 2, + b: [8, 3], + c: { d: [6, 7], e: 8, f: { a: ['a'], b: ['x'], c: ['c'] } }, + }) + ); + }); + } +); + +tap.test('pseudo pattern variant data should override arrays', function(test) { + const pl = stubPatternlab(); + pl.config.patternMergeVariantArrays = false; + + const pattern = loadPattern('00-test/475-variant-test.mustache', pl); + + addPattern(pattern, pl); + + return pph.find_pseudopatterns(pattern, pl).then(() => { + test.equals(pl.patterns[1].patternPartial, 'test-variant-test-merge'); + test.equals( + JSON.stringify(pl.patterns[1].jsonFileData), + JSON.stringify({ + a: 2, + b: [8], + c: { d: [6, 7], e: 8, f: { a: ['a'], b: ['x'], c: ['c'] } }, + }) + ); + }); +}); diff --git a/packages/core/test/util/patternlab-config.json b/packages/core/test/util/patternlab-config.json index c2edf9561..904e37afd 100644 --- a/packages/core/test/util/patternlab-config.json +++ b/packages/core/test/util/patternlab-config.json @@ -57,6 +57,7 @@ "patternExportPatternPartials": [], "patternExportDirectory": "./pattern_exports/", "patternExtension": "mustache", + "patternMergeVariantArrays": true, "cacheBust": true, "outputFileSuffixes": { "rendered": ".rendered", diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index f334f3156..dc48ac784 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. +## [5.11.1](https://github.com/pattern-lab/patternlab-node/compare/v5.10.2...v5.11.1) (2020-06-28) + +**Note:** Version bump only for package create-pattern-lab + + + + + +# [5.11.0](https://github.com/pattern-lab/patternlab-node/compare/v5.10.2...v5.11.0) (2020-06-28) + +**Note:** Version bump only for package create-pattern-lab + + + + + ## [5.10.1](https://github.com/pattern-lab/patternlab-node/compare/v5.10.0...v5.10.1) (2020-05-09) **Note:** Version bump only for package create-pattern-lab diff --git a/packages/create/package.json b/packages/create/package.json index 6a8ba6deb..248e2d593 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,12 +1,12 @@ { "name": "create-pattern-lab", - "version": "5.10.1", + "version": "5.11.1", "description": "", "bin": "index.js", "main": "index.js", "scripts": {}, "dependencies": { - "@pattern-lab/cli": "^5.10.1" + "@pattern-lab/cli": "^5.11.1" }, "author": "", "license": "MIT", diff --git a/packages/development-edition-engine-handlebars/CHANGELOG.md b/packages/development-edition-engine-handlebars/CHANGELOG.md index c1100ce70..a2a41e1fd 100644 --- a/packages/development-edition-engine-handlebars/CHANGELOG.md +++ b/packages/development-edition-engine-handlebars/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. +## [5.11.1](https://github.com/pattern-lab/patternlab-node/compare/v5.10.2...v5.11.1) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/development-edition-engine-handlebars + + + + + +# [5.11.0](https://github.com/pattern-lab/patternlab-node/compare/v5.10.2...v5.11.0) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/development-edition-engine-handlebars + + + + + ## [5.10.2](https://github.com/pattern-lab/patternlab-node/compare/v5.10.1...v5.10.2) (2020-05-24) **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 d3e09aa41..b99d064c7 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": "5.10.2", + "version": "5.11.1", "description": "The tree of components we use to test, develop and validate the Handlebars engine", "scripts": { "pl:build": "patternlab build --config ./patternlab-config.json", @@ -28,12 +28,12 @@ "node": ">=12.12.0" }, "dependencies": { - "@pattern-lab/cli": "^5.10.1", - "@pattern-lab/core": "^5.10.1", + "@pattern-lab/cli": "^5.11.1", + "@pattern-lab/core": "^5.11.1", "@pattern-lab/engine-handlebars": "^5.10.1", "@pattern-lab/engine-mustache": "^5.10.1", "@pattern-lab/plugin-tab": "^5.10.1", "@pattern-lab/starterkit-mustache-demo": "^5.0.0", - "@pattern-lab/uikit-workshop": "^5.10.2" + "@pattern-lab/uikit-workshop": "^5.11.1" } } diff --git a/packages/development-edition-engine-handlebars/patternlab-config.json b/packages/development-edition-engine-handlebars/patternlab-config.json index 5b9e9a0c2..141f35a47 100644 --- a/packages/development-edition-engine-handlebars/patternlab-config.json +++ b/packages/development-edition-engine-handlebars/patternlab-config.json @@ -70,6 +70,7 @@ "patternExportPatternPartials": [], "patternExportPreserveDirectoryStructure": true, "patternExportRaw": false, + "patternMergeVariantArrays": true, "serverOptions": { "wait": 1000 }, diff --git a/packages/development-edition-engine-react/CHANGELOG.md b/packages/development-edition-engine-react/CHANGELOG.md index c4cda9ff8..a0d4d3ca7 100644 --- a/packages/development-edition-engine-react/CHANGELOG.md +++ b/packages/development-edition-engine-react/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. +## [5.11.1](https://github.com/pattern-lab/edition-node-gulp/compare/v5.10.2...v5.11.1) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/engine-react-testing-tree + + + + + +# [5.11.0](https://github.com/pattern-lab/edition-node-gulp/compare/v5.10.2...v5.11.0) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/engine-react-testing-tree + + + + + ## [5.10.2](https://github.com/pattern-lab/edition-node-gulp/compare/v5.10.1...v5.10.2) (2020-05-24) **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 569f9feff..f965e876b 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": "5.10.2", + "version": "5.11.1", "private": true, "main": "gulpfile.js", "dependencies": { - "@pattern-lab/core": "^5.10.1", + "@pattern-lab/core": "^5.11.1", "@pattern-lab/engine-mustache": "^5.10.1", "@pattern-lab/engine-react": "^5.10.0", - "@pattern-lab/uikit-workshop": "^5.10.2", + "@pattern-lab/uikit-workshop": "^5.11.1", "gulp": "3.9.1", "minimist": "^1.2.0", "react": "16.2.0" diff --git a/packages/development-edition-engine-react/patternlab-config.json b/packages/development-edition-engine-react/patternlab-config.json index 23b459f2d..dd4efbd24 100644 --- a/packages/development-edition-engine-react/patternlab-config.json +++ b/packages/development-edition-engine-react/patternlab-config.json @@ -25,16 +25,7 @@ "m": [500, 800], "l": [800, 2600] }, -<<<<<<< HEAD:packages/development-edition-engine-react/patternlab-config.json "logLevel": "info", -======= - "patternExportAll": false, - "patternExportPreserveDirectoryStructure": false, - "patternExportRaw": false, - "patternExportPatternPartials": [], - "patternExportDirectory": "./pattern_exports/", - "cacheBust": true, ->>>>>>> 436dd99e50d808cd14691593b927209f1ecb663e:patternlab-config.json "outputFileSuffixes": { "rendered": ".rendered", "rawTemplate": "", @@ -79,8 +70,12 @@ }, "patternExtension": "mustache", "patternStateCascade": ["inprogress", "inreview", "complete"], + "patternExportAll": false, + "patternExportPreserveDirectoryStructure": false, + "patternExportRaw": false, "patternExportDirectory": "./pattern_exports/", "patternExportPatternPartials": [], + "patternMergeVariantArrays": true, "serverOptions": { "wait": 1000 }, diff --git a/packages/development-edition-engine-twig/CHANGELOG.md b/packages/development-edition-engine-twig/CHANGELOG.md index 85a64768a..e0b2901a8 100644 --- a/packages/development-edition-engine-twig/CHANGELOG.md +++ b/packages/development-edition-engine-twig/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. +## [5.11.1](https://github.com/pattern-lab/patternlab-node/compare/v5.10.2...v5.11.1) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/development-edition-engine-twig + + + + + +# [5.11.0](https://github.com/pattern-lab/patternlab-node/compare/v5.10.2...v5.11.0) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/development-edition-engine-twig + + + + + ## [5.10.2](https://github.com/pattern-lab/patternlab-node/compare/v5.10.1...v5.10.2) (2020-05-24) **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 b3387fc07..614f98cf3 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": "5.10.2", + "version": "5.11.1", "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", @@ -30,11 +30,11 @@ "node": ">=12.12.0" }, "dependencies": { - "@pattern-lab/cli": "^5.10.1", - "@pattern-lab/core": "^5.10.1", + "@pattern-lab/cli": "^5.11.1", + "@pattern-lab/core": "^5.11.1", "@pattern-lab/engine-twig": "^5.10.2", "@pattern-lab/starterkit-twig-demo": "^5.10.1", - "@pattern-lab/uikit-workshop": "^5.10.2" + "@pattern-lab/uikit-workshop": "^5.11.1" }, "workspaces": { "nohoist": [ diff --git a/packages/development-edition-engine-twig/patternlab-config.json b/packages/development-edition-engine-twig/patternlab-config.json index 3c18bd403..55fed5c95 100644 --- a/packages/development-edition-engine-twig/patternlab-config.json +++ b/packages/development-edition-engine-twig/patternlab-config.json @@ -80,6 +80,7 @@ ], "patternExportDirectory": "pattern_exports", "patternExportPatternPartials": [], + "patternMergeVariantArrays": true, "serverOptions": { "wait": 1000 }, diff --git a/packages/docs/CHANGELOG.md b/packages/docs/CHANGELOG.md index 8ff0bd8c5..3d409c881 100644 --- a/packages/docs/CHANGELOG.md +++ b/packages/docs/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. +## [5.11.1](https://github.com/bradfrost/pl-website-eleventy/compare/v5.10.2...v5.11.1) (2020-06-28) + + +### Bug Fixes + +* **docs:** fixed css code for custom patternstates color ([8995241](https://github.com/bradfrost/pl-website-eleventy/commit/89952416162c01d1e3e05221ce58a7755544131c)), closes [#1216](https://github.com/bradfrost/pl-website-eleventy/issues/1216) +* **docs:** headlines styling breaks in edge cases [#1158](https://github.com/bradfrost/pl-website-eleventy/issues/1158) ([d8244a2](https://github.com/bradfrost/pl-website-eleventy/commit/d8244a2d307b0a81d0846491f8c5a12e0ae167a5)) + + + + + +# [5.11.0](https://github.com/bradfrost/pl-website-eleventy/compare/v5.10.2...v5.11.0) (2020-06-28) + + +### Bug Fixes + +* **docs:** fixed css code for custom patternstates color ([8995241](https://github.com/bradfrost/pl-website-eleventy/commit/89952416162c01d1e3e05221ce58a7755544131c)), closes [#1216](https://github.com/bradfrost/pl-website-eleventy/issues/1216) +* **docs:** headlines styling breaks in edge cases [#1158](https://github.com/bradfrost/pl-website-eleventy/issues/1158) ([d8244a2](https://github.com/bradfrost/pl-website-eleventy/commit/d8244a2d307b0a81d0846491f8c5a12e0ae167a5)) + + + + + ## [5.10.1](https://github.com/bradfrost/pl-website-eleventy/compare/v5.10.0...v5.10.1) (2020-05-09) **Note:** Version bump only for package @pattern-lab/website diff --git a/packages/docs/package.json b/packages/docs/package.json index 4e80b4be2..4abbaa287 100755 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -1,6 +1,6 @@ { "name": "@pattern-lab/website", - "version": "5.10.1", + "version": "5.11.1", "description": "The website for patternlab.io", "main": "index.js", "dependencies": { diff --git a/packages/docs/src/docs/advanced-config-options.md b/packages/docs/src/docs/advanced-config-options.md index 01bceac30..e76c3d27a 100644 --- a/packages/docs/src/docs/advanced-config-options.md +++ b/packages/docs/src/docs/advanced-config-options.md @@ -186,6 +186,19 @@ For example, to export the navigation, header, and footer, one might do: **default**: `[]` +### patternMergeVariantArrays + +Used to override the merge behavior of pattern variants. For more information see [The Pseudo-Pattern File Data](docs/using-pseudo-patterns/#heading-the-pseudo-pattern-file data). + +- `true` will merge arrays of the pattern and pseudo-pattern with [lodash merge](https://lodash.com/docs/4.17.15#merge) +- `false` will override arrays from the pattern with pseudo-patterns arrays + +```javascript +"patternMergeVariantArrays": true, +``` + +**default**: `true` | `undefined` + ### serverOptions Sets live-server options. See the [live-server documentation](https://github.com/pattern-lab/live-server#usage-from-node) for more details. @@ -225,7 +238,12 @@ These template and page patterns would still be accessible via navigation. ### theme -Sets the theme options for the styleguide. There are three options: 'color', 'density', and 'layout'. +Sets the theme options for the styleguide. There are five options: +* `"color"` +* `"density"` +* `"layout"` +* `"noViewAll"` (optional) +* `"logo"` (optional) Available values are: @@ -233,11 +251,25 @@ Available values are: "theme" : { "color" : "dark" | "light", "density" : "compact" | "cozy" | "comfortable", - "layout" : "horizontal" | "vertical" + "layout" : "horizontal" | "vertical", + "noViewAll" : true | false, + "logo": { + "text": "Pattern Lab", + "altText": "Pattern Lab Logo", + "url": "/", + "srcLight": "styleguide/images/pattern-lab-logo--on-light.svg", + "srcDark": "styleguide/images/pattern-lab-logo--on-dark.svg", + "width": "187", + "height": "185" + } } ``` -See the [initial release notes](https://github.com/pattern-lab/styleguidekit-assets-default/releases/tag/v4.0.0-alpha.2) for the theme feature for example output. +See the [initial release notes](https://github.com/pattern-lab/styleguidekit-assets-default/releases/tag/v4.0.0-alpha.2) for the theme feature for example output on `"color"`, `'density"` and `"layout"`. + +`"noViewAll"` provides the possibility to hide the "View All" pages and links within the navigation. + +And `"logo"` lets you finetune the different aspects of the logo displayed on the left top corner of the styleguide. **default**: @@ -275,8 +307,7 @@ Introduced in Pattern Lab Node v3, UIKits are a new term in the Pattern Lab [Eco - `enabled`: quickly turn on or off the building of this UIKit - `excludedPatternStates`: tell Pattern Lab not to include patterns with these states in this UIKit's output -- `excludedPatternTags`: tell Pattern Lab not to include patterns with these tags in this UIKit's output - - [currently not supported](https://github.com/pattern-lab/patternlab-node/issues/844) +- `excludedTags`: tell Pattern Lab not to include patterns with these tags in this UIKit's output Important details: diff --git a/packages/docs/src/docs/advanced-ecosystem-overview.md b/packages/docs/src/docs/advanced-ecosystem-overview.md index 1d3c2a0c4..0c230ec17 100644 --- a/packages/docs/src/docs/advanced-ecosystem-overview.md +++ b/packages/docs/src/docs/advanced-ecosystem-overview.md @@ -49,6 +49,17 @@ PatternEngines are the templating engines that are responsible for parsing patte Plugins allow developers to extend Pattern Lab Core and other parts of the ecosystem. Pattern Lab’s architecture allows developers to modify data at different stages, add their own commands or pattern rules, or change the front-end to modify and extend Pattern Lab’s capabilities. +#### Node Plugins + +Currently the following plugins are provided by the community: +* [plugin-tab](https://github.com/pattern-lab/patternlab-node/tree/master/packages/plugin-tab): Displaying sibling files next to a pattern in the filesystem as further code tab panels +* [plugin-node-minify-html](https://github.com/JosefBredereck/plugin-node-minify-html): Patternlab Node HTML tabs panel compressor/minifier/beautifier +* [patternlab-plugin-node-wrappable](https://github.com/networkteam/patternlab-plugin-node-wrappable): Configuration to wrap patterns styleguide HTML output (e.g. for inverse backgrounds) +* [plugin-node-patternlab-inline-assets](https://github.com/michaelworm/plugin-node-patternlab-inline-assets): Consume and inline assets (out of the file system) into your templates before compiling +* [plugin-node-uiextension](https://github.com/bmuenzenmeyer/plugin-node-uiextension): Provide a simple Patternlab chrome customization path versus forking the `StyleguideKit` + +Please feel to contribute and [add your plugin to this list as well](https://github.com/pattern-lab/patternlab-node/edit/dev/packages/docs/src/docs/advanced-ecosystem-overview.md). + ### Other Types of Components The flexibility of the Pattern Lab ecosystem means that teams can develop tools on top of Pattern Lab that meet _their_ needs. Want to standardize and push entire data sets to teams? Want to develop with granular collections of components instead of entire StarterKits? Only want to customize the CSS for the default StyleguideKit and distribute it as part of your projects? All of this and more is possible. We feel we're just scratching the surface on what it means to develop projects and design systems with a tool like Pattern Lab diff --git a/packages/docs/src/docs/pattern-documenting.md b/packages/docs/src/docs/pattern-documenting.md index d26d6d75e..8cdcdb465 100644 --- a/packages/docs/src/docs/pattern-documenting.md +++ b/packages/docs/src/docs/pattern-documenting.md @@ -18,7 +18,14 @@ title: Title for my pattern This is a *Markdown* description of my pattern. ``` -The `title` attribute is used in Pattern Lab's navigation as well as in the styleguide views. The `description` is used in the styleguide views. +Attributes overview: +* The `title` attribute is used in Pattern Lab's navigation as well as in the styleguide views. Format: `string` +* Pattern `tags` has to be an array, like `tags: [new, relaunch, dev]` +* [Pattern `states`](/docs/using-pattern-states/) are defined like `state: incomplete` and [provide a simple visual indication](/docs/using-pattern-states/) + +Both `tags` and `states` could be used for [not including patterns in a UIKit specific build](/docs/editing-the-configuration-options/#heading-uikits). + +The `description` is used in the styleguide views. Pattern documentation needs to have a `.md` file extension and match the name of the pattern it's documenting. For example, to document the following pattern: @@ -46,5 +53,5 @@ We'd name our documentation file: ## Adding More Attributes to the Front Matter -A future update of Pattern Lab will support more front matter attributes including: state, order, hidden, links and tags. +A future update of Pattern Lab will support more front matter attributes including: excludeFromStyleguide, order, hidden and links. It will also support adding custom attributes that could be utilized by plugins. For example, GitHub issues related to patterns. diff --git a/packages/docs/src/docs/pattern-pseudo-patterns.md b/packages/docs/src/docs/pattern-pseudo-patterns.md index 6018113a8..01597ab4c 100644 --- a/packages/docs/src/docs/pattern-pseudo-patterns.md +++ b/packages/docs/src/docs/pattern-pseudo-patterns.md @@ -19,6 +19,14 @@ Pseudo-patterns are similar to [pattern-specific JSON files](/docs/creating-patt The tilde (`~`) and `.json` file extension are the hints that Pattern Lab uses to determine that this is a pseudo-pattern. The `patternName` tells Pattern Lab which existing pattern it should use when rendering the pseudo-pattern. The JSON file itself works exactly like the [pattern-specific JSON file](/docs/creating-pattern-specific-values/). It has the added benefit that the pseudo-pattern will also inherit any values from the existing pattern's pattern-specific JSON file. +## The Pseudo-Pattern File Data + +By default, arrays in pseudo-pattern data will be merged with the base pattern's array data on an index basis, effectively creating an array having as many entries as the larger of the two, with the indices declared in the variant replacing the first n of the parent, while keeping the rest. Declaring a larger array in the variant results in only using the variant array. To override this behavior globally you can set the parameter `patternMergeVariantArrays` in your `patternlab-config.json` to `false`. Arrays will then be overwritten and you will only have the variant's array data left. + +```json +"patternMergeVariantArrays": false +``` + From a navigation and naming perspective `patternName` and `pseudoPatternName` will be combined. ## Adding Pseudo-Patterns to Your Project diff --git a/packages/docs/src/docs/pattern-states.md b/packages/docs/src/docs/pattern-states.md index ec0aee7f6..65e37d026 100644 --- a/packages/docs/src/docs/pattern-states.md +++ b/packages/docs/src/docs/pattern-states.md @@ -45,8 +45,8 @@ The three default states included with Pattern Lab might not be enough for every You can use the following as your CSS template for new pattern states: ```css -{% raw %}.newpatternstate:before { - color: #B10DC9 !important; +{% raw %}.pl-c-pattern-state--newpatternstate { + background-color: #B10DC9; }{% endraw %} ``` diff --git a/packages/docs/src/js/primary-nav.js b/packages/docs/src/js/primary-nav.js index 45b8a7d91..867ca265a 100644 --- a/packages/docs/src/js/primary-nav.js +++ b/packages/docs/src/js/primary-nav.js @@ -9,75 +9,77 @@ * 4) If the nav dropdown trigger parent does not have an active class, add it. */ (function() { - var navDropdownListItem = document.querySelector('.js-nav-dropdown'); - var navLink = document.querySelectorAll('.js-nav-dropdown-trigger'); /* 1 */ + var navDropdownListItem = document.querySelector('.js-nav-dropdown'); + var navLink = document.querySelectorAll('.js-nav-dropdown-trigger'); /* 1 */ - for (i = 0; i < navLink.length; i++) { - /* 1 */ + for (i = 0; i < navLink.length; i++) { + /* 1 */ - navLink[i].addEventListener('click', function(event) { - /* 2 */ - event.preventDefault(); - var navLinkParent = this.parentNode; /* 2 */ + navLink[i].addEventListener('click', function(event) { + /* 2 */ + event.preventDefault(); + var navLinkParent = this.parentNode; /* 2 */ - if (navLinkParent.classList.contains('is-active')) { - /* 3 */ - navLinkParent.classList.remove('is-active'); - - this.setAttribute("aria-expanded", "false"); - } else { - /* 4 */ - navLinkParent.classList.add('is-active'); - - this.setAttribute("aria-expanded", "true"); - } - - }); - } + if (navLinkParent.classList.contains('is-active')) { + /* 3 */ + navLinkParent.classList.remove('is-active'); - /** - * Expose docs dropdown if on a docs page - */ - if (window.location.href.indexOf('docs') > -1) { - navDropdownListItem.classList.add('is-active'); - } + this.setAttribute('aria-expanded', 'false'); + } else { + /* 4 */ + navLinkParent.classList.add('is-active'); - var pathName = location.pathname; + this.setAttribute('aria-expanded', 'true'); + } + }); + } - var navLinks = document.querySelectorAll('.c-tree-nav a'); + /** + * Expose docs dropdown if on a docs page + */ + if (window.location.href.indexOf('docs') > -1) { + navDropdownListItem.classList.add('is-active'); + } - for (i = 0; i < navLinks.length; i++) { - var subnavLink = navLinks[i].getAttribute('href'); - if (subnavLink == pathName) { - navLinks[i].classList.add('is-active'); - } - } + var pathName = location.pathname; - /** - * Toggles active class on the primary nav panel - * 1) Select all nav triggers and cycle through them - * 2) On click, find the nav panel within the header - * 3) If the navPanel already has active class, remove it on click. - * 4) If the navPanel does not have an active class, add it on click. - */ - var navToggle = document.querySelectorAll('.js-nav-trigger'); /* 1 */ + var navLinks = document.querySelectorAll('.c-tree-nav a'); - for (i = 0; i < navToggle.length; i++) { - /* 1 */ + for (i = 0; i < navLinks.length; i++) { + var subnavLink = navLinks[i].getAttribute('href'); + if (subnavLink == pathName) { + navLinks[i].classList.add('is-active'); + } + } - navToggle[i].addEventListener('click', function(event) { - /* 2 */ - event.preventDefault(); - var navToggleParent = this.parentNode; /* 2 */ - var navPanel = navToggleParent.querySelector('.js-nav-panel'); /* 2 */ + /** + * Toggles active class on the primary nav panel + * 1) Select all nav triggers and cycle through them + * 2) On click, find the nav panel within the header + * 3) If the navPanel already has active class, remove it on click, as well as the aria-expanded attributes value. + * 4) If the navPanel does not have an active class, add it on click, as well as the aria-expanded attributes value. + */ + var navToggle = document.querySelectorAll('.js-nav-trigger'); /* 1 */ - if (navPanel.classList.contains('is-active')) { - /* 3 */ - navPanel.classList.remove('is-active'); - } else { - /* 4 */ - navPanel.classList.add('is-active'); - } - }); - } + for (i = 0; i < navToggle.length; i++) { + /* 1 */ + + navToggle[i].addEventListener('click', function(event) { + /* 2 */ + event.preventDefault(); + var navToggleElement = this; + var navToggleParent = navToggleElement.parentNode; /* 2 */ + var navPanel = navToggleParent.querySelector('.js-nav-panel'); /* 2 */ + + if (navPanel.classList.contains('is-active')) { + /* 3 */ + navPanel.classList.remove('is-active'); + navToggleElement.setAttribute('aria-expanded', 'false'); + } else { + /* 4 */ + navPanel.classList.add('is-active'); + navToggleElement.setAttribute('aria-expanded', 'true'); + } + }); + } })(); diff --git a/packages/docs/src/scss/abstracts/_mixins.scss b/packages/docs/src/scss/abstracts/_mixins.scss index a2425f6df..4cd55aa8c 100644 --- a/packages/docs/src/scss/abstracts/_mixins.scss +++ b/packages/docs/src/scss/abstracts/_mixins.scss @@ -91,6 +91,9 @@ z-index: 0; content: attr(data-text); + // Mitigating the positioning by 4px from the left to not have the words break incorrectly (see #GH-1158) + margin-right: -4px; + background-image: radial-gradient( $color-brand-purple 0%, $color-brand-purple 60%, diff --git a/packages/docs/src/scss/base/_text.scss b/packages/docs/src/scss/base/_text.scss index bbea0b569..a2c176e66 100644 --- a/packages/docs/src/scss/base/_text.scss +++ b/packages/docs/src/scss/base/_text.scss @@ -71,6 +71,7 @@ pre { border: 0; background: transparent; color: inherit; + white-space: pre-wrap; } } diff --git a/packages/docs/src/scss/components/_header.scss b/packages/docs/src/scss/components/_header.scss index bc5255b35..0173fbe32 100644 --- a/packages/docs/src/scss/components/_header.scss +++ b/packages/docs/src/scss/components/_header.scss @@ -47,6 +47,18 @@ .c-header__nav-btn { margin-left: auto; + // Pseudo / breakout element that enables clicking/tabbing outside of the menu to close it + &[aria-expanded="true"]::after { + position: fixed; + top: 0; + left: 0; + + content: ""; + + width: 100vw; + height: 100vh; + } + @media all and (min-width: $bp-large) { display: none; } diff --git a/packages/edition-node-gulp/CHANGELOG.md b/packages/edition-node-gulp/CHANGELOG.md index 84e8c85a3..92bee5ec1 100644 --- a/packages/edition-node-gulp/CHANGELOG.md +++ b/packages/edition-node-gulp/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. +## [5.11.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/edition-node-gulp/compare/v5.10.2...v5.11.1) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/edition-node-gulp + + + + + +# [5.11.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/edition-node-gulp/compare/v5.10.2...v5.11.0) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/edition-node-gulp + + + + + ## [5.10.2](https://github.com/pattern-lab/patternlab-node/tree/master/packages/edition-node-gulp/compare/v5.10.1...v5.10.2) (2020-05-24) **Note:** Version bump only for package @pattern-lab/edition-node-gulp diff --git a/packages/edition-node-gulp/README.md b/packages/edition-node-gulp/README.md index a6426c8ff..5218bf041 100644 --- a/packages/edition-node-gulp/README.md +++ b/packages/edition-node-gulp/README.md @@ -5,7 +5,7 @@ # Pattern Lab Node - Gulp Edition -The Gulp wrapper around [Pattern Lab Node Core](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core)), the default PatternEngine, and supporting frontend assets. +The Gulp wrapper around [Pattern Lab Node Core](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core), the default PatternEngine, and supporting frontend assets. [Online Demo of Pattern Lab Output](https://demo.patternlab.io/) diff --git a/packages/edition-node-gulp/package.json b/packages/edition-node-gulp/package.json index 1f465f1fd..f51b004a1 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": "5.10.2", + "version": "5.11.1", "main": "gulpfile.js", "dependencies": { - "@pattern-lab/cli": "^5.10.1", - "@pattern-lab/core": "^5.10.1", + "@pattern-lab/cli": "^5.11.1", + "@pattern-lab/core": "^5.11.1", "@pattern-lab/engine-mustache": "^5.10.1", - "@pattern-lab/uikit-workshop": "^5.10.2", + "@pattern-lab/uikit-workshop": "^5.11.1", "gulp": "3.9.1", "minimist": "1.2.0" }, diff --git a/packages/edition-node-gulp/patternlab-config.json b/packages/edition-node-gulp/patternlab-config.json index 20625a44f..e24473a02 100644 --- a/packages/edition-node-gulp/patternlab-config.json +++ b/packages/edition-node-gulp/patternlab-config.json @@ -75,6 +75,7 @@ "patternExportPatternPartials": [], "patternExportPreserveDirectoryStructure": true, "patternExportRaw": false, + "patternMergeVariantArrays": true, "serverOptions": { "wait": 1000 }, diff --git a/packages/edition-node/CHANGELOG.md b/packages/edition-node/CHANGELOG.md index f2f44db18..d38d68587 100644 --- a/packages/edition-node/CHANGELOG.md +++ b/packages/edition-node/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. +## [5.11.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/edition-node/compare/v5.10.2...v5.11.1) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/edition-node + + + + + +# [5.11.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/edition-node/compare/v5.10.2...v5.11.0) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/edition-node + + + + + ## [5.10.2](https://github.com/pattern-lab/patternlab-node/tree/master/packages/edition-node/compare/v5.10.1...v5.10.2) (2020-05-24) **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 87db89795..299687b62 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": "5.10.2", + "version": "5.11.1", "main": "patternlab-config.json", "dependencies": { - "@pattern-lab/cli": "^5.10.1", - "@pattern-lab/core": "^5.10.1", + "@pattern-lab/cli": "^5.11.1", + "@pattern-lab/core": "^5.11.1", "@pattern-lab/engine-handlebars": "^5.10.1", - "@pattern-lab/uikit-workshop": "^5.10.2" + "@pattern-lab/uikit-workshop": "^5.11.1" }, "keywords": [ "Pattern Lab", diff --git a/packages/edition-node/patternlab-config.json b/packages/edition-node/patternlab-config.json index e5cef6811..3112f5ac0 100644 --- a/packages/edition-node/patternlab-config.json +++ b/packages/edition-node/patternlab-config.json @@ -75,6 +75,7 @@ "patternExportPatternPartials": [], "patternExportPreserveDirectoryStructure": true, "patternExportRaw": false, + "patternMergeVariantArrays": true, "serverOptions": { "wait": 1000 }, diff --git a/packages/edition-twig/CHANGELOG.md b/packages/edition-twig/CHANGELOG.md index 75db0e017..53f4baae7 100644 --- a/packages/edition-twig/CHANGELOG.md +++ b/packages/edition-twig/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. +## [5.11.1](https://github.com/pattern-lab/patternlab-node/compare/v5.10.2...v5.11.1) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/edition-twig + + + + + +# [5.11.0](https://github.com/pattern-lab/patternlab-node/compare/v5.10.2...v5.11.0) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/edition-twig + + + + + ## [5.10.2](https://github.com/pattern-lab/patternlab-node/compare/v5.10.1...v5.10.2) (2020-05-24) **Note:** Version bump only for package @pattern-lab/edition-twig diff --git a/packages/edition-twig/package.json b/packages/edition-twig/package.json index 7c66a015a..ca2910b06 100644 --- a/packages/edition-twig/package.json +++ b/packages/edition-twig/package.json @@ -1,6 +1,6 @@ { "name": "@pattern-lab/edition-twig", - "version": "5.10.2", + "version": "5.11.1", "description": "Pattern Lab node with Twig PHP Engine", "author": { "name": "Evan Lovely", @@ -23,10 +23,10 @@ "dev": "node ./node_modules/@pattern-lab/uikit-workshop/build-tools.js" }, "dependencies": { - "@pattern-lab/cli": "^5.10.1", - "@pattern-lab/core": "^5.10.1", - "@pattern-lab/engine-twig-php": "^5.10.1", - "@pattern-lab/uikit-workshop": "^5.10.2" + "@pattern-lab/cli": "^5.11.1", + "@pattern-lab/core": "^5.11.1", + "@pattern-lab/engine-twig-php": "^5.11.1", + "@pattern-lab/uikit-workshop": "^5.11.1" }, "engines": { "node": ">=12.12.0" diff --git a/packages/edition-twig/patternlab-config.json b/packages/edition-twig/patternlab-config.json index e9652bde5..ee6acd691 100644 --- a/packages/edition-twig/patternlab-config.json +++ b/packages/edition-twig/patternlab-config.json @@ -139,6 +139,7 @@ "patternExportPatternPartials": [], "patternExportPreserveDirectoryStructure": true, "patternExportRaw": false, + "patternMergeVariantArrays": true, "serverOptions": { "wait": 1000 }, diff --git a/packages/engine-twig-php/CHANGELOG.md b/packages/engine-twig-php/CHANGELOG.md index d6ce46aff..0df20269e 100644 --- a/packages/engine-twig-php/CHANGELOG.md +++ b/packages/engine-twig-php/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. +## [5.11.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/engine-twig-php/compare/v5.10.2...v5.11.1) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/engine-twig-php + + + + + +# [5.11.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/engine-twig-php/compare/v5.10.2...v5.11.0) (2020-06-28) + +**Note:** Version bump only for package @pattern-lab/engine-twig-php + + + + + ## [5.10.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/engine-twig-php/compare/v5.10.0...v5.10.1) (2020-05-09) **Note:** Version bump only for package @pattern-lab/engine-twig-php diff --git a/packages/engine-twig-php/package.json b/packages/engine-twig-php/package.json index f3b2b1166..1383d28e8 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": "5.10.1", + "version": "5.11.1", "main": "lib/engine_twig_php.js", "dependencies": { "@basalt/twig-renderer": "0.13.1", - "@pattern-lab/core": "^5.10.1", + "@pattern-lab/core": "^5.11.1", "chalk": "^4.0.0", "fs-extra": "0.30.0" }, diff --git a/packages/starterkit-handlebars-demo/CHANGELOG.md b/packages/starterkit-handlebars-demo/CHANGELOG.md index cc7b9ed6b..a33ae9237 100644 --- a/packages/starterkit-handlebars-demo/CHANGELOG.md +++ b/packages/starterkit-handlebars-demo/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. +## [5.11.1](https://github.com/pattern-lab/patternlab-node/compare/v5.10.2...v5.11.1) (2020-06-28) + + +### Bug Fixes + +* **docs:** corrected a URL ([26ede14](https://github.com/pattern-lab/patternlab-node/commit/26ede14a6eafe8649cbc6b0076d84f1d323c3e20)) + + + + + +# [5.11.0](https://github.com/pattern-lab/patternlab-node/compare/v5.10.2...v5.11.0) (2020-06-28) + + +### Bug Fixes + +* **docs:** corrected a URL ([26ede14](https://github.com/pattern-lab/patternlab-node/commit/26ede14a6eafe8649cbc6b0076d84f1d323c3e20)) + + + + + ## [5.7.2](https://github.com/pattern-lab/patternlab-node/compare/v5.7.1...v5.7.2) (2020-03-24) **Note:** Version bump only for package @pattern-lab/starterkit-handlebars-demo diff --git a/packages/starterkit-handlebars-demo/package.json b/packages/starterkit-handlebars-demo/package.json index e3ffa26dd..4cca92f74 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": "5.7.2", + "version": "5.11.1", "description": "Pattern Lab's Demo StarterKit for Handlebars.", "main": "README.md", "repository": { @@ -18,7 +18,7 @@ "bugs": { "url": "https://github.com/pattern-lab/patternlab-node/issues" }, - "homepage": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/starterkit-handebars-demo", + "homepage": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/starterkit-handlebars-demo", "publishConfig": { "access": "public" }, diff --git a/packages/uikit-workshop/CHANGELOG.md b/packages/uikit-workshop/CHANGELOG.md index 732e76680..c03b27e04 100644 --- a/packages/uikit-workshop/CHANGELOG.md +++ b/packages/uikit-workshop/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [5.11.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/compare/v5.10.2...v5.11.1) (2020-06-28) + + +### Bug Fixes + +* update Viewport Size toggle to better handle async-loaded ishControl data + prevent rendering errors ([b937706](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/b93770669c6f723128ba68e522c9398cc1d2d70c)) +* update Webpack config to point to the patched version of preact-dom ([d3660b7](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/d3660b78bc0a74c52ed85b69b023c612b789c318)) +* visually hide NavToggle icon text; fix for visual regression after merging down https://github.com/pattern-lab/patternlab-node/pull/1227 ([3a2ad9f](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/3a2ad9f12d83b6d21dcca62e89d944a6a46342f6)) +* **patternflyouts:** preventing horizontal scrollbar in pattern flyouts in Edge 18 [#1124](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/issues/1124) ([63300bc](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/63300bc00ee797e38bfdb73fdc7694c188a423dc)) +* **patternstate:** added css color for pattern state "inprogress" [#1216](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/issues/1216) ([856bcda](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/856bcda150239928bb5e8719246b97e9fa366468)) +* **resetcss:** selector in uikit-workshop [#1109](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/issues/1109) ([6893b7c](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/6893b7cb5478309d4fdab0121edba3921718bd69)) + + + + + +# [5.11.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/compare/v5.10.2...v5.11.0) (2020-06-28) + + +### Bug Fixes + +* update Viewport Size toggle to better handle async-loaded ishControl data + prevent rendering errors ([b937706](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/b93770669c6f723128ba68e522c9398cc1d2d70c)) +* update Webpack config to point to the patched version of preact-dom ([d3660b7](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/d3660b78bc0a74c52ed85b69b023c612b789c318)) +* visually hide NavToggle icon text; fix for visual regression after merging down https://github.com/pattern-lab/patternlab-node/pull/1227 ([3a2ad9f](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/3a2ad9f12d83b6d21dcca62e89d944a6a46342f6)) +* **patternflyouts:** preventing horizontal scrollbar in pattern flyouts in Edge 18 [#1124](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/issues/1124) ([63300bc](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/63300bc00ee797e38bfdb73fdc7694c188a423dc)) +* **patternstate:** added css color for pattern state "inprogress" [#1216](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/issues/1216) ([856bcda](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/856bcda150239928bb5e8719246b97e9fa366468)) +* **resetcss:** selector in uikit-workshop [#1109](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/issues/1109) ([6893b7c](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/6893b7cb5478309d4fdab0121edba3921718bd69)) + + + + + ## [5.10.2](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/compare/v5.10.1...v5.10.2) (2020-05-24) diff --git a/packages/uikit-workshop/package.json b/packages/uikit-workshop/package.json index a3b76d642..5fff4430a 100644 --- a/packages/uikit-workshop/package.json +++ b/packages/uikit-workshop/package.json @@ -1,6 +1,6 @@ { "name": "@pattern-lab/uikit-workshop", - "version": "5.10.2", + "version": "5.11.1", "description": "Front-end assets and templates for the default Pattern Lab workshop view", "main": "gulpfile.js", "scripts": { @@ -32,7 +32,7 @@ "repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop", "bugs": "https://github.com/pattern-lab/patternlab-node/issues", "devDependencies": { - "@pattern-lab/core": "^5.10.1", + "@pattern-lab/core": "^5.11.1", "@pattern-lab/engine-handlebars": "^5.10.1", "@pattern-lab/engine-mustache": "^5.10.1", "better-opn": "^1.0.0", diff --git a/packages/uikit-workshop/src/sass/scss/01-abstracts/_variables.scss b/packages/uikit-workshop/src/sass/scss/01-abstracts/_variables.scss index e0028f563..7e6015247 100644 --- a/packages/uikit-workshop/src/sass/scss/01-abstracts/_variables.scss +++ b/packages/uikit-workshop/src/sass/scss/01-abstracts/_variables.scss @@ -24,6 +24,7 @@ $pl-color-trans-white-25: rgba(255, 255, 255, 0.25); $pl-color-state-info: #02a4d5; $pl-color-state-complete: #03790f; $pl-color-state-inreview: #c7a118; +$pl-color-state-inprogress: #b00b02; $pl-color-state-deprecated: #b00b02; // Font Family diff --git a/packages/uikit-workshop/src/sass/scss/02-base/_reset.scss b/packages/uikit-workshop/src/sass/scss/02-base/_reset.scss index 735a18995..ea44b6fd2 100644 --- a/packages/uikit-workshop/src/sass/scss/02-base/_reset.scss +++ b/packages/uikit-workshop/src/sass/scss/02-base/_reset.scss @@ -16,7 +16,7 @@ box-sizing: border-box; } -button { +button[class|="pl-c"] { font-size: inherit; background-color: transparent; } diff --git a/packages/uikit-workshop/src/sass/scss/04-components/_pattern-states.scss b/packages/uikit-workshop/src/sass/scss/04-components/_pattern-states.scss index 103fcf0a0..1a749e28f 100644 --- a/packages/uikit-workshop/src/sass/scss/04-components/_pattern-states.scss +++ b/packages/uikit-workshop/src/sass/scss/04-components/_pattern-states.scss @@ -22,6 +22,10 @@ background-color: $pl-color-state-inreview; } + &--inprogress { + background-color: $pl-color-state-inprogress; + } + &--deprecated { background-color: $pl-color-state-deprecated; } diff --git a/packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.scss b/packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.scss index cdcd5ba17..edafb1de5 100644 --- a/packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.scss +++ b/packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.scss @@ -586,7 +586,7 @@ pl-nav { opacity: 1; .pl-c-body--theme-horizontal & { - overflow: auto; + overflow-y: auto; } @media all and (min-width: $pl-bp-med) { diff --git a/packages/uikit-workshop/src/scripts/components/pl-nav/src/NavList.js b/packages/uikit-workshop/src/scripts/components/pl-nav/src/NavList.js index 0f12980b9..dcd11156f 100644 --- a/packages/uikit-workshop/src/scripts/components/pl-nav/src/NavList.js +++ b/packages/uikit-workshop/src/scripts/components/pl-nav/src/NavList.js @@ -36,7 +36,7 @@ export const NavList = props => { aria-controls={category} onClick={elem.toggleSpecialNavPanel} > - {category} + Expand / Collapse {category} Panel )} diff --git a/packages/uikit-workshop/src/scripts/components/pl-nav/src/NavToggle.js b/packages/uikit-workshop/src/scripts/components/pl-nav/src/NavToggle.js index cf238ee1a..f879e00f4 100644 --- a/packages/uikit-workshop/src/scripts/components/pl-nav/src/NavToggle.js +++ b/packages/uikit-workshop/src/scripts/components/pl-nav/src/NavToggle.js @@ -7,7 +7,7 @@ export const NavToggle = props => { role="tab" {...props} > - {props.children} + {props.children} - {!this.ishControlsHide.s && ( + {!this.ishControlsHide?.s && (
    • )} - {!this.ishControlsHide.m && ( + {!this.ishControlsHide?.m && (
    • )} - {!this.ishControlsHide.l && ( + {!this.ishControlsHide?.l && (
    • )} - {!this.ishControlsHide.full && ( + {!this.ishControlsHide?.full && (
    • )} - {!this.ishControlsHide.random && ( + {!this.ishControlsHide?.random && (
    • )} - {!this.ishControlsHide.disco && ( + {!this.ishControlsHide?.disco && (
    • )} - {!this.ishControlsHide.hay && ( + {!this.ishControlsHide?.hay && (
  • = 8" +"@octokit/types@^5.0.0": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.0.1.tgz#5459e9a5e9df8565dcc62c17a34491904d71971e" + integrity sha512-GorvORVwp244fGKEt3cgt/P+M0MGy4xEDbckw+K5ojEezxyMDgCaYPKVct+/eWQfZXOT7uq0xRpmrl/+hliabA== + dependencies: + "@types/node" ">= 8" + "@pattern-lab/starterkit-mustache-base@3.0.3": version "3.0.3" resolved "https://registry.yarnpkg.com/@pattern-lab/starterkit-mustache-base/-/starterkit-mustache-base-3.0.3.tgz#8ce9bc8e0d2254ee970a09c4bdc76d4f6131c91d" @@ -3132,22 +3207,22 @@ auto-bind@^2.0.0: dependencies: "@types/react" "^16.8.12" -auto@^9.31.1: - version "9.31.1" - resolved "https://registry.yarnpkg.com/auto/-/auto-9.31.1.tgz#1baeece6fc6bcd7e8443070440b2acb468f7df0e" - integrity sha512-fEvP9Wj1+UvDvWSk1AsLGOlrP/HJtVXWPSYm9WNDgLNWSqrGtcw/aa5JdrG2XZuQYimA4Qs7M2K/Gz+Zpy0Hbg== +auto@^9.40.5: + version "9.40.5" + resolved "https://registry.yarnpkg.com/auto/-/auto-9.40.5.tgz#0492ec2bf630c4c6bb83c1cc07356ef8945c6544" + integrity sha512-0KVhgcdb8l7B9I49qixgKwYIeWh7A2MASQYidQsleVJHrdu7N3NwH6XFGVNhRDs7HTEY6AGCMu9c2WIfHiOm1A== dependencies: - "@auto-it/core" "^9.31.1" - "@auto-it/npm" "^9.31.1" - "@auto-it/released" "^9.31.1" + "@auto-it/core" "^9.40.5" + "@auto-it/npm" "^9.40.5" + "@auto-it/released" "^9.40.5" await-to-js "^2.1.1" chalk "^4.0.0" - command-line-application "^0.9.3" + command-line-application "^0.10.1" endent "^2.0.1" module-alias "^2.2.2" signale "^1.4.0" terminal-link "^2.1.1" - tslib "1.11.1" + tslib "2.0.0" autoprefixer@^9.6.5: version "9.7.1" @@ -4755,10 +4830,10 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -command-line-application@^0.9.3: - version "0.9.6" - resolved "https://registry.yarnpkg.com/command-line-application/-/command-line-application-0.9.6.tgz#03da3db29a0dbee1af601f03198a2f2425d67803" - integrity sha512-7wc7YX7s/hqZWKp4r37IBlW/Bhh92HWeQW2VV++Mt9x35AKFntz9f7A94Zz+AsImHZmRGHd8iNW5m0jUd4GQpg== +command-line-application@^0.10.1: + version "0.10.1" + resolved "https://registry.yarnpkg.com/command-line-application/-/command-line-application-0.10.1.tgz#9ee0db7e41fe69f532eef0747e9ae958c0d348ae" + integrity sha512-PWZ4nRkz09MbBRocqEe/Fil3RjTaMNqw0didl1n/i3flDcw/vecVfvsw3r+ZHhGs4BOuW7sk3cEYSdfM3Wv5/Q== dependencies: "@types/command-line-args" "^5.0.0" "@types/command-line-usage" "^5.0.1" @@ -17490,10 +17565,10 @@ tslib@1.10.0, tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== -tslib@1.11.1: - version "1.11.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" - integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== +tslib@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3" + integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g== tslib@^1.11.1: version "1.11.2"