From be961c159683622627913a23cd2aa79639b31a01 Mon Sep 17 00:00:00 2001 From: zepumph Date: Fri, 4 Mar 2022 13:08:16 -0700 Subject: [PATCH] import kite files from imports.ts, https://github.com/phetsims/kite/issues/96 --- js/common/model/LightRay.ts | 2 +- js/common/model/LightSpot.ts | 3 +-- js/common/model/Optic.ts | 2 +- js/common/model/OpticShapes.ts | 2 +- js/common/model/ProjectionScreen.ts | 2 +- js/common/view/CueingArrowsNode.ts | 2 +- js/common/view/OpticalAxisForegroundNode.ts | 2 +- js/common/view/RealLightRaysForegroundNode.ts | 2 +- js/common/view/SecondPointNode.ts | 2 +- js/lens/model/Lens.ts | 2 +- js/lens/model/LensShapes.ts | 2 +- js/mirror/model/MirrorShapes.ts | 2 +- 12 files changed, 12 insertions(+), 13 deletions(-) diff --git a/js/common/model/LightRay.ts b/js/common/model/LightRay.ts index 14974ef3..9fa87e5a 100644 --- a/js/common/model/LightRay.ts +++ b/js/common/model/LightRay.ts @@ -11,7 +11,7 @@ */ import Vector2 from '../../../../dot/js/Vector2.js'; -import RayIntersection from '../../../../kite/js/util/RayIntersection.js'; +import { RayIntersection } from '../../../../kite/js/imports.js'; import AssertUtils from '../../../../phetcommon/js/AssertUtils.js'; import geometricOptics from '../../geometricOptics.js'; import Lens from '../../lens/model/Lens.js'; diff --git a/js/common/model/LightSpot.ts b/js/common/model/LightSpot.ts index 2bccde16..162106ce 100644 --- a/js/common/model/LightSpot.ts +++ b/js/common/model/LightSpot.ts @@ -10,8 +10,7 @@ import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import Vector2 from '../../../../dot/js/Vector2.js'; -import Graph from '../../../../kite/js/ops/Graph.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape, Graph } from '../../../../kite/js/imports.js'; import NumberIO from '../../../../tandem/js/types/NumberIO.js'; import Optic from './Optic.js'; import geometricOptics from '../../geometricOptics.js'; diff --git a/js/common/model/Optic.ts b/js/common/model/Optic.ts index 24936083..ad941afd 100644 --- a/js/common/model/Optic.ts +++ b/js/common/model/Optic.ts @@ -11,7 +11,7 @@ import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; import Matrix3 from '../../../../dot/js/Matrix3.js'; import Vector2 from '../../../../dot/js/Vector2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import NumberIO from '../../../../tandem/js/types/NumberIO.js'; import geometricOptics from '../../geometricOptics.js'; import OpticShapes from './OpticShapes.js'; diff --git a/js/common/model/OpticShapes.ts b/js/common/model/OpticShapes.ts index 2384559c..2a7bbade 100644 --- a/js/common/model/OpticShapes.ts +++ b/js/common/model/OpticShapes.ts @@ -7,7 +7,7 @@ * @author Martin Veillette */ -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; interface OpticShapes { diff --git a/js/common/model/ProjectionScreen.ts b/js/common/model/ProjectionScreen.ts index 6318aa36..4caae729 100644 --- a/js/common/model/ProjectionScreen.ts +++ b/js/common/model/ProjectionScreen.ts @@ -13,7 +13,7 @@ import Property from '../../../../axon/js/Property.js'; import Matrix3 from '../../../../dot/js/Matrix3.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import Vector2Property from '../../../../dot/js/Vector2Property.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import PhetioObject, { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js'; import geometricOptics from '../../geometricOptics.js'; import GOConstants from '../GOConstants.js'; diff --git a/js/common/view/CueingArrowsNode.ts b/js/common/view/CueingArrowsNode.ts index 020520ed..fae29c42 100644 --- a/js/common/view/CueingArrowsNode.ts +++ b/js/common/view/CueingArrowsNode.ts @@ -9,7 +9,7 @@ import geometricOptics from '../../geometricOptics.js'; import { Path, PathOptions } from '../../../../scenery/js/imports.js'; import ArrowShape from '../../../../scenery-phet/js/ArrowShape.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import GOConstants from '../GOConstants.js'; import optionize from '../../../../phet-core/js/optionize.js'; import { ArrowNodeOptions } from '../GOCommonOptions.js'; diff --git a/js/common/view/OpticalAxisForegroundNode.ts b/js/common/view/OpticalAxisForegroundNode.ts index a110a810..4ec28a10 100644 --- a/js/common/view/OpticalAxisForegroundNode.ts +++ b/js/common/view/OpticalAxisForegroundNode.ts @@ -15,7 +15,7 @@ import IReadOnlyProperty from '../../../../axon/js/IReadOnlyProperty.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import Vector2 from '../../../../dot/js/Vector2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; import geometricOptics from '../../geometricOptics.js'; import OpticalAxisNode, { OpticalAxisNodeOptions } from './OpticalAxisNode.js'; diff --git a/js/common/view/RealLightRaysForegroundNode.ts b/js/common/view/RealLightRaysForegroundNode.ts index 9ef45c6c..3a2c393d 100644 --- a/js/common/view/RealLightRaysForegroundNode.ts +++ b/js/common/view/RealLightRaysForegroundNode.ts @@ -16,7 +16,7 @@ import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransfo import GOQueryParameters from '../GOQueryParameters.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import Vector2 from '../../../../dot/js/Vector2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import { Path } from '../../../../scenery/js/imports.js'; import { OpticalImageType } from '../model/OpticalImageType.js'; import optionize from '../../../../phet-core/js/optionize.js'; diff --git a/js/common/view/SecondPointNode.ts b/js/common/view/SecondPointNode.ts index 0acd0465..082ed580 100644 --- a/js/common/view/SecondPointNode.ts +++ b/js/common/view/SecondPointNode.ts @@ -8,7 +8,7 @@ */ import Vector2Property from '../../../../dot/js/Vector2Property.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; import ArrowNode from '../../../../scenery-phet/js/ArrowNode.js'; import { Circle, DragListener, FocusHighlightFromNode, KeyboardDragListener, Node, NodeOptions, VBox, VBoxOptions } from '../../../../scenery/js/imports.js'; diff --git a/js/lens/model/Lens.ts b/js/lens/model/Lens.ts index 293fd04e..0dd268da 100644 --- a/js/lens/model/Lens.ts +++ b/js/lens/model/Lens.ts @@ -16,7 +16,7 @@ import LensShapes from './LensShapes.js'; import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import IReadOnlyProperty from '../../../../axon/js/IReadOnlyProperty.js'; import Utils from '../../../../dot/js/Utils.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import optionize from '../../../../phet-core/js/optionize.js'; import { PickRequired } from '../../../../phet-core/js/types/PickRequired.js'; import GOQueryParameters from '../../common/GOQueryParameters.js'; diff --git a/js/lens/model/LensShapes.ts b/js/lens/model/LensShapes.ts index 0527f2e5..029b5a92 100644 --- a/js/lens/model/LensShapes.ts +++ b/js/lens/model/LensShapes.ts @@ -12,7 +12,7 @@ */ import Vector2 from '../../../../dot/js/Vector2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import optionize from '../../../../phet-core/js/optionize.js'; import OpticShapes from '../../common/model/OpticShapes.js'; import geometricOptics from '../../geometricOptics.js'; diff --git a/js/mirror/model/MirrorShapes.ts b/js/mirror/model/MirrorShapes.ts index 3da75617..0a2f9ebc 100644 --- a/js/mirror/model/MirrorShapes.ts +++ b/js/mirror/model/MirrorShapes.ts @@ -12,7 +12,7 @@ */ import Vector2 from '../../../../dot/js/Vector2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import optionize from '../../../../phet-core/js/optionize.js'; import OpticShapes from '../../common/model/OpticShapes.js'; import geometricOptics from '../../geometricOptics.js';