Merge remote-tracking branch 'upstream/dev' into refactor-updated-depencencies-webpack

Author: mfranzke

CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.15.7](https://github.com/pattern-lab/patternlab-node/compare/v5.15.6...v5.15.7) (2021-12-07)
+
+**Note:** Version bump only for package patternlab-node-main
+
+
+
+
+
+## [5.15.6](https://github.com/pattern-lab/patternlab-node/compare/v5.15.5...v5.15.6) (2021-12-07)
+
+**Note:** Version bump only for package patternlab-node-main
+
+
+
+
+
+## [5.15.5](https://github.com/pattern-lab/patternlab-node/compare/v5.15.3...v5.15.5) (2021-12-06)
+
+
+### Bug Fixes
+
+* corrected some github urls ([#1388](https://github.com/pattern-lab/patternlab-node/issues/1388)) ([7f37e9d](https://github.com/pattern-lab/patternlab-node/commit/7f37e9d56b553dc4be53590766c0fc6251458829))
+
+
+### Features
+
+* define initial viewport ([#1386](https://github.com/pattern-lab/patternlab-node/issues/1386)) ([6fa630e](https://github.com/pattern-lab/patternlab-node/commit/6fa630e2353ed68295550e59c31148269f3b7cd0))
+
+
+
+
+
+## [5.15.4](https://github.com/pattern-lab/patternlab-node/compare/v5.15.3...v5.15.4) (2021-12-06)
+
+
+### Bug Fixes
+
+* corrected some github urls ([#1388](https://github.com/pattern-lab/patternlab-node/issues/1388)) ([7f37e9d](https://github.com/pattern-lab/patternlab-node/commit/7f37e9d56b553dc4be53590766c0fc6251458829))
+
+
+### Features
+
+* define initial viewport ([#1386](https://github.com/pattern-lab/patternlab-node/issues/1386)) ([6fa630e](https://github.com/pattern-lab/patternlab-node/commit/6fa630e2353ed68295550e59c31148269f3b7cd0))
+
+
+
+
+
 ## [5.15.3](https://github.com/pattern-lab/patternlab-node/compare/v5.15.2...v5.15.3) (2021-11-21)
 
 

README.md

@@ -16,7 +16,7 @@ If you'd like to see what a front-end project built with Pattern Lab looks like,
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
 [![node (scoped)](https://img.shields.io/node/v/@pattern-lab/core.svg)]()
 [![Join the chat at Gitter](https://badges.gitter.im/pattern-lab/node.svg)](https://gitter.im/pattern-lab/node)
-[![Join the chat at Discord](https://img.shields.io/badge/Chat-Discord-informational.svg)](https://discord.gg/WPPFAaETQC)
+[![Join the chat at Discord](https://img.shields.io/badge/Chat-Discord-informational.svg)](https://discord.gg/UcZrYYE7ht)
 
 Docs @ [![Netlify Status](https://api.netlify.com/api/v1/badges/d454dbde-02c5-4bd4-8393-4ab75e862b03/deploy-status)](https://app.netlify.com/sites/patternlab-docs-preview/deploys)
 

lerna.json

@@ -1,6 +1,6 @@
 {
-  "lerna": "3.11.0",
-  "version": "5.15.3",
+  "lerna": "4.0.0",
+  "version": "5.15.7",
   "packages": [
     "packages/*"
   ],

package.json

@@ -20,7 +20,7 @@
     "eslint-config-prettier": "^6.0.0",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-prettier": "^3.1.0",
-    "lerna": "3.17.0",
+    "lerna": "4.0.0",
     "prettier": "^2.2.1",
     "pretty-quick": "^3.1.0"
   },

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.15.5](https://github.com/pattern-lab/patternlab-node/compare/v5.15.3...v5.15.5) (2021-12-06)
+
+**Note:** Version bump only for package @pattern-lab/cli
+
+
+
+
+
+## [5.15.4](https://github.com/pattern-lab/patternlab-node/compare/v5.15.3...v5.15.4) (2021-12-06)
+
+**Note:** Version bump only for package @pattern-lab/cli
+
+
+
+
+
 ## [5.15.2](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v5.15.1...v5.15.2) (2021-11-03)
 
 **Note:** Version bump only for package @pattern-lab/cli

packages/cli/package.json

@@ -1,17 +1,16 @@
 {
   "name": "@pattern-lab/cli",
   "description": "Command-line interface (CLI) for the @pattern-lab/core.",
-  "version": "5.15.2",
+  "version": "5.15.5",
   "bin": {
     "patternlab": "bin/patternlab.js"
   },
   "author": {
     "name": "Patternlab contributors"
   },
   "dependencies": {
-    "@pattern-lab/core": "^5.15.2",
-    "@pattern-lab/live-server": "^5.15.1",
-    "@pattern-lab/starterkit-mustache-base": "3.0.3",
+    "@pattern-lab/core": "^5.15.5",
+    "@pattern-lab/live-server": "^5.15.5",
     "archiver": "2.1.1",
     "chalk": "4.1.0",
     "commander": "2.15.1",
@@ -24,18 +23,19 @@
     "lodash": "4.17.21",
     "ora": "2.1.0",
     "path-exists": "3.0.0",
-    "sanitize-filename": "1.6.3",
-    "starterkit-mustache-acidtest": "0.0.3",
-    "starterkit-mustache-bootstrap": "0.1.1",
-    "starterkit-mustache-foundation": "0.1.1",
-    "starterkit-mustache-materialdesign": "0.1.2"
+    "sanitize-filename": "1.6.3"
   },
   "devDependencies": {
+    "@pattern-lab/starterkit-mustache-base": "3.0.3",
     "eslint": "4.18.2",
     "eslint-config-prettier": "2.9.0",
     "eslint-plugin-prettier": "2.6.0",
     "prettier": "2.2.1",
     "proxyquire": "2.1.3",
+    "starterkit-mustache-acidtest": "0.0.3",
+    "starterkit-mustache-bootstrap": "0.1.1",
+    "starterkit-mustache-foundation": "0.1.1",
+    "starterkit-mustache-materialdesign": "0.1.2",
     "tap": "14.11.0"
   },
   "files": [