Merge branch 'dev' into feature/uikit-refactor-p6--search-component

bolt-bot · bolt-bot · commit ac8f7c7d0bb5 · 2018-10-27T07:26:31.000-04:00
# Conflicts:
#	packages/uikit-workshop/dist/styleguide/js/patternlab-viewer.js
#	packages/uikit-workshop/src/scripts/utils/polyfills.js
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -6,7 +6,7 @@ No pull request is too small. Check out any [help wanted 🆘](https://github.co
 
 ## Prerequisites
 
-To get started, you'll need Node 8 or higher. Managing Node with [nvm](https://github.com/creationix/nvm) is recommended. Once installed, you can target the version of Node we specify within the [`.nvmrc`](https://github.com/pattern-lab/patternlab-node/blob/master/.nvmrc) file.
+To get started, you'll need Node installed. Managing Node with [nvm](https://github.com/creationix/nvm) is recommended. Once installed, you can target the version of Node we specify within the [`.nvmrc`](https://github.com/pattern-lab/patternlab-node/blob/master/.nvmrc) file.
 
 ```sh
 nvm install <<version>>
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 <!-- before posting an issue, try chatting on https://gitter.im/pattern-lab/node -->
 
-<!-- before posting an issue, verify you are running at least Node 6 -->
+<!-- before posting an issue, verify you are running at least Node 8 -->
 
 I am using Pattern Lab Node `vX.X.X` on `Windows | Mac | Linux`, with Node `vX.X.X`, using a `Gulp | Grunt | Vanilla | Custom` Edition.
 
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-8.9.4
+10.0.0
diff --git a/.prettierignore b/.prettierignore
@@ -9,3 +9,6 @@ packages/core/scripts/api.handlebars
 packages/core/scripts/events.handlebars
 packages/core/test/files/annotations.js
 **/uikit-workshop/src/js/**/*
+*.json
+*.md
+*.scss
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ before_install:
 
 before_script:
   - npm install -g lerna@3.2.1
-  - npm run bootstrap
+  - 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
diff --git a/package.json b/package.json
@@ -5,8 +5,10 @@
   "private": true,
   "scripts": {
     "bootstrap": "lerna bootstrap",
+    "setup": "npm run bootstrap && npm run build:uikit",
+    "build:uikit": "lerna exec --scope @pattern-lab/uikit-workshop -- npm run build",
     "precommit": "pretty-quick --staged",
-    "prettier": "prettier --config .prettierrc --write ./**/*.js",
+    "prettier": "prettier --config .prettierrc --write ./**/*.js --ignore-path .prettierignore",
     "test": "lerna run test",
     "clean": "git clean -dfx"
   },
diff --git a/packages/cli/.nvmrc b/packages/cli/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/cli/.travis.yml b/packages/cli/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 node_js:
   - node
-  - 6
+  - 8
 before_script:
   - npm install edition-node
   - npm install starterkit-mustache-base
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -49,7 +49,7 @@
   "bugs": "https://github.com/pattern-lab/patternlab-node/issues",
   "license": "MIT",
   "engines": {
-    "node": ">=6.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/core/.nvmrc b/packages/core/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -65,7 +65,7 @@
     "test": "tap test/*_tests.js --reporter spec --coverage"
   },
   "engines": {
-    "node": ">=6.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/development-edition-engine-handlebars/.nvmrc b/packages/development-edition-engine-handlebars/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/development-edition-engine-handlebars/package.json b/packages/development-edition-engine-handlebars/package.json
@@ -21,6 +21,9 @@
     "type": "git",
     "url": "git://github.com/pattern-lab/patternlab-node.git"
   },
+  "engines": {
+    "node": ">=10.0"
+  },
   "dependencies": {
     "@pattern-lab/cli": "^0.0.1-beta.0",
     "@pattern-lab/core": "^3.0.0-beta.0",
diff --git a/packages/development-edition-engine-react/.nvmrc b/packages/development-edition-engine-react/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/development-edition-engine-react/package.json b/packages/development-edition-engine-react/package.json
@@ -31,6 +31,6 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=6.0"
+    "node": ">=10.0"
   }
 }
diff --git a/packages/edition-node-gulp/.nvmrc b/packages/edition-node-gulp/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/edition-node-gulp/package.json b/packages/edition-node-gulp/package.json
@@ -27,7 +27,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=6.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/edition-node/.nvmrc b/packages/edition-node/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/edition-node/package.json b/packages/edition-node/package.json
@@ -27,7 +27,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=6.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/engine-handlebars/.nvmrc b/packages/engine-handlebars/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-handlebars/package.json b/packages/engine-handlebars/package.json
@@ -22,7 +22,7 @@
   "license": "MIT",
   "scripts": {},
   "engines": {
-    "node": ">=4.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/engine-liquid/.nvmrc b/packages/engine-liquid/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-liquid/package.json b/packages/engine-liquid/package.json
@@ -22,7 +22,7 @@
   "license": "MIT",
   "scripts": {},
   "engines": {
-    "node": ">=0.1"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/engine-mustache/.nvmrc b/packages/engine-mustache/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-mustache/package.json b/packages/engine-mustache/package.json
@@ -22,7 +22,7 @@
   "license": "MIT",
   "scripts": {},
   "engines": {
-    "node": ">=0.1"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/engine-nunjucks/.nvmrc b/packages/engine-nunjucks/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-nunjucks/package.json b/packages/engine-nunjucks/package.json
@@ -11,7 +11,7 @@
     "nunjucks": "3.1.3"
   },
   "engines": {
-    "node": ">=4.0"
+    "node": ">=10.0"
   },
   "keywords": [
     "Pattern Lab",
diff --git a/packages/engine-react/.nvmrc b/packages/engine-react/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-react/package.json b/packages/engine-react/package.json
@@ -30,7 +30,7 @@
   "license": "MIT",
   "scripts": {},
   "engines": {
-    "node": ">=6"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/engine-twig/.nvmrc b/packages/engine-twig/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-twig/package.json b/packages/engine-twig/package.json
@@ -22,7 +22,7 @@
   "license": "MIT",
   "scripts": {},
   "engines": {
-    "node": ">=4.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/engine-underscore/.nvmrc b/packages/engine-underscore/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/engine-underscore/package.json b/packages/engine-underscore/package.json
@@ -23,7 +23,7 @@
     "lint": "eslint **/*.js"
   },
   "engines": {
-    "node": ">=4.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/live-server/.nvmrc b/packages/live-server/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/live-server/package.json b/packages/live-server/package.json
@@ -43,7 +43,7 @@
   "repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/live-server",
   "bugs": "https://github.com/pattern-lab/patternlab-node/issues",
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=10.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/plugin-tab/.nvmrc b/packages/plugin-tab/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/plugin-tab/package.json b/packages/plugin-tab/package.json
@@ -8,6 +8,9 @@
     "glob": "7.0.0",
     "lodash": "4.17.5"
   },
+  "engines": {
+    "node": ">=10.0"
+  },
   "repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/plugin-tab",
   "bugs": "https://github.com/pattern-lab/patternlab-node/issues",
   "scripts": {
diff --git a/packages/uikit-workshop/.nvmrc b/packages/uikit-workshop/.nvmrc
@@ -0,0 +1 @@
+10.0.0
diff --git a/packages/uikit-workshop/dist/styleguide/js/patternlab-pattern.js b/packages/uikit-workshop/dist/styleguide/js/patternlab-pattern.js
diff --git a/packages/uikit-workshop/dist/styleguide/js/patternlab-viewer.js b/packages/uikit-workshop/dist/styleguide/js/patternlab-viewer.js
diff --git a/packages/uikit-workshop/package.json b/packages/uikit-workshop/package.json
@@ -4,9 +4,9 @@
   "description": "Front-end assets and templates for the default Pattern Lab workshop view",
   "main": "gulpfile.js",
   "scripts": {
-    "build": "webpack-cli --config webpack.config.js --progress",
+    "build": "webpack-cli --config webpack.config.js --progress --bail",
     "watch": "webpack-cli --config webpack.config.js --progress --watch",
-    "test": "npm run build -- --bail"
+    "test": "npm run build"
   },
   "authors": [
     {
@@ -59,6 +59,7 @@
     "postcss-loader": "^3.0.0",
     "raw-loader": "^0.5.1",
     "sass-loader": "^7.1.0",
+    "style-loader": "^0.23.1",
     "uglifyjs-webpack-plugin": "^1.2.7",
     "webpack": "4.16.3",
     "webpack-cli": "^3.1.0",
@@ -68,6 +69,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "engines": {
+    "node": ">=10.0"
+  },
   "dependencies": {
     "@reach/visually-hidden": "^0.1.1",
     "react-html-parser": "^2.0.2",
diff --git a/packages/uikit-workshop/webpack.config.js b/packages/uikit-workshop/webpack.config.js
@@ -17,6 +17,7 @@ const defaultConfig = {
   buildDir: './dist',
   prod: false, // or false for local dev
   sourceMaps: true,
+  publicPath: '/styleguide/',
 };
 
 module.exports = async function() {
@@ -92,7 +93,7 @@ module.exports = async function() {
       },
       output: {
         path: path.resolve(process.cwd(), `${config.buildDir}/styleguide`),
-        publicPath: '/pattern-lab/styleguide/',
+        publicPath: `${config.publicPath}`,
         filename: '[name].js',
         chunkFilename: `js/[name]-chunk-[chunkhash].js`,
       },
