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 -->

common/lib/xmodule/xmodule/js/js_test.yml

@@ -38,7 +38,7 @@ lib_paths:
     - common_static/js/src/logger.js
     - common_static/js/vendor/jasmine-jquery.js
     - common_static/js/vendor/jasmine-imagediff.js
-    - common_static/js/vendor/require.js
+    - common_static/js/vendor/requirejs/require.js
     - RequireJS-namespace-undefine.js
     - common_static/js/vendor/jquery.min.js
     - common_static/js/vendor/jquery-ui.min.js

common/static/js/vendor/requirejs/require.js

+../../../../../node_modules/requirejs/require.js
\ No newline at end of file

lms/envs/common.py

@@ -1237,7 +1237,7 @@ base_vendor_js = [
     'js/vendor/jquery.cookie.js',
     'js/vendor/url.min.js',
     'js/vendor/underscore-min.js',
-    'js/vendor/require.js',
+    'js/vendor/requirejs/require.js',
     'js/RequireJS-namespace-undefine.js',
     'js/vendor/URI.min.js',
     'js/vendor/backbone-min.js'
@@ -1604,7 +1604,7 @@ REQUIRE_BASE_URL = "./"
 REQUIRE_BUILD_PROFILE = "lms/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/requirejs/require.js"
 
 # A dictionary of standalone modules to build with almond.js.
 REQUIRE_STANDALONE_MODULES = {}

lms/static/js_test.yml

@@ -33,7 +33,7 @@ lib_paths:
     - xmodule_js/common_static/js/src/logger.js
     - xmodule_js/common_static/js/vendor/jasmine-jquery.js
     - xmodule_js/common_static/js/vendor/jasmine-imagediff.js
-    - xmodule_js/common_static/js/vendor/require.js
+    - xmodule_js/common_static/js/vendor/requirejs/require.js
     - js/RequireJS-namespace-undefine.js
     - xmodule_js/common_static/js/vendor/requirejs/text.js
     - xmodule_js/common_static/js/vendor/jquery.min.js

lms/static/js_test_coffee.yml

@@ -33,7 +33,7 @@ lib_paths:
     - xmodule_js/common_static/js/src/logger.js
     - xmodule_js/common_static/js/vendor/jasmine-jquery.js
     - xmodule_js/common_static/js/vendor/jasmine-imagediff.js
-    - xmodule_js/common_static/js/vendor/require.js
+    - xmodule_js/common_static/js/vendor/requirejs/require.js
     - js/RequireJS-namespace-undefine.js
     - xmodule_js/common_static/js/vendor/jquery.min.js
     - xmodule_js/common_static/js/vendor/jquery-ui.min.js

package.json

@@ -4,6 +4,7 @@
   "dependencies": {
     "coffee-script": "1.6.1",
     "edx-pattern-library": "0.10.4",
+    "requirejs": "~2.1.22",
     "uglify-js": "2.4.24",
     "underscore": "1.4.4"
   },

static/monitoring/package.json

@@ -16,7 +16,6 @@
         "moment": "2.10.6",
         "mustache": "0.5.1",
         "rangeslider": "1.0",
-        "require": "2.1.8",
         "requirejs-text": "2.0.14",
         "slickgrid": "2.1",
         "timeago": "0.11.4",