Skip to content

Commit

Permalink
Fix the webpack build for quiz statistics
Browse files Browse the repository at this point in the history
This keeps quiz_statistics using the underscore compatible
version of lodash 2.4.1 in which exists _.findWhere rather than
using the new 4.x version of lodash recently added.

closes CNVS-30750

Test Plan:
  - Post-merge and silent patchset builds for selenium webpack pass

Change-Id: I4f63aa431e29b77dd46dad4a9828afe10e84ef85
Reviewed-on: https://gerrit.instructure.com/86007
Tested-by: Jenkins
Reviewed-by: Jon Jensen <[email protected]>
Product-Review: Jon Jensen <[email protected]>
QA-Review: Jon Jensen <[email protected]>
  • Loading branch information
claydiffrient committed Aug 3, 2016
1 parent 2f8e67c commit c08c79e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion client_apps/canvas_quizzes/config/requirejs/development.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ requirejs.config({
jsx: {
fileExtension: '.jsx'
},
});
});
7 changes: 7 additions & 0 deletions frontend_build/clientAppPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ clientAppPlugin.prototype.apply = function(compiler){
if(request == "react-router" || request == "canvas_packages/react-router"){
request = "old_unsupported_dont_use_react-router-webpack"
}

// Likewise, they depend on requiring lodash directly, which was set to
// map to lodash.underscore prior to 37914f705ee4055224107f01f0afb772d443f90d
// which added up-to-date normal lodash via 'lodash'
if (request === "lodash") {
request = "underscore";
}
}

// client apps are using a jsx plugin for require js; we have a JSX
Expand Down

0 comments on commit c08c79e

Please sign in to comment.