diff --git a/packages/accessibility/test/AccessibilityManager.tests.ts b/packages/accessibility/test/AccessibilityManager.tests.ts index 3226fa5aeb..74a96a624c 100644 --- a/packages/accessibility/test/AccessibilityManager.tests.ts +++ b/packages/accessibility/test/AccessibilityManager.tests.ts @@ -1,8 +1,7 @@ import { AccessibilityManager } from '@pixi/accessibility'; import { CanvasRenderer } from '@pixi/canvas-renderer'; import { DisplayObject, Container } from '@pixi/display'; -import { Renderer } from '@pixi/core'; -import { isMobile } from '@pixi/utils'; +import { Renderer, utils } from '@pixi/core'; describe('AccessibilityManager', () => { @@ -29,9 +28,9 @@ describe('AccessibilityManager', () => it('should remove touch hook when destroyed', () => { - const phone = isMobile.phone; + const phone = utils.isMobile.phone; - isMobile.phone = true; + utils.isMobile.phone = true; const manager = new AccessibilityManager(undefined); const hookDiv = manager['_hookDiv']; @@ -39,7 +38,7 @@ describe('AccessibilityManager', () => expect(document.body.contains(hookDiv)).toBe(true); manager.destroy(); expect(document.body.contains(hookDiv)).toBe(false); - isMobile.phone = phone; + utils.isMobile.phone = phone; }); it('should activate when tab is pressed and deactivate when mouse moved', () => diff --git a/packages/app/src/Application.ts b/packages/app/src/Application.ts index f1f55e9f2a..71d084884f 100644 --- a/packages/app/src/Application.ts +++ b/packages/app/src/Application.ts @@ -1,9 +1,8 @@ import { autoDetectRenderer, extensions, ExtensionType } from '@pixi/core'; import { Container } from '@pixi/display'; -import type { Rectangle, IRendererOptionsAuto, IRenderer } from '@pixi/core'; +import type { ICanvas, IRendererOptionsAuto, IRenderer, Rectangle } from '@pixi/core'; import type { IDestroyOptions } from '@pixi/display'; -import type { ICanvas } from '@pixi/settings'; /** * Any plugin that's usable for Application should contain these methods. diff --git a/packages/canvas-extract/src/CanvasExtract.ts b/packages/canvas-extract/src/CanvasExtract.ts index 467ca0baaf..e2ac1ddd9c 100644 --- a/packages/canvas-extract/src/CanvasExtract.ts +++ b/packages/canvas-extract/src/CanvasExtract.ts @@ -1,9 +1,8 @@ import { Rectangle, extensions, ExtensionType, RenderTexture, utils } from '@pixi/core'; import type { CanvasRenderer } from '@pixi/canvas-renderer'; -import type { BaseRenderTexture, ExtensionMetadata, ISystem } from '@pixi/core'; +import type { BaseRenderTexture, ExtensionMetadata, ICanvas, ISystem } from '@pixi/core'; import type { DisplayObject } from '@pixi/display'; -import type { ICanvas } from '@pixi/settings'; const TEMP_RECT = new Rectangle(); diff --git a/packages/canvas-prepare/src/CanvasPrepare.ts b/packages/canvas-prepare/src/CanvasPrepare.ts index 9a78072927..7a2c97eb41 100644 --- a/packages/canvas-prepare/src/CanvasPrepare.ts +++ b/packages/canvas-prepare/src/CanvasPrepare.ts @@ -1,10 +1,9 @@ import { settings, BaseTexture, extensions, ExtensionType } from '@pixi/core'; import { BasePrepare } from '@pixi/prepare'; -import type { ExtensionMetadata, IRenderer, ISystem } from '@pixi/core'; +import type { ExtensionMetadata, ICanvas, ICanvasRenderingContext2D, IRenderer, ISystem } from '@pixi/core'; import type { CanvasRenderer } from '@pixi/canvas-renderer'; import type { IDisplayObjectExtended } from '@pixi/prepare'; -import type { ICanvas, ICanvasRenderingContext2D } from '@pixi/settings'; const CANVAS_START_SIZE = 16; diff --git a/packages/canvas-renderer/src/CanvasContextSystem.ts b/packages/canvas-renderer/src/CanvasContextSystem.ts index e4c4b2fca7..f8ef38ebca 100644 --- a/packages/canvas-renderer/src/CanvasContextSystem.ts +++ b/packages/canvas-renderer/src/CanvasContextSystem.ts @@ -1,8 +1,7 @@ import { BLEND_MODES, SCALE_MODES, settings, Matrix, extensions, ExtensionType } from '@pixi/core'; import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; -import type { ExtensionMetadata, ISystem } from '@pixi/core'; -import type { ICanvasRenderingContext2D } from '@pixi/settings'; +import type { ExtensionMetadata, ICanvasRenderingContext2D, ISystem } from '@pixi/core'; import type { CanvasRenderer } from './CanvasRenderer'; const tempMatrix = new Matrix(); diff --git a/packages/canvas-renderer/src/CanvasRenderer.ts b/packages/canvas-renderer/src/CanvasRenderer.ts index 53c276fd42..748e9f5004 100644 --- a/packages/canvas-renderer/src/CanvasRenderer.ts +++ b/packages/canvas-renderer/src/CanvasRenderer.ts @@ -9,24 +9,26 @@ import { import type { BLEND_MODES, RENDERER_TYPE, - Matrix, - Rectangle, + BackgroundSystem, + ExtensionMetadata, + GenerateTextureSystem, + ICanvas, + ICanvasRenderingContext2D, + IGenerateTextureOptions, + IRenderableObject, + IRenderer, IRendererOptions, IRendererPlugins, IRendererRenderOptions, - RenderTexture, - IRenderableObject, - GenerateTextureSystem, - IRenderer, - BackgroundSystem, - ViewSystem, + Matrix, PluginSystem, - StartupSystem, + Rectangle, + RenderTexture, StartupOptions, - ExtensionMetadata, - IGenerateTextureOptions } from '@pixi/core'; + StartupSystem, + ViewSystem, +} from '@pixi/core'; import type { DisplayObject } from '@pixi/display'; -import type { ICanvas, ICanvasRenderingContext2D } from '@pixi/settings'; import type { CanvasContextSystem, SmoothingEnabledProperties } from './CanvasContextSystem'; import type { CanvasMaskSystem } from './CanvasMaskSystem'; import type { CanvasObjectRendererSystem } from './CanvasObjectRendererSystem'; diff --git a/packages/canvas-renderer/src/canvasUtils.ts b/packages/canvas-renderer/src/canvasUtils.ts index b4471e4371..8fee5a93b0 100644 --- a/packages/canvas-renderer/src/canvasUtils.ts +++ b/packages/canvas-renderer/src/canvasUtils.ts @@ -1,8 +1,7 @@ import { settings, utils } from '@pixi/core'; import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; -import type { Texture } from '@pixi/core'; -import type { ICanvas } from '@pixi/settings'; +import type { ICanvas, Texture } from '@pixi/core'; /** * Utility methods for Sprite/Texture tinting. diff --git a/packages/canvas-renderer/src/utils/canUseNewCanvasBlendModes.ts b/packages/canvas-renderer/src/utils/canUseNewCanvasBlendModes.ts index c8f56a99c3..5cb1f6966a 100644 --- a/packages/canvas-renderer/src/utils/canUseNewCanvasBlendModes.ts +++ b/packages/canvas-renderer/src/utils/canUseNewCanvasBlendModes.ts @@ -1,6 +1,6 @@ import { settings } from '@pixi/core'; -import type { ICanvas } from '@pixi/settings'; +import type { ICanvas } from '@pixi/core'; /** * Creates a little colored canvas diff --git a/packages/events/src/EventSystem.ts b/packages/events/src/EventSystem.ts index 63fc530743..67b04d8707 100644 --- a/packages/events/src/EventSystem.ts +++ b/packages/events/src/EventSystem.ts @@ -4,9 +4,8 @@ import { FederatedPointerEvent } from './FederatedPointerEvent'; import { FederatedWheelEvent } from './FederatedWheelEvent'; import { extensions, ExtensionType } from '@pixi/core'; -import type { IRenderableObject, ExtensionMetadata, IPointData } from '@pixi/core'; +import type { ExtensionMetadata, ICanvas, IPointData, IRenderableObject } from '@pixi/core'; import type { DisplayObject } from '@pixi/display'; -import type { ICanvas } from '@pixi/settings'; const MOUSE_POINTER_ID = 1; const TOUCH_TO_POINTER: Record = { diff --git a/packages/extract/src/Extract.ts b/packages/extract/src/Extract.ts index e14fecc334..dff7074027 100644 --- a/packages/extract/src/Extract.ts +++ b/packages/extract/src/Extract.ts @@ -1,8 +1,7 @@ import { Rectangle, utils, extensions, ExtensionType, RenderTexture } from '@pixi/core'; -import type { ISystem, ExtensionMetadata, Renderer } from '@pixi/core'; +import type { ExtensionMetadata, ICanvas, ISystem, Renderer } from '@pixi/core'; import type { DisplayObject } from '@pixi/display'; -import type { ICanvas } from '@pixi/settings'; const TEMP_RECT = new Rectangle(); const BYTES_PER_PIXEL = 4; diff --git a/packages/mixin-cache-as-bitmap/src/index.ts b/packages/mixin-cache-as-bitmap/src/index.ts index 63aed16114..78e2c7253a 100644 --- a/packages/mixin-cache-as-bitmap/src/index.ts +++ b/packages/mixin-cache-as-bitmap/src/index.ts @@ -3,9 +3,16 @@ import { Texture, BaseTexture, RenderTexture, Matrix, utils, settings } from '@p import { Sprite } from '@pixi/sprite'; import { DisplayObject } from '@pixi/display'; -import type { Renderer, MaskData, IRenderer, IPointData, Rectangle, MSAA_QUALITY } from '@pixi/core'; +import type { + MSAA_QUALITY, + ICanvasRenderingContext2D, + IPointData, + IRenderer, + MaskData, + Rectangle, + Renderer, +} from '@pixi/core'; import type { Container, IDestroyOptions } from '@pixi/display'; -import type { ICanvasRenderingContext2D } from '@pixi/settings'; // Don't import CanvasRender to remove dependency on this optional package // this type should satisify these requirements for cacheAsBitmap types diff --git a/packages/spritesheet/test/spritesheetAsset.tests.ts b/packages/spritesheet/test/spritesheetAsset.tests.ts index 19e0a0f94c..00122ad872 100644 --- a/packages/spritesheet/test/spritesheetAsset.tests.ts +++ b/packages/spritesheet/test/spritesheetAsset.tests.ts @@ -1,8 +1,7 @@ import type { CacheParser } from '@pixi/assets'; import { Cache, loadJson, loadTextures } from '@pixi/assets'; -import { Texture } from '@pixi/core'; +import { Texture, utils } from '@pixi/core'; import { spritesheetAsset, Spritesheet } from '@pixi/spritesheet'; -import { clearTextureCache } from '@pixi/utils'; import { Loader } from '../../assets/src/loader/Loader'; describe('spritesheetAsset', () => @@ -86,7 +85,7 @@ describe('spritesheetAsset', () => it('should not create multipack resources when related_multi_packs field is missing or the wrong type', async () => { // clear the caches only to avoid cluttering the output - clearTextureCache(); + utils.clearTextureCache(); const spritesheet = await loader.load(`${serverPath}building1-1.json`) as Spritesheet; const spritesheet2 = await loader.load(`${serverPath}atlas-multipack-wrong-type.json`) as Spritesheet; diff --git a/packages/text-bitmap/src/utils/drawGlyph.ts b/packages/text-bitmap/src/utils/drawGlyph.ts index 85cb9054d2..05619349c9 100644 --- a/packages/text-bitmap/src/utils/drawGlyph.ts +++ b/packages/text-bitmap/src/utils/drawGlyph.ts @@ -1,8 +1,8 @@ import { generateFillStyle } from './generateFillStyle'; import { utils } from '@pixi/core'; +import type { ICanvas, ICanvasRenderingContext2D } from '@pixi/core'; import type { TextMetrics, TextStyle } from '@pixi/text'; -import type { ICanvas, ICanvasRenderingContext2D } from '@pixi/settings'; // TODO: Prevent code duplication b/w drawGlyph & Text#updateText diff --git a/packages/text-bitmap/src/utils/generateFillStyle.ts b/packages/text-bitmap/src/utils/generateFillStyle.ts index 9a2f7f86b0..17dc14e34e 100644 --- a/packages/text-bitmap/src/utils/generateFillStyle.ts +++ b/packages/text-bitmap/src/utils/generateFillStyle.ts @@ -1,7 +1,7 @@ import { TEXT_GRADIENT } from '@pixi/text'; +import type { ICanvas, ICanvasRenderingContext2D } from '@pixi/core'; import type { TextStyle, TextMetrics } from '@pixi/text'; -import type { ICanvas, ICanvasRenderingContext2D } from '@pixi/settings'; // TODO: Prevent code duplication b/w generateFillStyle & Text#generateFillStyle diff --git a/tools/integration-tests/test/Bounds.tests.ts b/tools/integration-tests/test/Bounds.tests.ts index 603809a0ac..885cdfe8d7 100644 --- a/tools/integration-tests/test/Bounds.tests.ts +++ b/tools/integration-tests/test/Bounds.tests.ts @@ -1,7 +1,6 @@ +import { BaseRenderTexture, Rectangle, RenderTexture, Texture } from '@pixi/core'; import { Container } from '@pixi/display'; -import { RenderTexture, BaseRenderTexture, Texture } from '@pixi/core'; import { Sprite } from '@pixi/sprite'; -import { Rectangle } from '@pixi/math'; import { Graphics } from '@pixi/graphics'; import { Text } from '@pixi/text'; diff --git a/tools/integration-tests/test/Container.tests.ts b/tools/integration-tests/test/Container.tests.ts index d07b428136..9bf5ca2914 100644 --- a/tools/integration-tests/test/Container.tests.ts +++ b/tools/integration-tests/test/Container.tests.ts @@ -1,7 +1,6 @@ +import { MaskData, Transform } from '@pixi/core'; import { Container } from '@pixi/display'; import { Graphics } from '@pixi/graphics'; -import { Transform } from '@pixi/math'; -import { MaskData } from '@pixi/core'; import '@pixi/canvas-display';