diff --git a/packages/core/src/design.mjs b/packages/core/src/design.mjs index 6a5397dcc4a..ec059016df5 100644 --- a/packages/core/src/design.mjs +++ b/packages/core/src/design.mjs @@ -15,7 +15,6 @@ export function Design(config) { measurements: [], optionalMeasurements: [], plugins: [], - conditionalPlugins: [], ...config } const parts = {} @@ -39,14 +38,11 @@ export function Design(config) { Pattern.call(this, config) // Load plugins - if (Array.isArray(config.plugins)) for (const plugin of config.plugins) this.use(plugin) - else if (config.plugins) this.use(config.plugins) - - // Load conditional plugins - if (Array.isArray(config.conditionalPlugins)) - for (const plugin of config.conditionalPlugins) this.useIf(plugin, settings) - else if (config.conditionalPlugins.plugin && config.conditionalPlugins.condition) - this.useIf(config.conditionalPlugins, settings) + if (!Array.isArray(config.plugins)) config.plugins = [ config.plugins ] + for (const plugin of config.plugins) { + if (plugin.plugin && plugin.condition) this.useIf(plugin, settings) + else this.use(plugin) + } this.apply(settings) diff --git a/packages/core/tests/design.test.mjs b/packages/core/tests/design.test.mjs index f43a3818d24..7501fe6f0f1 100644 --- a/packages/core/tests/design.test.mjs +++ b/packages/core/tests/design.test.mjs @@ -76,7 +76,7 @@ describe('Design', () => { } }; const condition = () => true - const design = new Design({ conditionalPlugins: { plugin, condition } }); + const design = new Design({ plugins: { plugin, condition } }); const pattern = new design(); expect(pattern.hooks.preRender.length).to.equal(1); }); @@ -92,7 +92,7 @@ describe('Design', () => { } }; const condition = () => false - const design = new Design({ conditionalPlugins: { plugin, condition } }); + const design = new Design({ plugins: { plugin, condition } }); const pattern = new design(); expect(pattern.hooks.preRender.length).to.equal(0); }); @@ -109,7 +109,7 @@ describe('Design', () => { }; const condition1 = () => true const condition2 = () => false - const design = new Design({ conditionalPlugins: [ + const design = new Design({ plugins: [ { plugin, condition: condition1 }, { plugin, condition: condition2 }, ]});