optimize imports

phetsims · Jul 20, 2022 · 72b7d4f · 72b7d4f
1 parent 726fadc
commit 72b7d4f
Show file tree

Hide file tree

Showing 31 changed files with 35 additions and 66 deletions.
diff --git a/js/common/model/Scene.js b/js/common/model/Scene.js
@@ -26,8 +26,8 @@ import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransfo
 import SoundClip from '../../../../tambo/js/sound-generators/SoundClip.js';
 import soundManager from '../../../../tambo/js/soundManager.js';
 import squishierButtonV3_007_mp3 from '../../../sounds/squishierButtonV3_007_mp3.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import WaveInterferenceConstants from '../WaveInterferenceConstants.js';
 import Lattice from './Lattice.js';
 import TemporalMask from './TemporalMask.js';

diff --git a/js/common/view/AmplitudeControl.js b/js/common/view/AmplitudeControl.js
@@ -7,8 +7,8 @@
  */
 
 import { Node } from '../../../../scenery/js/imports.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import WaveInterferenceUtils from '../WaveInterferenceUtils.js';
 import SceneToggleNode from './SceneToggleNode.js';
 import WaveInterferenceSlider from './WaveInterferenceSlider.js';

diff --git a/js/common/view/DashedLineNode.js b/js/common/view/DashedLineNode.js
@@ -6,7 +6,7 @@
  * @author Sam Reid (PhET Interactive Simulations)
  */
 
