From bd522bcc17588aae65bcd71c152c018b137c77a0 Mon Sep 17 00:00:00 2001 From: zepumph Date: Fri, 4 Mar 2022 13:08:33 -0700 Subject: [PATCH] import kite files from imports.ts, https://github.com/phetsims/kite/issues/96 --- js/common/model/MovableShape.js | 2 +- js/common/model/PerimeterShape.js | 2 +- js/common/model/ShapePlacementBoard.js | 2 +- js/common/view/AreaBuilderIconFactory.js | 2 +- js/common/view/Grid.js | 2 +- js/common/view/PerimeterShapeNode.js | 2 +- js/explore/model/AreaBuilderExploreModel.js | 2 +- js/explore/view/ExploreNode.js | 2 +- js/game/model/AreaBuilderChallengeFactory.js | 2 +- js/game/model/AreaBuilderGameModel.js | 2 +- js/game/view/ColorProportionsPrompt.js | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/js/common/model/MovableShape.js b/js/common/model/MovableShape.js index 4ce3d51..b673255 100644 --- a/js/common/model/MovableShape.js +++ b/js/common/model/MovableShape.js @@ -9,7 +9,7 @@ import Emitter from '../../../../axon/js/Emitter.js'; import Property from '../../../../axon/js/Property.js'; import Vector2 from '../../../../dot/js/Vector2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import { Color } from '../../../../scenery/js/imports.js'; import areaBuilder from '../../areaBuilder.js'; import AreaBuilderSharedConstants from '../AreaBuilderSharedConstants.js'; diff --git a/js/common/model/PerimeterShape.js b/js/common/model/PerimeterShape.js index 2e2540d..0c04d58 100644 --- a/js/common/model/PerimeterShape.js +++ b/js/common/model/PerimeterShape.js @@ -8,7 +8,7 @@ */ import Vector2 from '../../../../dot/js/Vector2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import merge from '../../../../phet-core/js/merge.js'; import areaBuilder from '../../areaBuilder.js'; diff --git a/js/common/model/ShapePlacementBoard.js b/js/common/model/ShapePlacementBoard.js index 22518f9..74e31c7 100644 --- a/js/common/model/ShapePlacementBoard.js +++ b/js/common/model/ShapePlacementBoard.js @@ -11,7 +11,7 @@ import Property from '../../../../axon/js/Property.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import Utils from '../../../../dot/js/Utils.js'; import Vector2 from '../../../../dot/js/Vector2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import Fraction from '../../../../phetcommon/js/model/Fraction.js'; import { Color } from '../../../../scenery/js/imports.js'; import areaBuilder from '../../areaBuilder.js'; diff --git a/js/common/view/AreaBuilderIconFactory.js b/js/common/view/AreaBuilderIconFactory.js index 2fdb71f..45cfb7c 100644 --- a/js/common/view/AreaBuilderIconFactory.js +++ b/js/common/view/AreaBuilderIconFactory.js @@ -8,7 +8,7 @@ import Vector2 from '../../../../dot/js/Vector2.js'; import Screen from '../../../../joist/js/Screen.js'; import ScreenIcon from '../../../../joist/js/ScreenIcon.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import merge from '../../../../phet-core/js/merge.js'; import FaceNode from '../../../../scenery-phet/js/FaceNode.js'; import { HBox } from '../../../../scenery/js/imports.js'; diff --git a/js/common/view/Grid.js b/js/common/view/Grid.js index cceff75..52f2413 100644 --- a/js/common/view/Grid.js +++ b/js/common/view/Grid.js @@ -7,7 +7,7 @@ * @author John Blanco */ -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import { Path } from '../../../../scenery/js/imports.js'; import areaBuilder from '../../areaBuilder.js'; diff --git a/js/common/view/PerimeterShapeNode.js b/js/common/view/PerimeterShapeNode.js index 2a1ba32..0d467da 100644 --- a/js/common/view/PerimeterShapeNode.js +++ b/js/common/view/PerimeterShapeNode.js @@ -11,7 +11,7 @@ import Property from '../../../../axon/js/Property.js'; import Utils from '../../../../dot/js/Utils.js'; import Vector2 from '../../../../dot/js/Vector2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import { Node } from '../../../../scenery/js/imports.js'; import { Path } from '../../../../scenery/js/imports.js'; diff --git a/js/explore/model/AreaBuilderExploreModel.js b/js/explore/model/AreaBuilderExploreModel.js index e1bccf1..9ca0f52 100644 --- a/js/explore/model/AreaBuilderExploreModel.js +++ b/js/explore/model/AreaBuilderExploreModel.js @@ -11,7 +11,7 @@ import Property from '../../../../axon/js/Property.js'; import StringProperty from '../../../../axon/js/StringProperty.js'; import Dimension2 from '../../../../dot/js/Dimension2.js'; import Vector2 from '../../../../dot/js/Vector2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import Bucket from '../../../../phetcommon/js/model/Bucket.js'; import areaBuilder from '../../areaBuilder.js'; import AreaBuilderSharedConstants from '../../common/AreaBuilderSharedConstants.js'; diff --git a/js/explore/view/ExploreNode.js b/js/explore/view/ExploreNode.js index 4f5ac42..a0ef706 100644 --- a/js/explore/view/ExploreNode.js +++ b/js/explore/view/ExploreNode.js @@ -9,7 +9,7 @@ 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 merge from '../../../../phet-core/js/merge.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; import BucketFront from '../../../../scenery-phet/js/bucket/BucketFront.js'; diff --git a/js/game/model/AreaBuilderChallengeFactory.js b/js/game/model/AreaBuilderChallengeFactory.js index 0bf23a7..ca6c1cd 100644 --- a/js/game/model/AreaBuilderChallengeFactory.js +++ b/js/game/model/AreaBuilderChallengeFactory.js @@ -9,7 +9,7 @@ import dotRandom from '../../../../dot/js/dotRandom.js'; import Utils from '../../../../dot/js/Utils.js'; import Vector2 from '../../../../dot/js/Vector2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import Fraction from '../../../../phetcommon/js/model/Fraction.js'; import { Color } from '../../../../scenery/js/imports.js'; import areaBuilder from '../../areaBuilder.js'; diff --git a/js/game/model/AreaBuilderGameModel.js b/js/game/model/AreaBuilderGameModel.js index 5e4fcb5..80bc111 100644 --- a/js/game/model/AreaBuilderGameModel.js +++ b/js/game/model/AreaBuilderGameModel.js @@ -14,7 +14,7 @@ import createObservableArray from '../../../../axon/js/createObservableArray.js' import Property from '../../../../axon/js/Property.js'; import Dimension2 from '../../../../dot/js/Dimension2.js'; import Vector2 from '../../../../dot/js/Vector2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import { Color } from '../../../../scenery/js/imports.js'; import areaBuilder from '../../areaBuilder.js'; import AreaBuilderSharedConstants from '../../common/AreaBuilderSharedConstants.js'; diff --git a/js/game/view/ColorProportionsPrompt.js b/js/game/view/ColorProportionsPrompt.js index 18acdc1..91a56eb 100644 --- a/js/game/view/ColorProportionsPrompt.js +++ b/js/game/view/ColorProportionsPrompt.js @@ -7,7 +7,7 @@ * @author John Blanco */ -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import merge from '../../../../phet-core/js/merge.js'; import Fraction from '../../../../phetcommon/js/model/Fraction.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js';