Skip to content

Commit

Permalink
Merge pull request #4009 from getkirby/release-3.6.1.1/plugins-regres…
Browse files Browse the repository at this point in the history
…sion

Fix `plugins.js` regression
  • Loading branch information
bastianallgeier authored Dec 9, 2021
2 parents 29e5a0b + 7ec66e2 commit 2062238
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions panel/src/config/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,20 @@ export default {
// if component doesn't exist, don't extend
options.extends = null;
}
}

if (options.mixins) {
options.mixins = options.mixins.map((mixin) => {
return typeof mixin === "string" ? mixins[mixin] : mixin;
});
}
if (options.template) {
options.render = null;
}

if (components[name]) {
window.console.warn(`Plugin is replacing "${name}"`);
}
if (options.mixins) {
options.mixins = options.mixins.map((mixin) => {
return typeof mixin === "string" ? mixins[mixin] : mixin;
});
}

app.component(name, options);
components[name] = app.options.components[name];
if (components[name]) {
window.console.warn(`Plugin is replacing "${name}"`);
}

app.component(name, options);
Expand Down

0 comments on commit 2062238

Please sign in to comment.