diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index d667bc7..8d5b405 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", + "bundle": "dist/pixi-legacy.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "pixi.js": "^5.0.0-alpha", "@pixi/canvas-display": "^5.0.0-alpha", "@pixi/canvas-extract": "^5.0.0-alpha", @@ -34,7 +35,9 @@ "@pixi/canvas-renderer": "^5.0.0-alpha", "@pixi/canvas-sprite": "^5.0.0-alpha", "@pixi/canvas-sprite-tiling": "^5.0.0-alpha", - "@pixi/polyfill": "^5.0.0-alpha", + "@pixi/polyfill": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index d667bc7..8d5b405 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", + "bundle": "dist/pixi-legacy.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "pixi.js": "^5.0.0-alpha", "@pixi/canvas-display": "^5.0.0-alpha", "@pixi/canvas-extract": "^5.0.0-alpha", @@ -34,7 +35,9 @@ "@pixi/canvas-renderer": "^5.0.0-alpha", "@pixi/canvas-sprite": "^5.0.0-alpha", "@pixi/canvas-sprite-tiling": "^5.0.0-alpha", - "@pixi/polyfill": "^5.0.0-alpha", + "@pixi/polyfill": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js-legacy/src/PIXI.js b/bundles/pixi.js-legacy/src/PIXI.js deleted file mode 100644 index 31d0a54..0000000 --- a/bundles/pixi.js-legacy/src/PIXI.js +++ /dev/null @@ -1,31 +0,0 @@ -import '@pixi/polyfill'; - -export * from 'pixi.js/src/PIXI'; -export * from '@pixi/canvas-renderer'; -export * from '@pixi/canvas-graphics'; -export * from '@pixi/canvas-mesh'; -export * from '@pixi/canvas-sprite'; - -import { Application, accessibility, interaction, prepare, extract } from 'pixi.js/src/PIXI'; -import { CanvasRenderer, autoDetectRenderer } from '@pixi/canvas-renderer'; -import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; -import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; -import { CanvasSpriteRenderer } from '@pixi/canvas-sprite'; -import * as canvasExtract from '@pixi/canvas-extract'; -import * as canvasPrepare from '@pixi/canvas-prepare'; - -CanvasRenderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); -CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); -CanvasRenderer.registerPlugin('interaction', interaction.InteractionManager); -CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); -CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); -CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); - -Object.assign(prepare, canvasPrepare); -Object.assign(extract, canvasExtract); - -Application.prototype.createRenderer = autoDetectRenderer; - -import '@pixi/canvas-sprite-tiling'; -import '@pixi/canvas-display'; diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index d667bc7..8d5b405 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", + "bundle": "dist/pixi-legacy.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "pixi.js": "^5.0.0-alpha", "@pixi/canvas-display": "^5.0.0-alpha", "@pixi/canvas-extract": "^5.0.0-alpha", @@ -34,7 +35,9 @@ "@pixi/canvas-renderer": "^5.0.0-alpha", "@pixi/canvas-sprite": "^5.0.0-alpha", "@pixi/canvas-sprite-tiling": "^5.0.0-alpha", - "@pixi/polyfill": "^5.0.0-alpha", + "@pixi/polyfill": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js-legacy/src/PIXI.js b/bundles/pixi.js-legacy/src/PIXI.js deleted file mode 100644 index 31d0a54..0000000 --- a/bundles/pixi.js-legacy/src/PIXI.js +++ /dev/null @@ -1,31 +0,0 @@ -import '@pixi/polyfill'; - -export * from 'pixi.js/src/PIXI'; -export * from '@pixi/canvas-renderer'; -export * from '@pixi/canvas-graphics'; -export * from '@pixi/canvas-mesh'; -export * from '@pixi/canvas-sprite'; - -import { Application, accessibility, interaction, prepare, extract } from 'pixi.js/src/PIXI'; -import { CanvasRenderer, autoDetectRenderer } from '@pixi/canvas-renderer'; -import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; -import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; -import { CanvasSpriteRenderer } from '@pixi/canvas-sprite'; -import * as canvasExtract from '@pixi/canvas-extract'; -import * as canvasPrepare from '@pixi/canvas-prepare'; - -CanvasRenderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); -CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); -CanvasRenderer.registerPlugin('interaction', interaction.InteractionManager); -CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); -CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); -CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); - -Object.assign(prepare, canvasPrepare); -Object.assign(extract, canvasExtract); - -Application.prototype.createRenderer = autoDetectRenderer; - -import '@pixi/canvas-sprite-tiling'; -import '@pixi/canvas-display'; diff --git a/bundles/pixi.js-legacy/src/index.js b/bundles/pixi.js-legacy/src/index.js index fc437f9..b29ba1e 100644 --- a/bundles/pixi.js-legacy/src/index.js +++ b/bundles/pixi.js-legacy/src/index.js @@ -1,10 +1,46 @@ -export * from './PIXI'; -import * as PIXI from './PIXI'; +import '@pixi/polyfill'; -if (typeof window !== 'undefined') -{ - window.PIXI = PIXI; -} +import { PIXI } from 'pixi.js'; +import { autoDetectRenderer, CanvasRenderer } from '@pixi/canvas-renderer'; +import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; +import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; +import { CanvasSpriteRenderer, CanvasTinter } from '@pixi/canvas-sprite'; +import * as canvasExtract from '@pixi/canvas-extract'; +import * as canvasPrepare from '@pixi/canvas-prepare'; +import '@pixi/canvas-sprite-tiling'; +import '@pixi/canvas-display'; -import deprecated from 'pixi.js/src/deprecated'; -deprecated(PIXI); +CanvasRenderer.registerPlugin('accessibility', PIXI.accessibility.AccessibilityManager); +CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); +CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); +CanvasRenderer.registerPlugin('interaction', PIXI.interaction.InteractionManager); +CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); +CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); +CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); + +Object.assign(PIXI.prepare, canvasPrepare); +Object.assign(PIXI.extract, canvasExtract); + +PIXI.Application.prototype.createRenderer = autoDetectRenderer; + +// Add to namespace window object for people doing `import 'pixi.js-legacy'` +Object.assign(PIXI, { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}); + +// Export ES for those importing specifically by name, +// e.g., `import {autoDetectRenderer} from 'pixi.js-legacy'` +export * from 'pixi.js'; +export { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}; diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index d667bc7..8d5b405 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", + "bundle": "dist/pixi-legacy.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "pixi.js": "^5.0.0-alpha", "@pixi/canvas-display": "^5.0.0-alpha", "@pixi/canvas-extract": "^5.0.0-alpha", @@ -34,7 +35,9 @@ "@pixi/canvas-renderer": "^5.0.0-alpha", "@pixi/canvas-sprite": "^5.0.0-alpha", "@pixi/canvas-sprite-tiling": "^5.0.0-alpha", - "@pixi/polyfill": "^5.0.0-alpha", + "@pixi/polyfill": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js-legacy/src/PIXI.js b/bundles/pixi.js-legacy/src/PIXI.js deleted file mode 100644 index 31d0a54..0000000 --- a/bundles/pixi.js-legacy/src/PIXI.js +++ /dev/null @@ -1,31 +0,0 @@ -import '@pixi/polyfill'; - -export * from 'pixi.js/src/PIXI'; -export * from '@pixi/canvas-renderer'; -export * from '@pixi/canvas-graphics'; -export * from '@pixi/canvas-mesh'; -export * from '@pixi/canvas-sprite'; - -import { Application, accessibility, interaction, prepare, extract } from 'pixi.js/src/PIXI'; -import { CanvasRenderer, autoDetectRenderer } from '@pixi/canvas-renderer'; -import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; -import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; -import { CanvasSpriteRenderer } from '@pixi/canvas-sprite'; -import * as canvasExtract from '@pixi/canvas-extract'; -import * as canvasPrepare from '@pixi/canvas-prepare'; - -CanvasRenderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); -CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); -CanvasRenderer.registerPlugin('interaction', interaction.InteractionManager); -CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); -CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); -CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); - -Object.assign(prepare, canvasPrepare); -Object.assign(extract, canvasExtract); - -Application.prototype.createRenderer = autoDetectRenderer; - -import '@pixi/canvas-sprite-tiling'; -import '@pixi/canvas-display'; diff --git a/bundles/pixi.js-legacy/src/index.js b/bundles/pixi.js-legacy/src/index.js index fc437f9..b29ba1e 100644 --- a/bundles/pixi.js-legacy/src/index.js +++ b/bundles/pixi.js-legacy/src/index.js @@ -1,10 +1,46 @@ -export * from './PIXI'; -import * as PIXI from './PIXI'; +import '@pixi/polyfill'; -if (typeof window !== 'undefined') -{ - window.PIXI = PIXI; -} +import { PIXI } from 'pixi.js'; +import { autoDetectRenderer, CanvasRenderer } from '@pixi/canvas-renderer'; +import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; +import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; +import { CanvasSpriteRenderer, CanvasTinter } from '@pixi/canvas-sprite'; +import * as canvasExtract from '@pixi/canvas-extract'; +import * as canvasPrepare from '@pixi/canvas-prepare'; +import '@pixi/canvas-sprite-tiling'; +import '@pixi/canvas-display'; -import deprecated from 'pixi.js/src/deprecated'; -deprecated(PIXI); +CanvasRenderer.registerPlugin('accessibility', PIXI.accessibility.AccessibilityManager); +CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); +CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); +CanvasRenderer.registerPlugin('interaction', PIXI.interaction.InteractionManager); +CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); +CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); +CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); + +Object.assign(PIXI.prepare, canvasPrepare); +Object.assign(PIXI.extract, canvasExtract); + +PIXI.Application.prototype.createRenderer = autoDetectRenderer; + +// Add to namespace window object for people doing `import 'pixi.js-legacy'` +Object.assign(PIXI, { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}); + +// Export ES for those importing specifically by name, +// e.g., `import {autoDetectRenderer} from 'pixi.js-legacy'` +export * from 'pixi.js'; +export { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a0763bc..0e8e8f2 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi.js", "module": "lib/pixi.es.js", + "bundle": "dist/pixi.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", @@ -56,7 +57,9 @@ "@pixi/text": "^5.0.0-alpha", "@pixi/text-bitmap": "^5.0.0-alpha", "@pixi/ticker": "^5.0.0-alpha", - "@pixi/utils": "^5.0.0-alpha", + "@pixi/utils": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index d667bc7..8d5b405 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", + "bundle": "dist/pixi-legacy.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "pixi.js": "^5.0.0-alpha", "@pixi/canvas-display": "^5.0.0-alpha", "@pixi/canvas-extract": "^5.0.0-alpha", @@ -34,7 +35,9 @@ "@pixi/canvas-renderer": "^5.0.0-alpha", "@pixi/canvas-sprite": "^5.0.0-alpha", "@pixi/canvas-sprite-tiling": "^5.0.0-alpha", - "@pixi/polyfill": "^5.0.0-alpha", + "@pixi/polyfill": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js-legacy/src/PIXI.js b/bundles/pixi.js-legacy/src/PIXI.js deleted file mode 100644 index 31d0a54..0000000 --- a/bundles/pixi.js-legacy/src/PIXI.js +++ /dev/null @@ -1,31 +0,0 @@ -import '@pixi/polyfill'; - -export * from 'pixi.js/src/PIXI'; -export * from '@pixi/canvas-renderer'; -export * from '@pixi/canvas-graphics'; -export * from '@pixi/canvas-mesh'; -export * from '@pixi/canvas-sprite'; - -import { Application, accessibility, interaction, prepare, extract } from 'pixi.js/src/PIXI'; -import { CanvasRenderer, autoDetectRenderer } from '@pixi/canvas-renderer'; -import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; -import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; -import { CanvasSpriteRenderer } from '@pixi/canvas-sprite'; -import * as canvasExtract from '@pixi/canvas-extract'; -import * as canvasPrepare from '@pixi/canvas-prepare'; - -CanvasRenderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); -CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); -CanvasRenderer.registerPlugin('interaction', interaction.InteractionManager); -CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); -CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); -CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); - -Object.assign(prepare, canvasPrepare); -Object.assign(extract, canvasExtract); - -Application.prototype.createRenderer = autoDetectRenderer; - -import '@pixi/canvas-sprite-tiling'; -import '@pixi/canvas-display'; diff --git a/bundles/pixi.js-legacy/src/index.js b/bundles/pixi.js-legacy/src/index.js index fc437f9..b29ba1e 100644 --- a/bundles/pixi.js-legacy/src/index.js +++ b/bundles/pixi.js-legacy/src/index.js @@ -1,10 +1,46 @@ -export * from './PIXI'; -import * as PIXI from './PIXI'; +import '@pixi/polyfill'; -if (typeof window !== 'undefined') -{ - window.PIXI = PIXI; -} +import { PIXI } from 'pixi.js'; +import { autoDetectRenderer, CanvasRenderer } from '@pixi/canvas-renderer'; +import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; +import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; +import { CanvasSpriteRenderer, CanvasTinter } from '@pixi/canvas-sprite'; +import * as canvasExtract from '@pixi/canvas-extract'; +import * as canvasPrepare from '@pixi/canvas-prepare'; +import '@pixi/canvas-sprite-tiling'; +import '@pixi/canvas-display'; -import deprecated from 'pixi.js/src/deprecated'; -deprecated(PIXI); +CanvasRenderer.registerPlugin('accessibility', PIXI.accessibility.AccessibilityManager); +CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); +CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); +CanvasRenderer.registerPlugin('interaction', PIXI.interaction.InteractionManager); +CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); +CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); +CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); + +Object.assign(PIXI.prepare, canvasPrepare); +Object.assign(PIXI.extract, canvasExtract); + +PIXI.Application.prototype.createRenderer = autoDetectRenderer; + +// Add to namespace window object for people doing `import 'pixi.js-legacy'` +Object.assign(PIXI, { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}); + +// Export ES for those importing specifically by name, +// e.g., `import {autoDetectRenderer} from 'pixi.js-legacy'` +export * from 'pixi.js'; +export { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a0763bc..0e8e8f2 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi.js", "module": "lib/pixi.es.js", + "bundle": "dist/pixi.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", @@ -56,7 +57,9 @@ "@pixi/text": "^5.0.0-alpha", "@pixi/text-bitmap": "^5.0.0-alpha", "@pixi/ticker": "^5.0.0-alpha", - "@pixi/utils": "^5.0.0-alpha", + "@pixi/utils": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js/src/PIXI.js b/bundles/pixi.js/src/PIXI.js deleted file mode 100644 index ae40c7e..0000000 --- a/bundles/pixi.js/src/PIXI.js +++ /dev/null @@ -1,60 +0,0 @@ -export * from '@pixi/core'; -export * from '@pixi/app'; -export * from '@pixi/sprite'; -export * from '@pixi/spritesheet'; -export * from '@pixi/text'; -export * from '@pixi/text-bitmap'; -export * from '@pixi/graphics'; -export * from '@pixi/sprite-animated'; -export * from '@pixi/sprite-tiling'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; -export * from '@pixi/mesh'; -export * from '@pixi/ticker'; -export * from '@pixi/loaders'; - -import { Renderer } from '@pixi/core'; -import * as interaction from '@pixi/interaction'; -import * as extract from '@pixi/extract'; -import * as prepare from '@pixi/prepare'; -import { MeshRenderer } from '@pixi/mesh'; -import { SpriteRenderer } from '@pixi/sprite'; -import { TilingSpriteRenderer } from '@pixi/sprite-tiling'; -import { GraphicsRenderer } from '@pixi/graphics'; -import * as accessibility from '@pixi/accessibility'; -import { Loader } from '@pixi/loaders'; -import * as filters from './filters'; -import * as utils from '@pixi/utils'; -import { settings } from '@pixi/settings'; -import { SpritesheetLoader } from '@pixi/spritesheet'; -import { BitmapFontLoader } from '@pixi/text-bitmap'; - -Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -Renderer.registerPlugin('extract', extract.Extract); -Renderer.registerPlugin('graphics', GraphicsRenderer); -Renderer.registerPlugin('interaction', interaction.InteractionManager); -Renderer.registerPlugin('mesh', MeshRenderer); -Renderer.registerPlugin('prepare', prepare.Prepare); -Renderer.registerPlugin('sprite', SpriteRenderer); -Renderer.registerPlugin('tilingSprite', TilingSpriteRenderer); - -Loader.registerPlugin(SpritesheetLoader); -Loader.registerPlugin(BitmapFontLoader); - -import '@pixi/mixin-cache-as-bitmap'; -import '@pixi/mixin-get-child-by-name'; -import '@pixi/mixin-get-global-position'; -import '@pixi/mixin-app-loader'; - -utils.mixins.performMixins(); - -export { - accessibility, - extract, - filters, - interaction, - prepare, - utils, - settings, -}; diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index d667bc7..8d5b405 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", + "bundle": "dist/pixi-legacy.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "pixi.js": "^5.0.0-alpha", "@pixi/canvas-display": "^5.0.0-alpha", "@pixi/canvas-extract": "^5.0.0-alpha", @@ -34,7 +35,9 @@ "@pixi/canvas-renderer": "^5.0.0-alpha", "@pixi/canvas-sprite": "^5.0.0-alpha", "@pixi/canvas-sprite-tiling": "^5.0.0-alpha", - "@pixi/polyfill": "^5.0.0-alpha", + "@pixi/polyfill": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js-legacy/src/PIXI.js b/bundles/pixi.js-legacy/src/PIXI.js deleted file mode 100644 index 31d0a54..0000000 --- a/bundles/pixi.js-legacy/src/PIXI.js +++ /dev/null @@ -1,31 +0,0 @@ -import '@pixi/polyfill'; - -export * from 'pixi.js/src/PIXI'; -export * from '@pixi/canvas-renderer'; -export * from '@pixi/canvas-graphics'; -export * from '@pixi/canvas-mesh'; -export * from '@pixi/canvas-sprite'; - -import { Application, accessibility, interaction, prepare, extract } from 'pixi.js/src/PIXI'; -import { CanvasRenderer, autoDetectRenderer } from '@pixi/canvas-renderer'; -import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; -import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; -import { CanvasSpriteRenderer } from '@pixi/canvas-sprite'; -import * as canvasExtract from '@pixi/canvas-extract'; -import * as canvasPrepare from '@pixi/canvas-prepare'; - -CanvasRenderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); -CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); -CanvasRenderer.registerPlugin('interaction', interaction.InteractionManager); -CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); -CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); -CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); - -Object.assign(prepare, canvasPrepare); -Object.assign(extract, canvasExtract); - -Application.prototype.createRenderer = autoDetectRenderer; - -import '@pixi/canvas-sprite-tiling'; -import '@pixi/canvas-display'; diff --git a/bundles/pixi.js-legacy/src/index.js b/bundles/pixi.js-legacy/src/index.js index fc437f9..b29ba1e 100644 --- a/bundles/pixi.js-legacy/src/index.js +++ b/bundles/pixi.js-legacy/src/index.js @@ -1,10 +1,46 @@ -export * from './PIXI'; -import * as PIXI from './PIXI'; +import '@pixi/polyfill'; -if (typeof window !== 'undefined') -{ - window.PIXI = PIXI; -} +import { PIXI } from 'pixi.js'; +import { autoDetectRenderer, CanvasRenderer } from '@pixi/canvas-renderer'; +import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; +import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; +import { CanvasSpriteRenderer, CanvasTinter } from '@pixi/canvas-sprite'; +import * as canvasExtract from '@pixi/canvas-extract'; +import * as canvasPrepare from '@pixi/canvas-prepare'; +import '@pixi/canvas-sprite-tiling'; +import '@pixi/canvas-display'; -import deprecated from 'pixi.js/src/deprecated'; -deprecated(PIXI); +CanvasRenderer.registerPlugin('accessibility', PIXI.accessibility.AccessibilityManager); +CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); +CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); +CanvasRenderer.registerPlugin('interaction', PIXI.interaction.InteractionManager); +CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); +CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); +CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); + +Object.assign(PIXI.prepare, canvasPrepare); +Object.assign(PIXI.extract, canvasExtract); + +PIXI.Application.prototype.createRenderer = autoDetectRenderer; + +// Add to namespace window object for people doing `import 'pixi.js-legacy'` +Object.assign(PIXI, { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}); + +// Export ES for those importing specifically by name, +// e.g., `import {autoDetectRenderer} from 'pixi.js-legacy'` +export * from 'pixi.js'; +export { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a0763bc..0e8e8f2 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi.js", "module": "lib/pixi.es.js", + "bundle": "dist/pixi.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", @@ -56,7 +57,9 @@ "@pixi/text": "^5.0.0-alpha", "@pixi/text-bitmap": "^5.0.0-alpha", "@pixi/ticker": "^5.0.0-alpha", - "@pixi/utils": "^5.0.0-alpha", + "@pixi/utils": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js/src/PIXI.js b/bundles/pixi.js/src/PIXI.js deleted file mode 100644 index ae40c7e..0000000 --- a/bundles/pixi.js/src/PIXI.js +++ /dev/null @@ -1,60 +0,0 @@ -export * from '@pixi/core'; -export * from '@pixi/app'; -export * from '@pixi/sprite'; -export * from '@pixi/spritesheet'; -export * from '@pixi/text'; -export * from '@pixi/text-bitmap'; -export * from '@pixi/graphics'; -export * from '@pixi/sprite-animated'; -export * from '@pixi/sprite-tiling'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; -export * from '@pixi/mesh'; -export * from '@pixi/ticker'; -export * from '@pixi/loaders'; - -import { Renderer } from '@pixi/core'; -import * as interaction from '@pixi/interaction'; -import * as extract from '@pixi/extract'; -import * as prepare from '@pixi/prepare'; -import { MeshRenderer } from '@pixi/mesh'; -import { SpriteRenderer } from '@pixi/sprite'; -import { TilingSpriteRenderer } from '@pixi/sprite-tiling'; -import { GraphicsRenderer } from '@pixi/graphics'; -import * as accessibility from '@pixi/accessibility'; -import { Loader } from '@pixi/loaders'; -import * as filters from './filters'; -import * as utils from '@pixi/utils'; -import { settings } from '@pixi/settings'; -import { SpritesheetLoader } from '@pixi/spritesheet'; -import { BitmapFontLoader } from '@pixi/text-bitmap'; - -Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -Renderer.registerPlugin('extract', extract.Extract); -Renderer.registerPlugin('graphics', GraphicsRenderer); -Renderer.registerPlugin('interaction', interaction.InteractionManager); -Renderer.registerPlugin('mesh', MeshRenderer); -Renderer.registerPlugin('prepare', prepare.Prepare); -Renderer.registerPlugin('sprite', SpriteRenderer); -Renderer.registerPlugin('tilingSprite', TilingSpriteRenderer); - -Loader.registerPlugin(SpritesheetLoader); -Loader.registerPlugin(BitmapFontLoader); - -import '@pixi/mixin-cache-as-bitmap'; -import '@pixi/mixin-get-child-by-name'; -import '@pixi/mixin-get-global-position'; -import '@pixi/mixin-app-loader'; - -utils.mixins.performMixins(); - -export { - accessibility, - extract, - filters, - interaction, - prepare, - utils, - settings, -}; diff --git a/bundles/pixi.js/src/filters.js b/bundles/pixi.js/src/filters.js deleted file mode 100644 index 187f642..0000000 --- a/bundles/pixi.js/src/filters.js +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This namespace contains WebGL-only display filters that can be applied - * to DisplayObjects using the {@link PIXI.DisplayObject#filters filters} property. - * @example - * // Create a new application - * const app = new PIXI.Application(); - * - * // Draw a green rectangle - * const rect = new PIXI.Graphics() - * .beginFill(0x00ff00) - * .drawRect(40, 40, 200, 200); - * - * // Add a blur filter - * rect.filters = [new PIXI.filters.BlurFilter()]; - * - * // Display rectangle - * app.stage.addChild(rect); - * document.body.appendChild(app.view); - * @namespace PIXI.filters - */ -export * from '@pixi/filter-fxaa'; -export * from '@pixi/filter-noise'; -export * from '@pixi/filter-displacement'; -export * from '@pixi/filter-blur'; -export * from '@pixi/filter-color-matrix'; -export * from '@pixi/filter-alpha'; diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index d667bc7..8d5b405 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", + "bundle": "dist/pixi-legacy.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "pixi.js": "^5.0.0-alpha", "@pixi/canvas-display": "^5.0.0-alpha", "@pixi/canvas-extract": "^5.0.0-alpha", @@ -34,7 +35,9 @@ "@pixi/canvas-renderer": "^5.0.0-alpha", "@pixi/canvas-sprite": "^5.0.0-alpha", "@pixi/canvas-sprite-tiling": "^5.0.0-alpha", - "@pixi/polyfill": "^5.0.0-alpha", + "@pixi/polyfill": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js-legacy/src/PIXI.js b/bundles/pixi.js-legacy/src/PIXI.js deleted file mode 100644 index 31d0a54..0000000 --- a/bundles/pixi.js-legacy/src/PIXI.js +++ /dev/null @@ -1,31 +0,0 @@ -import '@pixi/polyfill'; - -export * from 'pixi.js/src/PIXI'; -export * from '@pixi/canvas-renderer'; -export * from '@pixi/canvas-graphics'; -export * from '@pixi/canvas-mesh'; -export * from '@pixi/canvas-sprite'; - -import { Application, accessibility, interaction, prepare, extract } from 'pixi.js/src/PIXI'; -import { CanvasRenderer, autoDetectRenderer } from '@pixi/canvas-renderer'; -import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; -import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; -import { CanvasSpriteRenderer } from '@pixi/canvas-sprite'; -import * as canvasExtract from '@pixi/canvas-extract'; -import * as canvasPrepare from '@pixi/canvas-prepare'; - -CanvasRenderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); -CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); -CanvasRenderer.registerPlugin('interaction', interaction.InteractionManager); -CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); -CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); -CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); - -Object.assign(prepare, canvasPrepare); -Object.assign(extract, canvasExtract); - -Application.prototype.createRenderer = autoDetectRenderer; - -import '@pixi/canvas-sprite-tiling'; -import '@pixi/canvas-display'; diff --git a/bundles/pixi.js-legacy/src/index.js b/bundles/pixi.js-legacy/src/index.js index fc437f9..b29ba1e 100644 --- a/bundles/pixi.js-legacy/src/index.js +++ b/bundles/pixi.js-legacy/src/index.js @@ -1,10 +1,46 @@ -export * from './PIXI'; -import * as PIXI from './PIXI'; +import '@pixi/polyfill'; -if (typeof window !== 'undefined') -{ - window.PIXI = PIXI; -} +import { PIXI } from 'pixi.js'; +import { autoDetectRenderer, CanvasRenderer } from '@pixi/canvas-renderer'; +import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; +import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; +import { CanvasSpriteRenderer, CanvasTinter } from '@pixi/canvas-sprite'; +import * as canvasExtract from '@pixi/canvas-extract'; +import * as canvasPrepare from '@pixi/canvas-prepare'; +import '@pixi/canvas-sprite-tiling'; +import '@pixi/canvas-display'; -import deprecated from 'pixi.js/src/deprecated'; -deprecated(PIXI); +CanvasRenderer.registerPlugin('accessibility', PIXI.accessibility.AccessibilityManager); +CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); +CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); +CanvasRenderer.registerPlugin('interaction', PIXI.interaction.InteractionManager); +CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); +CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); +CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); + +Object.assign(PIXI.prepare, canvasPrepare); +Object.assign(PIXI.extract, canvasExtract); + +PIXI.Application.prototype.createRenderer = autoDetectRenderer; + +// Add to namespace window object for people doing `import 'pixi.js-legacy'` +Object.assign(PIXI, { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}); + +// Export ES for those importing specifically by name, +// e.g., `import {autoDetectRenderer} from 'pixi.js-legacy'` +export * from 'pixi.js'; +export { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a0763bc..0e8e8f2 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi.js", "module": "lib/pixi.es.js", + "bundle": "dist/pixi.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", @@ -56,7 +57,9 @@ "@pixi/text": "^5.0.0-alpha", "@pixi/text-bitmap": "^5.0.0-alpha", "@pixi/ticker": "^5.0.0-alpha", - "@pixi/utils": "^5.0.0-alpha", + "@pixi/utils": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js/src/PIXI.js b/bundles/pixi.js/src/PIXI.js deleted file mode 100644 index ae40c7e..0000000 --- a/bundles/pixi.js/src/PIXI.js +++ /dev/null @@ -1,60 +0,0 @@ -export * from '@pixi/core'; -export * from '@pixi/app'; -export * from '@pixi/sprite'; -export * from '@pixi/spritesheet'; -export * from '@pixi/text'; -export * from '@pixi/text-bitmap'; -export * from '@pixi/graphics'; -export * from '@pixi/sprite-animated'; -export * from '@pixi/sprite-tiling'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; -export * from '@pixi/mesh'; -export * from '@pixi/ticker'; -export * from '@pixi/loaders'; - -import { Renderer } from '@pixi/core'; -import * as interaction from '@pixi/interaction'; -import * as extract from '@pixi/extract'; -import * as prepare from '@pixi/prepare'; -import { MeshRenderer } from '@pixi/mesh'; -import { SpriteRenderer } from '@pixi/sprite'; -import { TilingSpriteRenderer } from '@pixi/sprite-tiling'; -import { GraphicsRenderer } from '@pixi/graphics'; -import * as accessibility from '@pixi/accessibility'; -import { Loader } from '@pixi/loaders'; -import * as filters from './filters'; -import * as utils from '@pixi/utils'; -import { settings } from '@pixi/settings'; -import { SpritesheetLoader } from '@pixi/spritesheet'; -import { BitmapFontLoader } from '@pixi/text-bitmap'; - -Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -Renderer.registerPlugin('extract', extract.Extract); -Renderer.registerPlugin('graphics', GraphicsRenderer); -Renderer.registerPlugin('interaction', interaction.InteractionManager); -Renderer.registerPlugin('mesh', MeshRenderer); -Renderer.registerPlugin('prepare', prepare.Prepare); -Renderer.registerPlugin('sprite', SpriteRenderer); -Renderer.registerPlugin('tilingSprite', TilingSpriteRenderer); - -Loader.registerPlugin(SpritesheetLoader); -Loader.registerPlugin(BitmapFontLoader); - -import '@pixi/mixin-cache-as-bitmap'; -import '@pixi/mixin-get-child-by-name'; -import '@pixi/mixin-get-global-position'; -import '@pixi/mixin-app-loader'; - -utils.mixins.performMixins(); - -export { - accessibility, - extract, - filters, - interaction, - prepare, - utils, - settings, -}; diff --git a/bundles/pixi.js/src/filters.js b/bundles/pixi.js/src/filters.js deleted file mode 100644 index 187f642..0000000 --- a/bundles/pixi.js/src/filters.js +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This namespace contains WebGL-only display filters that can be applied - * to DisplayObjects using the {@link PIXI.DisplayObject#filters filters} property. - * @example - * // Create a new application - * const app = new PIXI.Application(); - * - * // Draw a green rectangle - * const rect = new PIXI.Graphics() - * .beginFill(0x00ff00) - * .drawRect(40, 40, 200, 200); - * - * // Add a blur filter - * rect.filters = [new PIXI.filters.BlurFilter()]; - * - * // Display rectangle - * app.stage.addChild(rect); - * document.body.appendChild(app.view); - * @namespace PIXI.filters - */ -export * from '@pixi/filter-fxaa'; -export * from '@pixi/filter-noise'; -export * from '@pixi/filter-displacement'; -export * from '@pixi/filter-blur'; -export * from '@pixi/filter-color-matrix'; -export * from '@pixi/filter-alpha'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 5000d40..52d7cb4 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -1,10 +1,161 @@ -export * from './PIXI'; -import * as PIXI from './PIXI'; +import * as accessibility from '@pixi/accessibility'; +import * as app from '@pixi/app'; +import * as constants from '@pixi/constants'; +import * as core from '@pixi/core'; +import * as display from '@pixi/display'; +import * as extract from '@pixi/extract'; +import * as graphics from '@pixi/graphics'; +import * as interaction from '@pixi/interaction'; +import * as loaders from '@pixi/loaders'; +import * as math from '@pixi/math'; +import * as mesh from '@pixi/mesh'; +import * as prepare from '@pixi/prepare'; +import * as sprite from '@pixi/sprite'; +import * as spriteAnimated from '@pixi/sprite-animated'; +import * as spritesheet from '@pixi/spritesheet'; +import * as spriteTiling from '@pixi/sprite-tiling'; +import * as text from '@pixi/text'; +import * as textBitmap from '@pixi/text-bitmap'; +import * as ticker from '@pixi/ticker'; +import * as utils from '@pixi/utils'; +import { settings } from '@pixi/settings'; +import { AlphaFilter } from '@pixi/filter-alpha'; +import { BlurFilter, BlurXFilter, BlurYFilter } from '@pixi/filter-blur'; +import { ColorMatrixFilter } from '@pixi/filter-color-matrix'; +import { DisplacementFilter } from '@pixi/filter-displacement'; +import { FXAAFilter } from '@pixi/filter-fxaa'; +import { NoiseFilter } from '@pixi/filter-noise'; +import '@pixi/mixin-app-loader'; +import '@pixi/mixin-cache-as-bitmap'; +import '@pixi/mixin-get-child-by-name'; +import '@pixi/mixin-get-global-position'; +import deprecated from './deprecated'; +// Install renderer plugins +core.Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); +core.Renderer.registerPlugin('extract', extract.Extract); +core.Renderer.registerPlugin('graphics', graphics.GraphicsRenderer); +core.Renderer.registerPlugin('interaction', interaction.InteractionManager); +core.Renderer.registerPlugin('mesh', mesh.MeshRenderer); +core.Renderer.registerPlugin('prepare', prepare.Prepare); +core.Renderer.registerPlugin('sprite', sprite.SpriteRenderer); +core.Renderer.registerPlugin('tilingSprite', spriteTiling.TilingSpriteRenderer); + +loaders.Loader.registerPlugin(textBitmap.BitmapFontLoader); +loaders.Loader.registerPlugin(spritesheet.SpritesheetLoader); + +// Apply deplayed mixins +utils.mixins.performMixins(); + +/** + * String of the current PIXI version. + * + * @static + * @constant + * @memberof PIXI + * @name VERSION + * @type {string} + */ +const VERSION = '__VERSION__'; + +/** + * @namespace PIXI + */ +const PIXI = { VERSION }; + +/** + * This namespace contains WebGL-only display filters that can be applied + * to DisplayObjects using the {@link PIXI.DisplayObject#filters filters} property. + * @example + * // Create a new application + * const app = new PIXI.Application(); + * + * // Draw a green rectangle + * const rect = new PIXI.Graphics() + * .beginFill(0x00ff00) + * .drawRect(40, 40, 200, 200); + * + * // Add a blur filter + * rect.filters = [new PIXI.filters.BlurFilter()]; + * + * // Display rectangle + * app.stage.addChild(rect); + * document.body.appendChild(app.view); + * @namespace PIXI.filters + */ +const filters = { + AlphaFilter, + BlurFilter, + BlurXFilter, + BlurYFilter, + ColorMatrixFilter, + DisplacementFilter, + FXAAFilter, + NoiseFilter, +}; + +// Add to namespace window object for people doing `import 'pixi.js'` if (typeof window !== 'undefined') { - window.PIXI = PIXI; + const namespaces = { + accessibility, + extract, + filters, + interaction, + prepare, + settings, + utils, + }; + + window.PIXI = Object.assign( + PIXI, + namespaces, + app, + constants, + core, + display, + graphics, + loaders, + math, + mesh, + sprite, + spriteAnimated, + spritesheet, + spriteTiling, + text, + textBitmap, + ticker + ); + + // Deprecations only apply to Window object + deprecated(PIXI); } -import deprecated from './deprecated'; -deprecated(PIXI); +// Export ES for those importing specifically by name, +// e.g., `import {autoDetectRenderer} from 'pixi.js'` +export * from '@pixi/app'; +export * from '@pixi/constants'; +export * from '@pixi/core'; +export * from '@pixi/display'; +export * from '@pixi/graphics'; +export * from '@pixi/loaders'; +export * from '@pixi/math'; +export * from '@pixi/mesh'; +export * from '@pixi/sprite'; +export * from '@pixi/spritesheet'; +export * from '@pixi/sprite-animated'; +export * from '@pixi/sprite-tiling'; +export * from '@pixi/text'; +export * from '@pixi/text-bitmap'; +export * from '@pixi/ticker'; +export { + PIXI, + VERSION, + accessibility, + extract, + filters, + interaction, + prepare, + settings, + utils, +}; diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index d667bc7..8d5b405 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", + "bundle": "dist/pixi-legacy.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "pixi.js": "^5.0.0-alpha", "@pixi/canvas-display": "^5.0.0-alpha", "@pixi/canvas-extract": "^5.0.0-alpha", @@ -34,7 +35,9 @@ "@pixi/canvas-renderer": "^5.0.0-alpha", "@pixi/canvas-sprite": "^5.0.0-alpha", "@pixi/canvas-sprite-tiling": "^5.0.0-alpha", - "@pixi/polyfill": "^5.0.0-alpha", + "@pixi/polyfill": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js-legacy/src/PIXI.js b/bundles/pixi.js-legacy/src/PIXI.js deleted file mode 100644 index 31d0a54..0000000 --- a/bundles/pixi.js-legacy/src/PIXI.js +++ /dev/null @@ -1,31 +0,0 @@ -import '@pixi/polyfill'; - -export * from 'pixi.js/src/PIXI'; -export * from '@pixi/canvas-renderer'; -export * from '@pixi/canvas-graphics'; -export * from '@pixi/canvas-mesh'; -export * from '@pixi/canvas-sprite'; - -import { Application, accessibility, interaction, prepare, extract } from 'pixi.js/src/PIXI'; -import { CanvasRenderer, autoDetectRenderer } from '@pixi/canvas-renderer'; -import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; -import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; -import { CanvasSpriteRenderer } from '@pixi/canvas-sprite'; -import * as canvasExtract from '@pixi/canvas-extract'; -import * as canvasPrepare from '@pixi/canvas-prepare'; - -CanvasRenderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); -CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); -CanvasRenderer.registerPlugin('interaction', interaction.InteractionManager); -CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); -CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); -CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); - -Object.assign(prepare, canvasPrepare); -Object.assign(extract, canvasExtract); - -Application.prototype.createRenderer = autoDetectRenderer; - -import '@pixi/canvas-sprite-tiling'; -import '@pixi/canvas-display'; diff --git a/bundles/pixi.js-legacy/src/index.js b/bundles/pixi.js-legacy/src/index.js index fc437f9..b29ba1e 100644 --- a/bundles/pixi.js-legacy/src/index.js +++ b/bundles/pixi.js-legacy/src/index.js @@ -1,10 +1,46 @@ -export * from './PIXI'; -import * as PIXI from './PIXI'; +import '@pixi/polyfill'; -if (typeof window !== 'undefined') -{ - window.PIXI = PIXI; -} +import { PIXI } from 'pixi.js'; +import { autoDetectRenderer, CanvasRenderer } from '@pixi/canvas-renderer'; +import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; +import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; +import { CanvasSpriteRenderer, CanvasTinter } from '@pixi/canvas-sprite'; +import * as canvasExtract from '@pixi/canvas-extract'; +import * as canvasPrepare from '@pixi/canvas-prepare'; +import '@pixi/canvas-sprite-tiling'; +import '@pixi/canvas-display'; -import deprecated from 'pixi.js/src/deprecated'; -deprecated(PIXI); +CanvasRenderer.registerPlugin('accessibility', PIXI.accessibility.AccessibilityManager); +CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); +CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); +CanvasRenderer.registerPlugin('interaction', PIXI.interaction.InteractionManager); +CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); +CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); +CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); + +Object.assign(PIXI.prepare, canvasPrepare); +Object.assign(PIXI.extract, canvasExtract); + +PIXI.Application.prototype.createRenderer = autoDetectRenderer; + +// Add to namespace window object for people doing `import 'pixi.js-legacy'` +Object.assign(PIXI, { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}); + +// Export ES for those importing specifically by name, +// e.g., `import {autoDetectRenderer} from 'pixi.js-legacy'` +export * from 'pixi.js'; +export { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a0763bc..0e8e8f2 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi.js", "module": "lib/pixi.es.js", + "bundle": "dist/pixi.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", @@ -56,7 +57,9 @@ "@pixi/text": "^5.0.0-alpha", "@pixi/text-bitmap": "^5.0.0-alpha", "@pixi/ticker": "^5.0.0-alpha", - "@pixi/utils": "^5.0.0-alpha", + "@pixi/utils": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js/src/PIXI.js b/bundles/pixi.js/src/PIXI.js deleted file mode 100644 index ae40c7e..0000000 --- a/bundles/pixi.js/src/PIXI.js +++ /dev/null @@ -1,60 +0,0 @@ -export * from '@pixi/core'; -export * from '@pixi/app'; -export * from '@pixi/sprite'; -export * from '@pixi/spritesheet'; -export * from '@pixi/text'; -export * from '@pixi/text-bitmap'; -export * from '@pixi/graphics'; -export * from '@pixi/sprite-animated'; -export * from '@pixi/sprite-tiling'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; -export * from '@pixi/mesh'; -export * from '@pixi/ticker'; -export * from '@pixi/loaders'; - -import { Renderer } from '@pixi/core'; -import * as interaction from '@pixi/interaction'; -import * as extract from '@pixi/extract'; -import * as prepare from '@pixi/prepare'; -import { MeshRenderer } from '@pixi/mesh'; -import { SpriteRenderer } from '@pixi/sprite'; -import { TilingSpriteRenderer } from '@pixi/sprite-tiling'; -import { GraphicsRenderer } from '@pixi/graphics'; -import * as accessibility from '@pixi/accessibility'; -import { Loader } from '@pixi/loaders'; -import * as filters from './filters'; -import * as utils from '@pixi/utils'; -import { settings } from '@pixi/settings'; -import { SpritesheetLoader } from '@pixi/spritesheet'; -import { BitmapFontLoader } from '@pixi/text-bitmap'; - -Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -Renderer.registerPlugin('extract', extract.Extract); -Renderer.registerPlugin('graphics', GraphicsRenderer); -Renderer.registerPlugin('interaction', interaction.InteractionManager); -Renderer.registerPlugin('mesh', MeshRenderer); -Renderer.registerPlugin('prepare', prepare.Prepare); -Renderer.registerPlugin('sprite', SpriteRenderer); -Renderer.registerPlugin('tilingSprite', TilingSpriteRenderer); - -Loader.registerPlugin(SpritesheetLoader); -Loader.registerPlugin(BitmapFontLoader); - -import '@pixi/mixin-cache-as-bitmap'; -import '@pixi/mixin-get-child-by-name'; -import '@pixi/mixin-get-global-position'; -import '@pixi/mixin-app-loader'; - -utils.mixins.performMixins(); - -export { - accessibility, - extract, - filters, - interaction, - prepare, - utils, - settings, -}; diff --git a/bundles/pixi.js/src/filters.js b/bundles/pixi.js/src/filters.js deleted file mode 100644 index 187f642..0000000 --- a/bundles/pixi.js/src/filters.js +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This namespace contains WebGL-only display filters that can be applied - * to DisplayObjects using the {@link PIXI.DisplayObject#filters filters} property. - * @example - * // Create a new application - * const app = new PIXI.Application(); - * - * // Draw a green rectangle - * const rect = new PIXI.Graphics() - * .beginFill(0x00ff00) - * .drawRect(40, 40, 200, 200); - * - * // Add a blur filter - * rect.filters = [new PIXI.filters.BlurFilter()]; - * - * // Display rectangle - * app.stage.addChild(rect); - * document.body.appendChild(app.view); - * @namespace PIXI.filters - */ -export * from '@pixi/filter-fxaa'; -export * from '@pixi/filter-noise'; -export * from '@pixi/filter-displacement'; -export * from '@pixi/filter-blur'; -export * from '@pixi/filter-color-matrix'; -export * from '@pixi/filter-alpha'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 5000d40..52d7cb4 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -1,10 +1,161 @@ -export * from './PIXI'; -import * as PIXI from './PIXI'; +import * as accessibility from '@pixi/accessibility'; +import * as app from '@pixi/app'; +import * as constants from '@pixi/constants'; +import * as core from '@pixi/core'; +import * as display from '@pixi/display'; +import * as extract from '@pixi/extract'; +import * as graphics from '@pixi/graphics'; +import * as interaction from '@pixi/interaction'; +import * as loaders from '@pixi/loaders'; +import * as math from '@pixi/math'; +import * as mesh from '@pixi/mesh'; +import * as prepare from '@pixi/prepare'; +import * as sprite from '@pixi/sprite'; +import * as spriteAnimated from '@pixi/sprite-animated'; +import * as spritesheet from '@pixi/spritesheet'; +import * as spriteTiling from '@pixi/sprite-tiling'; +import * as text from '@pixi/text'; +import * as textBitmap from '@pixi/text-bitmap'; +import * as ticker from '@pixi/ticker'; +import * as utils from '@pixi/utils'; +import { settings } from '@pixi/settings'; +import { AlphaFilter } from '@pixi/filter-alpha'; +import { BlurFilter, BlurXFilter, BlurYFilter } from '@pixi/filter-blur'; +import { ColorMatrixFilter } from '@pixi/filter-color-matrix'; +import { DisplacementFilter } from '@pixi/filter-displacement'; +import { FXAAFilter } from '@pixi/filter-fxaa'; +import { NoiseFilter } from '@pixi/filter-noise'; +import '@pixi/mixin-app-loader'; +import '@pixi/mixin-cache-as-bitmap'; +import '@pixi/mixin-get-child-by-name'; +import '@pixi/mixin-get-global-position'; +import deprecated from './deprecated'; +// Install renderer plugins +core.Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); +core.Renderer.registerPlugin('extract', extract.Extract); +core.Renderer.registerPlugin('graphics', graphics.GraphicsRenderer); +core.Renderer.registerPlugin('interaction', interaction.InteractionManager); +core.Renderer.registerPlugin('mesh', mesh.MeshRenderer); +core.Renderer.registerPlugin('prepare', prepare.Prepare); +core.Renderer.registerPlugin('sprite', sprite.SpriteRenderer); +core.Renderer.registerPlugin('tilingSprite', spriteTiling.TilingSpriteRenderer); + +loaders.Loader.registerPlugin(textBitmap.BitmapFontLoader); +loaders.Loader.registerPlugin(spritesheet.SpritesheetLoader); + +// Apply deplayed mixins +utils.mixins.performMixins(); + +/** + * String of the current PIXI version. + * + * @static + * @constant + * @memberof PIXI + * @name VERSION + * @type {string} + */ +const VERSION = '__VERSION__'; + +/** + * @namespace PIXI + */ +const PIXI = { VERSION }; + +/** + * This namespace contains WebGL-only display filters that can be applied + * to DisplayObjects using the {@link PIXI.DisplayObject#filters filters} property. + * @example + * // Create a new application + * const app = new PIXI.Application(); + * + * // Draw a green rectangle + * const rect = new PIXI.Graphics() + * .beginFill(0x00ff00) + * .drawRect(40, 40, 200, 200); + * + * // Add a blur filter + * rect.filters = [new PIXI.filters.BlurFilter()]; + * + * // Display rectangle + * app.stage.addChild(rect); + * document.body.appendChild(app.view); + * @namespace PIXI.filters + */ +const filters = { + AlphaFilter, + BlurFilter, + BlurXFilter, + BlurYFilter, + ColorMatrixFilter, + DisplacementFilter, + FXAAFilter, + NoiseFilter, +}; + +// Add to namespace window object for people doing `import 'pixi.js'` if (typeof window !== 'undefined') { - window.PIXI = PIXI; + const namespaces = { + accessibility, + extract, + filters, + interaction, + prepare, + settings, + utils, + }; + + window.PIXI = Object.assign( + PIXI, + namespaces, + app, + constants, + core, + display, + graphics, + loaders, + math, + mesh, + sprite, + spriteAnimated, + spritesheet, + spriteTiling, + text, + textBitmap, + ticker + ); + + // Deprecations only apply to Window object + deprecated(PIXI); } -import deprecated from './deprecated'; -deprecated(PIXI); +// Export ES for those importing specifically by name, +// e.g., `import {autoDetectRenderer} from 'pixi.js'` +export * from '@pixi/app'; +export * from '@pixi/constants'; +export * from '@pixi/core'; +export * from '@pixi/display'; +export * from '@pixi/graphics'; +export * from '@pixi/loaders'; +export * from '@pixi/math'; +export * from '@pixi/mesh'; +export * from '@pixi/sprite'; +export * from '@pixi/spritesheet'; +export * from '@pixi/sprite-animated'; +export * from '@pixi/sprite-tiling'; +export * from '@pixi/text'; +export * from '@pixi/text-bitmap'; +export * from '@pixi/ticker'; +export { + PIXI, + VERSION, + accessibility, + extract, + filters, + interaction, + prepare, + settings, + utils, +}; diff --git a/package.json b/package.json index 4c1e42f..70f11c1 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "predeploy": "npm run docs", "pretest": "npm run lint && npm run build:dev", "test": "floss --path test", + "unit-test": "floss --path test", "docs": "jsdoc -c jsdoc.conf.json -R README.md", "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", @@ -17,8 +18,8 @@ "lerna": "lerna", "predist": "rimraf dist/*", "dist": "npm run docs && npm run build -- --scope \"pixi.js*\"", - "postdist": "copyfiles -f \"bundles/*/lib/pixi?(-legacy).js*\" dist", - "prepub": "npm run build && floss --path test", + "postdist": "copyfiles -f \"bundles/*/dist/*\" dist", + "prepub": "npm run build && npm run unit-test", "pub": "lerna publish" }, "devDependencies": { diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index d667bc7..8d5b405 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", + "bundle": "dist/pixi-legacy.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "pixi.js": "^5.0.0-alpha", "@pixi/canvas-display": "^5.0.0-alpha", "@pixi/canvas-extract": "^5.0.0-alpha", @@ -34,7 +35,9 @@ "@pixi/canvas-renderer": "^5.0.0-alpha", "@pixi/canvas-sprite": "^5.0.0-alpha", "@pixi/canvas-sprite-tiling": "^5.0.0-alpha", - "@pixi/polyfill": "^5.0.0-alpha", + "@pixi/polyfill": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js-legacy/src/PIXI.js b/bundles/pixi.js-legacy/src/PIXI.js deleted file mode 100644 index 31d0a54..0000000 --- a/bundles/pixi.js-legacy/src/PIXI.js +++ /dev/null @@ -1,31 +0,0 @@ -import '@pixi/polyfill'; - -export * from 'pixi.js/src/PIXI'; -export * from '@pixi/canvas-renderer'; -export * from '@pixi/canvas-graphics'; -export * from '@pixi/canvas-mesh'; -export * from '@pixi/canvas-sprite'; - -import { Application, accessibility, interaction, prepare, extract } from 'pixi.js/src/PIXI'; -import { CanvasRenderer, autoDetectRenderer } from '@pixi/canvas-renderer'; -import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; -import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; -import { CanvasSpriteRenderer } from '@pixi/canvas-sprite'; -import * as canvasExtract from '@pixi/canvas-extract'; -import * as canvasPrepare from '@pixi/canvas-prepare'; - -CanvasRenderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); -CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); -CanvasRenderer.registerPlugin('interaction', interaction.InteractionManager); -CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); -CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); -CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); - -Object.assign(prepare, canvasPrepare); -Object.assign(extract, canvasExtract); - -Application.prototype.createRenderer = autoDetectRenderer; - -import '@pixi/canvas-sprite-tiling'; -import '@pixi/canvas-display'; diff --git a/bundles/pixi.js-legacy/src/index.js b/bundles/pixi.js-legacy/src/index.js index fc437f9..b29ba1e 100644 --- a/bundles/pixi.js-legacy/src/index.js +++ b/bundles/pixi.js-legacy/src/index.js @@ -1,10 +1,46 @@ -export * from './PIXI'; -import * as PIXI from './PIXI'; +import '@pixi/polyfill'; -if (typeof window !== 'undefined') -{ - window.PIXI = PIXI; -} +import { PIXI } from 'pixi.js'; +import { autoDetectRenderer, CanvasRenderer } from '@pixi/canvas-renderer'; +import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; +import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; +import { CanvasSpriteRenderer, CanvasTinter } from '@pixi/canvas-sprite'; +import * as canvasExtract from '@pixi/canvas-extract'; +import * as canvasPrepare from '@pixi/canvas-prepare'; +import '@pixi/canvas-sprite-tiling'; +import '@pixi/canvas-display'; -import deprecated from 'pixi.js/src/deprecated'; -deprecated(PIXI); +CanvasRenderer.registerPlugin('accessibility', PIXI.accessibility.AccessibilityManager); +CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); +CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); +CanvasRenderer.registerPlugin('interaction', PIXI.interaction.InteractionManager); +CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); +CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); +CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); + +Object.assign(PIXI.prepare, canvasPrepare); +Object.assign(PIXI.extract, canvasExtract); + +PIXI.Application.prototype.createRenderer = autoDetectRenderer; + +// Add to namespace window object for people doing `import 'pixi.js-legacy'` +Object.assign(PIXI, { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}); + +// Export ES for those importing specifically by name, +// e.g., `import {autoDetectRenderer} from 'pixi.js-legacy'` +export * from 'pixi.js'; +export { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a0763bc..0e8e8f2 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi.js", "module": "lib/pixi.es.js", + "bundle": "dist/pixi.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", @@ -56,7 +57,9 @@ "@pixi/text": "^5.0.0-alpha", "@pixi/text-bitmap": "^5.0.0-alpha", "@pixi/ticker": "^5.0.0-alpha", - "@pixi/utils": "^5.0.0-alpha", + "@pixi/utils": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js/src/PIXI.js b/bundles/pixi.js/src/PIXI.js deleted file mode 100644 index ae40c7e..0000000 --- a/bundles/pixi.js/src/PIXI.js +++ /dev/null @@ -1,60 +0,0 @@ -export * from '@pixi/core'; -export * from '@pixi/app'; -export * from '@pixi/sprite'; -export * from '@pixi/spritesheet'; -export * from '@pixi/text'; -export * from '@pixi/text-bitmap'; -export * from '@pixi/graphics'; -export * from '@pixi/sprite-animated'; -export * from '@pixi/sprite-tiling'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; -export * from '@pixi/mesh'; -export * from '@pixi/ticker'; -export * from '@pixi/loaders'; - -import { Renderer } from '@pixi/core'; -import * as interaction from '@pixi/interaction'; -import * as extract from '@pixi/extract'; -import * as prepare from '@pixi/prepare'; -import { MeshRenderer } from '@pixi/mesh'; -import { SpriteRenderer } from '@pixi/sprite'; -import { TilingSpriteRenderer } from '@pixi/sprite-tiling'; -import { GraphicsRenderer } from '@pixi/graphics'; -import * as accessibility from '@pixi/accessibility'; -import { Loader } from '@pixi/loaders'; -import * as filters from './filters'; -import * as utils from '@pixi/utils'; -import { settings } from '@pixi/settings'; -import { SpritesheetLoader } from '@pixi/spritesheet'; -import { BitmapFontLoader } from '@pixi/text-bitmap'; - -Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -Renderer.registerPlugin('extract', extract.Extract); -Renderer.registerPlugin('graphics', GraphicsRenderer); -Renderer.registerPlugin('interaction', interaction.InteractionManager); -Renderer.registerPlugin('mesh', MeshRenderer); -Renderer.registerPlugin('prepare', prepare.Prepare); -Renderer.registerPlugin('sprite', SpriteRenderer); -Renderer.registerPlugin('tilingSprite', TilingSpriteRenderer); - -Loader.registerPlugin(SpritesheetLoader); -Loader.registerPlugin(BitmapFontLoader); - -import '@pixi/mixin-cache-as-bitmap'; -import '@pixi/mixin-get-child-by-name'; -import '@pixi/mixin-get-global-position'; -import '@pixi/mixin-app-loader'; - -utils.mixins.performMixins(); - -export { - accessibility, - extract, - filters, - interaction, - prepare, - utils, - settings, -}; diff --git a/bundles/pixi.js/src/filters.js b/bundles/pixi.js/src/filters.js deleted file mode 100644 index 187f642..0000000 --- a/bundles/pixi.js/src/filters.js +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This namespace contains WebGL-only display filters that can be applied - * to DisplayObjects using the {@link PIXI.DisplayObject#filters filters} property. - * @example - * // Create a new application - * const app = new PIXI.Application(); - * - * // Draw a green rectangle - * const rect = new PIXI.Graphics() - * .beginFill(0x00ff00) - * .drawRect(40, 40, 200, 200); - * - * // Add a blur filter - * rect.filters = [new PIXI.filters.BlurFilter()]; - * - * // Display rectangle - * app.stage.addChild(rect); - * document.body.appendChild(app.view); - * @namespace PIXI.filters - */ -export * from '@pixi/filter-fxaa'; -export * from '@pixi/filter-noise'; -export * from '@pixi/filter-displacement'; -export * from '@pixi/filter-blur'; -export * from '@pixi/filter-color-matrix'; -export * from '@pixi/filter-alpha'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 5000d40..52d7cb4 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -1,10 +1,161 @@ -export * from './PIXI'; -import * as PIXI from './PIXI'; +import * as accessibility from '@pixi/accessibility'; +import * as app from '@pixi/app'; +import * as constants from '@pixi/constants'; +import * as core from '@pixi/core'; +import * as display from '@pixi/display'; +import * as extract from '@pixi/extract'; +import * as graphics from '@pixi/graphics'; +import * as interaction from '@pixi/interaction'; +import * as loaders from '@pixi/loaders'; +import * as math from '@pixi/math'; +import * as mesh from '@pixi/mesh'; +import * as prepare from '@pixi/prepare'; +import * as sprite from '@pixi/sprite'; +import * as spriteAnimated from '@pixi/sprite-animated'; +import * as spritesheet from '@pixi/spritesheet'; +import * as spriteTiling from '@pixi/sprite-tiling'; +import * as text from '@pixi/text'; +import * as textBitmap from '@pixi/text-bitmap'; +import * as ticker from '@pixi/ticker'; +import * as utils from '@pixi/utils'; +import { settings } from '@pixi/settings'; +import { AlphaFilter } from '@pixi/filter-alpha'; +import { BlurFilter, BlurXFilter, BlurYFilter } from '@pixi/filter-blur'; +import { ColorMatrixFilter } from '@pixi/filter-color-matrix'; +import { DisplacementFilter } from '@pixi/filter-displacement'; +import { FXAAFilter } from '@pixi/filter-fxaa'; +import { NoiseFilter } from '@pixi/filter-noise'; +import '@pixi/mixin-app-loader'; +import '@pixi/mixin-cache-as-bitmap'; +import '@pixi/mixin-get-child-by-name'; +import '@pixi/mixin-get-global-position'; +import deprecated from './deprecated'; +// Install renderer plugins +core.Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); +core.Renderer.registerPlugin('extract', extract.Extract); +core.Renderer.registerPlugin('graphics', graphics.GraphicsRenderer); +core.Renderer.registerPlugin('interaction', interaction.InteractionManager); +core.Renderer.registerPlugin('mesh', mesh.MeshRenderer); +core.Renderer.registerPlugin('prepare', prepare.Prepare); +core.Renderer.registerPlugin('sprite', sprite.SpriteRenderer); +core.Renderer.registerPlugin('tilingSprite', spriteTiling.TilingSpriteRenderer); + +loaders.Loader.registerPlugin(textBitmap.BitmapFontLoader); +loaders.Loader.registerPlugin(spritesheet.SpritesheetLoader); + +// Apply deplayed mixins +utils.mixins.performMixins(); + +/** + * String of the current PIXI version. + * + * @static + * @constant + * @memberof PIXI + * @name VERSION + * @type {string} + */ +const VERSION = '__VERSION__'; + +/** + * @namespace PIXI + */ +const PIXI = { VERSION }; + +/** + * This namespace contains WebGL-only display filters that can be applied + * to DisplayObjects using the {@link PIXI.DisplayObject#filters filters} property. + * @example + * // Create a new application + * const app = new PIXI.Application(); + * + * // Draw a green rectangle + * const rect = new PIXI.Graphics() + * .beginFill(0x00ff00) + * .drawRect(40, 40, 200, 200); + * + * // Add a blur filter + * rect.filters = [new PIXI.filters.BlurFilter()]; + * + * // Display rectangle + * app.stage.addChild(rect); + * document.body.appendChild(app.view); + * @namespace PIXI.filters + */ +const filters = { + AlphaFilter, + BlurFilter, + BlurXFilter, + BlurYFilter, + ColorMatrixFilter, + DisplacementFilter, + FXAAFilter, + NoiseFilter, +}; + +// Add to namespace window object for people doing `import 'pixi.js'` if (typeof window !== 'undefined') { - window.PIXI = PIXI; + const namespaces = { + accessibility, + extract, + filters, + interaction, + prepare, + settings, + utils, + }; + + window.PIXI = Object.assign( + PIXI, + namespaces, + app, + constants, + core, + display, + graphics, + loaders, + math, + mesh, + sprite, + spriteAnimated, + spritesheet, + spriteTiling, + text, + textBitmap, + ticker + ); + + // Deprecations only apply to Window object + deprecated(PIXI); } -import deprecated from './deprecated'; -deprecated(PIXI); +// Export ES for those importing specifically by name, +// e.g., `import {autoDetectRenderer} from 'pixi.js'` +export * from '@pixi/app'; +export * from '@pixi/constants'; +export * from '@pixi/core'; +export * from '@pixi/display'; +export * from '@pixi/graphics'; +export * from '@pixi/loaders'; +export * from '@pixi/math'; +export * from '@pixi/mesh'; +export * from '@pixi/sprite'; +export * from '@pixi/spritesheet'; +export * from '@pixi/sprite-animated'; +export * from '@pixi/sprite-tiling'; +export * from '@pixi/text'; +export * from '@pixi/text-bitmap'; +export * from '@pixi/ticker'; +export { + PIXI, + VERSION, + accessibility, + extract, + filters, + interaction, + prepare, + settings, + utils, +}; diff --git a/package.json b/package.json index 4c1e42f..70f11c1 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "predeploy": "npm run docs", "pretest": "npm run lint && npm run build:dev", "test": "floss --path test", + "unit-test": "floss --path test", "docs": "jsdoc -c jsdoc.conf.json -R README.md", "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", @@ -17,8 +18,8 @@ "lerna": "lerna", "predist": "rimraf dist/*", "dist": "npm run docs && npm run build -- --scope \"pixi.js*\"", - "postdist": "copyfiles -f \"bundles/*/lib/pixi?(-legacy).js*\" dist", - "prepub": "npm run build && floss --path test", + "postdist": "copyfiles -f \"bundles/*/dist/*\" dist", + "prepub": "npm run build && npm run unit-test", "pub": "lerna publish" }, "devDependencies": { diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 5c6a55b..3d4390c 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,18 +1,3 @@ -/** - * @namespace PIXI - */ - -/** - * String of the current PIXI version. - * - * @static - * @constant - * @memberof PIXI - * @name VERSION - * @type {string} - */ -export const VERSION = '__VERSION__'; - export { default as Renderer } from './renderers/Renderer'; export { default as AbstractRenderer } from './renderers/AbstractRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index d667bc7..8d5b405 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", + "bundle": "dist/pixi-legacy.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "pixi.js": "^5.0.0-alpha", "@pixi/canvas-display": "^5.0.0-alpha", "@pixi/canvas-extract": "^5.0.0-alpha", @@ -34,7 +35,9 @@ "@pixi/canvas-renderer": "^5.0.0-alpha", "@pixi/canvas-sprite": "^5.0.0-alpha", "@pixi/canvas-sprite-tiling": "^5.0.0-alpha", - "@pixi/polyfill": "^5.0.0-alpha", + "@pixi/polyfill": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js-legacy/src/PIXI.js b/bundles/pixi.js-legacy/src/PIXI.js deleted file mode 100644 index 31d0a54..0000000 --- a/bundles/pixi.js-legacy/src/PIXI.js +++ /dev/null @@ -1,31 +0,0 @@ -import '@pixi/polyfill'; - -export * from 'pixi.js/src/PIXI'; -export * from '@pixi/canvas-renderer'; -export * from '@pixi/canvas-graphics'; -export * from '@pixi/canvas-mesh'; -export * from '@pixi/canvas-sprite'; - -import { Application, accessibility, interaction, prepare, extract } from 'pixi.js/src/PIXI'; -import { CanvasRenderer, autoDetectRenderer } from '@pixi/canvas-renderer'; -import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; -import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; -import { CanvasSpriteRenderer } from '@pixi/canvas-sprite'; -import * as canvasExtract from '@pixi/canvas-extract'; -import * as canvasPrepare from '@pixi/canvas-prepare'; - -CanvasRenderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); -CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); -CanvasRenderer.registerPlugin('interaction', interaction.InteractionManager); -CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); -CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); -CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); - -Object.assign(prepare, canvasPrepare); -Object.assign(extract, canvasExtract); - -Application.prototype.createRenderer = autoDetectRenderer; - -import '@pixi/canvas-sprite-tiling'; -import '@pixi/canvas-display'; diff --git a/bundles/pixi.js-legacy/src/index.js b/bundles/pixi.js-legacy/src/index.js index fc437f9..b29ba1e 100644 --- a/bundles/pixi.js-legacy/src/index.js +++ b/bundles/pixi.js-legacy/src/index.js @@ -1,10 +1,46 @@ -export * from './PIXI'; -import * as PIXI from './PIXI'; +import '@pixi/polyfill'; -if (typeof window !== 'undefined') -{ - window.PIXI = PIXI; -} +import { PIXI } from 'pixi.js'; +import { autoDetectRenderer, CanvasRenderer } from '@pixi/canvas-renderer'; +import { CanvasMeshRenderer } from '@pixi/canvas-mesh'; +import { CanvasGraphicsRenderer } from '@pixi/canvas-graphics'; +import { CanvasSpriteRenderer, CanvasTinter } from '@pixi/canvas-sprite'; +import * as canvasExtract from '@pixi/canvas-extract'; +import * as canvasPrepare from '@pixi/canvas-prepare'; +import '@pixi/canvas-sprite-tiling'; +import '@pixi/canvas-display'; -import deprecated from 'pixi.js/src/deprecated'; -deprecated(PIXI); +CanvasRenderer.registerPlugin('accessibility', PIXI.accessibility.AccessibilityManager); +CanvasRenderer.registerPlugin('extract', canvasExtract.CanvasExtract); +CanvasRenderer.registerPlugin('graphics', CanvasGraphicsRenderer); +CanvasRenderer.registerPlugin('interaction', PIXI.interaction.InteractionManager); +CanvasRenderer.registerPlugin('mesh', CanvasMeshRenderer); +CanvasRenderer.registerPlugin('prepare', canvasPrepare.CanvasPrepare); +CanvasRenderer.registerPlugin('sprite', CanvasSpriteRenderer); + +Object.assign(PIXI.prepare, canvasPrepare); +Object.assign(PIXI.extract, canvasExtract); + +PIXI.Application.prototype.createRenderer = autoDetectRenderer; + +// Add to namespace window object for people doing `import 'pixi.js-legacy'` +Object.assign(PIXI, { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}); + +// Export ES for those importing specifically by name, +// e.g., `import {autoDetectRenderer} from 'pixi.js-legacy'` +export * from 'pixi.js'; +export { + autoDetectRenderer, + CanvasRenderer, + CanvasGraphicsRenderer, + CanvasMeshRenderer, + CanvasSpriteRenderer, + CanvasTinter, +}; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a0763bc..0e8e8f2 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -11,6 +11,7 @@ ], "main": "lib/pixi.js", "module": "lib/pixi.es.js", + "bundle": "dist/pixi.js", "homepage": "http://www.pixijs.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -24,7 +25,7 @@ "files": [ "lib/" ], - "devDependencies": { + "dependencies": { "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", @@ -56,7 +57,9 @@ "@pixi/text": "^5.0.0-alpha", "@pixi/text-bitmap": "^5.0.0-alpha", "@pixi/ticker": "^5.0.0-alpha", - "@pixi/utils": "^5.0.0-alpha", + "@pixi/utils": "^5.0.0-alpha" + }, + "devDependencies": { "floss": "^2.1.3" } } diff --git a/bundles/pixi.js/src/PIXI.js b/bundles/pixi.js/src/PIXI.js deleted file mode 100644 index ae40c7e..0000000 --- a/bundles/pixi.js/src/PIXI.js +++ /dev/null @@ -1,60 +0,0 @@ -export * from '@pixi/core'; -export * from '@pixi/app'; -export * from '@pixi/sprite'; -export * from '@pixi/spritesheet'; -export * from '@pixi/text'; -export * from '@pixi/text-bitmap'; -export * from '@pixi/graphics'; -export * from '@pixi/sprite-animated'; -export * from '@pixi/sprite-tiling'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; -export * from '@pixi/mesh'; -export * from '@pixi/ticker'; -export * from '@pixi/loaders'; - -import { Renderer } from '@pixi/core'; -import * as interaction from '@pixi/interaction'; -import * as extract from '@pixi/extract'; -import * as prepare from '@pixi/prepare'; -import { MeshRenderer } from '@pixi/mesh'; -import { SpriteRenderer } from '@pixi/sprite'; -import { TilingSpriteRenderer } from '@pixi/sprite-tiling'; -import { GraphicsRenderer } from '@pixi/graphics'; -import * as accessibility from '@pixi/accessibility'; -import { Loader } from '@pixi/loaders'; -import * as filters from './filters'; -import * as utils from '@pixi/utils'; -import { settings } from '@pixi/settings'; -import { SpritesheetLoader } from '@pixi/spritesheet'; -import { BitmapFontLoader } from '@pixi/text-bitmap'; - -Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); -Renderer.registerPlugin('extract', extract.Extract); -Renderer.registerPlugin('graphics', GraphicsRenderer); -Renderer.registerPlugin('interaction', interaction.InteractionManager); -Renderer.registerPlugin('mesh', MeshRenderer); -Renderer.registerPlugin('prepare', prepare.Prepare); -Renderer.registerPlugin('sprite', SpriteRenderer); -Renderer.registerPlugin('tilingSprite', TilingSpriteRenderer); - -Loader.registerPlugin(SpritesheetLoader); -Loader.registerPlugin(BitmapFontLoader); - -import '@pixi/mixin-cache-as-bitmap'; -import '@pixi/mixin-get-child-by-name'; -import '@pixi/mixin-get-global-position'; -import '@pixi/mixin-app-loader'; - -utils.mixins.performMixins(); - -export { - accessibility, - extract, - filters, - interaction, - prepare, - utils, - settings, -}; diff --git a/bundles/pixi.js/src/filters.js b/bundles/pixi.js/src/filters.js deleted file mode 100644 index 187f642..0000000 --- a/bundles/pixi.js/src/filters.js +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This namespace contains WebGL-only display filters that can be applied - * to DisplayObjects using the {@link PIXI.DisplayObject#filters filters} property. - * @example - * // Create a new application - * const app = new PIXI.Application(); - * - * // Draw a green rectangle - * const rect = new PIXI.Graphics() - * .beginFill(0x00ff00) - * .drawRect(40, 40, 200, 200); - * - * // Add a blur filter - * rect.filters = [new PIXI.filters.BlurFilter()]; - * - * // Display rectangle - * app.stage.addChild(rect); - * document.body.appendChild(app.view); - * @namespace PIXI.filters - */ -export * from '@pixi/filter-fxaa'; -export * from '@pixi/filter-noise'; -export * from '@pixi/filter-displacement'; -export * from '@pixi/filter-blur'; -export * from '@pixi/filter-color-matrix'; -export * from '@pixi/filter-alpha'; diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 5000d40..52d7cb4 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -1,10 +1,161 @@ -export * from './PIXI'; -import * as PIXI from './PIXI'; +import * as accessibility from '@pixi/accessibility'; +import * as app from '@pixi/app'; +import * as constants from '@pixi/constants'; +import * as core from '@pixi/core'; +import * as display from '@pixi/display'; +import * as extract from '@pixi/extract'; +import * as graphics from '@pixi/graphics'; +import * as interaction from '@pixi/interaction'; +import * as loaders from '@pixi/loaders'; +import * as math from '@pixi/math'; +import * as mesh from '@pixi/mesh'; +import * as prepare from '@pixi/prepare'; +import * as sprite from '@pixi/sprite'; +import * as spriteAnimated from '@pixi/sprite-animated'; +import * as spritesheet from '@pixi/spritesheet'; +import * as spriteTiling from '@pixi/sprite-tiling'; +import * as text from '@pixi/text'; +import * as textBitmap from '@pixi/text-bitmap'; +import * as ticker from '@pixi/ticker'; +import * as utils from '@pixi/utils'; +import { settings } from '@pixi/settings'; +import { AlphaFilter } from '@pixi/filter-alpha'; +import { BlurFilter, BlurXFilter, BlurYFilter } from '@pixi/filter-blur'; +import { ColorMatrixFilter } from '@pixi/filter-color-matrix'; +import { DisplacementFilter } from '@pixi/filter-displacement'; +import { FXAAFilter } from '@pixi/filter-fxaa'; +import { NoiseFilter } from '@pixi/filter-noise'; +import '@pixi/mixin-app-loader'; +import '@pixi/mixin-cache-as-bitmap'; +import '@pixi/mixin-get-child-by-name'; +import '@pixi/mixin-get-global-position'; +import deprecated from './deprecated'; +// Install renderer plugins +core.Renderer.registerPlugin('accessibility', accessibility.AccessibilityManager); +core.Renderer.registerPlugin('extract', extract.Extract); +core.Renderer.registerPlugin('graphics', graphics.GraphicsRenderer); +core.Renderer.registerPlugin('interaction', interaction.InteractionManager); +core.Renderer.registerPlugin('mesh', mesh.MeshRenderer); +core.Renderer.registerPlugin('prepare', prepare.Prepare); +core.Renderer.registerPlugin('sprite', sprite.SpriteRenderer); +core.Renderer.registerPlugin('tilingSprite', spriteTiling.TilingSpriteRenderer); + +loaders.Loader.registerPlugin(textBitmap.BitmapFontLoader); +loaders.Loader.registerPlugin(spritesheet.SpritesheetLoader); + +// Apply deplayed mixins +utils.mixins.performMixins(); + +/** + * String of the current PIXI version. + * + * @static + * @constant + * @memberof PIXI + * @name VERSION + * @type {string} + */ +const VERSION = '__VERSION__'; + +/** + * @namespace PIXI + */ +const PIXI = { VERSION }; + +/** + * This namespace contains WebGL-only display filters that can be applied + * to DisplayObjects using the {@link PIXI.DisplayObject#filters filters} property. + * @example + * // Create a new application + * const app = new PIXI.Application(); + * + * // Draw a green rectangle + * const rect = new PIXI.Graphics() + * .beginFill(0x00ff00) + * .drawRect(40, 40, 200, 200); + * + * // Add a blur filter + * rect.filters = [new PIXI.filters.BlurFilter()]; + * + * // Display rectangle + * app.stage.addChild(rect); + * document.body.appendChild(app.view); + * @namespace PIXI.filters + */ +const filters = { + AlphaFilter, + BlurFilter, + BlurXFilter, + BlurYFilter, + ColorMatrixFilter, + DisplacementFilter, + FXAAFilter, + NoiseFilter, +}; + +// Add to namespace window object for people doing `import 'pixi.js'` if (typeof window !== 'undefined') { - window.PIXI = PIXI; + const namespaces = { + accessibility, + extract, + filters, + interaction, + prepare, + settings, + utils, + }; + + window.PIXI = Object.assign( + PIXI, + namespaces, + app, + constants, + core, + display, + graphics, + loaders, + math, + mesh, + sprite, + spriteAnimated, + spritesheet, + spriteTiling, + text, + textBitmap, + ticker + ); + + // Deprecations only apply to Window object + deprecated(PIXI); } -import deprecated from './deprecated'; -deprecated(PIXI); +// Export ES for those importing specifically by name, +// e.g., `import {autoDetectRenderer} from 'pixi.js'` +export * from '@pixi/app'; +export * from '@pixi/constants'; +export * from '@pixi/core'; +export * from '@pixi/display'; +export * from '@pixi/graphics'; +export * from '@pixi/loaders'; +export * from '@pixi/math'; +export * from '@pixi/mesh'; +export * from '@pixi/sprite'; +export * from '@pixi/spritesheet'; +export * from '@pixi/sprite-animated'; +export * from '@pixi/sprite-tiling'; +export * from '@pixi/text'; +export * from '@pixi/text-bitmap'; +export * from '@pixi/ticker'; +export { + PIXI, + VERSION, + accessibility, + extract, + filters, + interaction, + prepare, + settings, + utils, +}; diff --git a/package.json b/package.json index 4c1e42f..70f11c1 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "predeploy": "npm run docs", "pretest": "npm run lint && npm run build:dev", "test": "floss --path test", + "unit-test": "floss --path test", "docs": "jsdoc -c jsdoc.conf.json -R README.md", "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", @@ -17,8 +18,8 @@ "lerna": "lerna", "predist": "rimraf dist/*", "dist": "npm run docs && npm run build -- --scope \"pixi.js*\"", - "postdist": "copyfiles -f \"bundles/*/lib/pixi?(-legacy).js*\" dist", - "prepub": "npm run build && floss --path test", + "postdist": "copyfiles -f \"bundles/*/dist/*\" dist", + "prepub": "npm run build && npm run unit-test", "pub": "lerna publish" }, "devDependencies": { diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 5c6a55b..3d4390c 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,18 +1,3 @@ -/** - * @namespace PIXI - */ - -/** - * String of the current PIXI version. - * - * @static - * @constant - * @memberof PIXI - * @name VERSION - * @type {string} - */ -export const VERSION = '__VERSION__'; - export { default as Renderer } from './renderers/Renderer'; export { default as AbstractRenderer } from './renderers/AbstractRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; diff --git a/rollup.config.js b/rollup.config.js index 2466a0c..70c46ab 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -15,12 +15,14 @@ // Support --scope and --ignore globs const args = minimist(process.argv.slice(2), { - boolean: ['prod'], + boolean: ['prod', 'bundles'], default: { prod: false, + bundles: true, }, alias: { p: 'prod', + b: 'bundles', }, }); @@ -82,7 +84,6 @@ { return; } - const external = Object.keys(pkg.dependencies || []); const banner = [ `/*!`, ` * ${pkg.name} - v${pkg.version}`, @@ -91,24 +92,24 @@ ` * ${pkg.name} is licensed under the MIT License.`, ` * http://www.opensource.org/licenses/mit-license`, ` */`, - ]; + ].join('\n'); // Check for bundle folder + const external = Object.keys(pkg.dependencies || []); const basePath = path.relative(__dirname, pkg.location); - const bundle = basePath.indexOf('bundles/') === 0; + const input = path.join(basePath, 'src/index.js'); + const { main, module, bundle } = pkg._package; results.push({ - banner: banner.join('\n'), - name: 'PIXI', - input: path.join(basePath, 'src/index.js'), - treeshake: !bundle, + banner, + input, output: [ { - file: path.join(basePath, pkg._package.main), - format: bundle ? 'umd' : 'cjs', + file: path.join(basePath, main), + format: 'cjs', }, { - file: path.join(basePath, pkg._package.module), + file: path.join(basePath, module), format: 'es', }, ], @@ -116,6 +117,25 @@ sourcemap, plugins, }); + + // The package.json file has a bundle field + // we'll use this to generate the bundle file + // this will package all dependencies + if (args.bundles && bundle) + { + results.push({ + banner, + input, + output: { + file: path.join(basePath, bundle), + format: 'umd', + }, + name: 'PIXI', + treeshake: false, + sourcemap, + plugins, + }); + } }); });