@@ -5,7 +5,7 @@ const jsonCopy = require('./json_copy');
5
5
const ae = require ( './annotation_exporter' ) ;
6
6
const of = require ( './object_factory' ) ;
7
7
const Pattern = of . Pattern ;
8
- const plutils = require ( './utilities ' ) ;
8
+ const logger = require ( './log ' ) ;
9
9
const eol = require ( 'os' ) . EOL ;
10
10
const _ = require ( 'lodash' ) ;
11
11
@@ -67,37 +67,29 @@ const ui_builder = function () {
67
67
// skip underscore-prefixed files
68
68
isOmitted = pattern . isPattern && pattern . fileName . charAt ( 0 ) === '_' ;
69
69
if ( isOmitted ) {
70
- if ( patternlab . config . debug ) {
71
- console . log ( 'Omitting ' + pattern . patternPartial + " from styleguide patterns because it has an underscore suffix." ) ;
72
- }
70
+ logger . debug ( `Omitting ${ pattern . patternPartial } from styleguide patterns because it has an underscore suffix.` ) ;
73
71
return true ;
74
72
}
75
73
76
74
//this is meant to be a homepage that is not present anywhere else
77
75
isOmitted = pattern . patternPartial === patternlab . config . defaultPattern ;
78
76
if ( isOmitted ) {
79
- if ( patternlab . config . debug ) {
80
- console . log ( 'Omitting ' + pattern . patternPartial + ' from styleguide patterns because it is defined as a defaultPattern.' ) ;
81
- }
77
+ logger . debug ( `Omitting ${ pattern . patternPartial } from styleguide patterns because it is defined as a defaultPattern.` ) ;
82
78
patternlab . defaultPattern = pattern ;
83
79
return true ;
84
80
}
85
81
86
82
//this pattern is contained with a directory prefixed with an underscore (a handy way to hide whole directories from the nav
87
83
isOmitted = pattern . relPath . charAt ( 0 ) === '_' || pattern . relPath . indexOf ( path . sep + '_' ) > - 1 ;
88
84
if ( isOmitted ) {
89
- if ( patternlab . config . debug ) {
90
- console . log ( 'Omitting ' + pattern . patternPartial + ' from styleguide patterns because its contained within an underscored directory.' ) ;
91
- }
85
+ logger . debug ( `Omitting ${ pattern . patternPartial } from styleguide patterns because its contained within an underscored directory.` ) ;
92
86
return true ;
93
87
}
94
88
95
89
//this pattern is a head or foot pattern
96
90
isOmitted = pattern . isMetaPattern ;
97
91
if ( isOmitted ) {
98
- if ( patternlab . config . debug ) {
99
- console . log ( 'Omitting ' + pattern . patternPartial + ' from styleguide patterns because its a meta pattern.' ) ;
100
- }
92
+ logger . debug ( `Omitting ${ pattern . patternPartial } from styleguide patterns because its a meta pattern.` ) ;
101
93
return true ;
102
94
}
103
95
@@ -169,9 +161,7 @@ const ui_builder = function () {
169
161
const patternType = _ . find ( patternlab . patternTypes , [ 'patternType' , pattern . patternType ] ) ;
170
162
171
163
if ( ! patternType ) {
172
- plutils . error ( 'Could not find patternType' + pattern . patternType + '. This is a critical error.' ) ;
173
- console . trace ( ) ;
174
- process . exit ( 1 ) ;
164
+ logger . error ( `Could not find patternType ${ pattern . patternType } . This is a critical error.` ) ;
175
165
}
176
166
177
167
return patternType ;
@@ -188,9 +178,7 @@ const ui_builder = function () {
188
178
const patternSubType = _ . find ( patternType . patternTypeItems , [ 'patternSubtype' , pattern . patternSubType ] ) ;
189
179
190
180
if ( ! patternSubType ) {
191
- plutils . error ( 'Could not find patternType ' + pattern . patternType + '-' + pattern . patternType + '. This is a critical error.' ) ;
192
- console . trace ( ) ;
193
- process . exit ( 1 ) ;
181
+ logger . error ( `Could not find patternType ${ pattern . patternType } -${ pattern . patternType } . This is a critical error.` ) ;
194
182
}
195
183
196
184
return patternSubType ;
@@ -276,9 +264,7 @@ const ui_builder = function () {
276
264
function addPatternItem ( patternlab , pattern , isViewAllVariant ) {
277
265
const patternType = getPatternType ( patternlab , pattern ) ;
278
266
if ( ! patternType ) {
279
- plutils . error ( 'Could not find patternType' + pattern . patternType + '. This is a critical error.' ) ;
280
- console . trace ( ) ;
281
- process . exit ( 1 ) ;
267
+ logger . error ( `Could not find patternType ${ pattern . patternType } . This is a critical error.` ) ;
282
268
}
283
269
284
270
if ( ! patternType . patternItems ) {
@@ -439,8 +425,8 @@ const ui_builder = function () {
439
425
try {
440
426
allFooterData = jsonCopy ( patternlab . data , 'config.paths.source.data plus patterns data' ) ;
441
427
} catch ( err ) {
442
- console . log ( 'There was an error parsing JSON for patternlab.data' ) ;
443
- console . log ( err ) ;
428
+ logger . warning ( 'There was an error parsing JSON for patternlab.data' ) ;
429
+ logger . warning ( err ) ;
444
430
}
445
431
allFooterData . patternLabFoot = footerPartial ;
446
432
@@ -517,9 +503,7 @@ const ui_builder = function () {
517
503
return exclude === patternType + '/' + patternSubtype ;
518
504
} ) ;
519
505
if ( omitPatternType ) {
520
- if ( patternlab . config . debug ) {
521
- console . log ( 'Omitting ' + patternType + '/' + patternSubtype + ' from building a viewall page because its patternSubGroup is specified in styleguideExcludes.' ) ;
522
- }
506
+ logger . debug ( `Omitting ${ patternType } /${ patternSubtype } from building a viewall page because its patternSubGroup is specified in styleguideExcludes.` ) ;
523
507
} else {
524
508
styleguideTypePatterns = styleguideTypePatterns . concat ( subtypePatterns ) ;
525
509
}
@@ -556,9 +540,7 @@ const ui_builder = function () {
556
540
return exclude === patternType ;
557
541
} ) ;
558
542
if ( omitPatternType ) {
559
- if ( patternlab . config . debug ) {
560
- console . log ( 'Omitting ' + patternType + ' from building a viewall page because its patternGroup is specified in styleguideExcludes.' ) ;
561
- }
543
+ logger . debug ( `Omitting ${ patternType } from building a viewall page because its patternGroup is specified in styleguideExcludes.` ) ;
562
544
} else {
563
545
patterns = patterns . concat ( styleguideTypePatterns ) ;
564
546
}
@@ -671,10 +653,8 @@ const ui_builder = function () {
671
653
let patternlabSiteHtml ;
672
654
try {
673
655
patternlabSiteHtml = fs . readFileSync ( path . resolve ( paths . source . styleguide , 'index.html' ) , 'utf8' ) ;
674
- } catch ( error ) {
675
- console . log ( error ) ;
676
- console . log ( "\nERROR: Could not load one or more styleguidekit assets from" , paths . source . styleguide , '\n' ) ;
677
- process . exit ( 1 ) ;
656
+ } catch ( err ) {
657
+ logger . error ( `Could not load one or more styleguidekit assets from ${ paths . source . styleguide } ` ) ;
678
658
}
679
659
fs . outputFileSync ( path . resolve ( paths . public . root , 'index.html' ) , patternlabSiteHtml ) ;
680
660
0 commit comments