fixup! Load all webpack chunks into fragments as correctly-typed resources

This commit is contained in:
Calen Pennington
2018-09-11 13:56:05 -04:00
parent cb075a3240
commit 9c32073e9b
2 changed files with 6 additions and 4 deletions

View File

@@ -152,9 +152,8 @@
eval.call(window, data);
console.log("JavaScript text resource eval'd", resource);
} else if (kind === 'url') {
// This is a dependency loaded from the LMS (not ideal)
return ViewUtils.loadJavaScript(data).done(function() {
console.log('JavaScript url resource loaded', resource);
$script(data, data, function () {
console.log('JavaScript url resource loaded', resource);
});
}
} else if (mimetype === 'text/html') {

View File

@@ -106,7 +106,10 @@ module.exports = Merge.smart({
Popper: 'popper.js', // used by bootstrap
CodeMirror: 'codemirror',
'edx.HtmlUtils': 'edx-ui-toolkit/js/utils/html-utils',
AjaxPrefix: 'ajax_prefix'
AjaxPrefix: 'ajax_prefix',
// This is used by some XModules/XBlocks, which don't have
// any other way to declare that dependency.
$script: 'scriptjs'
}),
// Note: Until karma-webpack releases v3, it doesn't play well with