diff --git a/lerna.json b/lerna.json
index ebb176d9b..c9e459dff 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
{
- "lerna": "3.2.1",
+ "lerna": "3.10.8",
"packages": [
"packages/*"
],
diff --git a/package.json b/package.json
index 78de351d6..b995af86b 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,14 @@
{
- "devDependencies": {
- "lerna": "3.2.1"
+ "dependencies": {
+ "lerna": "3.10.8",
+ "prettier": "^1.14.3",
+ "pretty-quick": "^1.8.0"
},
"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",
+ "setup": "npm install && npm run bootstrap && 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",
"test": "lerna run test",
diff --git a/packages/core/src/lib/addPattern.js b/packages/core/src/lib/addPattern.js
index af6886466..12c0c9429 100644
--- a/packages/core/src/lib/addPattern.js
+++ b/packages/core/src/lib/addPattern.js
@@ -1,7 +1,5 @@
'use strict';
-const _ = require('lodash');
-
const logger = require('./log');
module.exports = function(pattern, patternlab) {
diff --git a/packages/core/src/lib/buildPatterns.js b/packages/core/src/lib/buildPatterns.js
index 51dcea8b3..824d6840e 100644
--- a/packages/core/src/lib/buildPatterns.js
+++ b/packages/core/src/lib/buildPatterns.js
@@ -141,7 +141,10 @@ module.exports = (deletePatternDir, patternlab, additionalData) => {
}
//render all patterns last, so lineageR works
const allPatternsPromise = patternsToBuild.map(pattern =>
- compose(pattern, patternlab)
+ compose(
+ pattern,
+ patternlab
+ )
);
//copy non-pattern files like JavaScript
const allJS = patternsToBuild.map(pattern => {
diff --git a/packages/core/src/lib/markModifiedPatterns.js b/packages/core/src/lib/markModifiedPatterns.js
index 00ed51de1..aa80b25bb 100644
--- a/packages/core/src/lib/markModifiedPatterns.js
+++ b/packages/core/src/lib/markModifiedPatterns.js
@@ -28,10 +28,8 @@ module.exports = function(lastModified, patternlab) {
array.forEach(func);
}
};
- const modifiedOrNot = _.groupBy(
- patternlab.patterns,
- p =>
- changes_hunter.needsRebuild(lastModified, p) ? 'modified' : 'notModified'
+ const modifiedOrNot = _.groupBy(patternlab.patterns, p =>
+ changes_hunter.needsRebuild(lastModified, p) ? 'modified' : 'notModified'
);
// For all unmodified patterns load their rendered template output
diff --git a/packages/core/src/lib/object_factory.js b/packages/core/src/lib/object_factory.js
index 0c3ffe5d2..895db06bf 100644
--- a/packages/core/src/lib/object_factory.js
+++ b/packages/core/src/lib/object_factory.js
@@ -76,7 +76,9 @@ const Pattern = function(relPath, data, patternlab) {
// (rendered!) html file for this pattern, to be shown in the iframe
this.patternLink = this.patternSectionSubtype
? `$${this.name}/index.html`
- : patternlab ? this.getPatternLink(patternlab, 'rendered') : null;
+ : patternlab
+ ? this.getPatternLink(patternlab, 'rendered')
+ : null;
// The canonical "key" by which this pattern is known. This is the callable
// name of the pattern. UPDATE: this.key is now known as this.patternPartial
diff --git a/packages/core/src/lib/plugin_manager.js b/packages/core/src/lib/plugin_manager.js
index a3a37ab58..33bde9fe5 100644
--- a/packages/core/src/lib/plugin_manager.js
+++ b/packages/core/src/lib/plugin_manager.js
@@ -3,9 +3,6 @@
const plugin_manager = function() {
const path = require('path');
const findModules = require('./findModules');
-
- const _ = require('lodash');
-
const logger = require('./log');
const pluginMatcher = /^plugin-(.*)$/;
diff --git a/packages/uikit-workshop/dist/index.html b/packages/uikit-workshop/dist/index.html
index 908d91800..4ce91e8f1 100644
--- a/packages/uikit-workshop/dist/index.html
+++ b/packages/uikit-workshop/dist/index.html
@@ -77,27 +77,7 @@
-
-
-
+
@@ -229,9 +209,7 @@