Skip to content

Commit f7be15d

Browse files
sghowerisghoweri
committed
Merge branch 'dev' into feature/uikit-refactor--batched-updates
# Conflicts: # packages/uikit-workshop/dist/index.html # packages/uikit-workshop/dist/styleguide/css/pattern-lab.css # packages/uikit-workshop/dist/styleguide/js/patternlab-pattern.js # packages/uikit-workshop/dist/styleguide/js/patternlab-viewer.js # packages/uikit-workshop/package.json # packages/uikit-workshop/src/html/index.html # packages/uikit-workshop/src/sass/pattern-lab.scss # packages/uikit-workshop/src/sass/scss/04-components/_pattern-info.scss # packages/uikit-workshop/src/sass/scss/04-components/_tabs.scss # packages/uikit-workshop/src/sass/scss/05-themes/_light-theme.scss # packages/uikit-workshop/src/sass/scss/05-themes/_sidebar-theme.scss # packages/uikit-workshop/src/scripts/actions/app.js # packages/uikit-workshop/src/scripts/components/modal-viewer.js # packages/uikit-workshop/src/scripts/components/panels-viewer.js # packages/uikit-workshop/src/scripts/components/pl-controls/pl-controls.js # packages/uikit-workshop/src/scripts/components/pl-drawer/pl-drawer.js # packages/uikit-workshop/src/scripts/components/pl-drawer/pl-drawer.scss # packages/uikit-workshop/src/scripts/components/pl-header/pl-header.js # packages/uikit-workshop/src/scripts/components/pl-header/pl-header.scss # packages/uikit-workshop/src/scripts/components/pl-layout/pl-layout.js # packages/uikit-workshop/src/scripts/components/pl-layout/pl-layout.scss # packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.js # packages/uikit-workshop/src/scripts/components/pl-search/pl-search.scss # packages/uikit-workshop/src/scripts/components/pl-toggle-info/pl-toggle-info.js # packages/uikit-workshop/src/scripts/components/pl-toggle-info/pl-toggle-info.scss # packages/uikit-workshop/src/scripts/components/pl-toggle-theme/pl-toggle-theme.js # packages/uikit-workshop/src/scripts/components/pl-tools-menu/pl-tools-menu.js # packages/uikit-workshop/src/scripts/components/pl-viewport-size-list/pl-viewport-size-list.js # packages/uikit-workshop/src/scripts/components/pl-viewport-size-list/pl-viewport-size-list.scss # packages/uikit-workshop/src/scripts/components/pl-viewport-size/pl-viewport-size.js # packages/uikit-workshop/src/scripts/components/pl-viewport/pl-viewport.js # packages/uikit-workshop/src/scripts/components/styleguide.js # packages/uikit-workshop/src/scripts/patternlab-viewer.js # packages/uikit-workshop/src/scripts/reducers/app.js # packages/uikit-workshop/src/scripts/utils/index.js # packages/uikit-workshop/src/scripts/utils/pattern-name.js # packages/uikit-workshop/webpack.config.js
2 parents c882bab + 8e7ea7f commit f7be15d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1074
-1465
lines changed

