Skip to content

Commit

Permalink
optimize imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@zepumph
zepumph committed Jul 20, 2022
1 parent 719dd2a commit 7932885
Show file tree
Hide file tree
Showing 26 changed files with 28 additions and 69 deletions.
2 changes: 1 addition & 1 deletion js/common/model/BallSystem.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
*/

import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
import createObservableArray from '../../../../axon/js/createObservableArray.js';
import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
import NumberProperty from '../../../../axon/js/NumberProperty.js';
import createObservableArray from '../../../../axon/js/createObservableArray.js';
import dotRandom from '../../../../dot/js/dotRandom.js';
import RangeWithValue from '../../../../dot/js/RangeWithValue.js';
import Vector2 from '../../../../dot/js/Vector2.js';
Expand Down
2 changes: 1 addition & 1 deletion js/common/model/CollisionEngine.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
* @author Martin Veillette
*/

import NumberProperty from '../../../../axon/js/NumberProperty.js';
import Multilink from '../../../../axon/js/Multilink.js';
import NumberProperty from '../../../../axon/js/NumberProperty.js';
import Utils from '../../../../dot/js/Utils.js';
import Vector2 from '../../../../dot/js/Vector2.js';
import collisionLab from '../../collisionLab.js';
Expand Down
2 changes: 1 addition & 1 deletion js/common/model/MomentaDiagram.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
import NumberProperty from '../../../../axon/js/NumberProperty.js';
import Multilink from '../../../../axon/js/Multilink.js';
import NumberProperty from '../../../../axon/js/NumberProperty.js';
import Bounds2 from '../../../../dot/js/Bounds2.js';
import Vector2 from '../../../../dot/js/Vector2.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
Expand Down
6 changes: 1 addition & 5 deletions js/common/view/BallNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { DragListener } from '../../../../scenery/js/imports.js';
import { Circle } from '../../../../scenery/js/imports.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { Color } from '../../../../scenery/js/imports.js';
import { Circle, Color, DragListener, Node, Text } from '../../../../scenery/js/imports.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
import CollisionLabColors from '../CollisionLabColors.js';
Expand Down
4 changes: 1 addition & 3 deletions js/common/view/BallValuesPanelColumnNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@

import merge from '../../../../phet-core/js/merge.js';
import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
import { AlignGroup } from '../../../../scenery/js/imports.js';
import { RichText } from '../../../../scenery/js/imports.js';
import { VBox } from '../../../../scenery/js/imports.js';
import { AlignGroup, RichText, VBox } from '../../../../scenery/js/imports.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
import CollisionLabConstants from '../CollisionLabConstants.js';
Expand Down
3 changes: 1 addition & 2 deletions js/common/view/BallValuesPanelNumberDisplay.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ import Utils from '../../../../dot/js/Utils.js';
import merge from '../../../../phet-core/js/merge.js';
import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
import NumberDisplay from '../../../../scenery-phet/js/NumberDisplay.js';
import { FireListener } from '../../../../scenery/js/imports.js';
import { Color } from '../../../../scenery/js/imports.js';
import { Color, FireListener } from '../../../../scenery/js/imports.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
import CollisionLabColors from '../CollisionLabColors.js';
Expand Down
5 changes: 1 addition & 4 deletions js/common/view/BallVelocityVectorNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ import Bounds2 from '../../../../dot/js/Bounds2.js';
import merge from '../../../../phet-core/js/merge.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
import { DragListener } from '../../../../scenery/js/imports.js';
import { Circle } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { Color } from '../../../../scenery/js/imports.js';
import { Circle, Color, DragListener, Text } from '../../../../scenery/js/imports.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
import CollisionLabColors from '../CollisionLabColors.js';
Expand Down
4 changes: 2 additions & 2 deletions js/common/view/CenterOfMassNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ import { Shape } from '../../../../kite/js/imports.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
import XNode from '../../../../scenery-phet/js/XNode.js';
import { Node } from '../../../../scenery/js/imports.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
import CollisionLabColors from '../CollisionLabColors.js';
import CollisionLabConstants from '../CollisionLabConstants.js';
import CenterOfMass from '../model/CenterOfMass.js';
import PlayAreaNumberDisplay from './PlayAreaNumberDisplay.js';
import XNode from '../../../../scenery-phet/js/XNode.js';
import CollisionLabColors from '../CollisionLabColors.js';

