Skip to content

Commit

Permalink
Fixing imports to use direct imports, instead of phet-lib imports.ts …
Browse files Browse the repository at this point in the history
…files. See phetsims/phet-lib#6
  • Loading branch information
jonathanolson committed Mar 5, 2024
1 parent 33eb5b1 commit 589cf4a
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion js/display/PaintObserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @author Jonathan Olson <[email protected]>
*/

import { isTReadOnlyProperty } from '../../../axon/js/imports.js';
import { isTReadOnlyProperty } from '../../../axon/js/TReadOnlyProperty.js';
import { Color, Gradient, scenery } from '../imports.js';

class PaintObserver {
Expand Down
2 changes: 1 addition & 1 deletion js/display/SVGGradientStop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import Pool, { TPoolable } from '../../../phet-core/js/Pool.js';
import WithoutNull from '../../../phet-core/js/types/WithoutNull.js';
import { ActiveSVGGradient, Color, scenery, svgns, TColor } from '../imports.js';
import { isTReadOnlyProperty } from '../../../axon/js/imports.js';
import { isTReadOnlyProperty } from '../../../axon/js/TReadOnlyProperty.js';

const scratchColor = new Color( 'transparent' );

Expand Down
2 changes: 1 addition & 1 deletion js/display/drawables/RectangleWebGLDrawable.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @author Jonathan Olson <[email protected]>
*/

import { isTReadOnlyProperty } from '../../../../axon/js/imports.js';
import { isTReadOnlyProperty } from '../../../../axon/js/TReadOnlyProperty.js';
import Vector2 from '../../../../dot/js/Vector2.js';
import Poolable from '../../../../phet-core/js/Poolable.js';
import { Color, RectangleStatefulDrawable, Renderer, scenery, WebGLSelfDrawable } from '../../imports.js';
Expand Down
2 changes: 1 addition & 1 deletion js/nodes/Paintable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { CanvasContextWrapper, Color, Gradient, LinearGradient, Node, Paint, Pai
import Constructor from '../../../phet-core/js/types/Constructor.js';
import IntentionalAny from '../../../phet-core/js/types/IntentionalAny.js';
import Vector2 from '../../../dot/js/Vector2.js';
import { isTReadOnlyProperty } from '../../../axon/js/imports.js';
import { isTReadOnlyProperty } from '../../../axon/js/TReadOnlyProperty.js';

const isSafari5 = platform.safari5;

Expand Down
2 changes: 1 addition & 1 deletion js/util/CanvasContextWrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @author Jonathan Olson <[email protected]>
*/

import { isTReadOnlyProperty } from '../../../axon/js/imports.js';
import { isTReadOnlyProperty } from '../../../axon/js/TReadOnlyProperty.js';
import { scenery } from '../imports.js';

class CanvasContextWrapper {
Expand Down
2 changes: 1 addition & 1 deletion js/util/ColorDef.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import OrIO from '../../../tandem/js/types/OrIO.js';
import ReferenceIO from '../../../tandem/js/types/ReferenceIO.js';
import StringIO from '../../../tandem/js/types/StringIO.js';
import { Color, scenery, TColor } from '../imports.js';
import { isTReadOnlyProperty } from '../../../axon/js/imports.js';
import { isTReadOnlyProperty } from '../../../axon/js/TReadOnlyProperty.js';

const ColorDef = {
/**
Expand Down
2 changes: 1 addition & 1 deletion js/util/Gradient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import cleanArray from '../../../phet-core/js/cleanArray.js';
import { Color, Paint, scenery, TColor } from '../imports.js';
import { isTReadOnlyProperty } from '../../../axon/js/imports.js';
import { isTReadOnlyProperty } from '../../../axon/js/TReadOnlyProperty.js';

export type GradientStop = {
ratio: number;
Expand Down
2 changes: 1 addition & 1 deletion js/util/PaintDef.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @author Jonathan Olson <[email protected]>
*/

import { isTReadOnlyProperty } from '../../../axon/js/imports.js';
import { isTReadOnlyProperty } from '../../../axon/js/TReadOnlyProperty.js';
import { Color, Gradient, Paint, scenery } from '../imports.js';

const PaintDef = {
Expand Down
2 changes: 1 addition & 1 deletion js/util/sceneryDeserialize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import Vector2 from '../../../dot/js/Vector2.js';
import { Shape } from '../../../kite/js/imports.js';
import IntentionalAny from '../../../phet-core/js/types/IntentionalAny.js';
import { Circle, Color, DOM, Gradient, Image, Line, LinearGradient, Mipmap, Node, Paint, Path, Pattern, RadialGradient, Rectangle, scenery, Text } from '../imports.js';
import { TinyProperty } from '../../../axon/js/imports.js';
import TinyProperty from '../../../axon/js/TinyProperty.js';

const sceneryDeserialize = ( value: { type: string; [ key: string ]: IntentionalAny } ): IntentionalAny => {
const nodeTypes = [
Expand Down
3 changes: 2 additions & 1 deletion js/util/scenerySerialize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ import { Shape } from '../../../kite/js/imports.js';
import inheritance from '../../../phet-core/js/inheritance.js';
import { CanvasContextWrapper, CanvasNode, Circle, Color, Display, DOM, Gradient, Image, Line, LinearGradient, Node, Paint, PAINTABLE_DEFAULT_OPTIONS, Path, Pattern, RadialGradient, Rectangle, scenery, Text, WebGLNode } from '../imports.js';
import IntentionalAny from '../../../phet-core/js/types/IntentionalAny.js';
import { ReadOnlyProperty, TinyProperty } from '../../../axon/js/imports.js';
import ReadOnlyProperty from '../../../axon/js/ReadOnlyProperty.js';
import TinyProperty from '../../../axon/js/TinyProperty.js';

const scenerySerialize = ( value: unknown ): IntentionalAny => {
if ( value instanceof Vector2 ) {
Expand Down

0 comments on commit 589cf4a

Please sign in to comment.