Fixing imports to use direct imports, instead of phet-lib imports.ts …

…files. See phetsims/phet-lib#6

js/common-sm/model/SMModel.ts

@@ -14,7 +14,7 @@ import projectileDataLab from '../../projectileDataLab.js';
 import VSMModel, { VSMModelOptions } from '../../common-vsm/model/VSMModel.js';
 import SMField from './SMField.js';
 import { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
-import { PhetioProperty } from '../../../../axon/js/imports.js';
+import PhetioProperty from '../../../../axon/js/PhetioProperty.js';
 
 type SelfOptions = EmptySelfOptions;
 export type SMModelOptions = SelfOptions & VSMModelOptions<SMField>;

js/common-vsm/view/InteractiveToolPanel.ts

@@ -24,9 +24,9 @@ import PhetioProperty from '../../../../axon/js/PhetioProperty.js';
 import PDLCheckboxRow from '../../common/view/PDLCheckboxRow.js';
 import PDLStopwatchNode from './PDLStopwatchNode.js';
 import Stopwatch from '../../../../scenery-phet/js/Stopwatch.js';
-import { DerivedProperty } from '../../../../axon/js/imports.js';
 import PDLPreferences from '../../common/PDLPreferences.js';
 import WithRequired from '../../../../phet-core/js/types/WithRequired.js';
+import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 
 type SelfOptions = {
   additionalVerticalCheckboxGroupItems?: VerticalCheckboxGroupItem[];

js/common-vsm/view/PDLStopwatchNode.ts

@@ -16,7 +16,8 @@ import optionize from '../../../../phet-core/js/optionize.js';
 import WithRequired from '../../../../phet-core/js/types/WithRequired.js';
 import PDLText from '../../common/view/PDLText.js';
 import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
-import { DerivedProperty, TReadOnlyProperty } from '../../../../axon/js/imports.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 
 type SelfOptions = {
   launchButtonEnabledProperty: TReadOnlyProperty<boolean>;

js/common-vsm/view/VSMFieldSignNode.ts

@@ -16,10 +16,9 @@ import { Text, VBox } from '../../../../scenery/js/imports.js';
 import PDLConstants from '../../common/PDLConstants.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import Field from '../../common/model/Field.js';
-import { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
+import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 import PDLColors from '../../common/PDLColors.js';
 import ProjectileSelectorNode from './ProjectileSelectorNode.js';
-import { optionize } from '../../../../phet-core/js/imports.js';
 
 type SelfOptions = EmptySelfOptions;
 type VSMFieldSignNodeOptions = SelfOptions & FieldSignNodeOptions;

js/common-vsm/view/VSMHistogramNode.ts

@@ -15,7 +15,7 @@ import { ColorProperty, Node } from '../../../../scenery/js/imports.js';
 import projectileDataLab from '../../projectileDataLab.js';
 import WithRequired from '../../../../phet-core/js/types/WithRequired.js';
 import HistogramNode, { HistogramNodeOptions } from '../../common/view/HistogramNode.js';
-import { DerivedProperty } from '../../../../axon/js/imports.js';
+import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 
 type SelfOptions = EmptySelfOptions;
 

js/common/PDLConstants.ts

@@ -9,7 +9,7 @@
 import Range from '../../../dot/js/Range.js';
 import projectileDataLab from '../projectileDataLab.js';
 import PhetFont from '../../../scenery-phet/js/PhetFont.js';
-import { BooleanProperty } from '../../../axon/js/imports.js';
+import BooleanProperty from '../../../axon/js/BooleanProperty.js';
 
 //REVIEW Constants should be uppercase.
 const maxFieldDistance = 100;

js/common/PDLPreferences.ts

@@ -10,10 +10,10 @@
 import Tandem from '../../../tandem/js/Tandem.js';
 import StringUnionProperty from '../../../axon/js/StringUnionProperty.js';
 import { BinStrategy, BinStrategyValues } from './BinStrategy.js';
-import { BooleanProperty } from '../../../axon/js/imports.js';
 import PDLQueryParameters from './PDLQueryParameters.js';
 import projectileDataLab from '../projectileDataLab.js';
 import { LaunchSoundStrategy, LaunchSoundStrategyValues } from './LaunchSoundStrategy.js';
+import BooleanProperty from '../../../axon/js/BooleanProperty.js';
 
 const PDLPreferences = {
 

js/common/model/HistogramSonifier.ts

@@ -9,11 +9,12 @@
 
 import projectileDataLab from '../../projectileDataLab.js';
 import HistogramData from './HistogramData.js';
-import { Property, TReadOnlyProperty } from '../../../../axon/js/imports.js';
 import SoundClip from '../../../../tambo/js/sound-generators/SoundClip.js';
 import soundManager from '../../../../tambo/js/soundManager.js';
 import Utils from '../../../../dot/js/Utils.js';
 import histogramTone_mp3 from '../../../sounds/histogramTone_mp3.js';
+import Property from '../../../../axon/js/Property.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 
 const binSoundClip = new SoundClip( histogramTone_mp3, { initialOutputLevel: 0.8 } );
 soundManager.addSoundGenerator( binSoundClip );

js/common/model/Launcher.ts

@@ -22,8 +22,8 @@ import NumberProperty from '../../../../axon/js/NumberProperty.js';
 import PDLConstants from '../PDLConstants.js';
 import Utils from '../../../../dot/js/Utils.js';
 import Range from '../../../../dot/js/Range.js';
-import { DerivedProperty } from '../../../../axon/js/imports.js';
 import NumberIO from '../../../../tandem/js/types/NumberIO.js';
+import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 
 type SelfOptions = EmptySelfOptions;
 type LauncherOptions = SelfOptions & PhetioObjectOptions;

js/common/model/ProjectileSound.ts

@@ -16,7 +16,7 @@ import pianoLand_mp3 from '../../../sounds/pianoLand_mp3.js';
 import cannonballTone_mp3 from '../../../sounds/cannonballTone_mp3.js';
 import pumpkinTone_mp3 from '../../../sounds/pumpkinTone_mp3.js';
 import pianoTone_mp3 from '../../../sounds/pianoTone_mp3.js';
-import { dotRandom } from '../../../../dot/js/imports.js';
+import dotRandom from '../../../../dot/js/dotRandom.js';
 
 const cannonballToneSoundClip = new SoundClip( cannonballTone_mp3, { initialOutputLevel: 0.1 } );
 const pumpkinToneSoundClip = new SoundClip( pumpkinTone_mp3, { initialOutputLevel: 0.1 } );

js/common/view/FieldSignNode.ts

@@ -14,8 +14,8 @@ import Vector2 from '../../../../dot/js/Vector2.js';
 import SelectorNode from './SelectorNode.js';
 import Field from '../model/Field.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
-import { EmptySelfOptions, optionize } from '../../../../phet-core/js/imports.js';
 import PDLColors from '../PDLColors.js';
+import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 
 type SelfOptions = EmptySelfOptions;
 export type FieldSignNodeOptions = SelfOptions & VBoxOptions;

js/common/view/HistogramNode.ts

@@ -38,14 +38,14 @@ import pdlToggleButtonA_mp3 from '../../../sounds/pdlToggleButtonA_mp3.js';
 import pdlToggleButtonB_mp3 from '../../../sounds/pdlToggleButtonB_mp3.js';
 import SoundClip from '../../../../tambo/js/sound-generators/SoundClip.js';
 import soundManager from '../../../../tambo/js/soundManager.js';
-import { RectangularPushButton } from '../../../../sun/js/imports.js';
 import bullhornSolidShape from '../../../../sherpa/js/fontawesome-5/bullhornSolidShape.js';
 import Dimension2 from '../../../../dot/js/Dimension2.js';
 import PhetColorScheme from '../../../../scenery-phet/js/PhetColorScheme.js';
 import nullSoundPlayer from '../../../../tambo/js/shared-sound-players/nullSoundPlayer.js';
-import { DerivedProperty } from '../../../../axon/js/imports.js';
 import ToggleNode from '../../../../sun/js/ToggleNode.js';
 import stopSolidShape from '../../../../sherpa/js/fontawesome-5/stopSolidShape.js';
+import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
+import RectangularPushButton from '../../../../sun/js/buttons/RectangularPushButton.js';
 
 type SelfOptions = EmptySelfOptions;
 export type HistogramNodeOptions = SelfOptions & WithRequired<NodeOptions, 'tandem'>;

js/common/view/LauncherIconNode.ts

@@ -12,14 +12,15 @@ import { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 import { Node, NodeOptions } from '../../../../scenery/js/imports.js';
 import projectileDataLab from '../../projectileDataLab.js';
 import { Shape } from '../../../../kite/js/imports.js';
-import { NumberProperty, Property } from '../../../../axon/js/imports.js';
 import { LauncherConfiguration, MEAN_LAUNCH_ANGLES } from '../model/LauncherConfiguration.js';
 import { MysteryOrCustom } from '../model/MysteryOrCustom.js';
 import Launcher, { MYSTERY_LAUNCHERS } from '../model/Launcher.js';
 import LauncherMechanism, { SPRING } from '../../common-vsm/model/LauncherMechanism.js';
 import CustomLauncherNode from '../../common-vsm/view/CustomLauncherNode.js';
 import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
 import PDLConstants from '../PDLConstants.js';
+import Property from '../../../../axon/js/Property.js';
+import NumberProperty from '../../../../axon/js/NumberProperty.js';
 
 type SelfOptions = EmptySelfOptions;
 type LauncherIconNodeOptions = SelfOptions & NodeOptions;

js/common/view/PDLKeyboardHelpNode.ts

@@ -19,7 +19,7 @@ import LetterKeyNode from '../../../../scenery-phet/js/keyboard/LetterKeyNode.js
 import ProjectileDataLabStrings from '../../ProjectileDataLabStrings.js';
 import KeyboardHelpIconFactory from '../../../../scenery-phet/js/keyboard/help/KeyboardHelpIconFactory.js';
 import NumberKeyNode from '../../../../scenery-phet/js/keyboard/NumberKeyNode.js';
-import { optionize } from '../../../../phet-core/js/imports.js';
+import optionize from '../../../../phet-core/js/optionize.js';
 
 type SelfOptions = {
 

js/common/view/PDLScreenView.ts

@@ -34,8 +34,8 @@ import TimeControlNode from '../../../../scenery-phet/js/TimeControlNode.js';
 import LaunchButton from './LaunchButton.js';
 import FieldSignNode from './FieldSignNode.js';
 import EraserButton from '../../../../scenery-phet/js/buttons/EraserButton.js';
-import { DerivedProperty } from '../../../../axon/js/imports.js';
 import PDLPreferences from '../PDLPreferences.js';
+import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 
 type SelfOptions = {
   createLauncherNode: ( modelViewTransform: ModelViewTransform2 ) => LauncherNode;

js/common/view/SelectorNode.ts

@@ -23,7 +23,7 @@ import angleLeftSolidShape from '../../../../sherpa/js/fontawesome-5/angleLeftSo
 import TProperty from '../../../../axon/js/TProperty.js';
 import PhetioObject from '../../../../tandem/js/PhetioObject.js';
 import nullSoundPlayer from '../../../../tambo/js/shared-sound-players/nullSoundPlayer.js';
-import { platform } from '../../../../phet-core/js/imports.js';
+import platform from '../../../../phet-core/js/platform.js';
 
 type SelfOptions = {
   playSound: ( selectedItem: number ) => void;

js/measures/view/DataMeasuresOverlay.ts

@@ -28,9 +28,9 @@ import PatternStringProperty from '../../../../axon/js/PatternStringProperty.js'
 import ProjectileDataLabStrings from '../../ProjectileDataLabStrings.js';
 import PDLConstants, { IS_CURRENTLY_AUTO_GENERATING_DATA_PROPERTY } from '../../common/PDLConstants.js';
 import { PDLPanel } from '../../common/view/PDLPanel.js';
-import { TReadOnlyProperty } from '../../../../axon/js/imports.js';
 import PDLColors from '../../common/PDLColors.js';
 import { HistogramSonifierPhase } from '../../common/model/HistogramSonifier.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 
 type SelfOptions = {
   context: 'histogram' | 'field' | 'icon';

js/measures/view/IntervalToolNode.ts

@@ -26,13 +26,14 @@ import PDLColors from '../../common/PDLColors.js';
 import Property from '../../../../axon/js/Property.js';
 import SoundClip from '../../../../tambo/js/sound-generators/SoundClip.js';
 import soundManager from '../../../../tambo/js/soundManager.js';
-import { BooleanProperty, NumberProperty } from '../../../../axon/js/imports.js';
 import ValueChangeSoundPlayer from '../../../../tambo/js/sound-generators/ValueChangeSoundPlayer.js';
 import Range from '../../../../dot/js/Range.js';
 import intervalTool_wav from '../../../sounds/intervalTool_wav.js';
 import PDLConstants from '../../common/PDLConstants.js';
 import phetAudioContext from '../../../../tambo/js/phetAudioContext.js';
 import nullSoundPlayer from '../../../../tambo/js/shared-sound-players/nullSoundPlayer.js';
+import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
+import NumberProperty from '../../../../axon/js/NumberProperty.js';
 
 const edgeFilter = new BiquadFilterNode( phetAudioContext, {
   type: 'lowpass',

js/sampling/view/SamplingFieldSignNode.ts

@@ -13,12 +13,11 @@ import ProjectileDataLabStrings from '../../ProjectileDataLabStrings.js';
 import { Text, VBox } from '../../../../scenery/js/imports.js';
 import PDLConstants from '../../common/PDLConstants.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
-import { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
+import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 import PDLColors from '../../common/PDLColors.js';
 import Launcher from '../../common/model/Launcher.js';
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import SampleSelectorNode from './SampleSelectorNode.js';
-import { optionize } from '../../../../phet-core/js/imports.js';
 import Field from '../../common/model/Field.js';
 
 type SelfOptions = EmptySelfOptions;

js/sampling/view/SamplingHistogramNode.ts

@@ -23,9 +23,9 @@ import PDLColors from '../../common/PDLColors.js';
 import PDLConstants from '../../common/PDLConstants.js';
 import Launcher from '../../common/model/Launcher.js';
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
-import { Multilink } from '../../../../axon/js/imports.js';
 import PDLQueryParameters from '../../common/PDLQueryParameters.js';
 import Histogram from '../../common/model/Histogram.js';
+import Multilink from '../../../../axon/js/Multilink.js';
 
 export default class SamplingHistogramNode extends HistogramNode {
   public constructor( launcherProperty: TReadOnlyProperty<Launcher>,