Merge branch 'dev' into dev

Author: bmuenzenmeyer

.eslintignore

@@ -0,0 +1,9 @@
+**/node_modules/**
+node_modules
+**/vendor/**
+vendor
+**/test/**
+**/dist/**
+
+// being refactored / removed
+packages/uikit-workshop/src/scripts/components/styleguide.js

.eslintrc.js

@@ -0,0 +1,86 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true,
+    builtin: true,
+    es6: true,
+    browser: true,
+  },
+  parser: 'babel-eslint',
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: 'module',
+    allowImportExportEverywhere: true,
+    ecmaFeatures: {
+      jsx: true,
+      experimentalDecorators: true,
+    },
+  },
+  globals: {},
+  plugins: ['prettier'],
+  extends: ['eslint-config-prettier'].map(require.resolve),
+  rules: {
+    'prettier/prettier': 'error',
+    'block-scoped-var': 0,
+    camelcase: 0,
+    'consistent-return': 2,
+    curly: [2, 'all'],
+    'dot-notation': [1, { allowKeywords: true }],
+    eqeqeq: [2, 'allow-null'],
+    'global-strict': [0, 'never'],
+    'guard-for-in': 2,
+    'key-spacing': 0,
+    'new-cap': 0,
+    'no-alert': 2,
+    'no-bitwise': 2,
+    'no-caller': 2,
+    'no-cond-assign': [2, 'except-parens'],
+    'no-debugger': 2,
+    'no-dupe-args': 2,
+    'no-dupe-keys': 2,
+    'no-empty': 2,
+    'no-eval': 2,
+    'no-extend-native': 2,
+    'no-extra-bind': 2,
+    'no-extra-parens': 0,
+    'no-func-assign': 2,
+    'no-implied-eval': 2,
+    'no-invalid-regexp': 2,
+    'no-irregular-whitespace': 1,
+    'no-iterator': 2,
+    'no-loop-func': 2,
+    'no-mixed-requires': 0,
+    'no-multi-str': 2,
+    'no-native-reassign': 2,
+    'no-new': 2,
+    'no-param-reassign': 1,
+    'no-proto': 2,
+    'no-redeclare': 0,
+    'no-script-url': 2,
+    'no-self-assign': 2,
+    'no-self-compare': 2,
+    'no-sequences': 2,
+    'no-shadow': 2,
+    'no-undef': 2,
+    'no-underscore-dangle': 0,
+    'no-unreachable': 1,
+    'no-unused-vars': 1,
+    'no-use-before-define': 1,
+    'no-useless-call': 2,
+    'no-useless-concat': 2,
+    'no-var': 2,
+    'no-with': 2,
+    quotes: [0, 'single'],
+    radix: 2,
+    strict: 0,
+    'valid-typeof': 2,
+    'vars-on-top': 0,
+    'prefer-const': [
+      'error',
+      {
+        destructuring: 'any',
+        ignoreReadBeforeAssign: false,
+      },
+    ],
+  },
+};

.eslintrc.json

@@ -1,11 +1,12 @@
 {
+  "root": true,
   "env": {
     "node": true,
     "builtin": true,
     "es6": true
   },
   "parserOptions": {
-    "ecmaVersion": 6,
+    "ecmaVersion": 2017,
     "sourceType": "module"
   },
   "globals": {},

.travis.yml

@@ -1,5 +1,8 @@
 language: node_js
 
+addons:
+  chrome: stable
+
 before_install:
   - phantomjs --version
 
@@ -13,6 +16,8 @@ before_script:
   - lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
   - lerna add @pattern-lab/engine-react --scope=@pattern-lab/core
 
+script: travis_wait npm run test
+
 branches:
   only:
     - master

babel.config.js

@@ -0,0 +1,27 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        targets: {
+          node: 'current',
+        },
+      },
+    ],
+  ],
+  plugins: [
+    /**
+     * 1. Helps with our Web Component Preact renderer
+     */
+    '@babel/plugin-syntax-jsx' /* [1] */,
+    [
+      '@babel/plugin-transform-react-jsx' /* [1] */,
+      {
+        pragma: 'h',
+        pragmaFrag: '"span"',
+        throwIfNamespace: false,
+        useBuiltIns: false,
+      },
+    ],
+  ],
+};

lerna.json

@@ -14,7 +14,8 @@
         "eslin*",
         "husky",
         "prettier",
-        "pretty-quick"
+        "pretty-quick",
+        "babel-eslint"
       ]
     },
     "publish": {

package.json

@@ -1,14 +1,26 @@
 {
-  "devDependencies": {
-    "lerna": "3.11.0"
+  "dependencies": {
+    "@babel/plugin-proposal-decorators": "^7.4.4",
+    "@babel/plugin-syntax-jsx": "^7.2.0",
+    "babel-eslint": "^10.0.2",
+    "eslint": "^6.1.0",
+    "eslint-config-airbnb-base": "^14.0.0",
+    "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"
   },
   "private": true,
   "scripts": {
+    "postinstall": "npm run bootstrap",
     "bootstrap": "lerna bootstrap",
-    "setup": "npm run bootstrap && npm run build:uikit",
-    "build:uikit": "lerna exec --scope @pattern-lab/uikit-workshop -- npm run build",
+    "setup": "npm install && npm run build:uikit",
+    "build:uikit": "cd packages/uikit-workshop && npm run build",
     "precommit": "pretty-quick --staged",
-    "prettier": "prettier --config .prettierrc --write ./**/*.js --ignore-path .prettierignore",
+    "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"
   },

packages/cli/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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)
+
+
+### Bug Fixes
+
+* **cli:** merge config arrays via overwrite instead of concatenate ([42e5f7b](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/42e5f7b))
+* **cli:** proper path resolution to helpers ([a18fe5e](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/a18fe5e))
+
+
+### BREAKING CHANGES
+
+* **cli:** previously, we concatenated arrays, which is unlikely to be intended
+
+
+
+
+
+# [0.1.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.3...@pattern-lab/cli@0.1.0) (2019-08-23)
+
+
+### 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/5b7a057))
+* **cli:** add custom install logic to edition-node ([f04fd26](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/f04fd26))
+* **cli:** re-order and clarify engines ([e39e301](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/e39e301))
+
+
+### Features
+
+* **starterkits:** add starterkit-handlebars-demo ([384d2cf](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/384d2cf))
+
+
+
+
+
+
 ## [0.0.3](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.0.3-alpha.0...@pattern-lab/cli@0.0.3) (2019-05-16)
 
 **Note:** Version bump only for package @pattern-lab/cli

packages/cli/bin/cli-actions/disable.js

@@ -12,7 +12,10 @@ const writeJsonAsync = require('../utils').writeJsonAsync;
  */
 const enable = options =>
   wrapAsync(function*() {
-    const { parent: { config: configPath }, plugins } = options;
+    const {
+      parent: { config: configPath },
+      plugins,
+    } = options;
     const config = yield resolveConfig(configPath);
 
     const spinner = ora(`⊙ patternlab → Disable …`).start();

packages/cli/bin/cli-actions/enable.js

@@ -12,7 +12,10 @@ const writeJsonAsync = require('../utils').writeJsonAsync;
  */
 const enable = options =>
   wrapAsync(function*() {
-    const { parent: { config: configPath }, plugins } = options;
+    const {
+      parent: { config: configPath },
+      plugins,
+    } = options;
     const config = yield resolveConfig(configPath);
 
     const spinner = ora(`⊙ patternlab → Enable …`).start();