‎.eslintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"root": true,
23
"env": {
34
"node": true,
45
"builtin": true,

‎package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{
2-
"devDependencies": {
3-
"lerna": "3.11.0"
2+
"dependencies": {
3+
"lerna": "3.11.0",
4+
"prettier": "^1.14.3",
5+
"pretty-quick": "^1.8.0"
46
},
57
"private": true,
68
"scripts": {
79
"bootstrap": "lerna bootstrap",
8-
"setup": "npm run bootstrap && npm run build:uikit",
9-
"build:uikit": "lerna exec --scope @pattern-lab/uikit-workshop -- npm run build",
10+
"setup": "npm install && npm run bootstrap && npm run build:uikit",
11+
"build:uikit": "cd packages/uikit-workshop && npm run build",
1012
"precommit": "pretty-quick --staged",
1113
"prettier": "prettier --config .prettierrc --write ./**/*.js --ignore-path .prettierignore",
1214
"test": "lerna run test",

‎packages/core/src/lib/addPattern.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
'use strict';
22

3-
const _ = require('lodash');
4-
53
const logger = require('./log');
64

75
module.exports = function(pattern, patternlab) {

‎packages/core/src/lib/plugin_manager.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
const plugin_manager = function() {
44
const path = require('path');
55
const findModules = require('./findModules');
6-
7-
const _ = require('lodash');
8-
96
const logger = require('./log');
107

118
const pluginMatcher = /^plugin-(.*)$/;

‎packages/core/src/lib/ui_builder.js

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,7 @@ const ui_builder = function() {
7575
isOmitted = uikitExcludePattern(pattern, uikit);
7676
if (isOmitted) {
7777
logger.info(
78-
`Omitting ${
79-
pattern.patternPartial
80-
} from styleguide patterns because its pattern state or tag is excluded within ${
81-
uikit.name
82-
}.`
78+
`Omitting ${pattern.patternPartial} from styleguide patterns because its pattern state or tag is excluded within ${uikit.name}.`
8379
);
8480
return true;
8581
}
@@ -88,9 +84,7 @@ const ui_builder = function() {
8884
isOmitted = pattern.isPattern && pattern.fileName.charAt(0) === '_';
8985
if (isOmitted) {
9086
logger.info(
91-
`Omitting ${
92-
pattern.patternPartial
93-
} from styleguide patterns because it has an underscore suffix.`
87+
`Omitting ${pattern.patternPartial} from styleguide patterns because it has an underscore prefix.`
9488
);
9589
return true;
9690
}
@@ -99,9 +93,7 @@ const ui_builder = function() {
9993
isOmitted = pattern.patternPartial === patternlab.config.defaultPattern;
10094
if (isOmitted) {
10195
logger.info(
102-
`Omitting ${
103-
pattern.patternPartial
104-
} from styleguide patterns because it is defined as a defaultPattern.`
96+
`Omitting ${pattern.patternPartial} from styleguide patterns because it is defined as a defaultPattern.`
10597
);
10698
patternlab.defaultPattern = pattern;
10799
return true;
@@ -113,9 +105,7 @@ const ui_builder = function() {
113105
pattern.relPath.indexOf(path.sep + '_') > -1;
114106
if (isOmitted) {
115107
logger.info(
116-
`Omitting ${
117-
pattern.patternPartial
118-
} from styleguide patterns because its contained within an underscored directory.`
108+
`Omitting ${pattern.patternPartial} from styleguide patterns because its contained within an underscored directory.`
119109
);
120110
return true;
121111
}
@@ -124,9 +114,7 @@ const ui_builder = function() {
124114
isOmitted = pattern.isMetaPattern;
125115
if (isOmitted) {
126116
logger.info(
127-
`Omitting ${
128-
pattern.patternPartial
129-
} from styleguide patterns because its a meta pattern.`
117+
`Omitting ${pattern.patternPartial} from styleguide patterns because its a meta pattern.`
130118
);
131119
return true;
132120
}
@@ -212,9 +200,7 @@ const ui_builder = function() {
212200

213201
if (!patternType) {
214202
logger.error(
215-
`Could not find patternType ${
216-
pattern.patternType
217-
}. This is a critical error.`
203+
`Could not find patternType ${pattern.patternType}. This is a critical error.`
218204
);
219205
}
220206

@@ -236,9 +222,7 @@ const ui_builder = function() {
236222

237223
if (!patternSubType) {
238224
logger.error(
239-
`Could not find patternType ${pattern.patternType}-${
240-
pattern.patternType
241-
}. This is a critical error.`
225+
`Could not find patternType ${pattern.patternType}-${pattern.patternType}. This is a critical error.`
242226
);
243227
}
244228

@@ -348,9 +332,7 @@ const ui_builder = function() {
348332
const patternType = getPatternType(patternlab, pattern);
349333
if (!patternType) {
350334
logger.error(
351-
`Could not find patternType ${
352-
pattern.patternType
353-
}. This is a critical error.`
335+
`Could not find patternType ${pattern.patternType}. This is a critical error.`
354336
);
355337
}
356338

@@ -867,9 +849,7 @@ const ui_builder = function() {
867849
);
868850
} catch (err) {
869851
logger.error(
870-
`Could not load one or more styleguidekit assets from ${
871-
paths.source.styleguide
872-
}`
852+
`Could not load one or more styleguidekit assets from ${paths.source.styleguide}`
873853
);
874854
}
875855
fs.outputFileSync(

0 commit comments

Comments
 (0)