From 301fe1ef4890ec8d4febeec524b0b4bcc19364b4 Mon Sep 17 00:00:00 2001 From: zepumph Date: Fri, 4 Mar 2022 13:07:41 -0700 Subject: [PATCH] import kite files from imports.ts, https://github.com/phetsims/kite/issues/96 --- js/common/view/BarometerNode.js | 2 +- js/common/view/VelocitySensorNode.js | 2 +- js/flow/view/FlowToolsControlPanel.js | 2 +- js/flow/view/FluxMeterNode.js | 2 +- js/flow/view/PipeNode.js | 2 +- js/under-pressure/view/ChamberPoolBack.js | 2 +- js/under-pressure/view/ChamberPoolWaterNode.js | 2 +- js/under-pressure/view/ControlPanel.js | 2 +- js/under-pressure/view/MassStackNode.js | 2 +- js/under-pressure/view/SquarePoolBack.js | 2 +- js/under-pressure/view/TrapezoidPoolBack.js | 2 +- js/under-pressure/view/TrapezoidPoolWaterNode.js | 2 +- js/watertower/view/HoseNode.js | 2 +- js/watertower/view/SluiceControlPanel.js | 2 +- js/watertower/view/ToolsControlPanel.js | 2 +- js/watertower/view/WaterTowerLegsNode.js | 2 +- js/watertower/view/WaterTowerNode.js | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/js/common/view/BarometerNode.js b/js/common/view/BarometerNode.js index 98d6c57..9cae892 100644 --- a/js/common/view/BarometerNode.js +++ b/js/common/view/BarometerNode.js @@ -13,7 +13,7 @@ import Property from '../../../../axon/js/Property.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import Dimension2 from '../../../../dot/js/Dimension2.js'; import Range from '../../../../dot/js/Range.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import merge from '../../../../phet-core/js/merge.js'; import GaugeNode from '../../../../scenery-phet/js/GaugeNode.js'; import MovableDragHandler from '../../../../scenery-phet/js/input/MovableDragHandler.js'; diff --git a/js/common/view/VelocitySensorNode.js b/js/common/view/VelocitySensorNode.js index 40e3b74..a19064d 100644 --- a/js/common/view/VelocitySensorNode.js +++ b/js/common/view/VelocitySensorNode.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 Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import merge from '../../../../phet-core/js/merge.js'; import ArrowShape from '../../../../scenery-phet/js/ArrowShape.js'; import MovableDragHandler from '../../../../scenery-phet/js/input/MovableDragHandler.js'; diff --git a/js/flow/view/FlowToolsControlPanel.js b/js/flow/view/FlowToolsControlPanel.js index 7abed99..f1a16ef 100644 --- a/js/flow/view/FlowToolsControlPanel.js +++ b/js/flow/view/FlowToolsControlPanel.js @@ -7,7 +7,7 @@ */ import Bounds2 from '../../../../dot/js/Bounds2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import merge from '../../../../phet-core/js/merge.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import RulerNode from '../../../../scenery-phet/js/RulerNode.js'; diff --git a/js/flow/view/FluxMeterNode.js b/js/flow/view/FluxMeterNode.js index eb9aa84..9135dcd 100644 --- a/js/flow/view/FluxMeterNode.js +++ b/js/flow/view/FluxMeterNode.js @@ -10,7 +10,7 @@ import Property from '../../../../axon/js/Property.js'; import Utils from '../../../../dot/js/Utils.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import merge from '../../../../phet-core/js/merge.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import { SimpleDragHandler } from '../../../../scenery/js/imports.js'; diff --git a/js/flow/view/PipeNode.js b/js/flow/view/PipeNode.js index 3e0d01b..bce770d 100644 --- a/js/flow/view/PipeNode.js +++ b/js/flow/view/PipeNode.js @@ -8,7 +8,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 { Image } from '../../../../scenery/js/imports.js'; import { Node } from '../../../../scenery/js/imports.js'; import { Path } from '../../../../scenery/js/imports.js'; diff --git a/js/under-pressure/view/ChamberPoolBack.js b/js/under-pressure/view/ChamberPoolBack.js index 7d6e338..fd2a4e3 100644 --- a/js/under-pressure/view/ChamberPoolBack.js +++ b/js/under-pressure/view/ChamberPoolBack.js @@ -7,7 +7,7 @@ */ import Matrix3 from '../../../../dot/js/Matrix3.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import { Node } from '../../../../scenery/js/imports.js'; import { Path } from '../../../../scenery/js/imports.js'; import { Rectangle } from '../../../../scenery/js/imports.js'; diff --git a/js/under-pressure/view/ChamberPoolWaterNode.js b/js/under-pressure/view/ChamberPoolWaterNode.js index 0c86595..6ace498 100644 --- a/js/under-pressure/view/ChamberPoolWaterNode.js +++ b/js/under-pressure/view/ChamberPoolWaterNode.js @@ -6,7 +6,7 @@ * @author Vasily Shakhov (Mlearner) */ -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import { Node } from '../../../../scenery/js/imports.js'; import { Path } from '../../../../scenery/js/imports.js'; import fluidPressureAndFlow from '../../fluidPressureAndFlow.js'; diff --git a/js/under-pressure/view/ControlPanel.js b/js/under-pressure/view/ControlPanel.js index 23e9f97..65a1998 100644 --- a/js/under-pressure/view/ControlPanel.js +++ b/js/under-pressure/view/ControlPanel.js @@ -7,7 +7,7 @@ * @author Siddhartha Chinthapally (Actual Concepts) */ -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import merge from '../../../../phet-core/js/merge.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import RulerNode from '../../../../scenery-phet/js/RulerNode.js'; diff --git a/js/under-pressure/view/MassStackNode.js b/js/under-pressure/view/MassStackNode.js index 5509486..7677e6e 100644 --- a/js/under-pressure/view/MassStackNode.js +++ b/js/under-pressure/view/MassStackNode.js @@ -7,7 +7,7 @@ */ import Vector2 from '../../../../dot/js/Vector2.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import { Node } from '../../../../scenery/js/imports.js'; import { Path } from '../../../../scenery/js/imports.js'; import { Rectangle } from '../../../../scenery/js/imports.js'; diff --git a/js/under-pressure/view/SquarePoolBack.js b/js/under-pressure/view/SquarePoolBack.js index 35e693f..26137c1 100644 --- a/js/under-pressure/view/SquarePoolBack.js +++ b/js/under-pressure/view/SquarePoolBack.js @@ -8,7 +8,7 @@ */ import Matrix3 from '../../../../dot/js/Matrix3.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import { Node } from '../../../../scenery/js/imports.js'; import { Path } from '../../../../scenery/js/imports.js'; import { Rectangle } from '../../../../scenery/js/imports.js'; diff --git a/js/under-pressure/view/TrapezoidPoolBack.js b/js/under-pressure/view/TrapezoidPoolBack.js index a8283b7..5d5242a 100644 --- a/js/under-pressure/view/TrapezoidPoolBack.js +++ b/js/under-pressure/view/TrapezoidPoolBack.js @@ -8,7 +8,7 @@ */ import Matrix3 from '../../../../dot/js/Matrix3.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import { Node } from '../../../../scenery/js/imports.js'; import { Path } from '../../../../scenery/js/imports.js'; import { Rectangle } from '../../../../scenery/js/imports.js'; diff --git a/js/under-pressure/view/TrapezoidPoolWaterNode.js b/js/under-pressure/view/TrapezoidPoolWaterNode.js index da2529b..867b229 100644 --- a/js/under-pressure/view/TrapezoidPoolWaterNode.js +++ b/js/under-pressure/view/TrapezoidPoolWaterNode.js @@ -7,7 +7,7 @@ * @author Siddhartha Chinthapally (Actual Concepts) */ -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import { Node } from '../../../../scenery/js/imports.js'; import { Path } from '../../../../scenery/js/imports.js'; import fluidPressureAndFlow from '../../fluidPressureAndFlow.js'; diff --git a/js/watertower/view/HoseNode.js b/js/watertower/view/HoseNode.js index 2bee45d..a3dddcf 100644 --- a/js/watertower/view/HoseNode.js +++ b/js/watertower/view/HoseNode.js @@ -9,7 +9,7 @@ * @author Siddhartha Chinthapally (Actual Concepts) */ -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import { SimpleDragHandler } from '../../../../scenery/js/imports.js'; import { Image } from '../../../../scenery/js/imports.js'; import { Node } from '../../../../scenery/js/imports.js'; diff --git a/js/watertower/view/SluiceControlPanel.js b/js/watertower/view/SluiceControlPanel.js index 2609312..e3063d3 100644 --- a/js/watertower/view/SluiceControlPanel.js +++ b/js/watertower/view/SluiceControlPanel.js @@ -8,7 +8,7 @@ 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 ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; import { Path } from '../../../../scenery/js/imports.js'; import { Rectangle } from '../../../../scenery/js/imports.js'; diff --git a/js/watertower/view/ToolsControlPanel.js b/js/watertower/view/ToolsControlPanel.js index 7121fa4..5be2c6d 100644 --- a/js/watertower/view/ToolsControlPanel.js +++ b/js/watertower/view/ToolsControlPanel.js @@ -6,7 +6,7 @@ * @author Siddhartha Chinthapally (ActualConcepts) */ -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import merge from '../../../../phet-core/js/merge.js'; import measuringTape_png from '../../../../scenery-phet/images/measuringTape_png.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; diff --git a/js/watertower/view/WaterTowerLegsNode.js b/js/watertower/view/WaterTowerLegsNode.js index 4af3988..398dc3b 100644 --- a/js/watertower/view/WaterTowerLegsNode.js +++ b/js/watertower/view/WaterTowerLegsNode.js @@ -6,7 +6,7 @@ */ import Utils from '../../../../dot/js/Utils.js'; -import Shape from '../../../../kite/js/Shape.js'; +import { Shape } from '../../../../kite/js/imports.js'; import merge from '../../../../phet-core/js/merge.js'; import { Line } from '../../../../scenery/js/imports.js'; import { Node } from '../../../../scenery/js/imports.js'; diff --git a/js/watertower/view/WaterTowerNode.js b/js/watertower/view/WaterTowerNode.js index 024d7c3..01d5320 100644 --- a/js/watertower/view/WaterTowerNode.js +++ b/js/watertower/view/WaterTowerNode.js @@ -7,7 +7,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 PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import { SimpleDragHandler } from '../../../../scenery/js/imports.js';