Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Maximilian Franzke committed Jun 11, 2020
2 parents 3238ac7 + 8afd3f3 commit 7f4ba39
Show file tree
Hide file tree
Showing 19 changed files with 100 additions and 21 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [5.10.2](https://github.com/pattern-lab/patternlab-node/compare/v5.10.1...v5.10.2) (2020-05-24)


### Bug Fixes

* update link to new PL docs homepage ([831b467](https://github.com/pattern-lab/patternlab-node/commit/831b467c57b9259c32ce3d3ddf366fe1867a48a9))





## [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 pl-node
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "3.11.0",
"version": "5.10.1",
"version": "5.10.2",
"packages": [
"packages/*"
],
Expand Down
8 changes: 8 additions & 0 deletions packages/development-edition-engine-handlebars/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

## [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





## [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 @pattern-lab/development-edition-engine-handlebars
Expand Down
4 changes: 2 additions & 2 deletions packages/development-edition-engine-handlebars/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@pattern-lab/development-edition-engine-handlebars",
"private": true,
"version": "5.10.1",
"version": "5.10.2",
"description": "The tree of components we use to test, develop and validate the Handlebars engine",
"scripts": {
"pl:build": "patternlab build --config ./patternlab-config.json",
Expand Down Expand Up @@ -34,6 +34,6 @@
"@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.1"
"@pattern-lab/uikit-workshop": "^5.10.2"
}
}
8 changes: 8 additions & 0 deletions packages/development-edition-engine-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

## [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





## [5.10.1](https://github.com/pattern-lab/edition-node-gulp/compare/v5.10.0...v5.10.1) (2020-05-09)

**Note:** Version bump only for package @pattern-lab/engine-react-testing-tree
Expand Down
4 changes: 2 additions & 2 deletions packages/development-edition-engine-react/package.json
Original file line number Diff line number Diff line change
@@ -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.1",
"version": "5.10.2",
"private": true,
"main": "gulpfile.js",
"dependencies": {
"@pattern-lab/core": "^5.10.1",
"@pattern-lab/engine-mustache": "^5.10.1",
"@pattern-lab/engine-react": "^5.10.0",
"@pattern-lab/uikit-workshop": "^5.10.1",
"@pattern-lab/uikit-workshop": "^5.10.2",
"gulp": "3.9.1",
"minimist": "^1.2.0",
"react": "16.2.0"
Expand Down
8 changes: 8 additions & 0 deletions packages/development-edition-engine-twig/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

## [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





## [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 @pattern-lab/development-edition-engine-twig
Expand Down
7 changes: 4 additions & 3 deletions packages/development-edition-engine-twig/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "@pattern-lab/development-edition-engine-twig",
"private": true,
"version": "5.10.1",
"version": "5.10.2",
"description": "The tree of components we use to test, develop and validate the twig engine (not engine-twig-php)",
"scripts": {
"postbootstrap": "patternlab install --starterkits @pattern-lab/starterkit-twig-demo",
"pl:build": "patternlab build --config ./patternlab-config.json",
"pl:debug": "node --inspect-brk=24984 node_modules/.bin/patternlab build --config ./patternlab-config.json",
"pl:help": "patternlab --help",
"pl:install": "patternlab install --config ./patternlab-config.json",
"pl:serve": "patternlab serve --config ./patternlab-config.json",
Expand All @@ -31,9 +32,9 @@
"dependencies": {
"@pattern-lab/cli": "^5.10.1",
"@pattern-lab/core": "^5.10.1",
"@pattern-lab/engine-twig": "^5.10.1",
"@pattern-lab/engine-twig": "^5.10.2",
"@pattern-lab/starterkit-twig-demo": "^5.10.1",
"@pattern-lab/uikit-workshop": "^5.10.1"
"@pattern-lab/uikit-workshop": "^5.10.2"
},
"workspaces": {
"nohoist": [
Expand Down
8 changes: 8 additions & 0 deletions packages/edition-node-gulp/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

## [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





## [5.10.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/edition-node-gulp/compare/v5.10.0...v5.10.1) (2020-05-09)

**Note:** Version bump only for package @pattern-lab/edition-node-gulp
Expand Down
4 changes: 2 additions & 2 deletions packages/edition-node-gulp/package.json
Original file line number Diff line number Diff line change
@@ -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.1",
"version": "5.10.2",
"main": "gulpfile.js",
"dependencies": {
"@pattern-lab/cli": "^5.10.1",
"@pattern-lab/core": "^5.10.1",
"@pattern-lab/engine-mustache": "^5.10.1",
"@pattern-lab/uikit-workshop": "^5.10.1",
"@pattern-lab/uikit-workshop": "^5.10.2",
"gulp": "3.9.1",
"minimist": "1.2.0"
},
Expand Down
8 changes: 8 additions & 0 deletions packages/edition-node/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

## [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





## [5.10.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/edition-node/compare/v5.10.0...v5.10.1) (2020-05-09)

**Note:** Version bump only for package @pattern-lab/edition-node
Expand Down
4 changes: 2 additions & 2 deletions packages/edition-node/package.json
Original file line number Diff line number Diff line change
@@ -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.1",
"version": "5.10.2",
"main": "patternlab-config.json",
"dependencies": {
"@pattern-lab/cli": "^5.10.1",
"@pattern-lab/core": "^5.10.1",
"@pattern-lab/engine-handlebars": "^5.10.1",
"@pattern-lab/uikit-workshop": "^5.10.1"
"@pattern-lab/uikit-workshop": "^5.10.2"
},
"keywords": [
"Pattern Lab",
Expand Down
8 changes: 8 additions & 0 deletions packages/edition-twig/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

## [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





## [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 @pattern-lab/edition-twig
Expand Down
4 changes: 2 additions & 2 deletions packages/edition-twig/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pattern-lab/edition-twig",
"version": "5.10.1",
"version": "5.10.2",
"description": "Pattern Lab node with Twig PHP Engine",
"author": {
"name": "Evan Lovely",
Expand All @@ -26,7 +26,7 @@
"@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.1"
"@pattern-lab/uikit-workshop": "^5.10.2"
},
"engines": {
"node": ">=12.12.0"
Expand Down
8 changes: 8 additions & 0 deletions packages/engine-twig/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

## [5.10.2](https://github.com/pattern-lab/patternlab-node/tree/master/packages/engine-twig/compare/v5.10.1...v5.10.2) (2020-05-24)

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





## [5.10.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/engine-twig/compare/v5.10.0...v5.10.1) (2020-05-09)

**Note:** Version bump only for package @pattern-lab/engine-twig
Expand Down
4 changes: 2 additions & 2 deletions packages/engine-twig/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@pattern-lab/engine-twig",
"description": "The Twig engine for Pattern Lab / Node",
"version": "5.10.1",
"version": "5.10.2",
"main": "lib/engine_twig.js",
"dependencies": {
"fs-extra": "0.30.0",
"twing": "4.0.6"
"twing": "^5.0.1"
},
"keywords": [
"Pattern Lab",
Expand Down
11 changes: 11 additions & 0 deletions packages/uikit-workshop/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [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)


### Bug Fixes

* update link to new PL docs homepage ([831b467](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/831b467c57b9259c32ce3d3ddf366fe1867a48a9))





## [5.10.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/compare/v5.10.0...v5.10.1) (2020-05-09)

**Note:** Version bump only for package @pattern-lab/uikit-workshop
Expand Down
2 changes: 1 addition & 1 deletion packages/uikit-workshop/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pattern-lab/uikit-workshop",
"version": "5.10.1",
"version": "5.10.2",
"description": "Front-end assets and templates for the default Pattern Lab workshop view",
"main": "gulpfile.js",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17524,10 +17524,10 @@ twig-lexer@^0.7.2:
dependencies:
"@types/node" "^12.0.8"

twing@4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/twing/-/twing-4.0.6.tgz#2dd7e9a514b4bb2a67bdaf585895c35f84fdb086"
integrity sha512-aAmMYXAUuNdOebbRlUq2L1PN5Lg9ceZMvVq46xvX6EkSFFiAIqNEaHTHDFchIb+nucFubr89Hs4s90LWlc2Cmw==
twing@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/twing/-/twing-5.0.1.tgz#8bedac6c0f2afce87608f6a8fe2327207da40727"
integrity sha512-oaeOQ8IrJKrxRtC6z+26XqD0B7Wal+52qOvsaJGLIDnvmqlzPT1a9GH4xMOEw40d2EZ6nWUXhYwaroJ4JAQF2w==
dependencies:
"@types/luxon" "^1.4.0"
camelcase "^4.1.0"
Expand Down

0 comments on commit 7f4ba39

Please sign in to comment.