Enable import-order Eslint Rule for craft/ and studio/

apps/.eslintrc.js

@@ -198,7 +198,6 @@ module.exports = {
         'src/code-studio/**',
         'src/cookieBanner/*',
         'src/courseExplorer/*',
-        'src/craft/**',
         'src/dance/**',
         'src/eval/*',
         'src/fish/*',
@@ -219,7 +218,6 @@ module.exports = {
         'src/sites/**',
         'src/standaloneVideo/*',
         'src/storage/**',
-        'src/studio/**',
         'src/templates/amazonFutureEngineerEligibility/**',
         'src/templates/census2017/**',
         'src/templates/certificates/**',
@@ -260,7 +258,6 @@ module.exports = {
         'test/unit/blockTooltips/**',
         'test/unit/calc/**',
         'test/unit/code-studio/**',
-        'test/unit/craft/**',
         'test/unit/dance/**',
         'test/unit/gamelab/**',
         'test/unit/javalab/**',
@@ -273,7 +270,6 @@ module.exports = {
         'test/unit/redux/**',
         'test/unit/sites/**',
         'test/unit/storage/**',
-        'test/unit/studio/**',
         'test/unit/weblab/**',
       ],
     },

apps/src/craft/CraftDialog.jsx

@@ -1,5 +1,6 @@
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
+
 import BaseDialog from '@cdo/apps/templates/BaseDialog';
 
 /**

apps/src/craft/PlayerSelectionDialog.jsx

@@ -1,8 +1,9 @@
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
 import {connect} from 'react-redux';
-import i18n from './locale';
+
 import CraftDialog from './CraftDialog';
+import i18n from './locale';
 
 /**
  * Dialog for selecting a player in Minecraft tutorials.

apps/src/craft/agent/CraftVisualizationColumn.jsx

@@ -1,12 +1,15 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-var msg = require('@cdo/locale');
 
-var GameButtons = require('../../templates/GameButtons').default;
+import SwipePrompt from '@cdo/apps/templates/SwipePrompt';
+
 import ArrowButtons from '../../templates/ArrowButtons';
-var BelowVisualization = require('../../templates/BelowVisualization');
 import ProtectedVisualizationDiv from '../../templates/ProtectedVisualizationDiv';
-import SwipePrompt from '@cdo/apps/templates/SwipePrompt';
+
+var msg = require('@cdo/locale');
+
+var BelowVisualization = require('../../templates/BelowVisualization');
+var GameButtons = require('../../templates/GameButtons').default;
 
 var CraftVisualizationColumn = function (props) {
   return (

apps/src/craft/agent/blocks.js

@@ -1,7 +1,9 @@
-var i18n = require('../locale');
-import {blockTypesToDropdownOptions} from '../utils';
 import {BlockColors, BlockStyles} from '@cdo/apps/blockly/constants';
 
+import {blockTypesToDropdownOptions} from '../utils';
+
+var i18n = require('../locale');
+
 var allBlocks = [
   'bedrock',
   'bricks',

apps/src/craft/agent/craft.js

@@ -1,38 +1,39 @@
-import $ from 'jquery';
-import React from 'react';
-import ReactDOM from 'react-dom';
-import Hammer from 'hammerjs';
-
-import trackEvent from '../../util/trackEvent';
-import {tryGetLocalStorage, trySetLocalStorage} from '@cdo/apps/utils';
-import {singleton as studioApp} from '../../StudioApp';
-import craftMsg from '../locale';
-import CustomMarshalingInterpreter from '../../lib/tools/jsinterpreter/CustomMarshalingInterpreter';
 import {
   GameController,
   FacingDirection,
   EventType,
   utils as CraftUtils,
 } from '@code-dot-org/craft';
-import dom from '../../dom';
-import MusicController from '../../MusicController';
+import Hammer from 'hammerjs';
+import $ from 'jquery';
+import React from 'react';
+import ReactDOM from 'react-dom';
 import {Provider} from 'react-redux';
-import AppView from '../../templates/AppView';
-import CraftVisualizationColumn from './CraftVisualizationColumn';
-import {getStore} from '../../redux';
-import Sounds from '../../Sounds';
 
-import {TestResults} from '../../constants';
-import {captureThumbnailFromCanvas} from '../../util/thumbnail';
-import {SignInState} from '@cdo/apps/templates/currentUserRedux';
+import PlayerSelectionDialog from '@cdo/apps/craft/PlayerSelectionDialog';
+import reducers from '@cdo/apps/craft/redux';
 import {ARROW_KEY_NAMES, handlePlayerSelection} from '@cdo/apps/craft/utils';
 import {
   showArrowButtons,
   dismissSwipeOverlay,
 } from '@cdo/apps/templates/arrowDisplayRedux';
-import PlayerSelectionDialog from '@cdo/apps/craft/PlayerSelectionDialog';
-import reducers from '@cdo/apps/craft/redux';
+import {SignInState} from '@cdo/apps/templates/currentUserRedux';
+import {tryGetLocalStorage, trySetLocalStorage} from '@cdo/apps/utils';
+
+import {TestResults} from '../../constants';
+import dom from '../../dom';
+import CustomMarshalingInterpreter from '../../lib/tools/jsinterpreter/CustomMarshalingInterpreter';
+import MusicController from '../../MusicController';
+import {getStore} from '../../redux';
+import Sounds from '../../Sounds';
+import {singleton as studioApp} from '../../StudioApp';
+import AppView from '../../templates/AppView';
 import {muteCookieWithLevel} from '../../util/muteCookieHelpers';
+import {captureThumbnailFromCanvas} from '../../util/thumbnail';
+import trackEvent from '../../util/trackEvent';
+import craftMsg from '../locale';
+
+import CraftVisualizationColumn from './CraftVisualizationColumn';
 
 const MEDIA_URL = '/blockly/media/craft/';
 

apps/src/craft/agent/skins.js

@@ -1,4 +1,5 @@
 import skinsBase from '../../skins';
+
 import Craft from './craft.js';
 
 exports.load = function (assetUrl, id) {

apps/src/craft/aquatic/craft.js

@@ -1,31 +1,34 @@
-import $ from 'jquery';
-import React from 'react';
-import ReactDOM from 'react-dom';
-import trackEvent from '../../util/trackEvent';
-import {singleton as studioApp} from '@cdo/apps/StudioApp';
-import craftMsg from '../locale';
-import CustomMarshalingInterpreter from '../../lib/tools/jsinterpreter/CustomMarshalingInterpreter';
 import {
   GameController,
   EventType,
   utils as CraftUtils,
 } from '@code-dot-org/craft';
+import $ from 'jquery';
+import React from 'react';
+import ReactDOM from 'react-dom';
+
+import {TestResults} from '@cdo/apps/constants';
+import PlayerSelectionDialog from '@cdo/apps/craft/PlayerSelectionDialog';
+import reducers from '@cdo/apps/craft/redux';
 import {handlePlayerSelection} from '@cdo/apps/craft/utils';
 import dom from '@cdo/apps/dom';
-import {trySetLocalStorage} from '@cdo/apps/utils';
 import MusicController from '@cdo/apps/MusicController';
-var Provider = require('react-redux').Provider;
-import AppView from '../../templates/AppView';
-var CraftVisualizationColumn = require('../simple/CraftVisualizationColumn');
 import {getStore} from '@cdo/apps/redux';
 import Sounds from '@cdo/apps/Sounds';
-
-import {TestResults} from '@cdo/apps/constants';
-import {captureThumbnailFromCanvas} from '@cdo/apps/util/thumbnail';
+import {singleton as studioApp} from '@cdo/apps/StudioApp';
 import {SignInState} from '@cdo/apps/templates/currentUserRedux';
-import PlayerSelectionDialog from '@cdo/apps/craft/PlayerSelectionDialog';
-import reducers from '@cdo/apps/craft/redux';
+import {captureThumbnailFromCanvas} from '@cdo/apps/util/thumbnail';
+import {trySetLocalStorage} from '@cdo/apps/utils';
+
+import CustomMarshalingInterpreter from '../../lib/tools/jsinterpreter/CustomMarshalingInterpreter';
+import AppView from '../../templates/AppView';
 import {muteCookieWithLevel} from '../../util/muteCookieHelpers';
+import trackEvent from '../../util/trackEvent';
+import craftMsg from '../locale';
+
+var Provider = require('react-redux').Provider;
+
+var CraftVisualizationColumn = require('../simple/CraftVisualizationColumn');
 
 var MEDIA_URL = '/blockly/media/craft/';
 

apps/src/craft/code-connection/CraftVisualizationColumn.jsx

@@ -1,8 +1,8 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 
-import GameButtons from '../../templates/GameButtons';
 import BelowVisualization from '../../templates/BelowVisualization';
+import GameButtons from '../../templates/GameButtons';
 import ProtectedVisualizationDiv from '../../templates/ProtectedVisualizationDiv';
 
 export default class CraftVisualizationColumn extends React.Component {

apps/src/craft/code-connection/blocks.js

@@ -1,6 +1,7 @@
-var i18n = require('../locale');
 import items from './items';
 
+var i18n = require('../locale');
+
 // Helper functions for block string
 function getName(blockString) {
   return blockString.split(',')[0];

apps/src/craft/code-connection/craft.js

@@ -2,13 +2,15 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import {Provider} from 'react-redux';
 
-import {singleton as studioApp} from '@cdo/apps/StudioApp';
-import CustomMarshalingInterpreter from '../../lib/tools/jsinterpreter/CustomMarshalingInterpreter';
 import {getStore} from '@cdo/apps/redux';
+import {singleton as studioApp} from '@cdo/apps/StudioApp';
 import AppView from '@cdo/apps/templates/AppView';
-import CraftVisualizationColumn from './CraftVisualizationColumn';
-import cc_client from './cc-client';
+
 import dom from '../../dom';
+import CustomMarshalingInterpreter from '../../lib/tools/jsinterpreter/CustomMarshalingInterpreter';
+
+import cc_client from './cc-client';
+import CraftVisualizationColumn from './CraftVisualizationColumn';
 import items from './items';
 
 const MEDIA_URL = '/blockly/media/craft/';

apps/src/craft/designer/CraftVisualizationColumn.jsx

@@ -1,13 +1,14 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+
+import SwipePrompt from '@cdo/apps/templates/SwipePrompt';
 import msg from '@cdo/locale';
-import craftMsg from '../locale';
 
-import {default as GameButtons} from '../../templates/GameButtons';
-import BelowVisualization from '../../templates/BelowVisualization';
 import ArrowButtons from '../../templates/ArrowButtons';
+import BelowVisualization from '../../templates/BelowVisualization';
+import {default as GameButtons} from '../../templates/GameButtons';
 import ProtectedVisualizationDiv from '../../templates/ProtectedVisualizationDiv';
-import SwipePrompt from '@cdo/apps/templates/SwipePrompt';
+import craftMsg from '../locale';
 
 export default class CraftVisualizationColumn extends React.Component {
   static propTypes = {

apps/src/craft/designer/blocks.js

@@ -1,10 +1,13 @@
-const i18n = require('../locale');
+import {EventType} from '@code-dot-org/craft';
+import _ from 'lodash';
+
+import {BlockColors, BlockStyles} from '@cdo/apps/blockly/constants';
+
 import {singleton as studioApp} from '../../StudioApp';
 import {stripQuotes} from '../../utils';
-import _ from 'lodash';
-import {EventType} from '@code-dot-org/craft';
 import {BLOCK_NAME_TO_DISPLAY_TEXT} from '../utils';
-import {BlockColors, BlockStyles} from '@cdo/apps/blockly/constants';
+
+const i18n = require('../locale');
 
 const ENTITY_INPUT_EXTRA_SPACING = 14;
 

apps/src/craft/designer/craft.js

@@ -1,40 +1,42 @@
-import $ from 'jquery';
-import React from 'react';
-import ReactDOM from 'react-dom';
-import _ from 'lodash';
-import Hammer from 'hammerjs';
-
-import {singleton as studioApp} from '../../StudioApp';
-import craftMsg from '../locale';
-import CustomMarshalingInterpreter from '../../lib/tools/jsinterpreter/CustomMarshalingInterpreter';
 import {
   GameController,
   FacingDirection,
   utils as CraftUtils,
 } from '@code-dot-org/craft';
-import dom from '../../dom';
-import {trySetLocalStorage} from '@cdo/apps/utils';
-import eventsLevelbuilderOverrides from './eventsLevelbuilderOverrides';
-import MusicController from '../../MusicController';
+import Hammer from 'hammerjs';
+import $ from 'jquery';
+import _ from 'lodash';
+import React from 'react';
+import ReactDOM from 'react-dom';
 import {Provider} from 'react-redux';
-import AppView from '../../templates/AppView';
-import CraftVisualizationColumn from './CraftVisualizationColumn';
-import {ENTITY_ACTION_BLOCKS, ENTITY_TARGET_ACTION_BLOCKS} from './blocks';
-import {getStore} from '../../redux';
-import Sounds from '../../Sounds';
-import {TestResults} from '../../constants';
-import trackEvent from '../../util/trackEvent';
-import {captureThumbnailFromCanvas} from '../../util/thumbnail';
-import {SignInState} from '@cdo/apps/templates/currentUserRedux';
+
+import PlayerSelectionDialog from '@cdo/apps/craft/PlayerSelectionDialog';
+import reducers from '@cdo/apps/craft/redux';
 import {ARROW_KEY_NAMES, handlePlayerSelection} from '@cdo/apps/craft/utils';
 import {
   showArrowButtons,
   hideArrowButtons,
   dismissSwipeOverlay,
 } from '@cdo/apps/templates/arrowDisplayRedux';
-import PlayerSelectionDialog from '@cdo/apps/craft/PlayerSelectionDialog';
-import reducers from '@cdo/apps/craft/redux';
+import {SignInState} from '@cdo/apps/templates/currentUserRedux';
+import {trySetLocalStorage} from '@cdo/apps/utils';
+
+import {TestResults} from '../../constants';
+import dom from '../../dom';
+import CustomMarshalingInterpreter from '../../lib/tools/jsinterpreter/CustomMarshalingInterpreter';
+import MusicController from '../../MusicController';
+import {getStore} from '../../redux';
+import Sounds from '../../Sounds';
+import {singleton as studioApp} from '../../StudioApp';
+import AppView from '../../templates/AppView';
 import {muteCookieWithLevel} from '../../util/muteCookieHelpers';
+import {captureThumbnailFromCanvas} from '../../util/thumbnail';
+import trackEvent from '../../util/trackEvent';
+import craftMsg from '../locale';
+
+import {ENTITY_ACTION_BLOCKS, ENTITY_TARGET_ACTION_BLOCKS} from './blocks';
+import CraftVisualizationColumn from './CraftVisualizationColumn';
+import eventsLevelbuilderOverrides from './eventsLevelbuilderOverrides';
 
 const MEDIA_URL = '/blockly/media/craft/';
 

apps/src/craft/locale.js

@@ -1,5 +1,5 @@
-import safeLoadLocale from '@cdo/apps/util/safeLoadLocale';
 import localeWithI18nStringTracker from '@cdo/apps/util/i18nStringTracker';
+import safeLoadLocale from '@cdo/apps/util/safeLoadLocale';
 
 let locale = safeLoadLocale('craft_locale');
 locale = localeWithI18nStringTracker(locale, 'craft');

apps/src/craft/simple/CraftVisualizationColumn.jsx

@@ -1,10 +1,12 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+
+import ProtectedVisualizationDiv from '../../templates/ProtectedVisualizationDiv';
+
 var msg = require('@cdo/locale');
 
-var GameButtons = require('../../templates/GameButtons').default;
 var BelowVisualization = require('../../templates/BelowVisualization');
-import ProtectedVisualizationDiv from '../../templates/ProtectedVisualizationDiv';
+var GameButtons = require('../../templates/GameButtons').default;
 
 var CraftVisualizationColumn = function (props) {
   return (

apps/src/craft/simple/blocks.js

@@ -1,7 +1,9 @@
-var i18n = require('../locale');
-import {blockTypesToDropdownOptions} from '../utils';
 import {BlockColors, BlockStyles} from '@cdo/apps/blockly/constants';
 
+import {blockTypesToDropdownOptions} from '../utils';
+
+var i18n = require('../locale');
+
 var allBlocks = [
   'bedrock',
   'bricks',