Skip to content

Fix handling of mixins for modules with no dependencies defined #27690

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 2 commits into from
Jun 5, 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
26 changes: 26 additions & 0 deletions dev/tests/js/jasmine/tests/lib/mage/requirejs/mixins.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,5 +183,31 @@ define(['rjsResolver', 'mixins'], function (resolver, mixins) {

require([name], function () {});
});

it('applies mixins for modules that have no dependencies', function (done) {
var name = 'tests/assets/mixins/mixins-applied-no-dependencies',
mixinName = 'tests/assets/mixins/mixins-applied-no-dependencies-ext';

mixins.hasMixins.and.returnValue(true);
mixins.getMixins.and.returnValue([mixinName]);

define(name, {
value: 'original'
});

define(mixinName, [], function () {
return function (module) {
module.value = 'changed';

return module;
};
});

require([name], function (module) {
expect(module.value).toBe('changed');

done();
});
});
});
});
7 changes: 5 additions & 2 deletions lib/web/mage/requirejs/mixins.js
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,12 @@ require([
* from it every time require call happens.
*/
defContext.defQueue.shift = function () {
var queueItem = Array.prototype.shift.call(this);
var queueItem = Array.prototype.shift.call(this),
lastDeps = queueItem && queueItem[1];

queueItem[1] = processNames(queueItem[1], defContext);
if (Array.isArray(lastDeps)) {
queueItem[1] = processNames(queueItem[1], defContext);
}

return queueItem;
};
Expand Down