diff --git a/.eslintrc.json b/.eslintrc.json index 777cc3c69..335572829 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,4 +1,5 @@ { + "root": true, "env": { "node": true, "builtin": true, diff --git a/package.json b/package.json index 650a8a3a8..d95e7889c 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,14 @@ { - "devDependencies": { - "lerna": "3.11.0" + "dependencies": { + "lerna": "3.11.0", + "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/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/core/src/lib/ui_builder.js b/packages/core/src/lib/ui_builder.js index 96229e08c..5dcb36986 100644 --- a/packages/core/src/lib/ui_builder.js +++ b/packages/core/src/lib/ui_builder.js @@ -75,11 +75,7 @@ const ui_builder = function() { isOmitted = uikitExcludePattern(pattern, uikit); if (isOmitted) { logger.info( - `Omitting ${ - pattern.patternPartial - } from styleguide patterns because its pattern state or tag is excluded within ${ - uikit.name - }.` + `Omitting ${pattern.patternPartial} from styleguide patterns because its pattern state or tag is excluded within ${uikit.name}.` ); return true; } @@ -88,9 +84,7 @@ const ui_builder = function() { isOmitted = pattern.isPattern && pattern.fileName.charAt(0) === '_'; if (isOmitted) { logger.info( - `Omitting ${ - pattern.patternPartial - } from styleguide patterns because it has an underscore suffix.` + `Omitting ${pattern.patternPartial} from styleguide patterns because it has an underscore prefix.` ); return true; } @@ -99,9 +93,7 @@ const ui_builder = function() { isOmitted = pattern.patternPartial === patternlab.config.defaultPattern; if (isOmitted) { logger.info( - `Omitting ${ - pattern.patternPartial - } from styleguide patterns because it is defined as a defaultPattern.` + `Omitting ${pattern.patternPartial} from styleguide patterns because it is defined as a defaultPattern.` ); patternlab.defaultPattern = pattern; return true; @@ -113,9 +105,7 @@ const ui_builder = function() { pattern.relPath.indexOf(path.sep + '_') > -1; if (isOmitted) { logger.info( - `Omitting ${ - pattern.patternPartial - } from styleguide patterns because its contained within an underscored directory.` + `Omitting ${pattern.patternPartial} from styleguide patterns because its contained within an underscored directory.` ); return true; } @@ -124,9 +114,7 @@ const ui_builder = function() { isOmitted = pattern.isMetaPattern; if (isOmitted) { logger.info( - `Omitting ${ - pattern.patternPartial - } from styleguide patterns because its a meta pattern.` + `Omitting ${pattern.patternPartial} from styleguide patterns because its a meta pattern.` ); return true; } @@ -212,9 +200,7 @@ const ui_builder = function() { if (!patternType) { logger.error( - `Could not find patternType ${ - pattern.patternType - }. This is a critical error.` + `Could not find patternType ${pattern.patternType}. This is a critical error.` ); } @@ -236,9 +222,7 @@ const ui_builder = function() { if (!patternSubType) { logger.error( - `Could not find patternType ${pattern.patternType}-${ - pattern.patternType - }. This is a critical error.` + `Could not find patternType ${pattern.patternType}-${pattern.patternType}. This is a critical error.` ); } @@ -348,9 +332,7 @@ const ui_builder = function() { const patternType = getPatternType(patternlab, pattern); if (!patternType) { logger.error( - `Could not find patternType ${ - pattern.patternType - }. This is a critical error.` + `Could not find patternType ${pattern.patternType}. This is a critical error.` ); } @@ -867,9 +849,7 @@ const ui_builder = function() { ); } catch (err) { logger.error( - `Could not load one or more styleguidekit assets from ${ - paths.source.styleguide - }` + `Could not load one or more styleguidekit assets from ${paths.source.styleguide}` ); } fs.outputFileSync( diff --git a/packages/uikit-workshop/dist/index.html b/packages/uikit-workshop/dist/index.html index 366fa967f..d5ffc395c 100644 --- a/packages/uikit-workshop/dist/index.html +++ b/packages/uikit-workshop/dist/index.html @@ -1,9 +1,9 @@ -