Skip to content

Commit 51edb8c

Browse files
Merge pull request #1151 from pattern-lab/1104-uikitpolyfill
fix(core): do not warn about uikit-polyfills
2 parents bb038a0 + 6bb68e7 commit 51edb8c

File tree

2 files changed

+43
-8
lines changed

2 files changed

+43
-8
lines changed

packages/core/src/lib/loaduikits.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,20 @@ const readModuleFile = (kit, subPath) => {
3737
/**
3838
* Loads uikits, connecting configuration and installed modules
3939
* [1] Looks in node_modules for uikits.
40-
* [2] Only continue if uikit is enabled in patternlab-config.json
41-
* [3] Reads files from uikit that apply to every template
40+
* [2] Filter out our uikit-polyfills package.
41+
* [3] Only continue if uikit is enabled in patternlab-config.json
42+
* [4] Reads files from uikit that apply to every template
4243
* @param {object} patternlab
4344
*/
4445
module.exports = patternlab => {
4546
const paths = patternlab.config.paths;
4647

47-
const uikits = findModules(nodeModulesPath, isUIKitModule); // [1]
48-
48+
const uikits = findModules(nodeModulesPath, isUIKitModule) // [1]
49+
.filter(kit => kit.name !== 'polyfills'); // [2]
4950
uikits.forEach(kit => {
5051
const configEntry = _.find(_.filter(patternlab.config.uikits, 'enabled'), {
5152
name: `uikit-${kit.name}`,
52-
}); // [2]
53+
}); // [3]
5354

5455
if (!configEntry) {
5556
logger.warning(
@@ -83,7 +84,7 @@ module.exports = patternlab => {
8384
paths.source.patternlabFiles.patternSectionSubtype
8485
),
8586
viewAll: readModuleFile(kit, paths.source.patternlabFiles.viewall),
86-
}; // [3]
87+
}; // [4]
8788
} catch (ex) {
8889
logger.error(ex);
8990
logger.error(

packages/core/test/loaduitkits_tests.js

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
const tap = require('tap');
44
const rewire = require('rewire');
55

6+
const logger = require('../src/lib/log');
67
const loaduikits = rewire('../src/lib/loaduikits');
78

89
const testConfig = require('./util/patternlab-config.json');
@@ -21,6 +22,10 @@ const findModulesMock = function() {
2122
name: 'baz',
2223
modulePath: 'node_modules/@pattern-lab/uikit-baz',
2324
},
25+
{
26+
name: 'polyfills',
27+
modulePath: 'node_modules/@pattern-lab/uikit-polyfills',
28+
},
2429
];
2530
};
2631

@@ -35,11 +40,40 @@ loaduikits.__set__({
3540
fs: fsMock,
3641
});
3742

43+
logger;
44+
45+
tap.test('loaduitkits - does not warn on uikit-polyfills', test => {
46+
//arrange
47+
const patternlab = {
48+
config: testConfig,
49+
uikits: {},
50+
};
51+
52+
patternlab.config.logLevel = 'warning';
53+
logger.log.on('warning', msg => test.notOk(msg.includes('uikit-polyfills')));
54+
55+
const uikitFoo = {
56+
name: 'uikit-foo',
57+
enabled: true,
58+
outputDir: 'foo',
59+
excludedPatternStates: ['legacy'],
60+
excludedTags: ['baz'],
61+
};
62+
63+
patternlab.config.uikits = [uikitFoo];
64+
65+
//act
66+
loaduikits(patternlab).then(() => {
67+
logger.warning = () => {};
68+
test.done();
69+
});
70+
});
71+
3872
tap.test('loaduikits - maps fields correctly', function(test) {
3973
//arrange
4074
const patternlab = {
4175
config: testConfig,
42-
uikits: [],
76+
uikits: {},
4377
};
4478

4579
const uikitFoo = {
@@ -78,7 +112,7 @@ tap.test('loaduikits - only adds files for enabled uikits', function(test) {
78112
//arrange
79113
const patternlab = {
80114
config: testConfig,
81-
uikits: [],
115+
uikits: {},
82116
};
83117

84118
patternlab.config.uikits = [

0 commit comments

Comments
 (0)