ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ensure you can still do requirejs and webpack simultaneously 

regression in 02d13b4e

test plan:
* `USE_WEBPACK=1 COMPILE_ASSETS_WEBPACK_RJS_FALLBACK=1 \
   rake canvas:compile_assets`
* it should work

Change-Id: Ie9f51367e11b97315fe2fc4b0fd6ac254802cfd7
Reviewed-on: https://gerrit.instructure.com/103404
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Jenkins
This commit is contained in:
Jon Jensen 2017-02-27 17:47:35 -07:00
parent accee852dd
commit 31c0b81cd6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tasks/canvas.rake
View File

@ -51,7 +51,7 @@ namespace :canvas do
build_js = ENV["COMPILE_ASSETS_BUILD_JS"] != "0"
build_api_docs = ENV["COMPILE_ASSETS_API_DOCS"] != "0"
compile_js = !CANVAS_WEBPACK
compile_js = !CANVAS_WEBPACK || ENV["COMPILE_ASSETS_WEBPACK_RJS_FALLBACK"] == "1"
# normally one or the other
build_requirejs = build_js && !CANVAS_WEBPACK
build_webpack = build_js && CANVAS_WEBPACK