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

…files. See phetsims/phet-lib#6
phetsims · Mar 5, 2024 · 71f904d · 71f904d
1 parent 05f9bd8
commit 71f904d
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 13 deletions.
diff --git a/js/common/model/Axis.ts b/js/common/model/Axis.ts
@@ -9,7 +9,8 @@
 import unitRates from '../../unitRates.js';
 import optionize from '../../../../phet-core/js/optionize.js';
 import SunConstants from '../../../../sun/js/SunConstants.js';
-import { StringProperty, TReadOnlyProperty } from '../../../../axon/js/imports.js';
+import StringProperty from '../../../../axon/js/StringProperty.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 
 const defaultValueFormatStringProperty = new StringProperty( SunConstants.VALUE_NUMBERED_PLACEHOLDER );
 

diff --git a/js/racinglab/view/RaceTimerNode.ts b/js/racinglab/view/RaceTimerNode.ts
@@ -15,7 +15,7 @@ import UnitRatesStrings from '../../UnitRatesStrings.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import { Text } from '../../../../scenery/js/imports.js';
-import { DerivedStringProperty } from '../../../../axon/js/imports.js';
+import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
 
 // constants
 const TIMER_FONT = new PhetFont( 16 );

diff --git a/js/racinglab/view/RaceTrackNode.ts b/js/racinglab/view/RaceTrackNode.ts
@@ -28,7 +28,7 @@ import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import RaceCar from '../model/RaceCar.js';
 import optionize from '../../../../phet-core/js/optionize.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
-import { Multilink } from '../../../../axon/js/imports.js';
+import Multilink from '../../../../axon/js/Multilink.js';
 
 // constants
 const NEGATIVE_TRACK_LENGTH = 65; // length of track to left of starting flag, in view coordinates

diff --git a/js/shopping/model/Bag.ts b/js/shopping/model/Bag.ts
@@ -12,7 +12,7 @@ import URMovable, { URMovableOptions } from '../../common/model/URMovable.js';
 import unitRates from '../../unitRates.js';
 import ShoppingItem from './ShoppingItem.js';
 import optionize from '../../../../phet-core/js/optionize.js';
