Skip to content

fix(core): do not warn about uikit-polyfills #1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions packages/core/src/lib/loaduikits.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,20 @@ const readModuleFile = (kit, subPath) => {
/**
* Loads uikits, connecting configuration and installed modules
* [1] Looks in node_modules for uikits.
* [2] Only continue if uikit is enabled in patternlab-config.json
* [3] Reads files from uikit that apply to every template
* [2] Filter out our uikit-polyfills package.
* [3] Only continue if uikit is enabled in patternlab-config.json
* [4] Reads files from uikit that apply to every template
* @param {object} patternlab
*/
module.exports = patternlab => {
const paths = patternlab.config.paths;

const uikits = findModules(nodeModulesPath, isUIKitModule); // [1]

const uikits = findModules(nodeModulesPath, isUIKitModule) // [1]
.filter(kit => kit.name !== 'polyfills'); // [2]
uikits.forEach(kit => {
const configEntry = _.find(_.filter(patternlab.config.uikits, 'enabled'), {
name: `uikit-${kit.name}`,
}); // [2]
}); // [3]

if (!configEntry) {
logger.warning(
Expand Down Expand Up @@ -83,7 +84,7 @@ module.exports = patternlab => {
paths.source.patternlabFiles.patternSectionSubtype
),
viewAll: readModuleFile(kit, paths.source.patternlabFiles.viewall),
}; // [3]
}; // [4]
} catch (ex) {
logger.error(ex);
logger.error(
Expand Down
38 changes: 36 additions & 2 deletions packages/core/test/loaduitkits_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
const tap = require('tap');
const rewire = require('rewire');

const logger = require('../src/lib/log');
const loaduikits = rewire('../src/lib/loaduikits');

const testConfig = require('./util/patternlab-config.json');
Expand All @@ -21,6 +22,10 @@ const findModulesMock = function() {
name: 'baz',
modulePath: 'node_modules/@pattern-lab/uikit-baz',
},
{
name: 'polyfills',
modulePath: 'node_modules/@pattern-lab/uikit-polyfills',
},
];
};

Expand All @@ -35,11 +40,40 @@ loaduikits.__set__({
fs: fsMock,
});

logger;

tap.test('loaduitkits - does not warn on uikit-polyfills', test => {
//arrange
const patternlab = {
config: testConfig,
uikits: {},
};

patternlab.config.logLevel = 'warning';
logger.log.on('warning', msg => test.notOk(msg.includes('uikit-polyfills')));

const uikitFoo = {
name: 'uikit-foo',
enabled: true,
outputDir: 'foo',
excludedPatternStates: ['legacy'],
excludedTags: ['baz'],
};

patternlab.config.uikits = [uikitFoo];

//act
loaduikits(patternlab).then(() => {
logger.warning = () => {};
test.done();
});
});

tap.test('loaduikits - maps fields correctly', function(test) {
//arrange
const patternlab = {
config: testConfig,
uikits: [],
uikits: {},
};

const uikitFoo = {
Expand Down Expand Up @@ -78,7 +112,7 @@ tap.test('loaduikits - only adds files for enabled uikits', function(test) {
//arrange
const patternlab = {
config: testConfig,
uikits: [],
uikits: {},
};

patternlab.config.uikits = [
Expand Down