move "old_unsupported_react" to client_apps

closes: CNVS-30472

since client_apps/canvas_quizzes is the only
thing that cares about our old version of
react and react-router, this moves them out
of canvas and into canvas_quizzes so it is the
only one that can use them. This simplifies
things in canvas so no one ever tries to
use them going forward.

test plan:

* inside of client_apps/canvas_quzzes
  run: `script/build && grunt test`
* it should pass jenkins
* click around in the quiz stats and quiz log
auditing apps to make sure they still load

mv old_unsupported

Change-Id: I56eadedfe2417f32f2afb99ec76a21870871ad7e

WIP move "old_unsupported_react" to client_apps

Change-Id: I673321b51db9b197a298ccb831c417e902aaae28
Reviewed-on: https://gerrit.instructure.com/85483
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>

app/coffeescripts/react/shared/utils/withReactDOM.coffee

@@ -1,49 +0,0 @@
-define ['old_unsupported_dont_use_react'], (React) ->
-
-  reactDomIsInjected = false
-
-  # This moves everything from React.DOM to the window, making non-jsx react
-  # code far more convenient, and even a bit haml-like
-  #
-  # ```coffee
-  # define ['react', 'compiled/react/shared/utils/withReactDOM'], (React, withReactDOM) ->
-  #   React.createClass
-  #     render: withDOM ->
-  #       div {className: 'container'},
-  #         ul {},
-  #           li {className: 'foo'}, 'Foo'
-  #           li {className: 'bar'}, 'Bar'
-  # ```
-
-  withReactDOM = (fn) ->
-    return ->
-      # to be faster, if a component above us used withReactDOM,
-      # and is currently rendering, don't re-inject
-      return fn.apply(this, arguments) if reactDomIsInjected
-
-      # inject everything from React.DOM into global scope,
-      # and preserve things that were already there.
-      originals = {}
-      for key of React.DOM
-        if key of window
-          originals[key] = window[key]
-        window[key] = React.DOM[key]
-      reactDomIsInjected = true
-
-      # run provided callback
-      retVal = fn.apply(this, arguments)
-
-      # clean up, putting the things that were on window back.
-      # Because JS is single threaded, by cleaning up here,
-      # we're guaranteed not to screw up some potential
-      # global `i` in other code. By the time our function has returned,
-      # everything will be back to how it was before.
-      for key of React.DOM
-        if key of originals
-          window[key] = originals[key]
-        else
-          delete window[key]
-      reactDomIsInjected = false
-
-      # return the result of the callback
-      retVal

client_apps/canvas_quizzes/apps/common/js/components/alert.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var classSet = require('../util/class_set');
   var $ = require('canvas_packages/jquery');
 

client_apps/canvas_quizzes/apps/common/js/components/dialog.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var jQueryUIDialog = require('canvas_packages/jqueryui/dialog');
   var $ = require('canvas_packages/jquery');
   var _ = require('lodash');

