diff --git a/ui/jstests/test-icheckbox.jsx b/ui/jstests/test-icheckbox.jsx index 6ba89e74..29e6b4b6 100644 --- a/ui/jstests/test-icheckbox.jsx +++ b/ui/jstests/test-icheckbox.jsx @@ -1,4 +1,4 @@ -define(['QUnit', 'jquery', 'utils', 'test_utils', 'reactaddons', 'icheck'], +define(['QUnit', 'jquery', 'utils', 'test_utils', 'react', 'icheck'], function(QUnit, $, Utils, TestUtils, React) { 'use strict'; diff --git a/ui/jstests/test-learning-resource.jsx b/ui/jstests/test-learning-resource.jsx index 02fc5dbc..13f23112 100644 --- a/ui/jstests/test-learning-resource.jsx +++ b/ui/jstests/test-learning-resource.jsx @@ -1,4 +1,4 @@ -define(['QUnit', 'jquery', 'reactaddons', 'lodash', 'learning_resources', +define(['QUnit', 'jquery', 'react', 'lodash', 'learning_resources', 'test_utils', 'jquery_mockjax'], function( QUnit, $, React, _, LearningResources, TestUtils) { 'use strict'; diff --git a/ui/jstests/test-select2.jsx b/ui/jstests/test-select2.jsx index 8fd3d386..4069ce59 100644 --- a/ui/jstests/test-select2.jsx +++ b/ui/jstests/test-select2.jsx @@ -1,4 +1,4 @@ -define(['QUnit', 'jquery', 'utils', 'reactaddons', +define(['QUnit', 'jquery', 'utils', 'react', 'test_utils'], function( QUnit, $, Utils, React, TestUtils) { 'use strict'; diff --git a/ui/jstests/test-static-assets.jsx b/ui/jstests/test-static-assets.jsx index 216eb4fc..16e12a01 100644 --- a/ui/jstests/test-static-assets.jsx +++ b/ui/jstests/test-static-assets.jsx @@ -1,4 +1,4 @@ -define(['QUnit', 'jquery', 'static_assets', 'reactaddons', +define(['QUnit', 'jquery', 'static_assets', 'react', 'test_utils'], function( QUnit, $, StaticAssets, React, TestUtils) { 'use strict'; diff --git a/ui/jstests/test_lr_exports.jsx b/ui/jstests/test_lr_exports.jsx index f194c959..324034d5 100644 --- a/ui/jstests/test_lr_exports.jsx +++ b/ui/jstests/test_lr_exports.jsx @@ -1,4 +1,4 @@ -define(['QUnit', 'jquery', 'lr_exports', 'reactaddons', +define(['QUnit', 'jquery', 'lr_exports', 'react', 'test_utils'], function(QUnit, $, Exports, React, TestUtils) { 'use strict'; diff --git a/ui/jstests/test_manage_taxonomies.jsx b/ui/jstests/test_manage_taxonomies.jsx index f209d2d4..97a384d8 100644 --- a/ui/jstests/test_manage_taxonomies.jsx +++ b/ui/jstests/test_manage_taxonomies.jsx @@ -1,4 +1,4 @@ -define(['QUnit', 'jquery', 'manage_taxonomies', 'reactaddons', +define(['QUnit', 'jquery', 'manage_taxonomies', 'react', 'test_utils'], function(QUnit, $, ManageTaxonomies, React, TestUtils) { 'use strict'; diff --git a/ui/static/ui/js/learning_resources.jsx b/ui/static/ui/js/learning_resources.jsx index 25171e8f..ae797666 100644 --- a/ui/static/ui/js/learning_resources.jsx +++ b/ui/static/ui/js/learning_resources.jsx @@ -1,5 +1,5 @@ define('learning_resources', [ - 'reactaddons', 'jquery', 'lodash', 'utils'], function ( + 'react', 'jquery', 'lodash', 'utils'], function ( React, $, _, Utils) { 'use strict'; diff --git a/ui/static/ui/js/lr_exports.jsx b/ui/static/ui/js/lr_exports.jsx index 5bb7e708..4621f193 100644 --- a/ui/static/ui/js/lr_exports.jsx +++ b/ui/static/ui/js/lr_exports.jsx @@ -1,5 +1,5 @@ define("lr_exports", - ['reactaddons', 'jquery', 'lodash', 'utils', 'icheck'], + ['react', 'jquery', 'lodash', 'utils', 'icheck'], function (React, $, _, Utils) { 'use strict'; diff --git a/ui/static/ui/js/manage_taxonomies.jsx b/ui/static/ui/js/manage_taxonomies.jsx index 18045853..e5d4240c 100644 --- a/ui/static/ui/js/manage_taxonomies.jsx +++ b/ui/static/ui/js/manage_taxonomies.jsx @@ -1,4 +1,4 @@ -define('manage_taxonomies', ['reactaddons', 'lodash', 'jquery', 'utils'], +define('manage_taxonomies', ['react', 'lodash', 'jquery', 'utils'], function (React, _, $, Utils) { 'use strict'; diff --git a/ui/static/ui/js/require_config.js b/ui/static/ui/js/require_config.js index 819a70f4..d1b567cd 100644 --- a/ui/static/ui/js/require_config.js +++ b/ui/static/ui/js/require_config.js @@ -5,8 +5,7 @@ var REQUIRE_PATHS = { bootstrap: "bootstrap/dist/js/bootstrap", icheck: "icheck/icheck", retina: "retina.js/dist/retina", - react: "react/react", - reactaddons: "react/react-with-addons", + react: "react/react-with-addons", lodash: "lodash/lodash", select2: "select2/dist/js/select2.full", csrf: "../ui/js/csrf", diff --git a/ui/static/ui/js/static_assets.jsx b/ui/static/ui/js/static_assets.jsx index 0cf62293..488bfb13 100644 --- a/ui/static/ui/js/static_assets.jsx +++ b/ui/static/ui/js/static_assets.jsx @@ -1,5 +1,5 @@ define('static_assets', [ - 'reactaddons', 'jquery', 'lodash', 'utils'], function (React, $, _, Utils) { + 'react', 'jquery', 'lodash', 'utils'], function (React, $, _, Utils) { 'use strict'; var StatusBox = Utils.StatusBox; diff --git a/ui/static/ui/js/utils.jsx b/ui/static/ui/js/utils.jsx index 907a9ca8..b376aa19 100644 --- a/ui/static/ui/js/utils.jsx +++ b/ui/static/ui/js/utils.jsx @@ -1,4 +1,4 @@ -define("utils", ["jquery", "lodash", "reactaddons", "select2"], +define("utils", ["jquery", "lodash", "react", "select2"], function ($, _, React) { 'use strict';