-import { Shape, LineStyles } from '../../../../kite/js/imports.js';
+import { LineStyles, Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import { Path } from '../../../../scenery/js/imports.js';
 import waveInterference from '../../waveInterference.js';

diff --git a/js/common/view/DisturbanceTypeIconNode.js b/js/common/view/DisturbanceTypeIconNode.js
@@ -7,10 +7,9 @@
  */
 
 import Utils from '../../../../dot/js/Utils.js';
-import { Shape, LineStyles } from '../../../../kite/js/imports.js';
+import { LineStyles, Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
-import { Node } from '../../../../scenery/js/imports.js';
-import { Path } from '../../../../scenery/js/imports.js';
+import { Node, Path } from '../../../../scenery/js/imports.js';
 import waveInterference from '../../waveInterference.js';
 import Scene from '../model/Scene.js';
 

diff --git a/js/common/view/FrequencyControl.js b/js/common/view/FrequencyControl.js
@@ -12,8 +12,8 @@ import SpectrumSliderThumb from '../../../../scenery-phet/js/SpectrumSliderThumb
 import SpectrumSliderTrack from '../../../../scenery-phet/js/SpectrumSliderTrack.js';
 import VisibleColor from '../../../../scenery-phet/js/VisibleColor.js';
 import { Node } from '../../../../scenery/js/imports.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import WaveInterferenceConstants from '../WaveInterferenceConstants.js';
 import WaveInterferenceUtils from '../WaveInterferenceUtils.js';
 import WaveInterferenceSlider from './WaveInterferenceSlider.js';

diff --git a/js/common/view/IntensityGraphPanel.js b/js/common/view/IntensityGraphPanel.js
@@ -11,14 +11,10 @@ import RangeWithValue from '../../../../dot/js/RangeWithValue.js';
 import Utils from '../../../../dot/js/Utils.js';
 import { Shape } from '../../../../kite/js/imports.js';
 import MagnifyingGlassZoomButtonGroup from '../../../../scenery-phet/js/MagnifyingGlassZoomButtonGroup.js';
-import { Line } from '../../../../scenery/js/imports.js';
-import { Node } from '../../../../scenery/js/imports.js';
-import { Path } from '../../../../scenery/js/imports.js';
-import { Rectangle } from '../../../../scenery/js/imports.js';
-import { Color } from '../../../../scenery/js/imports.js';
+import { Color, Line, Node, Path, Rectangle } from '../../../../scenery/js/imports.js';
 import ColorConstants from '../../../../sun/js/ColorConstants.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import WaveInterferenceConstants from '../WaveInterferenceConstants.js';
 import WaveInterferencePanel from './WaveInterferencePanel.js';
 import WaveInterferenceText from './WaveInterferenceText.js';

diff --git a/js/common/view/LatticeCanvasNode.js b/js/common/view/LatticeCanvasNode.js
@@ -9,8 +9,7 @@
 import Utils from '../../../../dot/js/Utils.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 import merge from '../../../../phet-core/js/merge.js';
-import { CanvasNode } from '../../../../scenery/js/imports.js';
-import { Color } from '../../../../scenery/js/imports.js';
+import { CanvasNode, Color } from '../../../../scenery/js/imports.js';
 import waveInterference from '../../waveInterference.js';
 import WaveInterferenceConstants from '../WaveInterferenceConstants.js';
 import WaveInterferenceUtils from '../WaveInterferenceUtils.js';

diff --git a/js/common/view/LengthScaleIndicatorNode.js b/js/common/view/LengthScaleIndicatorNode.js
@@ -9,8 +9,7 @@
 
 import merge from '../../../../phet-core/js/merge.js';
 import ArrowNode from '../../../../scenery-phet/js/ArrowNode.js';
-import { Line } from '../../../../scenery/js/imports.js';
-import { Node } from '../../../../scenery/js/imports.js';
+import { Line, Node } from '../../../../scenery/js/imports.js';
 import waveInterference from '../../waveInterference.js';
 import WaveInterferenceConstants from '../WaveInterferenceConstants.js';
 import WaveInterferenceText from './WaveInterferenceText.js';

diff --git a/js/common/view/LightScreenNode.js b/js/common/view/LightScreenNode.js
@@ -11,8 +11,7 @@ import Matrix3 from '../../../../dot/js/Matrix3.js';
 import PiecewiseLinearFunction from '../../../../dot/js/PiecewiseLinearFunction.js';
 import Utils from '../../../../dot/js/Utils.js';
 import merge from '../../../../phet-core/js/merge.js';
-import { CanvasNode } from '../../../../scenery/js/imports.js';
-import { Color } from '../../../../scenery/js/imports.js';
+import { CanvasNode, Color } from '../../../../scenery/js/imports.js';
 import waveInterference from '../../waveInterference.js';
 import WaveInterferenceConstants from '../WaveInterferenceConstants.js';
 import WaveInterferenceUtils from '../WaveInterferenceUtils.js';

diff --git a/js/common/view/Perspective3DNode.js b/js/common/view/Perspective3DNode.js
@@ -10,12 +10,10 @@ import Matrix3 from '../../../../dot/js/Matrix3.js';
 import Utils from '../../../../dot/js/Utils.js';
 import { Shape } from '../../../../kite/js/imports.js';
 import ArrowNode from '../../../../scenery-phet/js/ArrowNode.js';
-import { HBox } from '../../../../scenery/js/imports.js';
-import { Node } from '../../../../scenery/js/imports.js';
-import { Path } from '../../../../scenery/js/imports.js';
+import { HBox, Node, Path } from '../../../../scenery/js/imports.js';
 import Easing from '../../../../twixt/js/Easing.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import WaveInterferenceText from './WaveInterferenceText.js';
 
 const topString = waveInterferenceStrings.top;

diff --git a/js/common/view/SoundParticleImageLayer.js b/js/common/view/SoundParticleImageLayer.js
@@ -8,8 +8,7 @@
  */
 
 import merge from '../../../../phet-core/js/merge.js';
-import { Image } from '../../../../scenery/js/imports.js';
-import { Node } from '../../../../scenery/js/imports.js';
+import { Image, Node } from '../../../../scenery/js/imports.js';
 import waveInterference from '../../waveInterference.js';
 import WaveInterferenceConstants from '../WaveInterferenceConstants.js';
 import SoundParticleNode from './SoundParticleNode.js';

diff --git a/js/common/view/SoundViewTypeRadioButtonGroup.js b/js/common/view/SoundViewTypeRadioButtonGroup.js
@@ -7,8 +7,8 @@
  */
 
 import VerticalAquaRadioButtonGroup from '../../../../sun/js/VerticalAquaRadioButtonGroup.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import SoundScene from '../model/SoundScene.js';
 import WaveInterferenceConstants from '../WaveInterferenceConstants.js';
 import WaveInterferenceText from './WaveInterferenceText.js';

diff --git a/js/common/view/WaveAreaGraphNode.js b/js/common/view/WaveAreaGraphNode.js
@@ -9,9 +9,7 @@
 import Bounds2 from '../../../../dot/js/Bounds2.js';
 import Utils from '../../../../dot/js/Utils.js';
 import { Shape } from '../../../../kite/js/imports.js';
-import { Line } from '../../../../scenery/js/imports.js';
-import { Node } from '../../../../scenery/js/imports.js';
-import { Path } from '../../../../scenery/js/imports.js';
+import { Line, Node, Path } from '../../../../scenery/js/imports.js';
 import waveInterference from '../../waveInterference.js';
 import WaveInterferenceConstants from '../WaveInterferenceConstants.js';
 import WaveInterferenceUtils from '../WaveInterferenceUtils.js';

diff --git a/js/common/view/WaveInterferenceControlPanel.js b/js/common/view/WaveInterferenceControlPanel.js
@@ -10,8 +10,8 @@ import merge from '../../../../phet-core/js/merge.js';
 import { Node } from '../../../../scenery/js/imports.js';
 import HSeparator from '../../../../sun/js/HSeparator.js';
 import soundManager from '../../../../tambo/js/soundManager.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import WaveInterferenceConstants from '../WaveInterferenceConstants.js';
 import AmplitudeControl from './AmplitudeControl.js';
 import FrequencyControl from './FrequencyControl.js';

diff --git a/js/common/view/WaveInterferenceStopwatchNode.js b/js/common/view/WaveInterferenceStopwatchNode.js
@@ -7,8 +7,8 @@
  */
 
 import StringProperty from '../../../../axon/js/StringProperty.js';
-import merge from '../../../../phet-core/js/merge.js';
 import Range from '../../../../dot/js/Range.js';
+import merge from '../../../../phet-core/js/merge.js';
 import StopwatchNode from '../../../../scenery-phet/js/StopwatchNode.js';
 import waveInterference from '../../waveInterference.js';
 import WaveInterferenceConstants from '../WaveInterferenceConstants.js';

diff --git a/js/common/view/WaveMeterNode.js b/js/common/view/WaveMeterNode.js
@@ -21,12 +21,7 @@ import merge from '../../../../phet-core/js/merge.js';
 import NumberControl from '../../../../scenery-phet/js/NumberControl.js';
 import ShadedRectangle from '../../../../scenery-phet/js/ShadedRectangle.js';
 import WireNode from '../../../../scenery-phet/js/WireNode.js';
-import { HBox } from '../../../../scenery/js/imports.js';
-import { Node } from '../../../../scenery/js/imports.js';
-import { Text } from '../../../../scenery/js/imports.js';
-import { VBox } from '../../../../scenery/js/imports.js';
-import { Color } from '../../../../scenery/js/imports.js';
-import { NodeProperty } from '../../../../scenery/js/imports.js';
+import { Color, HBox, Node, NodeProperty, Text, VBox } from '../../../../scenery/js/imports.js';
 import RectangularPushButton from '../../../../sun/js/buttons/RectangularPushButton.js';
 import SoundClip from '../../../../tambo/js/sound-generators/SoundClip.js';
 import soundManager from '../../../../tambo/js/soundManager.js';

diff --git a/js/diffraction/DiffractionScreen.js b/js/diffraction/DiffractionScreen.js
@@ -11,8 +11,8 @@ import Screen from '../../../joist/js/Screen.js';
 import ScreenIcon from '../../../joist/js/ScreenIcon.js';
 import { Image } from '../../../scenery/js/imports.js';
 import diffraction_screen_icon_png from '../../images/diffraction_screen_icon_png.js';
-import waveInterferenceStrings from '../waveInterferenceStrings.js';
 import waveInterference from '../waveInterference.js';
+import waveInterferenceStrings from '../waveInterferenceStrings.js';
 import DiffractionModel from './model/DiffractionModel.js';
 import DiffractionScreenView from './view/DiffractionScreenView.js';
 

diff --git a/js/diffraction/view/CircleSquareSceneControlPanel.js b/js/diffraction/view/CircleSquareSceneControlPanel.js
@@ -10,8 +10,8 @@ import Utils from '../../../../dot/js/Utils.js';
 import { HBox } from '../../../../scenery/js/imports.js';
 import WaveInterferencePanel from '../../common/view/WaveInterferencePanel.js';
 import WaveInterferenceConstants from '../../common/WaveInterferenceConstants.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import DiffractionNumberControl from './DiffractionNumberControl.js';
 
 const circleDiameterString = waveInterferenceStrings.circleDiameter;

diff --git a/js/diffraction/view/DiffractionScreenView.js b/js/diffraction/view/DiffractionScreenView.js
@@ -16,22 +16,15 @@ import ResetAllButton from '../../../../scenery-phet/js/buttons/ResetAllButton.j
 import LaserPointerNode from '../../../../scenery-phet/js/LaserPointerNode.js';
 import VisibleColor from '../../../../scenery-phet/js/VisibleColor.js';
 import WavelengthNumberControl from '../../../../scenery-phet/js/WavelengthNumberControl.js';
-import { Circle } from '../../../../scenery/js/imports.js';
-import { HBox } from '../../../../scenery/js/imports.js';
-import { Image } from '../../../../scenery/js/imports.js';
-import { Node } from '../../../../scenery/js/imports.js';
-import { Path } from '../../../../scenery/js/imports.js';
-import { Rectangle } from '../../../../scenery/js/imports.js';
-import { VBox } from '../../../../scenery/js/imports.js';
-import { LinearGradient } from '../../../../scenery/js/imports.js';
+import { Circle, HBox, Image, LinearGradient, Node, Path, Rectangle, VBox } from '../../../../scenery/js/imports.js';
 import RectangularRadioButtonGroup from '../../../../sun/js/buttons/RectangularRadioButtonGroup.js';
 import ToggleNode from '../../../../sun/js/ToggleNode.js';
 import waving_girl_icon_png from '../../../images/waving_girl_icon_png.js';
 import LengthScaleIndicatorNode from '../../common/view/LengthScaleIndicatorNode.js';
 import WaveInterferencePanel from '../../common/view/WaveInterferencePanel.js';
 import WaveInterferenceConstants from '../../common/WaveInterferenceConstants.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import CircleSquareSceneControlPanel from './CircleSquareSceneControlPanel.js';
 import DisorderSceneControlPanel from './DisorderSceneControlPanel.js';
 import EllipseSceneControlPanel from './EllipseSceneControlPanel.js';

diff --git a/js/diffraction/view/DisorderSceneControlPanel.js b/js/diffraction/view/DisorderSceneControlPanel.js
@@ -11,8 +11,8 @@ import { HBox } from '../../../../scenery/js/imports.js';
 import WaveInterferencePanel from '../../common/view/WaveInterferencePanel.js';
 import WaveInterferenceText from '../../common/view/WaveInterferenceText.js';
 import WaveInterferenceConstants from '../../common/WaveInterferenceConstants.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import DiffractionNumberControl from './DiffractionNumberControl.js';
 
 const circleDiameterString = waveInterferenceStrings.circleDiameter;

diff --git a/js/diffraction/view/EllipseSceneControlPanel.js b/js/diffraction/view/EllipseSceneControlPanel.js
@@ -10,8 +10,8 @@ import Utils from '../../../../dot/js/Utils.js';
 import { HBox } from '../../../../scenery/js/imports.js';
 import WaveInterferencePanel from '../../common/view/WaveInterferencePanel.js';
 import WaveInterferenceConstants from '../../common/WaveInterferenceConstants.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import DiffractionNumberControl from './DiffractionNumberControl.js';
 
 const diameterString = waveInterferenceStrings.diameter;

diff --git a/js/diffraction/view/MatrixCanvasNode.js b/js/diffraction/view/MatrixCanvasNode.js
@@ -8,8 +8,7 @@
 
 import Bounds2 from '../../../../dot/js/Bounds2.js';
 import merge from '../../../../phet-core/js/merge.js';
-import { CanvasNode } from '../../../../scenery/js/imports.js';
-import { Color } from '../../../../scenery/js/imports.js';
+import { CanvasNode, Color } from '../../../../scenery/js/imports.js';
 import ImageDataRenderer from '../../common/view/ImageDataRenderer.js';
 import WaveInterferenceConstants from '../../common/WaveInterferenceConstants.js';
 import waveInterference from '../../waveInterference.js';

diff --git a/js/diffraction/view/RectangleSceneControlPanel.js b/js/diffraction/view/RectangleSceneControlPanel.js
@@ -10,8 +10,8 @@ import Utils from '../../../../dot/js/Utils.js';
 import { HBox } from '../../../../scenery/js/imports.js';
 import WaveInterferencePanel from '../../common/view/WaveInterferencePanel.js';
 import WaveInterferenceConstants from '../../common/WaveInterferenceConstants.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import DiffractionNumberControl from './DiffractionNumberControl.js';
 
 const heightString = waveInterferenceStrings.height;

diff --git a/js/diffraction/view/WavingGirlSceneControlPanel.js b/js/diffraction/view/WavingGirlSceneControlPanel.js
@@ -11,8 +11,8 @@ import { HBox } from '../../../../scenery/js/imports.js';
 import WaveInterferencePanel from '../../common/view/WaveInterferencePanel.js';
 import WaveInterferenceText from '../../common/view/WaveInterferenceText.js';
 import WaveInterferenceConstants from '../../common/WaveInterferenceConstants.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import DiffractionNumberControl from './DiffractionNumberControl.js';
 
 const degreesValueString = waveInterferenceStrings.degreesValue;

diff --git a/js/interference/InterferenceScreen.js b/js/interference/InterferenceScreen.js
@@ -11,8 +11,8 @@ import Screen from '../../../joist/js/Screen.js';
 import ScreenIcon from '../../../joist/js/ScreenIcon.js';
 import { Image } from '../../../scenery/js/imports.js';
 import interference_screen_icon_png from '../../images/interference_screen_icon_png.js';
-import waveInterferenceStrings from '../waveInterferenceStrings.js';
 import waveInterference from '../waveInterference.js';
+import waveInterferenceStrings from '../waveInterferenceStrings.js';
 import InterferenceModel from './model/InterferenceModel.js';
 import InterferenceScreenView from './view/InterferenceScreenView.js';
 

diff --git a/js/interference/view/SeparationControl.js b/js/interference/view/SeparationControl.js
@@ -13,8 +13,8 @@ import { Node } from '../../../../scenery/js/imports.js';
 import ToggleNode from '../../../../sun/js/ToggleNode.js';
 import WaveInterferenceText from '../../common/view/WaveInterferenceText.js';
 import WaveInterferenceConstants from '../../common/WaveInterferenceConstants.js';
-import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 import waveInterference from '../../waveInterference.js';
+import waveInterferenceStrings from '../../waveInterferenceStrings.js';
 
 const cmValueString = waveInterferenceStrings.cmValue;
 const nmValueString = waveInterferenceStrings.nmValue;

diff --git a/js/slits/SlitsScreen.js b/js/slits/SlitsScreen.js
@@ -11,8 +11,8 @@ import Screen from '../../../joist/js/Screen.js';
 import ScreenIcon from '../../../joist/js/ScreenIcon.js';
 import { Image } from '../../../scenery/js/imports.js';
 import slits_screen_icon_png from '../../images/slits_screen_icon_png.js';
-import waveInterferenceStrings from '../waveInterferenceStrings.js';
 import waveInterference from '../waveInterference.js';
+import waveInterferenceStrings from '../waveInterferenceStrings.js';
 import SlitsModel from './model/SlitsModel.js';
 import SlitsScreenView from './view/SlitsScreenView.js';
 

diff --git a/js/slits/view/BarriersNode.js b/js/slits/view/BarriersNode.js
@@ -8,9 +8,7 @@
 
 import DynamicProperty from '../../../../axon/js/DynamicProperty.js';
 import ArrowNode from '../../../../scenery-phet/js/ArrowNode.js';
-import { DragListener } from '../../../../scenery/js/imports.js';
-import { Node } from '../../../../scenery/js/imports.js';
-import { Rectangle } from '../../../../scenery/js/imports.js';
+import { DragListener, Node, Rectangle } from '../../../../scenery/js/imports.js';
 import Scene from '../../common/model/Scene.js';
 import WaveInterferenceConstants from '../../common/WaveInterferenceConstants.js';
 import waveInterference from '../../waveInterference.js';

diff --git a/js/slits/view/PlaneWaveGeneratorNode.js b/js/slits/view/PlaneWaveGeneratorNode.js
@@ -7,9 +7,7 @@
  */
 
 import merge from '../../../../phet-core/js/merge.js';
-import { Image } from '../../../../scenery/js/imports.js';
-import { Node } from '../../../../scenery/js/imports.js';
-import { Rectangle } from '../../../../scenery/js/imports.js';
+import { Image, Node, Rectangle } from '../../../../scenery/js/imports.js';
 import RoundStickyToggleButton from '../../../../sun/js/buttons/RoundStickyToggleButton.js';
 import ToggleNode from '../../../../sun/js/ToggleNode.js';
 import plane_wave_source_png from '../../../images/plane_wave_source_png.js';

diff --git a/js/slits/view/TheoryInterferenceOverlay.js b/js/slits/view/TheoryInterferenceOverlay.js
@@ -9,8 +9,7 @@
 
 import merge from '../../../../phet-core/js/merge.js';
 import PhetColorScheme from '../../../../scenery-phet/js/PhetColorScheme.js';
-import { Line } from '../../../../scenery/js/imports.js';
-import { Node } from '../../../../scenery/js/imports.js';
+import { Line, Node } from '../../../../scenery/js/imports.js';
 import Scene from '../../common/model/Scene.js';
 import WaveInterferenceConstants from '../../common/WaveInterferenceConstants.js';
 import waveInterference from '../../waveInterference.js';