Hotfix: Make sure core isn't bundled in ticker, canvas-sprite, canvas…

…-mesh (pixijs#8527)
michaeljherrmann · Jul 24, 2022 · 27365ba · 27365ba
1 parent 63b9f0c
commit 27365ba
Show file tree

Hide file tree

Showing 16 changed files with 109 additions and 9 deletions.
diff --git a/bundles/pixi.js-node/package.json b/bundles/pixi.js-node/package.json
@@ -38,6 +38,7 @@
     "@pixi/constants": "6.5.0",
     "@pixi/core": "6.5.0",
     "@pixi/display": "6.5.0",
+    "@pixi/extensions": "6.5.0",
     "@pixi/extract": "6.5.0",
     "@pixi/filter-alpha": "6.5.0",
     "@pixi/filter-blur": "6.5.0",

diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json
@@ -55,6 +55,7 @@
     "@pixi/constants": "6.5.0",
     "@pixi/core": "6.5.0",
     "@pixi/display": "6.5.0",
+    "@pixi/extensions": "6.5.0",
     "@pixi/extract": "6.5.0",
     "@pixi/filter-alpha": "6.5.0",
     "@pixi/filter-blur": "6.5.0",

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/canvas-mesh/package.json b/packages/canvas-mesh/package.json
@@ -38,6 +38,7 @@
     "*.d.ts"
   ],
   "peerDependencies": {
+    "@pixi/core": "6.5.0",
     "@pixi/canvas-display": "6.5.0",
     "@pixi/canvas-renderer": "6.5.0",
     "@pixi/constants": "6.5.0",

diff --git a/packages/canvas-sprite/package.json b/packages/canvas-sprite/package.json
@@ -41,6 +41,7 @@
     "@pixi/canvas-display": "6.5.0",
     "@pixi/canvas-renderer": "6.5.0",
     "@pixi/constants": "6.5.0",
+    "@pixi/core": "6.5.0",
     "@pixi/math": "6.5.0",
     "@pixi/sprite": "6.5.0",
     "@pixi/utils": "6.5.0"

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -46,6 +46,7 @@
   },
   "peerDependencies": {
     "@pixi/constants": "6.5.0",
+    "@pixi/extensions": "6.5.0",
     "@pixi/math": "6.5.0",
     "@pixi/runner": "6.5.0",
     "@pixi/settings": "6.5.0",

diff --git a/packages/core/src/Renderer.ts b/packages/core/src/Renderer.ts
@@ -28,7 +28,7 @@ import type { IRendererOptions, IRendererPlugins, IRendererRenderOptions,
 import type { ISystemConstructor } from './ISystem';
 import type { IRenderingContext } from './IRenderingContext';
 import type { IRenderableObject } from './IRenderableObject';
-import { extensions, ExtensionType } from './extensions';
+import { extensions, ExtensionType } from '@pixi/extensions';
 
 export interface IRendererPluginConstructor
 {

diff --git a/packages/core/src/batch/BatchPluginFactory.ts b/packages/core/src/batch/BatchPluginFactory.ts
@@ -6,8 +6,8 @@ import defaultVertex from './texture.vert';
 import defaultFragment from './texture.frag';
 
 import type { Renderer } from '../Renderer';
-import type { ExtensionMetadata } from '../extensions';
-import { ExtensionType } from '../extensions';
+import type { ExtensionMetadata } from '@pixi/extensions';
+import { ExtensionType } from '@pixi/extensions';
 
 export interface IBatchFactoryOptions
 {

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -10,7 +10,7 @@ import './settings';
  */
 export const VERSION = '$_VERSION';
 
-export * from './extensions';
+export * from '@pixi/extensions';
 export * from './textures/resources';
 export * from './systems';
 export * from './IRenderingContext';

diff --git a/packages/extensions/LICENSE b/packages/extensions/LICENSE
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2022 Matt Karl
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/packages/extensions/README.md b/packages/extensions/README.md
@@ -0,0 +1,15 @@
+# @pixi/extensions
+
+## Installation
+
+```bash
+npm install @pixi/extensions
+```
+
+## Usage
+
+```js
+import { extensions } from '@pixi/extensions';
+
+extensions.add(MyCustomExtension);
+```
diff --git a/packages/extensions/package.json b/packages/extensions/package.json
@@ -0,0 +1,38 @@
+{
+    "name": "@pixi/extensions",
+    "version": "6.5.0",
+    "main": "dist/cjs/extensions.js",
+    "module": "dist/esm/extensions.mjs",
+    "bundle": "dist/browser/extensions.js",
+    "types": "index.d.ts",
+    "exports": {
+      ".": {
+        "import": {
+          "types": "./index.d.ts",
+          "default": "./dist/esm/extensions.mjs"
+        },
+        "require": {
+          "types": "./index.d.ts",
+          "default": "./dist/cjs/extensions.js"
+        }
+      }
+    },
+    "description": "Installing and uninstalling extensions for PixiJS",
+    "author": "Matt Karl <matt@mattkarl.com>",
+    "homepage": "http://pixijs.com/",
+    "bugs": "https://github.com/pixijs/pixi.js/issues",
+    "license": "MIT",
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/pixijs/pixi.js.git"
+    },
+    "publishConfig": {
+      "access": "public"
+    },
+    "files": [
+      "lib",
+      "dist",
+      "*.d.ts"
+    ]
+  }
+
diff --git a/packages/core/src/extensions.ts → packages/extensions/src/index.ts b/packages/core/src/extensions.ts → packages/extensions/src/index.ts
diff --git a/packages/core/test/extensions.tests.ts → packages/extensions/test/extensions.tests.ts b/packages/core/test/extensions.tests.ts → packages/extensions/test/extensions.tests.ts
@@ -1,5 +1,5 @@
-import type { ExtensionMetadata, ExtensionType } from '@pixi/core';
-import { extensions } from '@pixi/core';
+import type { ExtensionMetadata, ExtensionType } from '@pixi/extensions';
+import { extensions } from '@pixi/extensions';
 
 const exampleType = 'test-extension' as ExtensionType;
 const exampleType2 = 'test-extension2' as ExtensionType;

diff --git a/packages/ticker/package.json b/packages/ticker/package.json
@@ -38,6 +38,7 @@
     "*.d.ts"
   ],
   "peerDependencies": {
+    "@pixi/extensions": "6.5.0",
     "@pixi/settings": "6.5.0"
   }
 }
diff --git a/packages/ticker/src/TickerPlugin.ts b/packages/ticker/src/TickerPlugin.ts
@@ -1,5 +1,5 @@
-import type { ExtensionMetadata } from '@pixi/core';
-import { ExtensionType } from '@pixi/core';
+import type { ExtensionMetadata } from '@pixi/extensions';
+import { ExtensionType } from '@pixi/extensions';
 import { UPDATE_PRIORITY } from './const';
 import { Ticker } from './Ticker';
 
@@ -8,7 +8,7 @@ import { Ticker } from './Ticker';
  * @example
  * import {TickerPlugin} from '@pixi/ticker';
  * import {Application} from '@pixi/app';
- * import {extensions} from '@pixi/core';
+ * import {extensions} from '@pixi/extensions';
  * extensions.add(TickerPlugin);
  * @class
  * @memberof PIXI