Merge remote-tracking branch 'upstream/dev' into refactor/further-code-optimizations

Author: mfranzke

packages/cli/package.json

@@ -11,7 +11,6 @@
   "dependencies": {
     "@pattern-lab/core": "^5.15.2",
     "@pattern-lab/live-server": "^5.15.1",
-    "@pattern-lab/starterkit-mustache-base": "3.0.3",
     "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": [

packages/docs/.eleventy.js

@@ -33,7 +33,10 @@ module.exports = function (config) {
 	config.addPassthroughCopy('src/js');
 	config.addPassthroughCopy('src/admin/config.yml');
 	config.addPassthroughCopy('src/admin/previews.js');
-	config.addPassthroughCopy('../../node_modules/nunjucks/browser/nunjucks-slim.js');
+	config.addPassthroughCopy({
+		'../../node_modules/nunjucks/browser/nunjucks-slim.js':
+			'node_modules/nunjucks/browser/nunjucks-slim.js',
+	});
 
 	const now = new Date();
 

packages/docs/package.json

@@ -4,9 +4,9 @@
   "description": "The website for patternlab.io",
   "main": "index.js",
   "dependencies": {
-    "@11ty/eleventy": "^0.8.3",
-    "@11ty/eleventy-plugin-rss": "^1.0.6",
-    "@11ty/eleventy-plugin-syntaxhighlight": "^2.0.3",
+    "@11ty/eleventy": "^0.12.1",
+    "@11ty/eleventy-plugin-rss": "^1.1.2",
+    "@11ty/eleventy-plugin-syntaxhighlight": "^3.1.3",
     "@tbranyen/jsdom": "^13.0.0",
     "concurrently": "^4.1.0",
     "html-minifier": "^4.0.0",
@@ -18,7 +18,7 @@
     "stalfos": "github:hankchizljaw/stalfos#c8971d22726326cfc04089b2da4d51eeb1ebb0eb"
   },
   "devDependencies": {
-    "@11ty/eleventy-navigation": "^0.1.5",
+    "@11ty/eleventy-navigation": "^0.3.2",
     "@erquhart/rollup-plugin-node-builtins": "^2.1.5",
     "bl": "^3.0.0",
     "chokidar-cli": "^2.1.0",

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

@@ -47,6 +47,12 @@ Sets whether or not you want the styleguide to load with the pattern info open o
 
 **default**: `false`
 
+## defaultInitialViewportWidth (optional)
+
+Possibility to define whether the initial viewport width on opening pattern lab in the browser should take the default of `100%` (value `true`) or take the (permanently) persisted value after the users have interacted with the viewport resize buttons previously (value `false`). This is especially beneficial in case that you'd expect the pages in full viewport at revisits, and even further if your startpage is defined as a "static" markdown welcome / orientation page.
+
+**default**: `false`
+
 ## defaultPatternInfoPanelCode (optional)
 
 Sets default active pattern info code panel by file extension - if unset, uses the value out of _patternExtension_ config value, or instead use value `html` to display the html code initially, or the value defined for the _patternExtension_.

packages/live-server/index.js

@@ -247,11 +247,12 @@ LiveServer.start = function (options) {
   // Use http-auth if configured
   if (htpasswd !== null) {
     const auth = require('http-auth');
+    const authConnect = require('http-auth-connect');
     const basic = auth.basic({
       realm: 'Please authorize',
       file: htpasswd,
     });
-    app.use(auth.connect(basic));
+    app.use(authConnect(basic));
   }
 
   if (cors) {

packages/live-server/package.json

@@ -18,7 +18,8 @@
     "cors": "2.8.5",
     "event-stream": "3.3.4",
     "faye-websocket": "0.11.x",
-    "http-auth": "3.2.x",
+    "http-auth": "4.1.x",
+    "http-auth-connect": "^1.0.5",
     "morgan": "1.10.0",
     "object-assign": "4.1.1",
     "opn": "5.3.0",

packages/starterkit-handlebars-demo/dist/_patterns/atoms/global/font-families.json

@@ -12,6 +12,6 @@
     }
   ],
   "meta": {
-    "description": "To add to these items, use Sass variables that start with <code>$font-family-</code> in <code>./source/css/scss/abstracts/_variables.scss</code>"
+    "description": ""
   }
-}
+}

packages/starterkit-handlebars-demo/dist/_patterns/atoms/global/font-families.md

@@ -1,3 +1,5 @@
 ---
 order: 2
----
+---
+
+To add to these items, use Sass variables that start with `$font-family-` in `./source/css/scss/abstracts/_variables.scss`

packages/starterkit-handlebars-demo/dist/_patterns/atoms/global/font-sizes.json

@@ -37,6 +37,6 @@
     }
   ],
   "meta": {
-    "description": "To add to these items, use Sass variables that start with <code>$font-size-</code> in <code>./source/css/scss/abstracts/_variables.scss</code>"
+    "description": ""
   }
-}
+}

packages/starterkit-handlebars-demo/dist/_patterns/atoms/global/font-sizes.md

@@ -1,3 +1,5 @@
 ---
 order: 2
----
+---
+
+To add to these items, use Sass variables that start with `$font-size-` in `./source/css/scss/abstracts/_variables.scss`