class CenterOfMassNode extends Node {

Expand Down
3 changes: 1 addition & 2 deletions js/common/view/CollisionLabCheckbox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@

import merge from '../../../../phet-core/js/merge.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { Node, Text } from '../../../../scenery/js/imports.js';
import Checkbox from '../../../../sun/js/Checkbox.js';
import collisionLab from '../../collisionLab.js';
import CollisionLabConstants from '../CollisionLabConstants.js';
Expand Down
3 changes: 1 addition & 2 deletions js/common/view/CollisionLabControlPanel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@

import merge from '../../../../phet-core/js/merge.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import { VBox } from '../../../../scenery/js/imports.js';
import { Color } from '../../../../scenery/js/imports.js';
import { Color, VBox } from '../../../../scenery/js/imports.js';
import HSeparator from '../../../../sun/js/HSeparator.js';
import Panel from '../../../../sun/js/Panel.js';
import collisionLab from '../../collisionLab.js';
Expand Down
10 changes: 2 additions & 8 deletions js/common/view/CollisionLabIconFactory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,8 @@ import merge from '../../../../phet-core/js/merge.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import ArrowNode from '../../../../scenery-phet/js/ArrowNode.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { Circle } from '../../../../scenery/js/imports.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Path } from '../../../../scenery/js/imports.js';
import { Spacer } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { Color } from '../../../../scenery/js/imports.js';
import { PaintDef } from '../../../../scenery/js/imports.js';
import XNode from '../../../../scenery-phet/js/XNode.js';
import { Circle, Color, Node, PaintDef, Path, Spacer, Text } from '../../../../scenery/js/imports.js';
import undoSolidShape from '../../../../sherpa/js/fontawesome-5/undoSolidShape.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
Expand All @@ -39,7 +34,6 @@ import CollisionLabConstants from '../CollisionLabConstants.js';
import Ball from '../model/Ball.js';
import BallState from '../model/BallState.js';
import BallUtils from '../model/BallUtils.js';
import XNode from '../../../../scenery-phet/js/XNode.js';

const CollisionLabIconFactory = {

Expand Down
2 changes: 1 addition & 1 deletion js/common/view/CollisionLabTimeControlNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
*/

import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js';
import merge from '../../../../phet-core/js/merge.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import TimeControlNode from '../../../../scenery-phet/js/TimeControlNode.js';
import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js';
import collisionLab from '../../collisionLab.js';
import CollisionLabConstants from '../CollisionLabConstants.js';

Expand Down
3 changes: 1 addition & 2 deletions js/common/view/ElasticityNumberControl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
import NumberControl from '../../../../scenery-phet/js/NumberControl.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { Text } from '../../../../scenery/js/imports.js';
import { Color } from '../../../../scenery/js/imports.js';
import { Color, Text } from '../../../../scenery/js/imports.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
import CollisionLabConstants from '../CollisionLabConstants.js';
Expand Down
6 changes: 1 addition & 5 deletions js/common/view/KeypadDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ import merge from '../../../../phet-core/js/merge.js';
import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
import Keypad from '../../../../scenery-phet/js/keypad/Keypad.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Rectangle } 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 { Color, Node, Rectangle, Text, VBox } from '../../../../scenery/js/imports.js';
import RectangularPushButton from '../../../../sun/js/buttons/RectangularPushButton.js';
import Dialog from '../../../../sun/js/Dialog.js';
import collisionLab from '../../collisionLab.js';
Expand Down
5 changes: 1 addition & 4 deletions js/common/view/MomentaDiagramAccordionBox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ import { Shape } from '../../../../kite/js/imports.js';
import merge from '../../../../phet-core/js/merge.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Rectangle } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { Color } from '../../../../scenery/js/imports.js';
import { Color, Node, Rectangle, Text } from '../../../../scenery/js/imports.js';
import AccordionBox from '../../../../sun/js/AccordionBox.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
Expand Down
3 changes: 1 addition & 2 deletions js/common/view/MomentaDiagramVectorNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
import ArrowNode from '../../../../scenery-phet/js/ArrowNode.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { Node, Text } from '../../../../scenery/js/imports.js';
import collisionLab from '../../collisionLab.js';
import CollisionLabColors from '../CollisionLabColors.js';
import CollisionLabConstants from '../CollisionLabConstants.js';
Expand Down
4 changes: 1 addition & 3 deletions js/common/view/PathsNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ import Vector2 from '../../../../dot/js/Vector2.js';
import merge from '../../../../phet-core/js/merge.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
import { CanvasNode } from '../../../../scenery/js/imports.js';
import { Color } from '../../../../scenery/js/imports.js';
import { PaintDef } from '../../../../scenery/js/imports.js';
import { CanvasNode, Color, PaintDef } from '../../../../scenery/js/imports.js';
import collisionLab from '../../collisionLab.js';
import CollisionLabColors from '../CollisionLabColors.js';
import Ball from '../model/Ball.js';
Expand Down
4 changes: 1 addition & 3 deletions js/common/view/PlayAreaNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ import { Shape } from '../../../../kite/js/imports.js';
import merge from '../../../../phet-core/js/merge.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Path } from '../../../../scenery/js/imports.js';
import { Rectangle } from '../../../../scenery/js/imports.js';
import { Node, Path, Rectangle } from '../../../../scenery/js/imports.js';
import collisionLab from '../../collisionLab.js';
import CollisionLabColors from '../CollisionLabColors.js';
import CollisionLabConstants from '../CollisionLabConstants.js';
Expand Down
3 changes: 1 addition & 2 deletions js/common/view/PlayAreaNumberDisplay.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
import NumberDisplay from '../../../../scenery-phet/js/NumberDisplay.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { Color } from '../../../../scenery/js/imports.js';
import { PaintDef } from '../../../../scenery/js/imports.js';
import { Color, PaintDef } from '../../../../scenery/js/imports.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
import CollisionLabConstants from '../CollisionLabConstants.js';
Expand Down
5 changes: 1 addition & 4 deletions js/common/view/PlayAreaScaleBarNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ import Orientation from '../../../../phet-core/js/Orientation.js';
import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
import ArrowNode from '../../../../scenery-phet/js/ArrowNode.js';
import { HBox } from '../../../../scenery/js/imports.js';
import { LayoutBox } from '../../../../scenery/js/imports.js';
import { Line } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { HBox, LayoutBox, Line, Text } from '../../../../scenery/js/imports.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
import CollisionLabColors from '../CollisionLabColors.js';
Expand Down
3 changes: 1 addition & 2 deletions js/common/view/PlayAreaTopRightControls.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import merge from '../../../../phet-core/js/merge.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import GridCheckbox from '../../../../scenery-phet/js/GridCheckbox.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { Text } from '../../../../scenery/js/imports.js';
import { VBox } from '../../../../scenery/js/imports.js';
import { Text, VBox } from '../../../../scenery/js/imports.js';
import NumberSpinner from '../../../../sun/js/NumberSpinner.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
Expand Down
4 changes: 1 addition & 3 deletions js/inelastic/view/InelasticControlPanel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ import merge from '../../../../phet-core/js/merge.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { HStrut } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { VBox } from '../../../../scenery/js/imports.js';
import { HStrut, Text, VBox } from '../../../../scenery/js/imports.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
import CollisionLabConstants from '../../common/CollisionLabConstants.js';
Expand Down
3 changes: 1 addition & 2 deletions js/inelastic/view/StickSlipABSwitch.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
import Dimension2 from '../../../../dot/js/Dimension2.js';
import merge from '../../../../phet-core/js/merge.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import { AlignGroup } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { AlignGroup, Text } from '../../../../scenery/js/imports.js';
import ABSwitch from '../../../../sun/js/ABSwitch.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
Expand Down
2 changes: 1 addition & 1 deletion js/intro/model/IntroBallSystem.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
*/

import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
import Multilink from '../../../../axon/js/Multilink.js';
import NumberProperty from '../../../../axon/js/NumberProperty.js';
import Property from '../../../../axon/js/Property.js';
import Multilink from '../../../../axon/js/Multilink.js';
import Range from '../../../../dot/js/Range.js';
import RangeWithValue from '../../../../dot/js/RangeWithValue.js';
import Utils from '../../../../dot/js/Utils.js';
Expand Down
3 changes: 1 addition & 2 deletions js/intro/view/ChangeInMomentumVectorNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import merge from '../../../../phet-core/js/merge.js';
import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.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 collisionLab from '../../collisionLab.js';
import CollisionLabColors from '../../common/CollisionLabColors.js';
import CollisionLabConstants from '../../common/CollisionLabConstants.js';
Expand Down
3 changes: 1 addition & 2 deletions js/intro/view/IntroBallSystemNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@

import AssertUtils from '../../../../phetcommon/js/AssertUtils.js';
import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { Node, Text } from '../../../../scenery/js/imports.js';
import collisionLab from '../../collisionLab.js';
import collisionLabStrings from '../../collisionLabStrings.js';
import CollisionLabConstants from '../../common/CollisionLabConstants.js';
Expand Down

0 comments on commit 7932885

Please sign in to comment.