Merge pull request #11813 from edx/andya/upgrade-requirejs

Upgrade RequireJS

cms/envs/common.py

@@ -652,7 +652,7 @@ REQUIRE_BASE_URL = "./"
 REQUIRE_BUILD_PROFILE = "cms/js/build.js"
 
 # The name of the require.js script used by your project, relative to REQUIRE_BASE_URL.
-REQUIRE_JS = "js/vendor/require.js"
+REQUIRE_JS = "js/vendor/requiresjs/require.js"
 
 # A dictionary of standalone modules to build with almond.js.
 REQUIRE_STANDALONE_MODULES = {}

cms/static/js_test.yml

@@ -28,7 +28,7 @@ prepend_path: cms/static
 
 # Paths to library JavaScript files (optional)
 lib_paths:
-    - xmodule_js/common_static/js/vendor/require.js
+    - xmodule_js/common_static/js/vendor/requirejs/require.js
     - xmodule_js/common_static/coffee/src/ajax_prefix.js
     - xmodule_js/common_static/js/src/utility.js
     - xmodule_js/common_static/js/vendor/jquery.min.js

cms/static/js_test_squire.yml

@@ -28,7 +28,7 @@ prepend_path: cms/static
 
 # Paths to library JavaScript files (optional)
 lib_paths:
-    - xmodule_js/common_static/js/vendor/require.js
+    - xmodule_js/common_static/js/vendor/requirejs/require.js
     - xmodule_js/common_static/coffee/src/ajax_prefix.js
     - xmodule_js/common_static/js/src/utility.js
     - xmodule_js/common_static/js/vendor/jquery.min.js

cms/templates/base.html

@@ -52,7 +52,7 @@ from openedx.core.djangolib.js_utils import (
       window.baseUrl = "${settings.STATIC_URL | n, js_escaped_string}";
       var require = {baseUrl: window.baseUrl};
     </script>
-    <script type="text/javascript" src="${static.url("js/vendor/require.js")}"></script>
+    <script type="text/javascript" src="${static.url("js/vendor/requirejs/require.js")}"></script>
     <script type="text/javascript" src="${static.url("cms/js/require-config.js")}"></script>
 
     <!-- view -->