Merge branch 'dev' into next

michaeljherrmann · Jun 21, 2022 · 9428029 · 9428029
2 parents ccc1516 + b98acb1
commit 9428029
Show file tree

Hide file tree

Showing 150 changed files with 1,856 additions and 1,312 deletions.
diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pixi.js-legacy",
-  "version": "6.4.0",
+  "version": "6.4.2",
   "description": "The HTML5 Creation Engine: Create beautiful digital content with the fastest, most flexible 2D WebGL renderer.",
   "author": "Mat Groves",
   "contributors": [
@@ -21,12 +21,12 @@
   "exports": {
     ".": {
       "import": {
-        "default": "./dist/cjs/pixi-legacy.js",
-        "types": "./index.d.ts"
+        "types": "./index.d.ts",
+        "default": "./dist/esm/pixi-legacy.js"
       },
       "require": {
-        "default": "./dist/esm/pixi-legacy.js",
-        "types": "./index.d.ts"
+        "types": "./index.d.ts",
+        "default": "./dist/cjs/pixi-legacy.js"
       }
     }
   },
@@ -47,16 +47,16 @@
     "url": "https://opencollective.com/pixijs"
   },
   "dependencies": {
-    "@pixi/canvas-display": "6.4.0",
-    "@pixi/canvas-extract": "6.4.0",
-    "@pixi/canvas-graphics": "6.4.0",
-    "@pixi/canvas-mesh": "6.4.0",
-    "@pixi/canvas-particle-container": "6.4.0",
-    "@pixi/canvas-prepare": "6.4.0",
-    "@pixi/canvas-renderer": "6.4.0",
-    "@pixi/canvas-sprite": "6.4.0",
-    "@pixi/canvas-sprite-tiling": "6.4.0",
-    "@pixi/canvas-text": "6.4.0",
-    "pixi.js": "6.4.0"
+    "@pixi/canvas-display": "6.4.2",
+    "@pixi/canvas-extract": "6.4.2",
+    "@pixi/canvas-graphics": "6.4.2",
+    "@pixi/canvas-mesh": "6.4.2",
+    "@pixi/canvas-particle-container": "6.4.2",
+    "@pixi/canvas-prepare": "6.4.2",
+    "@pixi/canvas-renderer": "6.4.2",
+    "@pixi/canvas-sprite": "6.4.2",
+    "@pixi/canvas-sprite-tiling": "6.4.2",
+    "@pixi/canvas-text": "6.4.2",
+    "pixi.js": "6.4.2"
   }
 }
diff --git a/bundles/pixi.js-legacy/src/index.ts b/bundles/pixi.js-legacy/src/index.ts
@@ -1,4 +1,4 @@
-import { AccessibilityManager, InteractionManager } from 'pixi.js';
+import { extensions } from 'pixi.js';
 import { CanvasRenderer, canvasUtils } from '@pixi/canvas-renderer';
 import { CanvasMeshRenderer } from '@pixi/canvas-mesh';
 import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics';
@@ -10,13 +10,13 @@ import '@pixi/canvas-particle-container';
 import '@pixi/canvas-display';
 import '@pixi/canvas-text';
 
-CanvasRenderer.registerPlugin('accessibility', AccessibilityManager);
-CanvasRenderer.registerPlugin('extract', CanvasExtract);
-CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer);
-CanvasRenderer.registerPlugin('interaction', InteractionManager);
-CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer);
-CanvasRenderer.registerPlugin('prepare', CanvasPrepare);
-CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer);
+extensions.add(
+    CanvasExtract,
+    CanvasGraphicsRenderer,
+    CanvasMeshRenderer,
+    CanvasPrepare,
+    CanvasSpriteRenderer
+);
 
 // Export ES for those importing specifically by name,
 // e.g., `import {autoDetectRenderer} from 'pixi.js-legacy'`

diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pixi.js",
-  "version": "6.4.0",
+  "version": "6.4.2",
   "description": "PixiJS without the CanvasRenderer fallback, modern browsers only",
   "author": "Mat Groves",
   "contributors": [
@@ -21,12 +21,12 @@
   "exports": {
     ".": {
       "import": {
-        "default": "./dist/cjs/pixi.js",
-        "types": "./index.d.ts"
+        "types": "./index.d.ts",
+        "default": "./dist/esm/pixi.js"
       },
       "require": {
-        "default": "./dist/esm/pixi.js",
-        "types": "./index.d.ts"
+        "types": "./index.d.ts",
+        "default": "./dist/cjs/pixi.js"
       }
     }
   },
@@ -50,40 +50,40 @@
     "url": "https://opencollective.com/pixijs"
   },
   "dependencies": {
-    "@pixi/accessibility": "6.4.0",
-    "@pixi/app": "6.4.0",
-    "@pixi/compressed-textures": "6.4.0",
-    "@pixi/constants": "6.4.0",
-    "@pixi/core": "6.4.0",
-    "@pixi/display": "6.4.0",
-    "@pixi/extract": "6.4.0",
-    "@pixi/filter-alpha": "6.4.0",
-    "@pixi/filter-blur": "6.4.0",
-    "@pixi/filter-color-matrix": "6.4.0",
-    "@pixi/filter-displacement": "6.4.0",
-    "@pixi/filter-fxaa": "6.4.0",
-    "@pixi/filter-noise": "6.4.0",
-    "@pixi/graphics": "6.4.0",
-    "@pixi/interaction": "6.4.0",
-    "@pixi/loaders": "6.4.0",
-    "@pixi/math": "6.4.0",
-    "@pixi/mesh": "6.4.0",
-    "@pixi/mesh-extras": "6.4.0",
-    "@pixi/mixin-cache-as-bitmap": "6.4.0",
-    "@pixi/mixin-get-child-by-name": "6.4.0",
-    "@pixi/mixin-get-global-position": "6.4.0",
-    "@pixi/particle-container": "6.4.0",
-    "@pixi/polyfill": "6.4.0",
-    "@pixi/prepare": "6.4.0",
-    "@pixi/runner": "6.4.0",
-    "@pixi/settings": "6.4.0",
-    "@pixi/sprite": "6.4.0",
-    "@pixi/sprite-animated": "6.4.0",
-    "@pixi/sprite-tiling": "6.4.0",
-    "@pixi/spritesheet": "6.4.0",
-    "@pixi/text": "6.4.0",
-    "@pixi/text-bitmap": "6.4.0",
-    "@pixi/ticker": "6.4.0",
-    "@pixi/utils": "6.4.0"
+    "@pixi/accessibility": "6.4.2",
+    "@pixi/app": "6.4.2",
+    "@pixi/compressed-textures": "6.4.2",
+    "@pixi/constants": "6.4.2",
+    "@pixi/core": "6.4.2",
+    "@pixi/display": "6.4.2",
+    "@pixi/extract": "6.4.2",
+    "@pixi/filter-alpha": "6.4.2",
+    "@pixi/filter-blur": "6.4.2",
+    "@pixi/filter-color-matrix": "6.4.2",
+    "@pixi/filter-displacement": "6.4.2",
+    "@pixi/filter-fxaa": "6.4.2",
+    "@pixi/filter-noise": "6.4.2",
+    "@pixi/graphics": "6.4.2",
+    "@pixi/interaction": "6.4.2",
+    "@pixi/loaders": "6.4.2",
+    "@pixi/math": "6.4.2",
+    "@pixi/mesh": "6.4.2",
+    "@pixi/mesh-extras": "6.4.2",
+    "@pixi/mixin-cache-as-bitmap": "6.4.2",
+    "@pixi/mixin-get-child-by-name": "6.4.2",
+    "@pixi/mixin-get-global-position": "6.4.2",
+    "@pixi/particle-container": "6.4.2",
+    "@pixi/polyfill": "6.4.2",
+    "@pixi/prepare": "6.4.2",
+    "@pixi/runner": "6.4.2",
+    "@pixi/settings": "6.4.2",
+    "@pixi/sprite": "6.4.2",
+    "@pixi/sprite-animated": "6.4.2",
+    "@pixi/sprite-tiling": "6.4.2",
+    "@pixi/spritesheet": "6.4.2",
+    "@pixi/text": "6.4.2",
+    "@pixi/text-bitmap": "6.4.2",
+    "@pixi/ticker": "6.4.2",
+    "@pixi/utils": "6.4.2"
   }
 }
diff --git a/bundles/pixi.js/src/index.ts b/bundles/pixi.js/src/index.ts
@@ -3,10 +3,9 @@ import '@pixi/polyfill';
 import * as utils from '@pixi/utils';
 import { AccessibilityManager } from '@pixi/accessibility';
 import { InteractionManager } from '@pixi/interaction';
-import { Application } from '@pixi/app';
-import { Renderer, BatchRenderer } from '@pixi/core';
+import { BatchRenderer, extensions } from '@pixi/core';
 import { Extract } from '@pixi/extract';
-import { Loader, AppLoaderPlugin } from '@pixi/loaders';
+import { AppLoaderPlugin } from '@pixi/loaders';
 import { CompressedTextureLoader, DDSLoader, KTXLoader } from '@pixi/compressed-textures';
 import { ParticleRenderer } from '@pixi/particle-container';
 import { Prepare } from '@pixi/prepare';
@@ -24,25 +23,27 @@ import '@pixi/mixin-cache-as-bitmap';
 import '@pixi/mixin-get-child-by-name';
 import '@pixi/mixin-get-global-position';
 
-// Install renderer plugins
-Renderer.registerPlugin('accessibility', AccessibilityManager);
-Renderer.registerPlugin('extract', Extract);
-Renderer.registerPlugin('interaction', InteractionManager);
-Renderer.registerPlugin('particle', ParticleRenderer);
-Renderer.registerPlugin('prepare', Prepare);
-Renderer.registerPlugin('batch', BatchRenderer);
-Renderer.registerPlugin('tilingSprite', TilingSpriteRenderer);
+extensions.add(
+    // Install renderer plugins
+    AccessibilityManager,
+    Extract,
+    InteractionManager,
+    ParticleRenderer,
+    Prepare,
+    BatchRenderer,
+    TilingSpriteRenderer,
 
-// Install loader plugins
-Loader.registerPlugin(BitmapFontLoader);
-Loader.registerPlugin(CompressedTextureLoader);
-Loader.registerPlugin(DDSLoader);
-Loader.registerPlugin(KTXLoader);
-Loader.registerPlugin(SpritesheetLoader);
+    // Install loader plugins
+    BitmapFontLoader,
+    CompressedTextureLoader,
+    DDSLoader,
+    KTXLoader,
+    SpritesheetLoader,
 
-// Install application plugins
-Application.registerPlugin(TickerPlugin);
-Application.registerPlugin(AppLoaderPlugin);
+    // Install application plugins
+    TickerPlugin,
+    AppLoaderPlugin
+);
 
 /**
  * String of the current PIXI version.

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
   "lerna": "4.0.0",
   "useWorkspaces": true,
-  "version": "6.4.0"
+  "version": "6.4.2"
 }