-import { TReadOnlyProperty } from '../../../../axon/js/imports.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 
 type SelfOptions = {
   visible?: boolean; // is the bag initially visible?

diff --git a/js/shopping/model/CostOfQuestion.ts b/js/shopping/model/CostOfQuestion.ts
@@ -8,12 +8,13 @@
 
 import unitRates from '../../unitRates.js';
 import ShoppingQuestion from './ShoppingQuestion.js';
-import { DerivedStringProperty, TReadOnlyProperty } from '../../../../axon/js/imports.js';
 import Axis from '../../common/model/Axis.js';
 import UnitRatesStrings from '../../UnitRatesStrings.js';
 import URUtils from '../../common/URUtils.js';
 import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
 import Utils from '../../../../dot/js/Utils.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
 
 export default class CostOfQuestion extends ShoppingQuestion {
 

diff --git a/js/shopping/model/ItemsForQuestion.ts b/js/shopping/model/ItemsForQuestion.ts
@@ -8,12 +8,13 @@
 
 import ShoppingQuestion from './ShoppingQuestion.js';
 import unitRates from '../../unitRates.js';
-import { DerivedStringProperty, TReadOnlyProperty } from '../../../../axon/js/imports.js';
 import Axis from '../../common/model/Axis.js';
 import UnitRatesStrings from '../../UnitRatesStrings.js';
 import URUtils from '../../common/URUtils.js';
 import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
 import Utils from '../../../../dot/js/Utils.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
 
 export default class ItemsForQuestion extends ShoppingQuestion {
 

diff --git a/js/shopping/model/ShoppingItem.ts b/js/shopping/model/ShoppingItem.ts
@@ -10,7 +10,7 @@ import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import URMovable, { URMovableOptions } from '../../common/model/URMovable.js';
 import unitRates from '../../unitRates.js';
 import optionize from '../../../../phet-core/js/optionize.js';
-import { TReadOnlyProperty } from '../../../../axon/js/imports.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 
 type SelfOptions = {
   visible?: boolean; // is the item initially visible?

diff --git a/js/shopping/model/ShoppingItemData.ts b/js/shopping/model/ShoppingItemData.ts
@@ -35,7 +35,7 @@ import tomatoBag_png from '../../../images/tomatoBag_png.js';
 import UnitRatesStrings from '../../UnitRatesStrings.js';
 import unitRates from '../../unitRates.js';
 import { Color } from '../../../../scenery/js/imports.js';
-import { TReadOnlyProperty } from '../../../../axon/js/imports.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 
 // Description of a shopping item, all fields are required
 export type ShoppingItemDataOptions = {

diff --git a/js/shopping/model/ShoppingQuestion.ts b/js/shopping/model/ShoppingQuestion.ts
@@ -10,7 +10,7 @@ import Emitter from '../../../../axon/js/Emitter.js';
 import Property from '../../../../axon/js/Property.js';
 import unitRates from '../../unitRates.js';
 import Axis from '../../common/model/Axis.js';
-import { TReadOnlyProperty } from '../../../../axon/js/imports.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 
 export default class ShoppingQuestion {
 

diff --git a/js/shopping/model/ShoppingScene.ts b/js/shopping/model/ShoppingScene.ts
@@ -35,10 +35,11 @@ import optionize, { combineOptions } from '../../../../phet-core/js/optionize.js
 import ShoppingQuestion from './ShoppingQuestion.js';
 import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
 import Axis, { AxisOptions } from '../../common/model/Axis.js';
-import { StringProperty, TReadOnlyProperty } from '../../../../axon/js/imports.js';
 import UnitRateQuestion from './UnitRateQuestion.js';
 import CostOfQuestion from './CostOfQuestion.js';
 import ItemsForQuestion from './ItemsForQuestion.js';
+import StringProperty from '../../../../axon/js/StringProperty.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 
 const noScaleUnitsStringProperty = new StringProperty( '' );
 

diff --git a/js/shopping/model/UnitRateQuestion.ts b/js/shopping/model/UnitRateQuestion.ts
@@ -8,11 +8,12 @@
 
 import unitRates from '../../unitRates.js';
 import ShoppingQuestion from './ShoppingQuestion.js';
-import { DerivedStringProperty, TReadOnlyProperty } from '../../../../axon/js/imports.js';
 import Axis from '../../common/model/Axis.js';
 import UnitRatesStrings from '../../UnitRatesStrings.js';
 import URUtils from '../../common/URUtils.js';
 import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
 
 export default class UnitRateQuestion extends ShoppingQuestion {
 

diff --git a/js/shopping/view/ScaleNode.ts b/js/shopping/view/ScaleNode.ts
@@ -19,8 +19,9 @@ import CostNode from './CostNode.js';
 import Scale from '../model/Scale.js';
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import optionize from '../../../../phet-core/js/optionize.js';
-import { DerivedStringProperty, TReadOnlyProperty } from '../../../../axon/js/imports.js';
 import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
+import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
+import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js';
 
 // constants
 const PANEL_WIDTH = 132;

diff --git a/js/shopping/view/ShoppingQuestionNode.ts b/js/shopping/view/ShoppingQuestionNode.ts
@@ -22,7 +22,7 @@ import KeypadLayer from '../../common/view/KeypadLayer.js';
 import optionize from '../../../../phet-core/js/optionize.js';
 import KeypadPanel from '../../common/view/KeypadPanel.js';
 import AccordionBox from '../../../../sun/js/AccordionBox.js';
-import { Multilink } from '../../../../axon/js/imports.js';
+import Multilink from '../../../../axon/js/Multilink.js';
 
 type SelfOptions = {
   valueBoxWidth?: number; // width of the value field, height determined by valueFont