Merge branch 'dev' into feature/no-viewall-links

Author: sghoweri

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+patreon: patternlab

.gitignore

@@ -5,9 +5,11 @@ Thumbs.db
 .nyc_output/
 .vscode/
 .idea/
+.env
 packages/core/test/public
 packages/*/public
 !packages/core/test/patterns/public/.gitkeep
 !packages/core/test/patterns/testDependencyGraph.json
 lerna-debug.log
 packages/edition-node-gulp/dependencyGraph.json
+packages/uikit-workshop/dist

.nvmrc

@@ -1 +1 @@
-10.0.0
+12.12.0

.travis.yml

@@ -4,19 +4,21 @@ addons:
   chrome: stable
 
 before_install:
-  - phantomjs --version
+  # version lifted from `.nvmrc`
+  - nvm install
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.19.0
+  - export PATH="$HOME/.yarn/bin:$PATH"
 
 before_script:
-  - npm install -g lerna@3.2.1
-  - npm run setup
-  - lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
-  - lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
-  - lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
-  - lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core
-  - lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
-  - lerna add @pattern-lab/engine-react --scope=@pattern-lab/core
+  - yarn run setup
+  - npx lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
+  - npx lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
+  - npx lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
+  - npx lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core
+  - npx lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
+  - npx lerna add @pattern-lab/engine-react --scope=@pattern-lab/core
 
-script: travis_wait npm run test
+script: travis_wait yarn run test
 
 branches:
   only:

CHANGELOG.md

@@ -61,6 +61,7 @@ Pattern Lab / Node wouldn't be what it is today without the support of the commu
 
 * **[Brad Frost](http://bradfrost.com/)**
 * [Marcos Peebles](https://twitter.com/marcospeebles)
+* [Maximilian Franzke](https://twitter.com/maedmaex)
 * [Susan Simkins](https://twitter.com/susanmsimkins)
 
 ## Contributing

README.md

@@ -1,28 +1,38 @@
 {
   "lerna": "3.11.0",
+  "version": "5.3.3",
   "packages": [
     "packages/*"
   ],
-  "version": "independent",
   "command": {
     "init": {
       "exact": true
     },
-    "bootstrap": {
-      "hoist": [
-        "tap",
-        "eslin*",
-        "husky",
-        "prettier",
-        "pretty-quick",
-        "babel-eslint"
-      ]
-    },
     "publish": {
-      "allowBranch": "master"
+      "allowBranch": [
+        "master",
+        "dev"
+      ],
+      "conventionalCommits": true,
+      "gitReset": true,
+      "includeMergedTags": true,
+      "noCommitHooks": true,
+      "verifyAccess": true
+    },
+    "changed": {
+      "includeMergedTags": true
     }
   },
+  "ignoreChanges": [
+    "**/__fixtures__/**",
+    "**/__tests__/**",
+    "**/*.md",
+    "**/__snapshots__/**"
+  ],
+  "npmClient": "yarn",
   "npmClientArgs": [
+    "--ignore-optional",
     "--registry=https://registry.npmjs.org/"
-  ]
+  ],
+  "useWorkspaces": true
 }

lerna.json

@@ -0,0 +1,2 @@
+[context.deploy-preview]
+  command = "npm run setup && npm run preview:hbs"

netlify.toml

@@ -1,4 +1,14 @@
 {
+  "workspaces": {
+    "packages": [
+      "packages/*"
+    ],
+    "nohoist": [
+      "@pattern-lab/engine-*",
+      "**/@pattern-lab/engine-*",
+      "**/@pattern-lab/uikit-workshop"
+    ]
+  },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.4.4",
     "@babel/plugin-syntax-jsx": "^7.2.0",
@@ -8,21 +18,28 @@
     "eslint-config-prettier": "^6.0.0",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-prettier": "^3.1.0",
-    "lerna": "3.11.0",
     "prettier": "^1.14.3",
-    "pretty-quick": "^1.11.1"
+    "lerna": "3.17.0",
+    "pretty-quick": "^1.11.1",
+    "auto": "^7.8.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/pattern-lab/patternlab-node.git"
   },
   "private": true,
   "scripts": {
-    "postinstall": "npm run bootstrap",
-    "bootstrap": "lerna bootstrap",
-    "setup": "npm install && npm run build:uikit",
+    "postinstall": "lerna run postbootstrap",
+    "setup": "yarn",
     "build:uikit": "cd packages/uikit-workshop && npm run build",
     "precommit": "pretty-quick --staged",
     "lint:fix": "npm run lint -- --fix",
     "lint": "eslint --max-warnings 0 './packages/{core,cli,uikit-workshop}/**/*.js ' --ignore-path .eslintignore",
     "test": "lerna run test",
-    "clean": "git clean -dfx"
+    "clean": "git clean -dfx",
+    "publish": "npx lerna publish -m \"[skip travis] chore(release): publish %s\"",
+    "postpublish": "auto release",
+    "preview:hbs": "cd packages/development-edition-engine-handlebars && npx patternlab add --starterkits @pattern-lab/starterkit-handlebars-vanilla && npm run pl:build"
   },
   "nyc": {
     "exclude": [

package.json

@@ -3,6 +3,59 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.3.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v5.2.0...v5.3.0) (2019-11-13)
+
+**Note:** Version bump only for package @pattern-lab/cli
+
+
+
+
+
+# [5.1.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v5.0.2...v5.1.0) (2019-10-29)
+
+**Note:** Version bump only for package @pattern-lab/cli
+
+
+
+
+
+# [5.0.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v3.0.0-beta.3...v5.0.0) (2019-10-25)
+
+
+### Bug Fixes
+
+* updates to fix eslint / prettier issues; update packages/core to reuse root .eslintrc.js file ([5b7a057](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/5b7a057d46ccd16b5832af1441030c7b76f237a8))
+* **cli:** add custom install logic to edition-node ([f04fd26](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/f04fd266429cd806987dab747e6d69bff9b926a4))
+* **cli:** allow any package to be installed as a starterkit ([d2aa1be](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/d2aa1be810a0a7473dcc52391a2263dacfdda0b8)), closes [#1067](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/issues/1067)
+* **cli:** merge config arrays via overwrite instead of concatenate ([42e5f7b](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/42e5f7b42a26b4fc1f262c68ee4b474b546f2eac))
+* **cli:** proper path resolution to helpers ([a18fe5e](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/a18fe5ef4d1c074a5eba8bfa255ebbee2261bf74))
+* **cli:** re-order and clarify engines ([e39e301](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/e39e301a33306c6615fabf64262f1893ca682b97))
+* **plugin:** correct spelling error and function locations ([d4abd88](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/d4abd88cb017550002407241b5045a2ad1adb1dc))
+
+
+### Features
+
+* **starterkits:** add starterkit-handlebars-demo ([384d2cf](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/384d2cfa3440c1e6f456d39f56ca6381f82f7689))
+
+
+### BREAKING CHANGES
+
+* **cli:** previously, we concatenated arrays, which is unlikely to be intended
+
+
+
+
+
+
+## [1.0.3](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@1.0.2...@pattern-lab/cli@1.0.3) (2019-10-14)
+
+**Note:** Version bump only for package @pattern-lab/cli
+
+
+
+
+
+
 # [1.0.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.1.0...@pattern-lab/cli@1.0.0) (2019-08-23)