client_apps/canvas_quizzes/apps/common/js/components/icon.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var ScreenReaderContent = require('jsx!./screen_reader_content');
   var SightedUserContent = require('jsx!./sighted_user_content');
   var Icon = React.createClass({

client_apps/canvas_quizzes/apps/common/js/components/popup.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var $ = require('canvas_packages/jquery');
   var _ = require('lodash');
   var jQuery_qTip = require('qtip');

client_apps/canvas_quizzes/apps/common/js/components/screen_reader_content.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
 
   /**
    * @class Components.ScreenReaderContent

client_apps/canvas_quizzes/apps/common/js/components/sighted_user_content.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
 
   /**
    * @class Components.SightedUserContent

client_apps/canvas_quizzes/apps/common/js/components/spinner.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var Spinner = React.createClass({
     render: function() {
       return(

client_apps/canvas_quizzes/apps/common/js/components/text.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var _ = require('lodash');
   var interpolate = require('../util/i18n_interpolate');
   var convertCase = require('../util/convert_case');

client_apps/canvas_quizzes/apps/common/js/util/class_set.js

@@ -1,5 +1,5 @@
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   /**
    * @member Util
    *

client_apps/canvas_quizzes/apps/common/test/helpers/react_route_suite.js

@@ -1,11 +1,11 @@
-require([ 'react' ], function(React) {
+require([ 'old_version_of_react_used_by_canvas_quizzes_client_apps' ], function(React) {
   window.React = React;
 
 // Creates a DOM element that ReactSuite tests will use tmount the subject
 // in. Although jasmine_react does that automatically on the start of each
 // ReactSuite, we will prepare it before-hand and expose it to jasmine.fixture
 // if you need to access directly.
-require([ 'jasmine_react', 'canvas_packages/react-router', ], function(ReactSuite, ReactRouter) {
+require([ 'jasmine_react', 'old_version_of_react-router_used_by_canvas_quizzes_client_apps'], function(ReactSuite, ReactRouter) {
   var Route = ReactRouter.Route;
 
   console.log("")

client_apps/canvas_quizzes/apps/common/test/unit/components/dialog_test.js

@@ -1,5 +1,5 @@
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var Subject = require('jsx!components/dialog');
 
   describe('Components.Dialog', function() {

client_apps/canvas_quizzes/apps/common/test/unit/components/text_test.js

@@ -1,5 +1,5 @@
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var Subject = require('jsx!components/text');
 
   describe('Components.Text', function() {

client_apps/canvas_quizzes/apps/events/js/bundles/routes.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var ReactRouter = require('canvas_packages/react-router');
+  var ReactRouter = require('old_version_of_react-router_used_by_canvas_quizzes_client_apps');
   var AppRoute = require('jsx!../routes/app');
   var EventStreamRoute = require('jsx!../routes/event_stream');
   var QuestionRoute = require('jsx!../routes/question');

client_apps/canvas_quizzes/apps/events/js/components/button.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var classSet = require('canvas_quizzes/util/class_set');
 
   /**

client_apps/canvas_quizzes/apps/events/js/core/delegate.js

@@ -1,5 +1,5 @@
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var _ = require('lodash');
   var config = require('../config');
   var initialize = require('../config/initializer');

client_apps/canvas_quizzes/apps/events/js/mixins/with_sidebar.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   return {
     render: function() {
       return (

client_apps/canvas_quizzes/apps/events/js/routes/answer_matrix.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var AnswerMatrix = require('jsx!../views/answer_matrix');
   var Config = require('../config');
 

client_apps/canvas_quizzes/apps/events/js/routes/app.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var Actions = require('../actions');
   var I18n = require('i18n!quiz_log_auditing');
 

client_apps/canvas_quizzes/apps/events/js/routes/event_stream.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var EventStream = require('jsx!../views/event_stream');
   var Session = require('jsx!../views/session');
 

client_apps/canvas_quizzes/apps/events/js/routes/question.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var WithSidebar = require('jsx!../mixins/with_sidebar');
   var QuestionInspector = require('jsx!../views/question_inspector');
   var QuestionListing = require('jsx!../views/question_listing');

client_apps/canvas_quizzes/apps/events/js/views/answer_matrix.jsx

@@ -1,7 +1,7 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
-  var ReactRouter = require('canvas_packages/react-router');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
+  var ReactRouter = require('old_version_of_react-router_used_by_canvas_quizzes_client_apps');
   var K = require('../constants');
   var I18n = require('i18n!quiz_log_auditing.table_view');
   var Legend = require('jsx!./answer_matrix/legend');

client_apps/canvas_quizzes/apps/events/js/views/answer_matrix/cell.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var _ = require('lodash');
   var K = require('../../constants');
   var Emblem = require('jsx!./emblem');

client_apps/canvas_quizzes/apps/events/js/views/answer_matrix/emblem.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
 
   /**
    * @class Events.Views.AnswerMatrix.Emblem

client_apps/canvas_quizzes/apps/events/js/views/answer_matrix/inverted_table.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var secondsToTime = require('canvas_quizzes/util/seconds_to_time');
   var I18n = require('i18n!quiz_log_auditing.inverted_table_view');
   var Cell = require('jsx!./cell');

client_apps/canvas_quizzes/apps/events/js/views/answer_matrix/legend.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var Emblem = require('jsx!./emblem');
   var I18n = require('i18n!quiz_log_auditing.table_view');
 

client_apps/canvas_quizzes/apps/events/js/views/answer_matrix/option.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var Option = React.createClass({
     getDefaultProps: function() {
       return {

client_apps/canvas_quizzes/apps/events/js/views/answer_matrix/table.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var I18n = require('i18n!quiz_log_auditing.table_view');
   var secondsToTime = require('canvas_quizzes/util/seconds_to_time');
   var Cell = require('jsx!./cell');

client_apps/canvas_quizzes/apps/events/js/views/event_stream.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var _ = require('lodash');
   var Actions = require('../actions');
   var I18n = require('i18n!quiz_log_auditing.event_stream');

client_apps/canvas_quizzes/apps/events/js/views/event_stream/event.jsx

@@ -1,13 +1,13 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var classSet = require('canvas_quizzes/util/class_set');
   var K = require('../../constants');
   var secondsToTime = require('canvas_quizzes/util/seconds_to_time');
   var I18n = require('i18n!quiz_log_auditing.event_stream');
   var Icon = require('jsx!canvas_quizzes/components/icon');
   var SightedUserContent = require('jsx!canvas_quizzes/components/sighted_user_content');
-  var Router = require('canvas_packages/react-router');
+  var Router = require('old_version_of_react-router_used_by_canvas_quizzes_client_apps');
   var Link = Router.Link;
 
 

client_apps/canvas_quizzes/apps/events/js/views/question_inspector.jsx

@@ -1,10 +1,10 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var I18n = require('i18n!quiz_log_auditing');
   var classSet = require('canvas_quizzes/util/class_set');
   var K = require('../constants');
-  var ReactRouter = require('canvas_packages/react-router');
+  var ReactRouter = require('old_version_of_react-router_used_by_canvas_quizzes_client_apps');
   var Answer = require('jsx!./question_inspector/answer');
   var NoAnswer = require('jsx!./question_inspector/answers/no_answer');
 

client_apps/canvas_quizzes/apps/events/js/views/question_inspector/answer.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var K = require('../../constants');
   var I18n = require('i18n!quiz_log_auditing');
   var classSet = require('canvas_quizzes/util/class_set');

client_apps/canvas_quizzes/apps/events/js/views/question_inspector/answers/essay.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var K = require('../../../constants');
   var Button = require('jsx!../../../components/button');
   var I18n = require('i18n!quiz_log_auditing.question_answers.essay');

client_apps/canvas_quizzes/apps/events/js/views/question_inspector/answers/fill_in_multiple_blanks.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var K = require('../../../constants');
   var NO_ANSWER = require('jsx!./no_answer');
   var keys = Object.keys;

client_apps/canvas_quizzes/apps/events/js/views/question_inspector/answers/matching.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var K = require('../../../constants');
   var NO_ANSWER = require('jsx!./no_answer');
 

client_apps/canvas_quizzes/apps/events/js/views/question_inspector/answers/multiple_answers.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var K = require('../../../constants');
 
   var MultipleAnswers = React.createClass({

client_apps/canvas_quizzes/apps/events/js/views/question_inspector/answers/multiple_choice.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var K = require('../../../constants');
 
   var MultipleChoice = React.createClass({

client_apps/canvas_quizzes/apps/events/js/views/question_inspector/answers/multiple_dropdowns.jsx

@@ -1,7 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var K = require('../../../constants');
   var NO_ANSWER = require('jsx!./no_answer');
   var keys = Object.keys;

client_apps/canvas_quizzes/apps/events/js/views/question_inspector/answers/no_answer.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var I18n = require('i18n!quiz_log_auditing');
 
   return (

client_apps/canvas_quizzes/apps/events/js/views/question_listing.jsx

@@ -1,7 +1,7 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
-  var ReactRouter = require('canvas_packages/react-router');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
+  var ReactRouter = require('old_version_of_react-router_used_by_canvas_quizzes_client_apps');
   var I18n = require('i18n!quiz_log_auditing.navigation');
   var Link = ReactRouter.Link;
 

client_apps/canvas_quizzes/apps/events/js/views/session.jsx

@@ -1,7 +1,7 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
-  var ReactRouter = require('canvas_packages/react-router');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
+  var ReactRouter = require('old_version_of_react-router_used_by_canvas_quizzes_client_apps');
   var I18n = require('i18n!quiz_log_auditing');
   var Button = require('jsx!../components/button');
   var ScreenReaderContent = require('jsx!canvas_quizzes/components/screen_reader_content');

client_apps/canvas_quizzes/apps/statistics/js/core/delegate.js

@@ -1,5 +1,5 @@
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var _ = require('lodash');
   var config = require('../config');
   var initialize = require('../config/initializer');

client_apps/canvas_quizzes/apps/statistics/js/ext/react.js

@@ -1,5 +1,5 @@
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var ActorMixin = require('../mixins/components/actor');
 
   if (!React.addons) {

client_apps/canvas_quizzes/apps/statistics/js/mixins/chart.js

@@ -1,5 +1,5 @@
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
 
   var getChartNode = function(component) {
     var ref = (component.refs || {}).chart || component;

client_apps/canvas_quizzes/apps/statistics/js/mixins/components/chart_inspector.js

@@ -1,5 +1,5 @@
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var d3 = require('d3');
   var $ = require('canvas_packages/jquery');
   var jQuery_qTip = require('qtip');

client_apps/canvas_quizzes/apps/statistics/js/views/app.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var _ = require('lodash');
   var I18n = require('i18n!quiz_statistics');
   var Notifications = require('jsx!./notifications');

client_apps/canvas_quizzes/apps/statistics/js/views/charts/correct_answer_donut.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var d3 = require('d3');
   var ChartMixin = require('../../mixins/chart');
   var round = require('canvas_quizzes/util/round');

client_apps/canvas_quizzes/apps/statistics/js/views/charts/discrimination_index.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var K = require('../../constants');
   var I18n = require('i18n!quiz_statistics.discrimination_index');
   var classSet = require('canvas_quizzes/util/class_set');

client_apps/canvas_quizzes/apps/statistics/js/views/charts/discrimination_index/chart.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var d3 = require('d3');
   var ChartMixin = require('../../../mixins/chart');
 

client_apps/canvas_quizzes/apps/statistics/js/views/charts/discrimination_index/help.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var K = require('../../../constants');
   var Text = require('jsx!canvas_quizzes/components/text');
   var I18n = require('i18n!quiz_statistics');

client_apps/canvas_quizzes/apps/statistics/js/views/notifications.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var Actions = require('../actions');
   var I18n = require('i18n!quizzes');
   var NotificationRenderers = [];

client_apps/canvas_quizzes/apps/statistics/js/views/notifications/report_generation_failed.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var Text = require('jsx!canvas_quizzes/components/text');
   var K = require('../../constants');
   var I18n = require('i18n!quiz_reports');

client_apps/canvas_quizzes/apps/statistics/js/views/question.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var classSet = require('canvas_quizzes/util/class_set');
 
   var Question = React.createClass({

client_apps/canvas_quizzes/apps/statistics/js/views/questions/answer_table.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var d3 = require('d3');
   var _ = require('lodash');
   var AnswerRow = require('jsx!./answer_table/answer_row');

client_apps/canvas_quizzes/apps/statistics/js/views/questions/answer_table/answer_row.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var _ = require('lodash');
   var I18n = require('i18n!quiz_statistics.answers_tables');
   var UserListDialog = require('jsx!./../user_list_dialog');

client_apps/canvas_quizzes/apps/statistics/js/views/questions/header.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var I18n = require('i18n!quiz_statistics');
   var ScreenReaderContent = require('jsx!canvas_quizzes/components/screen_reader_content');
 

client_apps/canvas_quizzes/apps/statistics/js/views/questions/user_list_dialog.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var Dialog = require('jsx!canvas_quizzes/components/dialog');
   var I18n = require('i18n!quiz_statistics');
 

client_apps/canvas_quizzes/apps/statistics/js/views/summary.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var I18n = require('i18n!quiz_statistics.summary');
   var secondsToTime = require('canvas_quizzes/util/seconds_to_time');
   var round = require('canvas_quizzes/util/round');

client_apps/canvas_quizzes/apps/statistics/js/views/summary/report/status.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var I18n = require('i18n!quiz_reports');
   var K = require('../../../constants');
   var Descriptor = require('../../../models/quiz_report_descriptor');

client_apps/canvas_quizzes/apps/statistics/js/views/summary/score_percentile_chart.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var ChartMixin = require('../../mixins/chart');
   var d3 = require('d3');
   var I18n = require('i18n!quiz_statistics.summary');

client_apps/canvas_quizzes/apps/statistics/js/views/summary/section_select.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var quizStatistics = require('../../stores/statistics');
   var config = require('../../config');
   var I18n = require('i18n!quiz_statistics');

client_apps/canvas_quizzes/apps/statistics/test/unit/views/questions/answer_table_test.js

@@ -1,7 +1,7 @@
 define(function(require) {
   var Subject = require('jsx!views/questions/answer_table');
   var $ = require('canvas_packages/jquery');
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var d3 = require('d3');
 
   describe('Views.Questions.AnswerTable', function() {

client_apps/canvas_quizzes/config/requirejs/build/map.json

@@ -2,7 +2,5 @@
   "lodash": "underscore",
   "d3": "vendor/d3.v3",
   "backbone": "vendor/backbone",
-  "jquery/instructure_date_and_time": "jquery.instructure_date_and_time",
-  "react": "old_unsupported_dont_use_react",
-  "react-router": "old_unsupported_dont_use_react-router"
+  "jquery/instructure_date_and_time": "jquery.instructure_date_and_time"
 }

client_apps/canvas_quizzes/config/requirejs/development.js

@@ -20,11 +20,12 @@ requirejs.config({
     // CQS dependencies
     'rsvp': '../../../vendor/js/rsvp.min',
     'qtip': '../../../vendor/js/jquery.qtip',
+    'old_version_of_react_used_by_canvas_quizzes_client_apps': '../../../vendor/js/old_version_of_react_used_by_canvas_quizzes_client_apps',
+    'old_version_of_react-router_used_by_canvas_quizzes_client_apps': '../../../vendor/js/old_version_of_react-router_used_by_canvas_quizzes_client_apps',
     // ========================================================================
 
     // ========================================================================
     // Aliases to frequently-used Canvas packages
-    'react': '../../../vendor/packages/react',
     'lodash': '../../../vendor/packages/lodash',
     'd3': '../../../vendor/packages/d3',
     // ========================================================================

client_apps/canvas_quizzes/config/requirejs/test.js

@@ -10,7 +10,7 @@ requirejs.config({
     },
 
     '*': {
-      'old_unsupported_dont_use_react': 'canvas/old_unsupported_dont_use_react',
+      'react': '../../../vendor/js/alias_to_old_version_of_react',
       'str': 'canvas/str',
       'jsx/railsFlashNotificationsHelper': 'canvas/jsx/railsFlashNotificationsHelper'
     }

client_apps/canvas_quizzes/doc/examples/i18n_using_text.jsx

@@ -1,6 +1,6 @@
 /** @jsx React.DOM */
 define(function(require) {
-  var React = require('react');
+  var React = require('old_version_of_react_used_by_canvas_quizzes_client_apps');
   var K = require('../../../constants');
   var Text = require('jsx!../../../components/text');
   var I18n = require('i18n!quiz_statistics');

client_apps/canvas_quizzes/doc/main.js

@@ -8,7 +8,7 @@ requirejs.config({
 require([ 'config/requirejs/development' ], function() {
   require([
     'canvas_packages/jquery',
-    'react',
+    'old_version_of_react_used_by_canvas_quizzes_client_apps',
     'canvas_quizzes/util/inflections',
   ], function($, React, Inflection) {
     var parseFileName = function() {

client_apps/canvas_quizzes/package.json

@@ -39,7 +39,9 @@
   "requirejs": {
     "bundledDependencies": [
       "rsvp",
-      "qtip"
+      "qtip",
+      "old_version_of_react_used_by_canvas_quizzes_client_apps",
+      "old_version_of_react-router_used_by_canvas_quizzes_client_apps"
     ]
   },
 

client_apps/canvas_quizzes/vendor/js/alias_to_old_version_of_react.js

@@ -0,0 +1,3 @@
+define(['old_version_of_react_used_by_canvas_quizzes_client_apps'], function(react){
+  return react;
+});

client_apps/canvas_quizzes/vendor/packages/react-router.js

@@ -1,3 +0,0 @@
-define([ 'canvas/old_unsupported_dont_use_react-router' ], function(Router) {
-  return Router;
-});

client_apps/canvas_quizzes/vendor/packages/react.js

@@ -1,3 +0,0 @@
-define([ 'canvas/old_unsupported_dont_use_react' ], function(React) {
-  return React;
-});

config/build.js.erb

@@ -3,7 +3,7 @@
   // file optimizations
   optimize: "none",
 
-  // continue to let Jammit do its thing
+  // our requireJS does nothing with CSS
   optimizeCss: "none",
 
   // where to place optimized javascript, relative to this file

frontend_build/clientAppPlugin.js

@@ -13,19 +13,8 @@ clientAppPlugin.prototype.apply = function(compiler){
     nmf.plugin("before-resolve", function(result, callback) {
       let request = result.request;
 
-      // the client apps use an old version of react and used requirejs aliases
-      // to keep it seperate from the react version the rest of canvas uses.
-      //  This should shim that difference into the webpack build.
       if(/client_apps\/canvas_quizzes/.test(result.context)){
-        if(request == "react"){
-          request = "old_unsupported_dont_use_react"
-        }
-
-        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
+        // The client apps 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") {

public/javascripts/.xssignore

@@ -12,7 +12,6 @@ vendor
 /tinymce/jscripts/tiny_mce/themes
 /tinymce/jscripts/tiny_mce/tiny_mce*.js
 /tinymce/jscripts/tiny_mce/utils
-/old_unsupported_dont_use_react.js
 
 # vendor package in analytics
 /plugins/analytics/react-bootstrap-table.js