diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text-bitmap/rollup.config.js b/packages/text-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text-bitmap/rollup.config.js +++ b/packages/text-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text-bitmap/rollup.config.js b/packages/text-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text-bitmap/rollup.config.js +++ b/packages/text-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text/package.json b/packages/text/package.json index 294eb74..6ade8f3 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text-bitmap/rollup.config.js b/packages/text-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text-bitmap/rollup.config.js +++ b/packages/text-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text/package.json b/packages/text/package.json index 294eb74..6ade8f3 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text/rollup.config.js b/packages/text/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text/rollup.config.js +++ b/packages/text/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text-bitmap/rollup.config.js b/packages/text-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text-bitmap/rollup.config.js +++ b/packages/text-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text/package.json b/packages/text/package.json index 294eb74..6ade8f3 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text/rollup.config.js b/packages/text/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text/rollup.config.js +++ b/packages/text/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/ticker/package.json b/packages/ticker/package.json index aa9e44c..86f9b33 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text-bitmap/rollup.config.js b/packages/text-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text-bitmap/rollup.config.js +++ b/packages/text-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text/package.json b/packages/text/package.json index 294eb74..6ade8f3 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text/rollup.config.js b/packages/text/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text/rollup.config.js +++ b/packages/text/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/ticker/package.json b/packages/ticker/package.json index aa9e44c..86f9b33 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/ticker/rollup.config.js b/packages/ticker/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/ticker/rollup.config.js +++ b/packages/ticker/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text-bitmap/rollup.config.js b/packages/text-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text-bitmap/rollup.config.js +++ b/packages/text-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text/package.json b/packages/text/package.json index 294eb74..6ade8f3 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text/rollup.config.js b/packages/text/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text/rollup.config.js +++ b/packages/text/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/ticker/package.json b/packages/ticker/package.json index aa9e44c..86f9b33 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/ticker/rollup.config.js b/packages/ticker/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/ticker/rollup.config.js +++ b/packages/ticker/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/package.json b/packages/utils/package.json index e1b9c47..e9e2f9d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text-bitmap/rollup.config.js b/packages/text-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text-bitmap/rollup.config.js +++ b/packages/text-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text/package.json b/packages/text/package.json index 294eb74..6ade8f3 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text/rollup.config.js b/packages/text/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text/rollup.config.js +++ b/packages/text/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/ticker/package.json b/packages/ticker/package.json index aa9e44c..86f9b33 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/ticker/rollup.config.js b/packages/ticker/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/ticker/rollup.config.js +++ b/packages/ticker/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/package.json b/packages/utils/package.json index e1b9c47..e9e2f9d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/utils/rollup.config.js b/packages/utils/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/utils/rollup.config.js +++ b/packages/utils/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text-bitmap/rollup.config.js b/packages/text-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text-bitmap/rollup.config.js +++ b/packages/text-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text/package.json b/packages/text/package.json index 294eb74..6ade8f3 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text/rollup.config.js b/packages/text/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text/rollup.config.js +++ b/packages/text/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/ticker/package.json b/packages/ticker/package.json index aa9e44c..86f9b33 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/ticker/rollup.config.js b/packages/ticker/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/ticker/rollup.config.js +++ b/packages/ticker/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/package.json b/packages/utils/package.json index e1b9c47..e9e2f9d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/utils/rollup.config.js b/packages/utils/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/utils/rollup.config.js +++ b/packages/utils/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/src/browser/deprecationWarn.js b/packages/utils/src/browser/deprecationWarn.js deleted file mode 100644 index 8e348da..0000000 --- a/packages/utils/src/browser/deprecationWarn.js +++ /dev/null @@ -1,37 +0,0 @@ -// provide method to give a stack track for warnings -// useful for tracking-down where deprecated methods/properties/classes -// are being used within the code -export function deprecationWarn(msg) -{ - /* eslint-disable no-console */ - let stack = new Error().stack; - - // Handle IE < 10 and Safari < 6 - if (typeof stack === 'undefined') - { - console.warn('Deprecation Warning: ', msg); - } - else - { - // chop off the stack trace which includes pixi.js internal calls - stack = stack.split('\n').splice(3).join('\n'); - - if (console.groupCollapsed) - { - console.groupCollapsed( - '%cDeprecation Warning: %c%s', - 'color:#614108;background:#fffbe6', - 'font-weight:normal;color:#614108;background:#fffbe6', - msg - ); - console.warn(stack); - console.groupEnd(); - } - else - { - console.warn('Deprecation Warning: ', msg); - console.warn(stack); - } - } - /* eslint-enable no-console */ -} diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text-bitmap/rollup.config.js b/packages/text-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text-bitmap/rollup.config.js +++ b/packages/text-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text/package.json b/packages/text/package.json index 294eb74..6ade8f3 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text/rollup.config.js b/packages/text/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text/rollup.config.js +++ b/packages/text/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/ticker/package.json b/packages/ticker/package.json index aa9e44c..86f9b33 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/ticker/rollup.config.js b/packages/ticker/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/ticker/rollup.config.js +++ b/packages/ticker/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/package.json b/packages/utils/package.json index e1b9c47..e9e2f9d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/utils/rollup.config.js b/packages/utils/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/utils/rollup.config.js +++ b/packages/utils/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/src/browser/deprecationWarn.js b/packages/utils/src/browser/deprecationWarn.js deleted file mode 100644 index 8e348da..0000000 --- a/packages/utils/src/browser/deprecationWarn.js +++ /dev/null @@ -1,37 +0,0 @@ -// provide method to give a stack track for warnings -// useful for tracking-down where deprecated methods/properties/classes -// are being used within the code -export function deprecationWarn(msg) -{ - /* eslint-disable no-console */ - let stack = new Error().stack; - - // Handle IE < 10 and Safari < 6 - if (typeof stack === 'undefined') - { - console.warn('Deprecation Warning: ', msg); - } - else - { - // chop off the stack trace which includes pixi.js internal calls - stack = stack.split('\n').splice(3).join('\n'); - - if (console.groupCollapsed) - { - console.groupCollapsed( - '%cDeprecation Warning: %c%s', - 'color:#614108;background:#fffbe6', - 'font-weight:normal;color:#614108;background:#fffbe6', - msg - ); - console.warn(stack); - console.groupEnd(); - } - else - { - console.warn('Deprecation Warning: ', msg); - console.warn(stack); - } - } - /* eslint-enable no-console */ -} diff --git a/packages/utils/src/browser/getTestContext.js b/packages/utils/src/browser/getTestContext.js deleted file mode 100644 index bd1e189..0000000 --- a/packages/utils/src/browser/getTestContext.js +++ /dev/null @@ -1,48 +0,0 @@ -import { settings } from '@pixi/settings'; - -let context = null; - -/** - * returns a little webGL context to use for program inspection. - * - * @static - * @private - * @returns {webGL-context} a gl context to test with - */ -export function getTestContext() -{ - if (!context) - { - const canvas = document.createElement('canvas'); - - let gl; - - if (settings.PREFER_WEBGL_2) - { - gl = canvas.getContext('webgl2', {}); - } - - if (!gl) - { - gl = canvas.getContext('webgl', {}) - || canvas.getContext('experimental-webgl', {}); - - if (!gl) - { - // fail, not able to get a context - throw new Error('This browser does not support webGL. Try using the canvas renderer'); - } - else - { - // for shader testing.. - gl.getExtension('WEBGL_draw_buffers'); - } - } - - context = gl; - - return gl; - } - - return context; -} diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text-bitmap/rollup.config.js b/packages/text-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text-bitmap/rollup.config.js +++ b/packages/text-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text/package.json b/packages/text/package.json index 294eb74..6ade8f3 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text/rollup.config.js b/packages/text/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text/rollup.config.js +++ b/packages/text/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/ticker/package.json b/packages/ticker/package.json index aa9e44c..86f9b33 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/ticker/rollup.config.js b/packages/ticker/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/ticker/rollup.config.js +++ b/packages/ticker/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/package.json b/packages/utils/package.json index e1b9c47..e9e2f9d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/utils/rollup.config.js b/packages/utils/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/utils/rollup.config.js +++ b/packages/utils/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/src/browser/deprecationWarn.js b/packages/utils/src/browser/deprecationWarn.js deleted file mode 100644 index 8e348da..0000000 --- a/packages/utils/src/browser/deprecationWarn.js +++ /dev/null @@ -1,37 +0,0 @@ -// provide method to give a stack track for warnings -// useful for tracking-down where deprecated methods/properties/classes -// are being used within the code -export function deprecationWarn(msg) -{ - /* eslint-disable no-console */ - let stack = new Error().stack; - - // Handle IE < 10 and Safari < 6 - if (typeof stack === 'undefined') - { - console.warn('Deprecation Warning: ', msg); - } - else - { - // chop off the stack trace which includes pixi.js internal calls - stack = stack.split('\n').splice(3).join('\n'); - - if (console.groupCollapsed) - { - console.groupCollapsed( - '%cDeprecation Warning: %c%s', - 'color:#614108;background:#fffbe6', - 'font-weight:normal;color:#614108;background:#fffbe6', - msg - ); - console.warn(stack); - console.groupEnd(); - } - else - { - console.warn('Deprecation Warning: ', msg); - console.warn(stack); - } - } - /* eslint-enable no-console */ -} diff --git a/packages/utils/src/browser/getTestContext.js b/packages/utils/src/browser/getTestContext.js deleted file mode 100644 index bd1e189..0000000 --- a/packages/utils/src/browser/getTestContext.js +++ /dev/null @@ -1,48 +0,0 @@ -import { settings } from '@pixi/settings'; - -let context = null; - -/** - * returns a little webGL context to use for program inspection. - * - * @static - * @private - * @returns {webGL-context} a gl context to test with - */ -export function getTestContext() -{ - if (!context) - { - const canvas = document.createElement('canvas'); - - let gl; - - if (settings.PREFER_WEBGL_2) - { - gl = canvas.getContext('webgl2', {}); - } - - if (!gl) - { - gl = canvas.getContext('webgl', {}) - || canvas.getContext('experimental-webgl', {}); - - if (!gl) - { - // fail, not able to get a context - throw new Error('This browser does not support webGL. Try using the canvas renderer'); - } - else - { - // for shader testing.. - gl.getExtension('WEBGL_draw_buffers'); - } - } - - context = gl; - - return gl; - } - - return context; -} diff --git a/packages/utils/src/browser/index.js b/packages/utils/src/browser/index.js index c58251d..c3fdce7 100644 --- a/packages/utils/src/browser/index.js +++ b/packages/utils/src/browser/index.js @@ -1,3 +1,2 @@ export * from './hello'; export * from './isWebGLSupported'; -export * from './deprecationWarn'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text-bitmap/rollup.config.js b/packages/text-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text-bitmap/rollup.config.js +++ b/packages/text-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text/package.json b/packages/text/package.json index 294eb74..6ade8f3 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text/rollup.config.js b/packages/text/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text/rollup.config.js +++ b/packages/text/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/ticker/package.json b/packages/ticker/package.json index aa9e44c..86f9b33 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/ticker/rollup.config.js b/packages/ticker/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/ticker/rollup.config.js +++ b/packages/ticker/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/package.json b/packages/utils/package.json index e1b9c47..e9e2f9d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/utils/rollup.config.js b/packages/utils/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/utils/rollup.config.js +++ b/packages/utils/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/src/browser/deprecationWarn.js b/packages/utils/src/browser/deprecationWarn.js deleted file mode 100644 index 8e348da..0000000 --- a/packages/utils/src/browser/deprecationWarn.js +++ /dev/null @@ -1,37 +0,0 @@ -// provide method to give a stack track for warnings -// useful for tracking-down where deprecated methods/properties/classes -// are being used within the code -export function deprecationWarn(msg) -{ - /* eslint-disable no-console */ - let stack = new Error().stack; - - // Handle IE < 10 and Safari < 6 - if (typeof stack === 'undefined') - { - console.warn('Deprecation Warning: ', msg); - } - else - { - // chop off the stack trace which includes pixi.js internal calls - stack = stack.split('\n').splice(3).join('\n'); - - if (console.groupCollapsed) - { - console.groupCollapsed( - '%cDeprecation Warning: %c%s', - 'color:#614108;background:#fffbe6', - 'font-weight:normal;color:#614108;background:#fffbe6', - msg - ); - console.warn(stack); - console.groupEnd(); - } - else - { - console.warn('Deprecation Warning: ', msg); - console.warn(stack); - } - } - /* eslint-enable no-console */ -} diff --git a/packages/utils/src/browser/getTestContext.js b/packages/utils/src/browser/getTestContext.js deleted file mode 100644 index bd1e189..0000000 --- a/packages/utils/src/browser/getTestContext.js +++ /dev/null @@ -1,48 +0,0 @@ -import { settings } from '@pixi/settings'; - -let context = null; - -/** - * returns a little webGL context to use for program inspection. - * - * @static - * @private - * @returns {webGL-context} a gl context to test with - */ -export function getTestContext() -{ - if (!context) - { - const canvas = document.createElement('canvas'); - - let gl; - - if (settings.PREFER_WEBGL_2) - { - gl = canvas.getContext('webgl2', {}); - } - - if (!gl) - { - gl = canvas.getContext('webgl', {}) - || canvas.getContext('experimental-webgl', {}); - - if (!gl) - { - // fail, not able to get a context - throw new Error('This browser does not support webGL. Try using the canvas renderer'); - } - else - { - // for shader testing.. - gl.getExtension('WEBGL_draw_buffers'); - } - } - - context = gl; - - return gl; - } - - return context; -} diff --git a/packages/utils/src/browser/index.js b/packages/utils/src/browser/index.js index c58251d..c3fdce7 100644 --- a/packages/utils/src/browser/index.js +++ b/packages/utils/src/browser/index.js @@ -1,3 +1,2 @@ export * from './hello'; export * from './isWebGLSupported'; -export * from './deprecationWarn'; diff --git a/packages/utils/src/deprecation.js b/packages/utils/src/deprecation.js deleted file mode 100644 index b34d942..0000000 --- a/packages/utils/src/deprecation.js +++ /dev/null @@ -1,23 +0,0 @@ -import { deprecationWarn as warn } from './browser/deprecationWarn'; - -/** - * @function PIXI.utils.getSvgSize - * @see PIXI.SVGResource.getSize - * @deprecated since 5.0.0 - */ -export function getSvgSize() -{ - warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); -} - -/** - * @constant - * @name SVG_SIZE - * @memberof PIXI.utils - * @see PIXI.SVGResource.SVG_SIZE - * @deprecated since 5.0.0 - */ -export function SVG_SIZE() -{ - warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); -} diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text-bitmap/rollup.config.js b/packages/text-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text-bitmap/rollup.config.js +++ b/packages/text-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text/package.json b/packages/text/package.json index 294eb74..6ade8f3 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text/rollup.config.js b/packages/text/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text/rollup.config.js +++ b/packages/text/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/ticker/package.json b/packages/ticker/package.json index aa9e44c..86f9b33 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/ticker/rollup.config.js b/packages/ticker/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/ticker/rollup.config.js +++ b/packages/ticker/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/package.json b/packages/utils/package.json index e1b9c47..e9e2f9d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/utils/rollup.config.js b/packages/utils/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/utils/rollup.config.js +++ b/packages/utils/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/src/browser/deprecationWarn.js b/packages/utils/src/browser/deprecationWarn.js deleted file mode 100644 index 8e348da..0000000 --- a/packages/utils/src/browser/deprecationWarn.js +++ /dev/null @@ -1,37 +0,0 @@ -// provide method to give a stack track for warnings -// useful for tracking-down where deprecated methods/properties/classes -// are being used within the code -export function deprecationWarn(msg) -{ - /* eslint-disable no-console */ - let stack = new Error().stack; - - // Handle IE < 10 and Safari < 6 - if (typeof stack === 'undefined') - { - console.warn('Deprecation Warning: ', msg); - } - else - { - // chop off the stack trace which includes pixi.js internal calls - stack = stack.split('\n').splice(3).join('\n'); - - if (console.groupCollapsed) - { - console.groupCollapsed( - '%cDeprecation Warning: %c%s', - 'color:#614108;background:#fffbe6', - 'font-weight:normal;color:#614108;background:#fffbe6', - msg - ); - console.warn(stack); - console.groupEnd(); - } - else - { - console.warn('Deprecation Warning: ', msg); - console.warn(stack); - } - } - /* eslint-enable no-console */ -} diff --git a/packages/utils/src/browser/getTestContext.js b/packages/utils/src/browser/getTestContext.js deleted file mode 100644 index bd1e189..0000000 --- a/packages/utils/src/browser/getTestContext.js +++ /dev/null @@ -1,48 +0,0 @@ -import { settings } from '@pixi/settings'; - -let context = null; - -/** - * returns a little webGL context to use for program inspection. - * - * @static - * @private - * @returns {webGL-context} a gl context to test with - */ -export function getTestContext() -{ - if (!context) - { - const canvas = document.createElement('canvas'); - - let gl; - - if (settings.PREFER_WEBGL_2) - { - gl = canvas.getContext('webgl2', {}); - } - - if (!gl) - { - gl = canvas.getContext('webgl', {}) - || canvas.getContext('experimental-webgl', {}); - - if (!gl) - { - // fail, not able to get a context - throw new Error('This browser does not support webGL. Try using the canvas renderer'); - } - else - { - // for shader testing.. - gl.getExtension('WEBGL_draw_buffers'); - } - } - - context = gl; - - return gl; - } - - return context; -} diff --git a/packages/utils/src/browser/index.js b/packages/utils/src/browser/index.js index c58251d..c3fdce7 100644 --- a/packages/utils/src/browser/index.js +++ b/packages/utils/src/browser/index.js @@ -1,3 +1,2 @@ export * from './hello'; export * from './isWebGLSupported'; -export * from './deprecationWarn'; diff --git a/packages/utils/src/deprecation.js b/packages/utils/src/deprecation.js deleted file mode 100644 index b34d942..0000000 --- a/packages/utils/src/deprecation.js +++ /dev/null @@ -1,23 +0,0 @@ -import { deprecationWarn as warn } from './browser/deprecationWarn'; - -/** - * @function PIXI.utils.getSvgSize - * @see PIXI.SVGResource.getSize - * @deprecated since 5.0.0 - */ -export function getSvgSize() -{ - warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); -} - -/** - * @constant - * @name SVG_SIZE - * @memberof PIXI.utils - * @see PIXI.SVGResource.SVG_SIZE - * @deprecated since 5.0.0 - */ -export function SVG_SIZE() -{ - warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); -} diff --git a/packages/utils/src/index.js b/packages/utils/src/index.js index 9152ec1..2466fa7 100644 --- a/packages/utils/src/index.js +++ b/packages/utils/src/index.js @@ -59,6 +59,5 @@ export * from './media'; export * from './network'; export * from './const'; -export * from './deprecation'; import './settings'; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index 090e4c5..54dcdad 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -19,9 +19,9 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "build": "rollup -cp && rollup -cp -f umd", - "build:dev": "rollup -c && rollup -c -f umd", - "watch": "rollup -cw -f umd", + "build": "rollup -cpb", + "build:dev": "rollup -cb", + "watch": "rollup -cwb", "postversion": "npm run build", "test": "tester" }, @@ -35,6 +35,8 @@ "@pixi/app": "^5.0.0-alpha", "@pixi/core": "^5.0.0-alpha", "@pixi/accessibility": "^5.0.0-alpha", + "@pixi/constants": "^5.0.0-alpha", + "@pixi/display": "^5.0.0-alpha", "@pixi/extract": "^5.0.0-alpha", "@pixi/filter-alpha": "^5.0.0-alpha", "@pixi/filter-blur": "^5.0.0-alpha", @@ -45,6 +47,7 @@ "@pixi/graphics": "^5.0.0-alpha", "@pixi/interaction": "^5.0.0-alpha", "@pixi/loaders": "^5.0.0-alpha", + "@pixi/math": "^5.0.0-alpha", "@pixi/mesh": "^5.0.0-alpha", "@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha", "@pixi/mixin-get-child-by-name": "^5.0.0-alpha", @@ -52,6 +55,7 @@ "@pixi/particles": "^5.0.0-alpha", "@pixi/polyfill": "^5.0.0-alpha", "@pixi/prepare": "^5.0.0-alpha", + "@pixi/settings": "^5.0.0-alpha", "@pixi/sprite": "^5.0.0-alpha", "@pixi/spritesheet": "^5.0.0-alpha", "@pixi/sprite-animated": "^5.0.0-alpha", @@ -62,8 +66,8 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", + "buble": "^0.17.0", "rimraf": "^2.6.2", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } diff --git a/bundles/pixi.js/rollup.config.js b/bundles/pixi.js/rollup.config.js index 15f56df..2096180 100644 --- a/bundles/pixi.js/rollup.config.js +++ b/bundles/pixi.js/rollup.config.js @@ -1 +1,18 @@ -export * from '@internal/builder'; +import config from '@internal/builder'; +import buble from 'buble'; +import * as fs from 'fs'; + +// Only support deprecations with UMD format, since this +// is the version of PixiJS run in the browser directly. ES format +// will not receive deprecations. +if (config[0].output.format === 'umd') +{ + // Rollup exports all the namespaces/classes, in order to + // deprecates exported classes, we need to add deprecate.js + // as the outro for the build. + const buffer = fs.readFileSync('./src/deprecated.js', 'utf8'); + + config[0].outro = buble.transform(buffer).code; +} + +export default config; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js new file mode 100644 index 0000000..214817f --- /dev/null +++ b/bundles/pixi.js/src/deprecated.js @@ -0,0 +1,155 @@ +// provide method to give a stack track for warnings +// useful for tracking-down where deprecated methods/properties/classes +// are being used within the code +function warn(msg) +{ + /* eslint-disable no-console */ + let stack = new Error().stack; + + // Handle IE < 10 and Safari < 6 + if (typeof stack === 'undefined') + { + console.warn('Deprecation Warning: ', msg); + } + else + { + // chop off the stack trace which includes pixi.js internal calls + stack = stack.split('\n').splice(3).join('\n'); + + if (console.groupCollapsed) + { + console.groupCollapsed( + '%cDeprecation Warning: %c%s', + 'color:#614108;background:#fffbe6', + 'font-weight:normal;color:#614108;background:#fffbe6', + msg + ); + console.warn(stack); + console.groupEnd(); + } + else + { + console.warn('Deprecation Warning: ', msg); + console.warn(stack); + } + } + /* eslint-enable no-console */ +} + +// Define via the exports +const PIXI = exports; + +Object.defineProperties(PIXI, { + /** + * @deprecated since 5.0.0 + * @see PIXI.ticker.UPDATE_PRIORITY + * @static + * @constant + * @name UPDATE_PRIORITY + * @memberof PIXI + * @type {object} + */ + UPDATE_PRIORITY: { + get() + { + warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); + + return PIXI.ticker.UPDATE_PRIORITY; + }, + }, + + /** + * @constant + * @name SVG_SIZE + * @memberof PIXI + * @see PIXI.SVGResource.SVG_SIZE + * @deprecated since 5.0.0 + */ + SVG_SIZE: { + get() + { + warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); + + return PIXI.SVGResource.SVG_SIZE; + }, + }, +}); + +/** + * This namespace has been removed. All classes previous nested + * under this namespace have been moved to the top-level `PIXI` object. + * @namespace PIXI.extras + * @deprecated since 5.0.0 + */ +PIXI.extras = {}; + +Object.defineProperties(PIXI.extras, { + /** + * @class PIXI.extras.TilingSprite + * @see PIXI.TilingSprite + * @deprecated since 5.0.0 + */ + TilingSprite: { + get() + { + warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); + + return PIXI.TilingSprite; + }, + }, + /** + * @class PIXI.extras.TilingSpriteRenderer + * @see PIXI.TilingSpriteRenderer + * @deprecated since 5.0.0 + */ + TilingSpriteRenderer: { + get() + { + warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); + + return PIXI.TilingSpriteRenderer; + }, + }, + /** + * @class PIXI.extras.AnimatedSprite + * @see PIXI.AnimatedSprite + * @deprecated since 5.0.0 + */ + AnimatedSprite: { + get() + { + warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); + + return PIXI.AnimatedSprite; + }, + }, + /** + * @class PIXI.extras.BitmapText + * @see PIXI.BitmapText + * @deprecated since 5.0.0 + */ + BitmapText: { + get() + { + warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); + + return PIXI.BitmapText; + }, + }, +}); + +Object.defineProperties(PIXI.utils, { + /** + * @function PIXI.utils.getSvgSize + * @see PIXI.SVGResource.getSize + * @deprecated since 5.0.0 + */ + getSvgSize: { + get() + { + warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); + + return PIXI.SVGResource.getSize; + }, + }, +}); diff --git a/bundles/pixi.js/src/deprecation.js b/bundles/pixi.js/src/deprecation.js deleted file mode 100644 index 21249bd..0000000 --- a/bundles/pixi.js/src/deprecation.js +++ /dev/null @@ -1,92 +0,0 @@ -import { deprecationWarn as warn } from '@pixi/utils'; -import { UPDATE_PRIORITY } from '@pixi/ticker'; - -/** - * Internal deprecations - * @private - */ -export function deprecation(PIXI) -{ - /** - * @deprecated since 5.0.0 - * @see PIXI.ticker.UPDATE_PRIORITY - * @static - * @constant - * @name UPDATE_PRIORITY - * @memberof PIXI - * @type {object} - */ - Object.defineProperties(PIXI, { - UPDATE_PRIORITY: { - get() - { - warn('PIXI.UPDATE_PRIORITY has moved to PIXI.ticker.UPDATE_PRIORITY'); - - return UPDATE_PRIORITY; - }, - }, - }); - - /** - * This namespace has been removed. All classes previous nested - * under this namespace have been moved to the top-level `PIXI` object. - * @namespace PIXI.extras - * @deprecated since 5.0.0 - */ - PIXI.extras = {}; - - Object.defineProperties(PIXI.extras, { - /** - * @class PIXI.extras.TilingSprite - * @see PIXI.TilingSprite - * @deprecated since 5.0.0 - */ - TilingSprite: { - get() - { - warn('PIXI.extras.TilingSprite has moved to PIXI.TilingSprite'); - - return PIXI.TilingSprite; - }, - }, - /** - * @class PIXI.extras.TilingSpriteRenderer - * @see PIXI.TilingSpriteRenderer - * @deprecated since 5.0.0 - */ - TilingSpriteRenderer: { - get() - { - warn('PIXI.extras.TilingSpriteRenderer has moved to PIXI.TilingSpriteRenderer'); - - return PIXI.TilingSpriteRenderer; - }, - }, - /** - * @class PIXI.extras.AnimatedSprite - * @see PIXI.AnimatedSprite - * @deprecated since 5.0.0 - */ - AnimatedSprite: { - get() - { - warn('PIXI.extras.AnimatedSprite has moved to PIXI.AnimatedSprite'); - - return PIXI.AnimatedSprite; - }, - }, - /** - * @class PIXI.extras.BitmapText - * @see PIXI.BitmapText - * @deprecated since 5.0.0 - */ - BitmapText: { - get() - { - warn('PIXI.extras.BitmapText has moved to PIXI.BitmapText'); - - return PIXI.BitmapText; - }, - }, - }); -} diff --git a/bundles/pixi.js/src/index.js b/bundles/pixi.js/src/index.js index 216a7fc..56b17fe 100644 --- a/bundles/pixi.js/src/index.js +++ b/bundles/pixi.js/src/index.js @@ -11,6 +11,9 @@ 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 libs import * as accessibility from '@pixi/accessibility'; @@ -21,17 +24,17 @@ import * as prepare from '@pixi/prepare'; // import * as particles from '@pixi/particles'; import * as filters from './filters'; +import * as utils from '@pixi/utils'; +import * as ticker from '@pixi/ticker'; +import { settings } from '@pixi/settings'; // imported for side effect of extending the prototype only, contains no exports import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import { deprecation } from './deprecation'; - // handle mixins now, after all code has been added -import { mixins } from '@pixi/utils'; -mixins.performMixins(); +utils.mixins.performMixins(); /** * Alias for {@link PIXI.loaders.shared}. @@ -39,7 +42,7 @@ * @memberof PIXI * @type {PIXI.loader.Loader} */ -const loader = loaders.shared || null; +export const loader = loaders.shared; export { accessibility, @@ -50,11 +53,7 @@ mesh, // particles, prepare, - loader, + utils, + ticker, + settings, }; - -// Always export PixiJS globally. -global.PIXI = exports; // eslint-disable-line - -// Apply deprecations -deprecation(global.PIXI); diff --git a/bundles/pixi.js/test/index.js b/bundles/pixi.js/test/index.js index 5a81a03..242a269 100755 --- a/bundles/pixi.js/test/index.js +++ b/bundles/pixi.js/test/index.js @@ -1,10 +1,18 @@ /* eslint-disable global-require */ -require('../'); +const PIXI = require('../'); describe('PIXI', function () { it('should exist as a global object', function () { - expect(PIXI).to.be.an('object'); + expect(PIXI).to.not.be.undefined; + expect(PIXI.interaction).to.not.be.undefined; + expect(PIXI.settings).to.not.be.undefined; + expect(PIXI.ticker).to.not.be.undefined; + expect(PIXI.loaders).to.not.be.undefined; + expect(PIXI.extract).to.not.be.undefined; + expect(PIXI.mesh).to.not.be.undefined; + expect(PIXI.prepare).to.not.be.undefined; + expect(PIXI.utils).to.not.be.undefined; }); }); diff --git a/filters/alpha/package.json b/filters/alpha/package.json index fe641b4..ffed23e 100644 --- a/filters/alpha/package.json +++ b/filters/alpha/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/alpha/rollup.config.js b/filters/alpha/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/alpha/rollup.config.js +++ b/filters/alpha/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/package.json b/filters/blur/package.json index cf18dce..c776e4d 100644 --- a/filters/blur/package.json +++ b/filters/blur/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/blur/rollup.config.js b/filters/blur/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/blur/rollup.config.js +++ b/filters/blur/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/blur/src/BlurYFilter.js b/filters/blur/src/BlurYFilter.js index f6869b6..c21d899 100644 --- a/filters/blur/src/BlurYFilter.js +++ b/filters/blur/src/BlurYFilter.js @@ -1,4 +1,5 @@ -import { Filter, settings } from '@pixi/core'; +import { Filter } from '@pixi/core'; +import { settings } from '@pixi/settings'; import generateBlurVertSource from './generateBlurVertSource'; import generateBlurFragSource from './generateBlurFragSource'; import getMaxBlurKernelSize from './getMaxBlurKernelSize'; diff --git a/filters/color-matrix/package.json b/filters/color-matrix/package.json index 30a40b3..d897e95 100644 --- a/filters/color-matrix/package.json +++ b/filters/color-matrix/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/color-matrix/rollup.config.js b/filters/color-matrix/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/color-matrix/rollup.config.js +++ b/filters/color-matrix/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/displacement/package.json b/filters/displacement/package.json index 43ecf07..10613ae 100644 --- a/filters/displacement/package.json +++ b/filters/displacement/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/displacement/rollup.config.js b/filters/displacement/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/displacement/rollup.config.js +++ b/filters/displacement/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/fxaa/package.json b/filters/fxaa/package.json index 31fa8d3..8416fcf 100644 --- a/filters/fxaa/package.json +++ b/filters/fxaa/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/fxaa/rollup.config.js b/filters/fxaa/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/fxaa/rollup.config.js +++ b/filters/fxaa/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/filters/noise/package.json b/filters/noise/package.json index 2ed61fb..280aff2 100644 --- a/filters/noise/package.json +++ b/filters/noise/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/filters/noise/rollup.config.js b/filters/noise/rollup.config.js index 15f56df..a73c874 100644 --- a/filters/noise/rollup.config.js +++ b/filters/noise/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index 99bbe2a..21e3b08 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -37,7 +37,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/accessibility/rollup.config.js b/packages/accessibility/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/accessibility/rollup.config.js +++ b/packages/accessibility/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/app/package.json b/packages/app/package.json index 9315df8..c3c02c0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "@pixi/utils": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/constants/package.json b/packages/constants/package.json index a386220..075cd3d 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/constants/rollup.config.js b/packages/constants/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/constants/rollup.config.js +++ b/packages/constants/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/package.json b/packages/core/package.json index f9bce48..ec4cd73 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -33,7 +33,7 @@ "earcut": "^2.0.7", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "pixi-gl-core": "^1.0.3", + "pixi-gl-core": "^2.0.0-alpha", "mini-runner": "^1.0.1", "@pixi/math": "^5.0.0-alpha", "@pixi/constants": "^5.0.0-alpha", @@ -45,7 +45,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index c2338f1..8383be7 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -13,18 +13,8 @@ */ export const VERSION = '__VERSION__'; -export * from '@pixi/math'; -export * from '@pixi/constants'; -export * from '@pixi/display'; - -import * as utils from '@pixi/utils'; -import * as ticker from '@pixi/ticker'; -import { settings } from '@pixi/settings'; -import CanvasRenderer from './renderers/canvas/CanvasRenderer'; -import WebGLRenderer from './renderers/webgl/WebGLRenderer'; - -export { settings, utils, ticker, CanvasRenderer, WebGLRenderer }; - +export { default as CanvasRenderer } from './renderers/canvas/CanvasRenderer'; +export { default as WebGLRenderer } from './renderers/webgl/WebGLRenderer'; export { default as FrameBuffer } from './textures/FrameBuffer'; export { default as CubeTexture } from './textures/CubeTexture'; export { default as BaseTexture } from './textures/BaseTexture'; diff --git a/packages/display/package.json b/packages/display/package.json index cd9ddf5..fe7233e 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/display/rollup.config.js b/packages/display/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/display/rollup.config.js +++ b/packages/display/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/extract/package.json b/packages/extract/package.json index ee5f45c..9afb9b5 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,7 +34,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/extract/rollup.config.js b/packages/extract/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/extract/rollup.config.js +++ b/packages/extract/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/fragments/package.json b/packages/fragments/package.json index 76304af..15f522d 100644 --- a/packages/fragments/package.json +++ b/packages/fragments/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/fragments/rollup.config.js b/packages/fragments/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/fragments/rollup.config.js +++ b/packages/fragments/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 7cc544a..867a900 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/graphics/rollup.config.js b/packages/graphics/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/graphics/rollup.config.js +++ b/packages/graphics/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/interaction/package.json b/packages/interaction/package.json index bfc4e26..b6e2f3c 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "@pixi/graphics": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/interaction/rollup.config.js b/packages/interaction/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/interaction/rollup.config.js +++ b/packages/interaction/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/loaders/package.json b/packages/loaders/package.json index 3746792..4e95914 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/loaders/rollup.config.js b/packages/loaders/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/loaders/rollup.config.js +++ b/packages/loaders/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/math/package.json b/packages/math/package.json index ad79dcf..e8e8014 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -31,7 +31,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/math/rollup.config.js b/packages/math/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/math/rollup.config.js +++ b/packages/math/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mesh/package.json b/packages/mesh/package.json index f7e3bb3..3a41629 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -39,7 +39,6 @@ "@pixi/loaders": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mesh/rollup.config.js b/packages/mesh/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mesh/rollup.config.js +++ b/packages/mesh/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 10d64e5..68938d5 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-cache-as-bitmap/rollup.config.js b/packages/mixin-cache-as-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-cache-as-bitmap/rollup.config.js +++ b/packages/mixin-cache-as-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index ff8518e..86b6af5 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/tester": "^5.0.0-alpha", "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-child-by-name/rollup.config.js b/packages/mixin-get-child-by-name/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-child-by-name/rollup.config.js +++ b/packages/mixin-get-child-by-name/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 97f13ed..7a6eab9 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -35,7 +35,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/mixin-get-global-position/rollup.config.js b/packages/mixin-get-global-position/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/mixin-get-global-position/rollup.config.js +++ b/packages/mixin-get-global-position/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/particles/package.json b/packages/particles/package.json index 9fdd3a3..b95e598 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -34,11 +34,10 @@ "@pixi/utils": "^5.0.0-alpha", "@pixi/display": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", - "pixi-gl-core": "^1.0.3" + "pixi-gl-core": "^2.0.0-alpha" }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/particles/rollup.config.js b/packages/particles/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/particles/rollup.config.js +++ b/packages/particles/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 3e5e611..0bcdfc1 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -33,7 +33,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/polyfill/rollup.config.js b/packages/polyfill/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/polyfill/rollup.config.js +++ b/packages/polyfill/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/prepare/package.json b/packages/prepare/package.json index d7087d9..079a6c5 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/prepare/rollup.config.js b/packages/prepare/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/prepare/rollup.config.js +++ b/packages/prepare/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/settings/package.json b/packages/settings/package.json index 87d7cef..91e0e38 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/settings/rollup.config.js b/packages/settings/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/settings/rollup.config.js +++ b/packages/settings/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 14eeab0..c5e9fa2 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -35,7 +35,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-animated/rollup.config.js b/packages/sprite-animated/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-animated/rollup.config.js +++ b/packages/sprite-animated/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index bcbda30..0e643f7 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -39,7 +39,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite-tiling/rollup.config.js b/packages/sprite-tiling/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite-tiling/rollup.config.js +++ b/packages/sprite-tiling/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 0d4a808..931d2a4 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -40,7 +40,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/sprite/rollup.config.js b/packages/sprite/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/sprite/rollup.config.js +++ b/packages/sprite/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index abcd2b6..34749e2 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -36,7 +36,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/spritesheet/rollup.config.js b/packages/spritesheet/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/spritesheet/rollup.config.js +++ b/packages/spritesheet/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index ba9ae2b..a8a5f95 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "exit 0" @@ -38,7 +38,6 @@ }, "devDependencies": { "@internal/builder": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text-bitmap/rollup.config.js b/packages/text-bitmap/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text-bitmap/rollup.config.js +++ b/packages/text-bitmap/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/text/package.json b/packages/text/package.json index 294eb74..6ade8f3 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/text/rollup.config.js b/packages/text/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/text/rollup.config.js +++ b/packages/text/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/ticker/package.json b/packages/ticker/package.json index aa9e44c..86f9b33 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -34,7 +34,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/ticker/rollup.config.js b/packages/ticker/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/ticker/rollup.config.js +++ b/packages/ticker/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/package.json b/packages/utils/package.json index e1b9c47..e9e2f9d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -19,8 +19,8 @@ "access": "public" }, "scripts": { - "build:dev": "rollup -c && rollup -c -f cjs", - "build": "rollup -cp && rollup -cp -f cjs", + "build:dev": "rollup -c", + "build": "rollup -cp", "watch": "rollup -cw", "postversion": "npm run build", "test": "tester" @@ -38,7 +38,6 @@ "devDependencies": { "@internal/builder": "^5.0.0-alpha", "@internal/tester": "^5.0.0-alpha", - "rollup": "^0.50.0", - "rollup-watch": "^4.3.1" + "rollup": "^0.50.0" } } \ No newline at end of file diff --git a/packages/utils/rollup.config.js b/packages/utils/rollup.config.js index 15f56df..a73c874 100644 --- a/packages/utils/rollup.config.js +++ b/packages/utils/rollup.config.js @@ -1 +1 @@ -export * from '@internal/builder'; +export { default } from '@internal/builder'; diff --git a/packages/utils/src/browser/deprecationWarn.js b/packages/utils/src/browser/deprecationWarn.js deleted file mode 100644 index 8e348da..0000000 --- a/packages/utils/src/browser/deprecationWarn.js +++ /dev/null @@ -1,37 +0,0 @@ -// provide method to give a stack track for warnings -// useful for tracking-down where deprecated methods/properties/classes -// are being used within the code -export function deprecationWarn(msg) -{ - /* eslint-disable no-console */ - let stack = new Error().stack; - - // Handle IE < 10 and Safari < 6 - if (typeof stack === 'undefined') - { - console.warn('Deprecation Warning: ', msg); - } - else - { - // chop off the stack trace which includes pixi.js internal calls - stack = stack.split('\n').splice(3).join('\n'); - - if (console.groupCollapsed) - { - console.groupCollapsed( - '%cDeprecation Warning: %c%s', - 'color:#614108;background:#fffbe6', - 'font-weight:normal;color:#614108;background:#fffbe6', - msg - ); - console.warn(stack); - console.groupEnd(); - } - else - { - console.warn('Deprecation Warning: ', msg); - console.warn(stack); - } - } - /* eslint-enable no-console */ -} diff --git a/packages/utils/src/browser/getTestContext.js b/packages/utils/src/browser/getTestContext.js deleted file mode 100644 index bd1e189..0000000 --- a/packages/utils/src/browser/getTestContext.js +++ /dev/null @@ -1,48 +0,0 @@ -import { settings } from '@pixi/settings'; - -let context = null; - -/** - * returns a little webGL context to use for program inspection. - * - * @static - * @private - * @returns {webGL-context} a gl context to test with - */ -export function getTestContext() -{ - if (!context) - { - const canvas = document.createElement('canvas'); - - let gl; - - if (settings.PREFER_WEBGL_2) - { - gl = canvas.getContext('webgl2', {}); - } - - if (!gl) - { - gl = canvas.getContext('webgl', {}) - || canvas.getContext('experimental-webgl', {}); - - if (!gl) - { - // fail, not able to get a context - throw new Error('This browser does not support webGL. Try using the canvas renderer'); - } - else - { - // for shader testing.. - gl.getExtension('WEBGL_draw_buffers'); - } - } - - context = gl; - - return gl; - } - - return context; -} diff --git a/packages/utils/src/browser/index.js b/packages/utils/src/browser/index.js index c58251d..c3fdce7 100644 --- a/packages/utils/src/browser/index.js +++ b/packages/utils/src/browser/index.js @@ -1,3 +1,2 @@ export * from './hello'; export * from './isWebGLSupported'; -export * from './deprecationWarn'; diff --git a/packages/utils/src/deprecation.js b/packages/utils/src/deprecation.js deleted file mode 100644 index b34d942..0000000 --- a/packages/utils/src/deprecation.js +++ /dev/null @@ -1,23 +0,0 @@ -import { deprecationWarn as warn } from './browser/deprecationWarn'; - -/** - * @function PIXI.utils.getSvgSize - * @see PIXI.SVGResource.getSize - * @deprecated since 5.0.0 - */ -export function getSvgSize() -{ - warn('PIXI.utils.getSvgSize has moved to PIXI.SVGResource.getSize'); -} - -/** - * @constant - * @name SVG_SIZE - * @memberof PIXI.utils - * @see PIXI.SVGResource.SVG_SIZE - * @deprecated since 5.0.0 - */ -export function SVG_SIZE() -{ - warn('PIXI.utils.SVG_SIZE has moved to PIXI.SVGResource.SVG_SIZE'); -} diff --git a/packages/utils/src/index.js b/packages/utils/src/index.js index 9152ec1..2466fa7 100644 --- a/packages/utils/src/index.js +++ b/packages/utils/src/index.js @@ -59,6 +59,5 @@ export * from './media'; export * from './network'; export * from './const'; -export * from './deprecation'; import './settings'; diff --git a/tools/builder/index.js b/tools/builder/index.js index 49114e0..4da4a20 100644 --- a/tools/builder/index.js +++ b/tools/builder/index.js @@ -11,27 +11,20 @@ const preprocess = require('rollup-plugin-preprocess').default; const pkg = require(path.resolve('./package')); -const safeName = path.basename(pkg.name); const input = 'src/index.js'; -const { prod, format, output } = minimist(process.argv.slice(2), { - string: ['format', 'output'], - boolean: ['prod'], +const { prod, bundle } = minimist(process.argv.slice(2), { + boolean: ['prod', 'bundle'], default: { - format: 'es', prod: false, - output: '', + bundle: false, }, alias: { - f: 'format', p: 'prod', - o: 'output', + b: 'bundle', }, }); -// Allow overriding output, but default to "module" and "main" fields -const file = output || (format === 'es' ? pkg.module : pkg.main); - const plugins = [ resolve({ browser: true, @@ -41,7 +34,7 @@ commonjs({ namedExports: { 'resource-loader': ['Resource'], - 'pixi-gl-core': ['GLFramebuffer'], + 'pixi-gl-core': ['GLFramebuffer'], // TODO: remove pixi-gl-core }, }), string({ @@ -62,6 +55,21 @@ }, }), buble(), + // This workaround plugin removes Object.freeze usage with Rollup + // because there is no way to disable and we need it to + // properly add deprecated methods/classes on namespaces + // such as PIXI.utils or PIXI.loaders, code was borrowed + // from 'rollup-plugin-es3' + // TODO: Removes this when opt-out option for Rollup is available + { + name: 'thaw', + transformBundle(code) + { + code = code.replace(/Object.freeze\s*\(\s*([^)]*)\)/g, '$1'); + + return { code, map: { mappings: '' } }; + }, + }, ]; if (prod) @@ -90,7 +98,9 @@ } const compiled = (new Date()).toUTCString().replace(/GMT/g, 'UTC'); - +const external = Object.keys(pkg.dependencies || []); +const sourcemap = true; +const name = 'PIXI'; const banner = `/*! * ${pkg.name} - v${pkg.version} * Compiled ${compiled} @@ -99,17 +109,28 @@ * http://www.opensource.org/licenses/mit-license */\n`; -const name = `__${safeName.replace(/-/g, '_')}`; - -module.exports = { - banner, - name, - input, - output: { - file, - format, +exports.default = [ + { + banner, + name, + input, + output: { + file: pkg.main, + format: bundle ? 'umd' : 'cjs', + }, + external, + sourcemap, + plugins, }, - external: Object.keys(pkg.dependencies || []), - sourcemap: true, - plugins, -}; + { + banner, + input, + output: { + file: pkg.module, + format: 'es', + }, + external, + sourcemap, + plugins, + }, +];