From 6bc575ab74bd951b0da28b5ce3ee68acd37a6d5d Mon Sep 17 00:00:00 2001 From: Sam Reid Date: Wed, 27 Nov 2024 12:09:36 -0700 Subject: [PATCH] Sort imports and run grunt modulify, see https://github.com/phetsims/chipper/issues/1462 --- eslint.config.mjs | 2 +- js/common/ExampleSimConstants.ts | 2 +- js/magnets/MagnetsScreen.ts | 4 ++-- js/magnets/model/BarMagnet.ts | 2 +- js/magnets/view/MagnetsControlPanel.ts | 4 ++-- js/magnets/view/MagnetsScreenView.ts | 4 ++-- js/particles/ParticlesScreen.ts | 4 ++-- js/particles/model/Particle.ts | 4 ++-- js/particles/view/ParticleNode.ts | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 7a4fedc..6d9220b 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -7,8 +7,8 @@ * @author Michael Kauzmann (PhET Interactive Simulations) */ -import banTSCommentConfig from '../perennial-alias/js/eslint/config/util/banTSCommentConfig.mjs'; import simEslintConfig from '../perennial-alias/js/eslint/config/sim.eslint.config.mjs'; +import banTSCommentConfig from '../perennial-alias/js/eslint/config/util/banTSCommentConfig.mjs'; export default [ ...simEslintConfig, diff --git a/js/common/ExampleSimConstants.ts b/js/common/ExampleSimConstants.ts index 0615112..e47de54 100644 --- a/js/common/ExampleSimConstants.ts +++ b/js/common/ExampleSimConstants.ts @@ -8,8 +8,8 @@ * @author Chris Malley (PixelZoom, Inc.) */ -import ExampleSimColors from './ExampleSimColors.js'; import exampleSim from '../exampleSim.js'; +import ExampleSimColors from './ExampleSimColors.js'; const ExampleSimConstants = { diff --git a/js/magnets/MagnetsScreen.ts b/js/magnets/MagnetsScreen.ts index ea854f6..e24ee83 100644 --- a/js/magnets/MagnetsScreen.ts +++ b/js/magnets/MagnetsScreen.ts @@ -8,7 +8,9 @@ import Screen, { ScreenOptions } from '../../../joist/js/Screen.js'; import ScreenIcon from '../../../joist/js/ScreenIcon.js'; +import { EmptySelfOptions, optionize4 } from '../../../phet-core/js/optionize.js'; import { Image } from '../../../scenery/js/imports.js'; +import Tandem from '../../../tandem/js/Tandem.js'; import barMagnet_png from '../../images/barMagnet_png.js'; import ExampleSimColors from '../common/ExampleSimColors.js'; import ExampleSimConstants from '../common/ExampleSimConstants.js'; @@ -16,8 +18,6 @@ import exampleSim from '../exampleSim.js'; import ExampleSimStrings from '../ExampleSimStrings.js'; import MagnetsModel from './model/MagnetsModel.js'; import MagnetsScreenView from './view/MagnetsScreenView.js'; -import { optionize4, EmptySelfOptions } from '../../../phet-core/js/optionize.js'; -import Tandem from '../../../tandem/js/Tandem.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/magnets/model/BarMagnet.ts b/js/magnets/model/BarMagnet.ts index 8e9d7ca..9a84ed0 100644 --- a/js/magnets/model/BarMagnet.ts +++ b/js/magnets/model/BarMagnet.ts @@ -8,9 +8,9 @@ * @author Steele Dalton (PhET Interactive Simulations) */ +import Property from '../../../../axon/js/Property.js'; import Dimension2 from '../../../../dot/js/Dimension2.js'; import Vector2 from '../../../../dot/js/Vector2.js'; -import Property from '../../../../axon/js/Property.js'; import TModel from '../../../../joist/js/TModel.js'; import exampleSim from '../../exampleSim.js'; diff --git a/js/magnets/view/MagnetsControlPanel.ts b/js/magnets/view/MagnetsControlPanel.ts index b2b63be..d305470 100644 --- a/js/magnets/view/MagnetsControlPanel.ts +++ b/js/magnets/view/MagnetsControlPanel.ts @@ -8,15 +8,15 @@ * @author Steele Dalton (PhET Interactive Simulations) */ +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import { Text, VBox } from '../../../../scenery/js/imports.js'; import RectangularPushButton from '../../../../sun/js/buttons/RectangularPushButton.js'; import Panel, { PanelOptions } from '../../../../sun/js/Panel.js'; -import exampleSim from '../../exampleSim.js'; import ExampleSimColors from '../../common/ExampleSimColors.js'; +import exampleSim from '../../exampleSim.js'; import ExampleSimStrings from '../../ExampleSimStrings.js'; import MagnetsModel from '../model/MagnetsModel.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; type SelfOptions = EmptySelfOptions; type MagnetsControlPanelOptions = SelfOptions & PanelOptions; diff --git a/js/magnets/view/MagnetsScreenView.ts b/js/magnets/view/MagnetsScreenView.ts index 0bf5c14..6a54b4e 100644 --- a/js/magnets/view/MagnetsScreenView.ts +++ b/js/magnets/view/MagnetsScreenView.ts @@ -11,14 +11,14 @@ import Vector2 from '../../../../dot/js/Vector2.js'; import ScreenView, { ScreenViewOptions } from '../../../../joist/js/ScreenView.js'; +import { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; import ResetAllButton from '../../../../scenery-phet/js/buttons/ResetAllButton.js'; -import exampleSim from '../../exampleSim.js'; import ExampleSimConstants from '../../common/ExampleSimConstants.js'; +import exampleSim from '../../exampleSim.js'; import MagnetsModel from '../model/MagnetsModel.js'; import BarMagnetNode from './BarMagnetNode.js'; import MagnetsControlPanel from './MagnetsControlPanel.js'; -import { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/particles/ParticlesScreen.ts b/js/particles/ParticlesScreen.ts index df07e9e..e48943d 100644 --- a/js/particles/ParticlesScreen.ts +++ b/js/particles/ParticlesScreen.ts @@ -12,15 +12,15 @@ import Screen, { ScreenOptions } from '../../../joist/js/Screen.js'; import ScreenIcon from '../../../joist/js/ScreenIcon.js'; +import { EmptySelfOptions, optionize4 } from '../../../phet-core/js/optionize.js'; import ShadedSphereNode from '../../../scenery-phet/js/ShadedSphereNode.js'; +import Tandem from '../../../tandem/js/Tandem.js'; import ExampleSimColors from '../common/ExampleSimColors.js'; import ExampleSimConstants from '../common/ExampleSimConstants.js'; import exampleSim from '../exampleSim.js'; import ExampleSimStrings from '../ExampleSimStrings.js'; import ParticlesModel from './model/ParticlesModel.js'; import ParticlesScreenView from './view/ParticlesScreenView.js'; -import { optionize4, EmptySelfOptions } from '../../../phet-core/js/optionize.js'; -import Tandem from '../../../tandem/js/Tandem.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/particles/model/Particle.ts b/js/particles/model/Particle.ts index 0ee2840..bf078bb 100644 --- a/js/particles/model/Particle.ts +++ b/js/particles/model/Particle.ts @@ -6,15 +6,15 @@ * @author Chris Malley (PixelZoom, Inc.) */ -import { Color } from '../../../../scenery/js/imports.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; import dotRandom from '../../../../dot/js/dotRandom.js'; import Range from '../../../../dot/js/Range.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import Vector2Property from '../../../../dot/js/Vector2Property.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; +import { Color } from '../../../../scenery/js/imports.js'; import ExampleSimColors from '../../common/ExampleSimColors.js'; import exampleSim from '../../exampleSim.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; // constants const DEFAULT_DIAMETER = 2000; // in nm diff --git a/js/particles/view/ParticleNode.ts b/js/particles/view/ParticleNode.ts index 4629ceb..a543976 100644 --- a/js/particles/view/ParticleNode.ts +++ b/js/particles/view/ParticleNode.ts @@ -7,11 +7,11 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; import ShadedSphereNode, { ShadedSphereNodeOptions } from '../../../../scenery-phet/js/ShadedSphereNode.js'; import exampleSim from '../../exampleSim.js'; import Particle from '../model/Particle.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; type SelfOptions = EmptySelfOptions; type ParticleNodeOptions = SelfOptions & ShadedSphereNodeOptions;